258 changed files with 7566 additions and 17238 deletions
--- a/.env.sample
+++ b/.env.sample
@ -2,4 +2,3 @@ ENV=production
 DATABASE_URL=data.db
 DATABASE_TYPE=sqlite
 CUSTOM_ACCESS_TOKEN_SCRIPT="function(user,tokenPayload){var data = tokenPayload;data.extra = {'x-extra-id': user.id};return data;}"
-DISABLE_PLAYGROUND=true
--- a/.env.test
+++ b/.env.test
@ -7,9 +7,4 @@ SMTP_PORT=2525
 SMTP_USERNAME=test
 SMTP_PASSWORD=test
 SENDER_EMAIL="info@authorizer.dev"
-TWILIO_API_KEY=test
-TWILIO_API_SECRET=test
-TWILIO_ACCOUNT_SID=ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-TWILIO_SENDER=909921212112
-SENDER_NAME="Authorizer"
 AWS_REGION=ap-south-1
--- a/.gitea/workflows/main.yml
+++ b/.gitea/workflows/main.yml
@ -1,36 +0,0 @@
-name: "deploy"
-on: [push]
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cloning repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Get Repo Name
-        id: repo_name
-        run: echo "::set-output name=repo::$(echo ${GITHUB_REPOSITORY##*/})"
-
-      - name: Get Branch Name
-        id: branch_name
-        run: echo "::set-output name=branch::$(echo ${GITHUB_REF##*/})"
-
-      - name: Push branch 'discours-dev' to staging
-        if: steps.branch_name.outputs.branch == 'discours-dev'
-        uses: dokku/github-action@master
-        with:
-          branch: "main"
-          git_remote_url: "ssh://dokku@staging.discours.io:22/authorizer"
-          ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
-
-      - name: Push branch 'discours' to v2.discours.io
-        if: steps.branch_name.outputs.branch == 'discours'
-        uses: dokku/github-action@master
-        with:
-          branch: "main"
-          git_remote_url: "ssh://dokku@v2.discours.io:22/authorizer"
-          ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
-          git_push_flags: '--force'
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -45,30 +45,12 @@ Please ask as many questions as you need, either directly in the issue or on [Di
 1. Fork the [authorizer](https://github.com/authorizerdev/authorizer) repository (**Skip this step if you have access to repo**)
 2. Clone repo: `git clone https://github.com/authorizerdev/authorizer.git` or use the forked url from step 1
 3. Change directory to authorizer: `cd authorizer`
-4. Create Env file `cp .env.sample .env`. Check all the supported env [here](https://docs.authorizer.dev/core/env/)
-5. Build Dashboard `make build-dashboard`
-6. Build App `make build-app`
-7. Build Server `make clean && make`
+5. Create Env file `cp .env.sample .env`. Check all the supported env [here](https://docs.authorizer.dev/core/env/)
+6. Build Dashboard `make build-dashboard`
+7. Build App `make build-app`
+8. Build Server `make clean && make`
   > Note: if you don't have [`make`](https://www.ibm.com/docs/en/aix/7.2?topic=concepts-make-command), you can `cd` into `server` dir and build using the `go build` command. In that case you will have to build `dashboard` & `app` manually using `npm run build` on both dirs.
-8. Run binary `./build/server`
-
-### Updating GraphQL schema
-
- Modify `server/graph/schema.graphqls` file
- Run `make generate-graphql` this will update the models and required methods
- If a new mutation or query is added
-  - Write the implementation for the new resolver in `server/resolvers/NEW_RESOLVER.GO`
-  - Update `server/graph/schema.resolvers.go` with the new resolver method
-
-### Adding support for new database
-
- Run `make generate-db-template dbname=NEW_DB_NAME`
-  eg `make generate-db-template dbname=dynamodb`
-
-This command will generate a folder in server/db/providers/ with name specified in the above command.
-One will have to implement methods present in that folder.
-
-> Note: Connection for database and schema changes are written in `server/db/providers/DB_NAME/provider.go` > `NewProvider` method is called for any given db based on the env variables present.
+9. Run binary `./build/server`

 ### Testing

--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-github: authorizerdev
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@ -62,14 +62,12 @@ jobs:
        run: |
          make clean && \
          make build && \
-          mkdir -p authorizer-${VERSION}-darwin-arm64/build authorizer-${VERSION}-darwin-arm64/app authorizer-${VERSION}-darwin-arm64/dashboard && cp build/darwin/arm64/server authorizer-${VERSION}-darwin-arm64/build/ && cp .env authorizer-${VERSION}-darwin-arm64/.env && cp -rf app/build authorizer-${VERSION}-darwin-arm64/app/build && cp -rf templates authorizer-${VERSION}-darwin-arm64/ && cp -rf dashboard/build authorizer-${VERSION}-darwin-arm64/dashboard/build && tar cvfz authorizer-${VERSION}-darwin-arm64.tar.gz authorizer-${VERSION}-darwin-arm64 && \
          mkdir -p authorizer-${VERSION}-darwin-amd64/build authorizer-${VERSION}-darwin-amd64/app authorizer-${VERSION}-darwin-amd64/dashboard && cp build/darwin/amd64/server authorizer-${VERSION}-darwin-amd64/build/ && cp .env authorizer-${VERSION}-darwin-amd64/.env && cp -rf app/build authorizer-${VERSION}-darwin-amd64/app/build && cp -rf templates authorizer-${VERSION}-darwin-amd64/ && cp -rf dashboard/build authorizer-${VERSION}-darwin-amd64/dashboard/build && tar cvfz authorizer-${VERSION}-darwin-amd64.tar.gz authorizer-${VERSION}-darwin-amd64 && \
          mkdir -p authorizer-${VERSION}-linux-amd64/build authorizer-${VERSION}-linux-amd64/app authorizer-${VERSION}-linux-amd64/dashboard && cp build/linux/amd64/server authorizer-${VERSION}-linux-amd64/build/ && cp .env authorizer-${VERSION}-linux-amd64/.env && cp -rf app/build authorizer-${VERSION}-linux-amd64/app/build && cp -rf templates authorizer-${VERSION}-linux-amd64/ && cp -rf dashboard/build authorizer-${VERSION}-linux-amd64/dashboard/build && tar cvfz authorizer-${VERSION}-linux-amd64.tar.gz authorizer-${VERSION}-linux-amd64 && \
          mkdir -p authorizer-${VERSION}-linux-arm64/build authorizer-${VERSION}-linux-arm64/app authorizer-${VERSION}-linux-arm64/dashboard && cp build/linux/arm64/server authorizer-${VERSION}-linux-arm64/build/ && cp .env authorizer-${VERSION}-linux-arm64/.env && cp -rf app/build authorizer-${VERSION}-linux-arm64/app/build && cp -rf templates authorizer-${VERSION}-linux-arm64/ && cp -rf dashboard/build authorizer-${VERSION}-linux-arm64/dashboard/build && tar cvfz authorizer-${VERSION}-linux-arm64.tar.gz authorizer-${VERSION}-linux-arm64 && \
          mkdir -p authorizer-${VERSION}-windows-amd64/build authorizer-${VERSION}-windows-amd64/app authorizer-${VERSION}-windows-amd64/dashboard && cp build/windows/amd64/server.exe authorizer-${VERSION}-windows-amd64/build/ && cp .env authorizer-${VERSION}-windows-amd64/.env && cp -rf app/build authorizer-${VERSION}-windows-amd64/app/build && cp -rf templates authorizer-${VERSION}-windows-amd64/ && cp -rf dashboard/build authorizer-${VERSION}-windows-amd64/dashboard/build && zip -vr authorizer-${VERSION}-windows-amd64.zip authorizer-${VERSION}-windows-amd64
      - name: Upload assets
        run: |
-          github-assets-uploader -f authorizer-${VERSION}-darwin-arm64.tar.gz -mediatype application/gzip -repo authorizerdev/authorizer -token ${{secrets.RELEASE_TOKEN}} -tag ${VERSION}
          github-assets-uploader -f authorizer-${VERSION}-darwin-amd64.tar.gz -mediatype application/gzip -repo authorizerdev/authorizer -token ${{secrets.RELEASE_TOKEN}} -tag ${VERSION}
          github-assets-uploader -f authorizer-${VERSION}-linux-amd64.tar.gz -mediatype application/gzip -repo authorizerdev/authorizer -token ${{secrets.RELEASE_TOKEN}} -tag ${VERSION}
          github-assets-uploader -f authorizer-${VERSION}-linux-arm64.tar.gz -mediatype application/gzip -repo authorizerdev/authorizer -token ${{secrets.RELEASE_TOKEN}} -tag ${VERSION}
--- a/.gitignore
+++ b/.gitignore
@ -18,5 +18,3 @@ yalc.lock
 certs/
 *-shm
 *-wal
-.idea
-*.iml
--- a/6
+++ b/6
@ -1,4 +1,4 @@
-FROM golang:1.21.3-alpine3.18 AS go-builder
+FROM golang:1.19.1-alpine as go-builder
 WORKDIR /authorizer
 COPY server server
 COPY Makefile .
@ -11,7 +11,7 @@ RUN apk add build-base &&\
    make clean && make && \
    chmod 777 build/server

-FROM node:20-alpine3.18 AS node-builder
+FROM node:17-alpine3.12 as node-builder
 WORKDIR /authorizer
 COPY app app
 COPY dashboard dashboard
@ -20,7 +20,7 @@ RUN apk add build-base &&\
    make build-app && \
    make build-dashboard

-FROM alpine:3.18
+FROM alpine:latest
 RUN adduser -D -h /authorizer -u 1000 -k /dev/null authorizer
 WORKDIR /authorizer
 RUN mkdir app dashboard
--- a/13
+++ b/13
@ -5,7 +5,7 @@ cmd:
 	cd server && go build -ldflags "-w -X main.VERSION=$(VERSION)" -o '../build/server'
 build:
 	cd server && gox \
-		-osarch="linux/amd64 linux/arm64 darwin/arm64 darwin/amd64 windows/amd64" \
+		-osarch="linux/amd64 linux/arm64 darwin/amd64 windows/amd64" \
 		-ldflags "-w -X main.VERSION=$(VERSION)" \
 		-output="../build/{{.OS}}/{{.Arch}}/server" \
 		./...
@ -26,7 +26,7 @@ test-scylladb:
 	cd server && go clean --testcache && TEST_DBS="scylladb" go test -p 1 -v ./test
 	docker rm -vf authorizer_scylla_db
 test-arangodb:
-	docker run -d --name authorizer_arangodb -p 8529:8529 -e ARANGO_NO_AUTH=1 arangodb/arangodb:3.10.3
+	docker run -d --name authorizer_arangodb -p 8529:8529 -e ARANGO_NO_AUTH=1 arangodb/arangodb:3.8.4
 	cd server && go clean --testcache && TEST_DBS="arangodb" go test -p 1 -v ./test
 	docker rm -vf authorizer_arangodb
 test-dynamodb:
@ -35,25 +35,20 @@ test-dynamodb:
 	docker rm -vf dynamodb-local-test
 test-couchbase:
 	docker run -d --name couchbase-local-test  -p 8091-8097:8091-8097 -p 11210:11210 -p 11207:11207 -p 18091-18095:18091-18095 -p 18096:18096 -p 18097:18097 couchbase:latest
-	sh scripts/couchbase-test.sh
 	cd server && go clean --testcache && TEST_DBS="couchbase" go test -p 1 -v ./test
 	docker rm -vf couchbase-local-test
 test-all-db:
 	rm -rf server/test/test.db server/test/test.db-shm server/test/test.db-wal && rm -rf test.db test.db-shm test.db-wal
 	docker run -d --name authorizer_scylla_db -p 9042:9042 scylladb/scylla
 	docker run -d --name authorizer_mongodb_db -p 27017:27017 mongo:4.4.15
-	docker run -d --name authorizer_arangodb -p 8529:8529 -e ARANGO_NO_AUTH=1 arangodb/arangodb:3.10.3
+	docker run -d --name authorizer_arangodb -p 8529:8529 -e ARANGO_NO_AUTH=1 arangodb/arangodb:3.8.4
 	docker run -d --name dynamodb-local-test  -p 8000:8000 amazon/dynamodb-local:latest
 	docker run -d --name couchbase-local-test  -p 8091-8097:8091-8097 -p 11210:11210 -p 11207:11207 -p 18091-18095:18091-18095 -p 18096:18096 -p 18097:18097 couchbase:latest
-	sh scripts/couchbase-test.sh
 	cd server && go clean --testcache && TEST_DBS="sqlite,mongodb,arangodb,scylladb,dynamodb,couchbase" go test -p 1 -v ./test
 	docker rm -vf authorizer_scylla_db
 	docker rm -vf authorizer_mongodb_db
 	docker rm -vf authorizer_arangodb
 	docker rm -vf dynamodb-local-test
 	docker rm -vf couchbase-local-test
-generate-graphql:
+generate:
 	cd server && go run github.com/99designs/gqlgen generate && go mod tidy
-generate-db-template:
-	cp -rf server/db/providers/provider_template server/db/providers/${dbname}
-	find server/db/providers/${dbname} -type f -exec sed -i -e 's/provider_template/${dbname}/g' {} \;
--- a/README.md
+++ b/README.md
@ -68,8 +68,6 @@ Deploy production ready Authorizer instance using one click deployment options a
 |    Railway.app     |                    <a href="https://railway.app/new/template/nwXp1C?referralCode=FEF4uT"><img src="https://railway.app/button.svg" style="height: 44px" alt="Deploy on Railway"></a>                     | [docs](https://docs.authorizer.dev/deployment/railway) |
 |       Heroku       | <a href="https://heroku.com/deploy?template=https://github.com/authorizerdev/authorizer-heroku"><img src="https://www.herokucdn.com/deploy/button.svg" alt="Deploy to Heroku" style="height: 44px;"></a> | [docs](https://docs.authorizer.dev/deployment/heroku)  |
 |       Render       |                     [![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/authorizerdev/authorizer-render)                      | [docs](https://docs.authorizer.dev/deployment/render)  |
-|       Koyeb       | <a target="_blank" href="https://app.koyeb.com/deploy?name=authorizer&type=docker&image=docker.io/lakhansamani/authorizer&env[PORT]=8000&env[DATABASE_TYPE]=postgres&env[DATABASE_URL]=CHANGE_ME&ports=8000;http;/"><img alt="Deploy to Koyeb" src="https://www.koyeb.com/static/images/deploy/button.svg" /></a> | [docs](https://docs.authorizer.dev/deployment/koyeb)  |
-|     RepoCloud     | <a href="https://repocloud.io/details/?app_id=174"><img src="https://d16t0pc4846x52.cloudfront.net/deploy.png" alt="Deploy on RepoCloud"></a> | [docs](https://repocloud.io/details/?app_id=174) |

 ### Deploy Authorizer Using Source Code

--- a/app/package-lock.json
+++ b/app/package-lock.json
--- a/app/package.json
+++ b/app/package.json
@ -12,7 +12,7 @@
 	"author": "Lakhan Samani",
 	"license": "ISC",
 	"dependencies": {
-		"@authorizerdev/authorizer-react": "^1.3.2",
+		"@authorizerdev/authorizer-react": "^1.1.7",
 		"@types/react": "^17.0.15",
 		"@types/react-dom": "^17.0.9",
 		"esbuild": "^0.12.17",
--- a/app/pnpm-lock.yaml
+++ b/app/pnpm-lock.yaml
@ -1,626 +0,0 @@
-lockfileVersion: 5.4
-
-specifiers:
-  '@authorizerdev/authorizer-react': ^1.1.9
-  '@types/react': ^17.0.15
-  '@types/react-dom': ^17.0.9
-  '@types/react-router-dom': ^5.1.8
-  '@types/styled-components': ^5.1.11
-  esbuild: ^0.12.17
-  prettier: 2.7.1
-  react: ^17.0.2
-  react-dom: ^17.0.2
-  react-is: ^17.0.2
-  react-router-dom: ^5.2.0
-  styled-components: ^5.3.0
-  typescript: ^4.3.5
-
-dependencies:
-  '@authorizerdev/authorizer-react': 1.1.9_react@17.0.2
-  '@types/react': 17.0.53
-  '@types/react-dom': 17.0.19
-  esbuild: 0.12.29
-  react: 17.0.2
-  react-dom: 17.0.2_react@17.0.2
-  react-is: 17.0.2
-  react-router-dom: 5.3.4_react@17.0.2
-  styled-components: 5.3.9_fane7jikarojcev26y27hpbhu4
-  typescript: 4.9.5
-
-devDependencies:
-  '@types/react-router-dom': 5.3.3
-  '@types/styled-components': 5.1.26
-  prettier: 2.7.1
-
-packages:
-
-  /@authorizerdev/authorizer-js/1.2.1:
-    resolution: {integrity: sha512-/nFARvsHyZUsGFKrcYi8hgpnbThYR/NMJ2BJdQpWy/x7QsBnfLeCChBYWncbYHSIjFCa5PPKKfvhXM56HqVqsw==}
-    engines: {node: '>=10'}
-    dependencies:
-      cross-fetch: 3.1.5
-    transitivePeerDependencies:
-      - encoding
-    dev: false
-
-  /@authorizerdev/authorizer-react/1.1.9_react@17.0.2:
-    resolution: {integrity: sha512-BlB4ixEm9nf+yjZ9OqIWbx5fMTmzeByEsNDAd5iYkt6HB+3Sk53DGiO5h6SgJznzPyqAwl8yg6y/QgbZreDTFA==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      react: '>=16'
-    dependencies:
-      '@authorizerdev/authorizer-js': 1.2.1
-      react: 17.0.2
-    transitivePeerDependencies:
-      - encoding
-    dev: false
-
-  /@babel/code-frame/7.18.6:
-    resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/highlight': 7.18.6
-    dev: false
-
-  /@babel/generator/7.21.3:
-    resolution: {integrity: sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.21.3
-      '@jridgewell/gen-mapping': 0.3.2
-      '@jridgewell/trace-mapping': 0.3.17
-      jsesc: 2.5.2
-    dev: false
-
-  /@babel/helper-annotate-as-pure/7.18.6:
-    resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.21.3
-    dev: false
-
-  /@babel/helper-environment-visitor/7.18.9:
-    resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==}
-    engines: {node: '>=6.9.0'}
-    dev: false
-
-  /@babel/helper-function-name/7.21.0:
-    resolution: {integrity: sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.20.7
-      '@babel/types': 7.21.3
-    dev: false
-
-  /@babel/helper-hoist-variables/7.18.6:
-    resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.21.3
-    dev: false
-
-  /@babel/helper-module-imports/7.18.6:
-    resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.21.3
-    dev: false
-
-  /@babel/helper-split-export-declaration/7.18.6:
-    resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.21.3
-    dev: false
-
-  /@babel/helper-string-parser/7.19.4:
-    resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==}
-    engines: {node: '>=6.9.0'}
-    dev: false
-
-  /@babel/helper-validator-identifier/7.19.1:
-    resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
-    engines: {node: '>=6.9.0'}
-    dev: false
-
-  /@babel/highlight/7.18.6:
-    resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-validator-identifier': 7.19.1
-      chalk: 2.4.2
-      js-tokens: 4.0.0
-    dev: false
-
-  /@babel/parser/7.21.3:
-    resolution: {integrity: sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.21.3
-    dev: false
-
-  /@babel/runtime/7.21.0:
-    resolution: {integrity: sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      regenerator-runtime: 0.13.11
-    dev: false
-
-  /@babel/template/7.20.7:
-    resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@babel/parser': 7.21.3
-      '@babel/types': 7.21.3
-    dev: false
-
-  /@babel/traverse/7.21.3_supports-color@5.5.0:
-    resolution: {integrity: sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@babel/generator': 7.21.3
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.21.0
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/parser': 7.21.3
-      '@babel/types': 7.21.3
-      debug: 4.3.4_supports-color@5.5.0
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /@babel/types/7.21.3:
-    resolution: {integrity: sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-string-parser': 7.19.4
-      '@babel/helper-validator-identifier': 7.19.1
-      to-fast-properties: 2.0.0
-    dev: false
-
-  /@emotion/is-prop-valid/1.2.0:
-    resolution: {integrity: sha512-3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg==}
-    dependencies:
-      '@emotion/memoize': 0.8.0
-    dev: false
-
-  /@emotion/memoize/0.8.0:
-    resolution: {integrity: sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==}
-    dev: false
-
-  /@emotion/stylis/0.8.5:
-    resolution: {integrity: sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==}
-    dev: false
-
-  /@emotion/unitless/0.7.5:
-    resolution: {integrity: sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==}
-    dev: false
-
-  /@jridgewell/gen-mapping/0.3.2:
-    resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      '@jridgewell/set-array': 1.1.2
-      '@jridgewell/sourcemap-codec': 1.4.14
-      '@jridgewell/trace-mapping': 0.3.17
-    dev: false
-
-  /@jridgewell/resolve-uri/3.1.0:
-    resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
-    engines: {node: '>=6.0.0'}
-    dev: false
-
-  /@jridgewell/set-array/1.1.2:
-    resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==}
-    engines: {node: '>=6.0.0'}
-    dev: false
-
-  /@jridgewell/sourcemap-codec/1.4.14:
-    resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
-    dev: false
-
-  /@jridgewell/trace-mapping/0.3.17:
-    resolution: {integrity: sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==}
-    dependencies:
-      '@jridgewell/resolve-uri': 3.1.0
-      '@jridgewell/sourcemap-codec': 1.4.14
-    dev: false
-
-  /@types/history/4.7.11:
-    resolution: {integrity: sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==}
-    dev: true
-
-  /@types/hoist-non-react-statics/3.3.1:
-    resolution: {integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==}
-    dependencies:
-      '@types/react': 17.0.53
-      hoist-non-react-statics: 3.3.2
-    dev: true
-
-  /@types/prop-types/15.7.5:
-    resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
-
-  /@types/react-dom/17.0.19:
-    resolution: {integrity: sha512-PiYG40pnQRdPHnlf7tZnp0aQ6q9tspYr72vD61saO6zFCybLfMqwUCN0va1/P+86DXn18ZWeW30Bk7xlC5eEAQ==}
-    dependencies:
-      '@types/react': 17.0.53
-    dev: false
-
-  /@types/react-router-dom/5.3.3:
-    resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==}
-    dependencies:
-      '@types/history': 4.7.11
-      '@types/react': 17.0.53
-      '@types/react-router': 5.1.20
-    dev: true
-
-  /@types/react-router/5.1.20:
-    resolution: {integrity: sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==}
-    dependencies:
-      '@types/history': 4.7.11
-      '@types/react': 17.0.53
-    dev: true
-
-  /@types/react/17.0.53:
-    resolution: {integrity: sha512-1yIpQR2zdYu1Z/dc1OxC+MA6GR240u3gcnP4l6mvj/PJiVaqHsQPmWttsvHsfnhfPbU2FuGmo0wSITPygjBmsw==}
-    dependencies:
-      '@types/prop-types': 15.7.5
-      '@types/scheduler': 0.16.3
-      csstype: 3.1.1
-
-  /@types/scheduler/0.16.3:
-    resolution: {integrity: sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==}
-
-  /@types/styled-components/5.1.26:
-    resolution: {integrity: sha512-KuKJ9Z6xb93uJiIyxo/+ksS7yLjS1KzG6iv5i78dhVg/X3u5t1H7juRWqVmodIdz6wGVaIApo1u01kmFRdJHVw==}
-    dependencies:
-      '@types/hoist-non-react-statics': 3.3.1
-      '@types/react': 17.0.53
-      csstype: 3.1.1
-    dev: true
-
-  /ansi-styles/3.2.1:
-    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
-    engines: {node: '>=4'}
-    dependencies:
-      color-convert: 1.9.3
-    dev: false
-
-  /babel-plugin-styled-components/2.0.7_styled-components@5.3.9:
-    resolution: {integrity: sha512-i7YhvPgVqRKfoQ66toiZ06jPNA3p6ierpfUuEWxNF+fV27Uv5gxBkf8KZLHUCc1nFA9j6+80pYoIpqCeyW3/bA==}
-    peerDependencies:
-      styled-components: '>= 2'
-    dependencies:
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-module-imports': 7.18.6
-      babel-plugin-syntax-jsx: 6.18.0
-      lodash: 4.17.21
-      picomatch: 2.3.1
-      styled-components: 5.3.9_fane7jikarojcev26y27hpbhu4
-    dev: false
-
-  /babel-plugin-syntax-jsx/6.18.0:
-    resolution: {integrity: sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==}
-    dev: false
-
-  /camelize/1.0.1:
-    resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==}
-    dev: false
-
-  /chalk/2.4.2:
-    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
-    engines: {node: '>=4'}
-    dependencies:
-      ansi-styles: 3.2.1
-      escape-string-regexp: 1.0.5
-      supports-color: 5.5.0
-    dev: false
-
-  /color-convert/1.9.3:
-    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
-    dependencies:
-      color-name: 1.1.3
-    dev: false
-
-  /color-name/1.1.3:
-    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
-    dev: false
-
-  /cross-fetch/3.1.5:
-    resolution: {integrity: sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==}
-    dependencies:
-      node-fetch: 2.6.7
-    transitivePeerDependencies:
-      - encoding
-    dev: false
-
-  /css-color-keywords/1.0.0:
-    resolution: {integrity: sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==}
-    engines: {node: '>=4'}
-    dev: false
-
-  /css-to-react-native/3.2.0:
-    resolution: {integrity: sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==}
-    dependencies:
-      camelize: 1.0.1
-      css-color-keywords: 1.0.0
-      postcss-value-parser: 4.2.0
-    dev: false
-
-  /csstype/3.1.1:
-    resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
-
-  /debug/4.3.4_supports-color@5.5.0:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.2
-      supports-color: 5.5.0
-    dev: false
-
-  /esbuild/0.12.29:
-    resolution: {integrity: sha512-w/XuoBCSwepyiZtIRsKsetiLDUVGPVw1E/R3VTFSecIy8UR7Cq3SOtwKHJMFoVqqVG36aGkzh4e8BvpO1Fdc7g==}
-    hasBin: true
-    requiresBuild: true
-    dev: false
-
-  /escape-string-regexp/1.0.5:
-    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
-    engines: {node: '>=0.8.0'}
-    dev: false
-
-  /globals/11.12.0:
-    resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
-    engines: {node: '>=4'}
-    dev: false
-
-  /has-flag/3.0.0:
-    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
-    engines: {node: '>=4'}
-    dev: false
-
-  /history/4.10.1:
-    resolution: {integrity: sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==}
-    dependencies:
-      '@babel/runtime': 7.21.0
-      loose-envify: 1.4.0
-      resolve-pathname: 3.0.0
-      tiny-invariant: 1.3.1
-      tiny-warning: 1.0.3
-      value-equal: 1.0.1
-    dev: false
-
-  /hoist-non-react-statics/3.3.2:
-    resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
-    dependencies:
-      react-is: 16.13.1
-
-  /isarray/0.0.1:
-    resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==}
-    dev: false
-
-  /js-tokens/4.0.0:
-    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
-    dev: false
-
-  /jsesc/2.5.2:
-    resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
-    engines: {node: '>=4'}
-    hasBin: true
-    dev: false
-
-  /lodash/4.17.21:
-    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
-    dev: false
-
-  /loose-envify/1.4.0:
-    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
-    hasBin: true
-    dependencies:
-      js-tokens: 4.0.0
-    dev: false
-
-  /ms/2.1.2:
-    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
-    dev: false
-
-  /node-fetch/2.6.7:
-    resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
-    engines: {node: 4.x || >=6.0.0}
-    peerDependencies:
-      encoding: ^0.1.0
-    peerDependenciesMeta:
-      encoding:
-        optional: true
-    dependencies:
-      whatwg-url: 5.0.0
-    dev: false
-
-  /object-assign/4.1.1:
-    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
-  /path-to-regexp/1.8.0:
-    resolution: {integrity: sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==}
-    dependencies:
-      isarray: 0.0.1
-    dev: false
-
-  /picomatch/2.3.1:
-    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
-    engines: {node: '>=8.6'}
-    dev: false
-
-  /postcss-value-parser/4.2.0:
-    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
-    dev: false
-
-  /prettier/2.7.1:
-    resolution: {integrity: sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-    dev: true
-
-  /prop-types/15.8.1:
-    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
-    dependencies:
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-      react-is: 16.13.1
-    dev: false
-
-  /react-dom/17.0.2_react@17.0.2:
-    resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==}
-    peerDependencies:
-      react: 17.0.2
-    dependencies:
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-      react: 17.0.2
-      scheduler: 0.20.2
-    dev: false
-
-  /react-is/16.13.1:
-    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
-
-  /react-is/17.0.2:
-    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
-    dev: false
-
-  /react-router-dom/5.3.4_react@17.0.2:
-    resolution: {integrity: sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==}
-    peerDependencies:
-      react: '>=15'
-    dependencies:
-      '@babel/runtime': 7.21.0
-      history: 4.10.1
-      loose-envify: 1.4.0
-      prop-types: 15.8.1
-      react: 17.0.2
-      react-router: 5.3.4_react@17.0.2
-      tiny-invariant: 1.3.1
-      tiny-warning: 1.0.3
-    dev: false
-
-  /react-router/5.3.4_react@17.0.2:
-    resolution: {integrity: sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==}
-    peerDependencies:
-      react: '>=15'
-    dependencies:
-      '@babel/runtime': 7.21.0
-      history: 4.10.1
-      hoist-non-react-statics: 3.3.2
-      loose-envify: 1.4.0
-      path-to-regexp: 1.8.0
-      prop-types: 15.8.1
-      react: 17.0.2
-      react-is: 16.13.1
-      tiny-invariant: 1.3.1
-      tiny-warning: 1.0.3
-    dev: false
-
-  /react/17.0.2:
-    resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-    dev: false
-
-  /regenerator-runtime/0.13.11:
-    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
-    dev: false
-
-  /resolve-pathname/3.0.0:
-    resolution: {integrity: sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==}
-    dev: false
-
-  /scheduler/0.20.2:
-    resolution: {integrity: sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==}
-    dependencies:
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-    dev: false
-
-  /shallowequal/1.1.0:
-    resolution: {integrity: sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==}
-    dev: false
-
-  /styled-components/5.3.9_fane7jikarojcev26y27hpbhu4:
-    resolution: {integrity: sha512-Aj3kb13B75DQBo2oRwRa/APdB5rSmwUfN5exyarpX+x/tlM/rwZA2vVk2vQgVSP6WKaZJHWwiFrzgHt+CLtB4A==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      react: '>= 16.8.0'
-      react-dom: '>= 16.8.0'
-      react-is: '>= 16.8.0'
-    dependencies:
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/traverse': 7.21.3_supports-color@5.5.0
-      '@emotion/is-prop-valid': 1.2.0
-      '@emotion/stylis': 0.8.5
-      '@emotion/unitless': 0.7.5
-      babel-plugin-styled-components: 2.0.7_styled-components@5.3.9
-      css-to-react-native: 3.2.0
-      hoist-non-react-statics: 3.3.2
-      react: 17.0.2
-      react-dom: 17.0.2_react@17.0.2
-      react-is: 17.0.2
-      shallowequal: 1.1.0
-      supports-color: 5.5.0
-    dev: false
-
-  /supports-color/5.5.0:
-    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
-    engines: {node: '>=4'}
-    dependencies:
-      has-flag: 3.0.0
-    dev: false
-
-  /tiny-invariant/1.3.1:
-    resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
-    dev: false
-
-  /tiny-warning/1.0.3:
-    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
-    dev: false
-
-  /to-fast-properties/2.0.0:
-    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
-    engines: {node: '>=4'}
-    dev: false
-
-  /tr46/0.0.3:
-    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
-    dev: false
-
-  /typescript/4.9.5:
-    resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==}
-    engines: {node: '>=4.2.0'}
-    hasBin: true
-    dev: false
-
-  /value-equal/1.0.1:
-    resolution: {integrity: sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==}
-    dev: false
-
-  /webidl-conversions/3.0.1:
-    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
-    dev: false
-
-  /whatwg-url/5.0.0:
-    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
-    dependencies:
-      tr46: 0.0.3
-      webidl-conversions: 3.0.1
-    dev: false
--- a/app/src/App.tsx
+++ b/app/src/App.tsx
@ -27,12 +27,13 @@ export default function App() {
 	if (redirectURL) {
 		urlProps.redirectURL = redirectURL;
 	} else {
-		urlProps.redirectURL = window.location.href;
+		urlProps.redirectURL = window.location.origin + '/app';
 	}
 	const globalState: Record<string, string> = {
 		...window['__authorizer__'],
 		...urlProps,
 	};
+
 	return (
 		<div
 			style={{
@ -53,7 +54,7 @@ export default function App() {
 				<img
 					src={`${globalState.organizationLogo}`}
 					alt="logo"
-					style={{ height: 60, objectFit: 'cover' }}
+					style={{ height: 60, width: 60, objectFit: 'cover' }}
 				/>
 				<h1>{globalState.organizationName}</h1>
 			</div>
--- a/app/src/Root.tsx
+++ b/app/src/Root.tsx
@ -59,9 +59,7 @@ export default function Root({
 	useEffect(() => {
 		if (token) {
 			let redirectURL = config.redirectURL || '/app';
-			// let params = `access_token=${token.access_token}&id_token=${token.id_token}&expires_in=${token.expires_in}&state=${globalState.state}`;
-			// Note: If OIDC breaks in the future, use the above params
-			let params = `state=${globalState.state}`;
+			let params = `access_token=${token.access_token}&id_token=${token.id_token}&expires_in=${token.expires_in}&state=${globalState.state}`;

 			if (code !== '') {
 				params += `&code=${code}`;
--- a/app/src/pages/login.tsx
+++ b/app/src/pages/login.tsx
@ -32,25 +32,20 @@ const FooterContent = styled.div`
 export default function Login({ urlProps }: { urlProps: Record<string, any> }) {
 	const { config } = useAuthorizer();
 	const [view, setView] = useState<VIEW_TYPES>(VIEW_TYPES.LOGIN);
-	const isBasicAuth = config.is_basic_authentication_enabled;
 	return (
 		<Fragment>
 			{view === VIEW_TYPES.LOGIN && (
 				<Fragment>
 					<h1 style={{ textAlign: 'center' }}>Login</h1>
-					<AuthorizerSocialLogin urlProps={urlProps} />
 					<br />
-					{(config.is_basic_authentication_enabled ||
-						config.is_mobile_basic_authentication_enabled) &&
+					<AuthorizerSocialLogin urlProps={urlProps} />
+					{config.is_basic_authentication_enabled &&
 						!config.is_magic_link_login_enabled && (
 							<AuthorizerBasicAuthLogin urlProps={urlProps} />
 						)}
 					{config.is_magic_link_login_enabled && (
 						<AuthorizerMagicLinkLogin urlProps={urlProps} />
 					)}
-					{(config.is_basic_authentication_enabled ||
-						config.is_mobile_basic_authentication_enabled) &&
-						!config.is_magic_link_login_enabled && (
 					<Footer>
 						<Link
 							to="#"
@ -60,7 +55,6 @@ export default function Login({ urlProps }: { urlProps: Record<string, any> }) {
 							Forgot Password?
 						</Link>
 					</Footer>
-						)}
 				</Fragment>
 			)}
 			{view === VIEW_TYPES.FORGOT_PASSWORD && (
@ -71,9 +65,6 @@ export default function Login({ urlProps }: { urlProps: Record<string, any> }) {
 							...urlProps,
 							redirect_uri: `${window.location.origin}/app/reset-password`,
 						}}
-						onPasswordReset={() => {
-							setView(VIEW_TYPES.LOGIN);
-						}}
 					/>
 					<Footer>
 						<Link
@ -90,7 +81,7 @@ export default function Login({ urlProps }: { urlProps: Record<string, any> }) {
 				!config.is_magic_link_login_enabled &&
 				config.is_sign_up_enabled && (
 					<FooterContent>
-						Don't have an account? &nbsp; <Link to="/app/signup"> Sign Up</Link>
+						Don't have an account? <Link to="/app/signup"> Sign Up</Link>
 					</FooterContent>
 				)}
 		</Fragment>
--- a/app/src/pages/signup.tsx
+++ b/app/src/pages/signup.tsx
@ -1,5 +1,5 @@
 import React, { Fragment } from 'react';
-import { AuthorizerSignup, AuthorizerSocialLogin } from '@authorizerdev/authorizer-react';
+import { AuthorizerSignup } from '@authorizerdev/authorizer-react';
 import styled from 'styled-components';
 import { Link } from 'react-router-dom';

@ -19,7 +19,6 @@ export default function SignUp({
 		<Fragment>
 			<h1 style={{ textAlign: 'center' }}>Sign Up</h1>
 			<br />
-            <AuthorizerSocialLogin urlProps={urlProps} />
 			<AuthorizerSignup urlProps={urlProps} />
 			<FooterContent>
 				Already have an account? <Link to="/app"> Login</Link>
--- a/app/yarn.lock
+++ b/app/yarn.lock
@ -1,619 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@authorizerdev/authorizer-js@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-2.0.3.tgz"
-  integrity sha512-uencwr3Ea8mwfxVKDFf2ITRCRSmzvua+O2voRuiWQORtRQTgZQjkN3M+IEkEj+WP9M1iFIl+NDgzECsp8ptC/A==
-  dependencies:
-    cross-fetch "^3.1.5"
-
-"@authorizerdev/authorizer-react@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.3.2.tgz"
-  integrity sha512-3kMAygHBCa8Fc9Oo0lz1k88r+Pd6kx1PSn3NMYLwxQXy2jRt4xWn7iuGn+SDGFs3DzofaN71I61gRwQ+6dO1rw==
-  dependencies:
-    "@authorizerdev/authorizer-js" "^2.0.3"
-    validator "^13.11.0"
-
-"@babel/code-frame@^7.22.13":
-  version "7.22.13"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz"
-  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
-  dependencies:
-    "@babel/highlight" "^7.22.13"
-    chalk "^2.4.2"
-
-"@babel/generator@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz"
-  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
-  dependencies:
-    "@babel/types" "^7.23.0"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
-"@babel/helper-annotate-as-pure@^7.16.0":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz"
-  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-environment-visitor@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz"
-  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
-
-"@babel/helper-function-name@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz"
-  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
-  dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.23.0"
-
-"@babel/helper-hoist-variables@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz"
-  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.16.0":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"
-  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-split-export-declaration@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz"
-  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-string-parser@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz"
-  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
-
-"@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
-
-"@babel/highlight@^7.22.13":
-  version "7.22.20"
-  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz"
-  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
-    chalk "^2.4.2"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz"
-  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
-
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.12.1":
-  version "7.14.8"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz"
-  integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/template@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz"
-  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
-  dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/parser" "^7.22.15"
-    "@babel/types" "^7.22.15"
-
-"@babel/traverse@^7.4.5":
-  version "7.23.2"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz"
-  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
-  dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.0"
-    "@babel/types" "^7.23.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/types@^7.16.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz"
-  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
-  dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.20"
-    to-fast-properties "^2.0.0"
-
-"@emotion/is-prop-valid@^0.8.8":
-  version "0.8.8"
-  resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz"
-  integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==
-  dependencies:
-    "@emotion/memoize" "0.7.4"
-
-"@emotion/memoize@0.7.4":
-  version "0.7.4"
-  resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz"
-  integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==
-
-"@emotion/stylis@^0.8.4":
-  version "0.8.5"
-  resolved "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz"
-  integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==
-
-"@emotion/unitless@^0.7.4":
-  version "0.7.5"
-  resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz"
-  integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
-
-"@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.3"
-  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz"
-  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.1"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@jridgewell/resolve-uri@^3.1.0":
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz"
-  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
-
-"@jridgewell/set-array@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"
-  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
-
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
-  version "1.4.15"
-  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
-  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
-
-"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.20"
-  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz"
-  integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-
-"@types/history@*":
-  version "4.7.9"
-  resolved "https://registry.npmjs.org/@types/history/-/history-4.7.9.tgz"
-  integrity sha512-MUc6zSmU3tEVnkQ78q0peeEjKWPUADMlC/t++2bI8WnAG2tvYRPIgHG8lWkXwqc8MsUF6Z2MOf+Mh5sazOmhiQ==
-
-"@types/hoist-non-react-statics@*":
-  version "3.3.1"
-  resolved "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz"
-  integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
-  dependencies:
-    "@types/react" "*"
-    hoist-non-react-statics "^3.3.0"
-
-"@types/prop-types@*":
-  version "15.7.4"
-  resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz"
-  integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
-
-"@types/react-dom@^17.0.9":
-  version "17.0.9"
-  resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.9.tgz"
-  integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react-router-dom@^5.1.8":
-  version "5.1.8"
-  resolved "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.1.8.tgz"
-  integrity sha512-03xHyncBzG0PmDmf8pf3rehtjY0NpUj7TIN46FrT5n1ZWHPZvXz32gUyNboJ+xsL8cpg8bQVLcllptcQHvocrw==
-  dependencies:
-    "@types/history" "*"
-    "@types/react" "*"
-    "@types/react-router" "*"
-
-"@types/react-router@*":
-  version "5.1.16"
-  resolved "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.16.tgz"
-  integrity sha512-8d7nR/fNSqlTFGHti0R3F9WwIertOaaA1UEB8/jr5l5mDMOs4CidEgvvYMw4ivqrBK+vtVLxyTj2P+Pr/dtgzg==
-  dependencies:
-    "@types/history" "*"
-    "@types/react" "*"
-
-"@types/react@*", "@types/react@^17.0.15":
-  version "17.0.15"
-  resolved "https://registry.npmjs.org/@types/react/-/react-17.0.15.tgz"
-  integrity sha512-uTKHDK9STXFHLaKv6IMnwp52fm0hwU+N89w/p9grdUqcFA6WuqDyPhaWopbNyE1k/VhgzmHl8pu1L4wITtmlLw==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
-"@types/scheduler@*":
-  version "0.16.2"
-  resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz"
-  integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
-
-"@types/styled-components@^5.1.11":
-  version "5.1.25"
-  resolved "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.25.tgz"
-  integrity sha512-fgwl+0Pa8pdkwXRoVPP9JbqF0Ivo9llnmsm+7TCI330kbPIFd9qv1Lrhr37shf4tnxCOSu+/IgqM7uJXLWZZNQ==
-  dependencies:
-    "@types/hoist-non-react-statics" "*"
-    "@types/react" "*"
-    csstype "^3.0.2"
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-"babel-plugin-styled-components@>= 1.12.0":
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.2.tgz"
-  integrity sha512-7eG5NE8rChnNTDxa6LQfynwgHTVOYYaHJbUYSlOhk8QBXIQiMBKq4gyfHBBKPrxUcVBXVJL61ihduCpCQbuNbw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.0"
-    "@babel/helper-module-imports" "^7.16.0"
-    babel-plugin-syntax-jsx "^6.18.0"
-    lodash "^4.17.11"
-
-babel-plugin-syntax-jsx@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"
-  integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
-
-camelize@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz"
-  integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=
-
-chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
-cross-fetch@^3.1.5:
-  version "3.1.8"
-  resolved "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz"
-  integrity sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==
-  dependencies:
-    node-fetch "^2.6.12"
-
-css-color-keywords@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz"
-  integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=
-
-css-to-react-native@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz"
-  integrity sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==
-  dependencies:
-    camelize "^1.0.0"
-    css-color-keywords "^1.0.0"
-    postcss-value-parser "^4.0.2"
-
-csstype@^3.0.2:
-  version "3.0.8"
-  resolved "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz"
-  integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==
-
-debug@^4.1.0:
-  version "4.3.3"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"
-  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
-  dependencies:
-    ms "2.1.2"
-
-esbuild@^0.12.17:
-  version "0.12.17"
-  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.12.17.tgz"
-  integrity sha512-GshKJyVYUnlSXIZj/NheC2O0Kblh42CS7P1wJyTbbIHevTG4jYMS9NNw8EOd8dDWD0dzydYHS01MpZoUcQXB4g==
-
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-
-globals@^11.1.0:
-  version "11.12.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-history@^4.9.0:
-  version "4.10.1"
-  resolved "https://registry.npmjs.org/history/-/history-4.10.1.tgz"
-  integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-    loose-envify "^1.2.0"
-    resolve-pathname "^3.0.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
-    value-equal "^1.0.1"
-
-hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0:
-  version "3.3.2"
-  resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"
-  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
-  dependencies:
-    react-is "^16.7.0"
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
-lodash@^4.17.11:
-  version "4.17.21"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-mini-create-react-context@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz"
-  integrity sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==
-  dependencies:
-    "@babel/runtime" "^7.12.1"
-    tiny-warning "^1.0.3"
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-node-fetch@^2.6.12:
-  version "2.7.0"
-  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"
-  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-path-to-regexp@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
-  dependencies:
-    isarray "0.0.1"
-
-postcss-value-parser@^4.0.2:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
-  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-
-prettier@2.7.1:
-  version "2.7.1"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz"
-  integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
-
-prop-types@^15.0.0, prop-types@^15.6.2:
-  version "15.7.2"
-  resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.8.1"
-
-react-dom@^17.0.2, "react-dom@>= 16.8.0":
-  version "17.0.2"
-  resolved "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz"
-  integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    scheduler "^0.20.2"
-
-react-is@^16.6.0:
-  version "16.13.1"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
-  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-
-react-is@^16.7.0:
-  version "16.13.1"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
-  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-
-react-is@^16.8.1:
-  version "16.13.1"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
-  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-
-react-is@^17.0.2, "react-is@>= 16.8.0":
-  version "17.0.2"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
-  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
-
-react-router-dom@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz"
-  integrity sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-    history "^4.9.0"
-    loose-envify "^1.3.1"
-    prop-types "^15.6.2"
-    react-router "5.2.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
-
-react-router@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz"
-  integrity sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-    history "^4.9.0"
-    hoist-non-react-statics "^3.1.0"
-    loose-envify "^1.3.1"
-    mini-create-react-context "^0.4.0"
-    path-to-regexp "^1.7.0"
-    prop-types "^15.6.2"
-    react-is "^16.6.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
-
-"react@^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0", react@^17.0.2, "react@>= 16.8.0", react@>=15, react@>=16, react@17.0.2:
-  version "17.0.2"
-  resolved "https://registry.npmjs.org/react/-/react-17.0.2.tgz"
-  integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-
-regenerator-runtime@^0.13.4:
-  version "0.13.9"
-  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"
-  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
-
-resolve-pathname@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz"
-  integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
-
-scheduler@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz"
-  integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-
-shallowequal@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz"
-  integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
-
-styled-components@^5.3.0, "styled-components@>= 2":
-  version "5.3.3"
-  resolved "https://registry.npmjs.org/styled-components/-/styled-components-5.3.3.tgz"
-  integrity sha512-++4iHwBM7ZN+x6DtPPWkCI4vdtwumQ+inA/DdAsqYd4SVgUKJie5vXyzotA00ttcFdQkCng7zc6grwlfIfw+lw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/traverse" "^7.4.5"
-    "@emotion/is-prop-valid" "^0.8.8"
-    "@emotion/stylis" "^0.8.4"
-    "@emotion/unitless" "^0.7.4"
-    babel-plugin-styled-components ">= 1.12.0"
-    css-to-react-native "^3.0.0"
-    hoist-non-react-statics "^3.0.0"
-    shallowequal "^1.1.0"
-    supports-color "^5.5.0"
-
-supports-color@^5.3.0, supports-color@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-tiny-invariant@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz"
-  integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw==
-
-tiny-warning@^1.0.0, tiny-warning@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz"
-  integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
-
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"
-  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-
-typescript@^4.3.5:
-  version "4.3.5"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz"
-  integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
-
-validator@^13.11.0:
-  version "13.11.0"
-  resolved "https://registry.npmjs.org/validator/-/validator-13.11.0.tgz"
-  integrity sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==
-
-value-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz"
-  integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"
-  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"
-  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
--- a/dashboard/package-lock.json
+++ b/dashboard/package-lock.json
--- a/dashboard/public/roblox.png
+++ b/dashboard/public/roblox.png
--- a/dashboard/src/components/EnvComponents/EmailConfiguration.tsx
+++ b/dashboard/src/components/EnvComponents/EmailConfiguration.tsx
@ -126,22 +126,6 @@ const EmailConfigurations = ({
 						/>
 					</Center>
 				</Flex>
-				<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
-					<Flex w="30%" justifyContent="start" alignItems="center">
-						<Text fontSize="sm">Sender Name:</Text>
-					</Flex>
-					<Center
-						w={isNotSmallerScreen ? '70%' : '100%'}
-						mt={isNotSmallerScreen ? '0' : '3'}
-					>
-						<InputField
-							borderRadius={5}
-							variables={variables}
-							setVariables={setVariables}
-							inputType={TextInputType.SENDER_NAME}
-						/>
-					</Center>
-				</Flex>
 			</Stack>
 		</div>
 	);
--- a/dashboard/src/components/EnvComponents/Features.tsx
+++ b/dashboard/src/components/EnvComponents/Features.tsx
@ -8,154 +8,105 @@ const Features = ({ variables, setVariables }: any) => {
 		<div>
 			{' '}
 			<Text fontSize="md" paddingTop="2%" fontWeight="bold" mb={5}>
-				Features
+				Disable Features
 			</Text>
 			<Stack spacing={6}>
 				<Flex>
 					<Flex w="100%" justifyContent="start" alignItems="center">
-						<Text fontSize="sm">Login Page:</Text>
+						<Text fontSize="sm">Disable Login Page:</Text>
 					</Flex>
 					<Flex justifyContent="start">
 						<InputField
 							variables={variables}
 							setVariables={setVariables}
 							inputType={SwitchInputType.DISABLE_LOGIN_PAGE}
-							hasReversedValue
 						/>
 					</Flex>
 				</Flex>
-
 				<Flex>
 					<Flex w="100%" justifyContent="start" alignItems="center">
-						<Text fontSize="sm">Email Verification:</Text>
+						<Text fontSize="sm">Disable Email Verification:</Text>
 					</Flex>
 					<Flex justifyContent="start">
 						<InputField
 							variables={variables}
 							setVariables={setVariables}
 							inputType={SwitchInputType.DISABLE_EMAIL_VERIFICATION}
-							hasReversedValue
 						/>
 					</Flex>
 				</Flex>
 				<Flex>
 					<Flex w="100%" justifyContent="start" alignItems="center">
-						<Text fontSize="sm">Magic Login Link:</Text>
+						<Text fontSize="sm">Disable Magic Login Link:</Text>
 					</Flex>
 					<Flex justifyContent="start">
 						<InputField
 							variables={variables}
 							setVariables={setVariables}
 							inputType={SwitchInputType.DISABLE_MAGIC_LINK_LOGIN}
-							hasReversedValue
 						/>
 					</Flex>
 				</Flex>
 				<Flex>
 					<Flex w="100%" justifyContent="start" alignItems="center">
-						<Text fontSize="sm">Email Basic Authentication:</Text>
+						<Text fontSize="sm">Disable Basic Authentication:</Text>
 					</Flex>
 					<Flex justifyContent="start">
 						<InputField
 							variables={variables}
 							setVariables={setVariables}
 							inputType={SwitchInputType.DISABLE_BASIC_AUTHENTICATION}
-							hasReversedValue
 						/>
 					</Flex>
 				</Flex>
 				<Flex>
 					<Flex w="100%" justifyContent="start" alignItems="center">
-						<Text fontSize="sm">Mobile Basic Authentication:</Text>
-					</Flex>
-					<Flex justifyContent="start">
-						<InputField
-							variables={variables}
-							setVariables={setVariables}
-							inputType={SwitchInputType.DISABLE_MOBILE_BASIC_AUTHENTICATION}
-							hasReversedValue
-						/>
-					</Flex>
-				</Flex>
-				<Flex>
-					<Flex w="100%" justifyContent="start" alignItems="center">
-						<Text fontSize="sm">Sign Up:</Text>
+						<Text fontSize="sm">Disable Sign Up:</Text>
 					</Flex>
 					<Flex justifyContent="start" mb={3}>
 						<InputField
 							variables={variables}
 							setVariables={setVariables}
 							inputType={SwitchInputType.DISABLE_SIGN_UP}
-							hasReversedValue
 						/>
 					</Flex>
 				</Flex>
 				<Flex>
 					<Flex w="100%" justifyContent="start" alignItems="center">
-						<Text fontSize="sm">Strong Password:</Text>
+						<Text fontSize="sm">Disable Strong Password:</Text>
 					</Flex>
 					<Flex justifyContent="start" mb={3}>
 						<InputField
 							variables={variables}
 							setVariables={setVariables}
 							inputType={SwitchInputType.DISABLE_STRONG_PASSWORD}
-							hasReversedValue
 						/>
 					</Flex>
 				</Flex>
 				<Flex alignItems="center">
 					<Flex w="100%" alignItems="baseline" flexDir="column">
-						<Text fontSize="sm">Multi Factor Authentication (MFA):</Text>
+						<Text fontSize="sm">
+							Disable Multi Factor Authentication (MFA):
+						</Text>
 						<Text fontSize="x-small">
 							Note: Enabling this will ignore Enforcing MFA shown below and will
 							also ignore the user MFA setting.
 						</Text>
 					</Flex>
-
 					<Flex justifyContent="start" mb={3}>
 						<InputField
 							variables={variables}
 							setVariables={setVariables}
 							inputType={SwitchInputType.DISABLE_MULTI_FACTOR_AUTHENTICATION}
-							hasReversedValue
 						/>
 					</Flex>
 				</Flex>
-				{!variables.DISABLE_MULTI_FACTOR_AUTHENTICATION && (
-					<Flex alignItems="center">
-						<Flex w="100%" alignItems="baseline" flexDir="column">
-							<Text fontSize="sm">Time Based OTP (TOTP):</Text>
-							<Text fontSize="x-small">Note: to enable totp mfa</Text>
-						</Flex>
-
-						<Flex justifyContent="start" mb={3}>
-							<InputField
-								variables={variables}
-								setVariables={setVariables}
-								inputType={SwitchInputType.DISABLE_TOTP_LOGIN}
-								hasReversedValue
-							/>
-						</Flex>
-					</Flex>
-				)}
-				{!variables.DISABLE_MULTI_FACTOR_AUTHENTICATION && (
-					<Flex alignItems="center">
-						<Flex w="100%" alignItems="baseline" flexDir="column">
-							<Text fontSize="sm">EMAIL OTP:</Text>
-							<Text fontSize="x-small">Note: to enable email otp mfa</Text>
-						</Flex>
-
-						<Flex justifyContent="start" mb={3}>
-							<InputField
-								variables={variables}
-								setVariables={setVariables}
-								inputType={SwitchInputType.DISABLE_MAIL_OTP_LOGIN}
-								hasReversedValue
-							/>
-						</Flex>
-					</Flex>
-				)}
-
+			</Stack>
+			<Divider paddingY={5} />
+			<Text fontSize="md" paddingTop={5} fontWeight="bold" mb={5}>
+				Enable Features
+			</Text>
+			<Stack spacing={6}>
 				<Flex alignItems="center">
 					<Flex w="100%" alignItems="baseline" flexDir="column">
 						<Text fontSize="sm">
@ -174,19 +125,6 @@ const Features = ({ variables, setVariables }: any) => {
 						/>
 					</Flex>
 				</Flex>
-				<Flex>
-					<Flex w="100%" justifyContent="start" alignItems="center">
-						<Text fontSize="sm">Playground:</Text>
-					</Flex>
-					<Flex justifyContent="start">
-						<InputField
-							variables={variables}
-							setVariables={setVariables}
-							inputType={SwitchInputType.DISABLE_PLAYGROUND}
-							hasReversedValue
-						/>
-					</Flex>
-				</Flex>
 			</Stack>
 			<Divider paddingY={5} />
 			<Text fontSize="md" paddingTop={5} fontWeight="bold" mb={5}>
--- a/dashboard/src/components/EnvComponents/JWTConfiguration.tsx
+++ b/dashboard/src/components/EnvComponents/JWTConfiguration.tsx
@ -61,6 +61,7 @@ const JSTConfigurations = ({

 	return (
 		<div>
+			{' '}
 			<Flex
 				borderRadius={5}
 				width="100%"
--- a/dashboard/src/components/EnvComponents/OAuthConfig.tsx
+++ b/dashboard/src/components/EnvComponents/OAuthConfig.tsx
@ -16,17 +16,8 @@ import {
 	FaLinkedin,
 	FaApple,
 	FaTwitter,
-	FaMicrosoft,
-	FaTwitch,
-	FaDiscord,
 } from 'react-icons/fa';
-import {
-	TextInputType,
-	HiddenInputType,
-	ResponseModes,
-	ResponseTypes,
-	SelectInputType,
-} from '../../constants';
+import { TextInputType, HiddenInputType } from '../../constants';

 const OAuthConfig = ({
 	envVariables,
@ -78,42 +69,6 @@ const OAuthConfig = ({
 							/>
 						</Center>
 					</Flex>
-					<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
-						<Flex w="30%" justifyContent="start" alignItems="center">
-							<Text fontSize="sm">Default Response Type:</Text>
-						</Flex>
-						<Flex
-							w={isNotSmallerScreen ? '70%' : '100%'}
-							mt={isNotSmallerScreen ? '0' : '2'}
-						>
-							<InputField
-								borderRadius={5}
-								variables={envVariables}
-								setVariables={setVariables}
-								inputType={SelectInputType.DEFAULT_AUTHORIZE_RESPONSE_TYPE}
-								value={SelectInputType}
-								options={ResponseTypes}
-							/>
-						</Flex>
-					</Flex>
-					<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
-						<Flex w="30%" justifyContent="start" alignItems="center">
-							<Text fontSize="sm">Default Response Mode:</Text>
-						</Flex>
-						<Flex
-							w={isNotSmallerScreen ? '70%' : '100%'}
-							mt={isNotSmallerScreen ? '0' : '2'}
-						>
-							<InputField
-								borderRadius={5}
-								variables={envVariables}
-								setVariables={setVariables}
-								inputType={SelectInputType.DEFAULT_AUTHORIZE_RESPONSE_MODE}
-								value={SelectInputType}
-								options={ResponseModes}
-							/>
-						</Flex>
-					</Flex>
 				</Stack>
 				<Divider mt={5} mb={2} color="blackAlpha.700" />
 				<Text fontSize="md" paddingTop="2%" fontWeight="bold" mb={4}>
@ -310,44 +265,6 @@ const OAuthConfig = ({
 							/>
 						</Center>
 					</Flex>
-					<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
-						<Center
-							w={isNotSmallerScreen ? '55px' : '35px'}
-							h="35px"
-							marginRight="1.5%"
-							border="1px solid #3b5998"
-							borderRadius="5px"
-						>
-							<FaDiscord style={{ color: '#7289da' }} />
-						</Center>
-						<Center
-							w={isNotSmallerScreen ? '70%' : '100%'}
-							mt={isNotSmallerScreen ? '0' : '3'}
-							marginRight="1.5%"
-						>
-							<InputField
-								borderRadius={5}
-								variables={envVariables}
-								setVariables={setVariables}
-								inputType={TextInputType.DISCORD_CLIENT_ID}
-								placeholder="Discord Client ID"
-							/>
-						</Center>
-						<Center
-							w={isNotSmallerScreen ? '70%' : '100%'}
-							mt={isNotSmallerScreen ? '0' : '3'}
-						>
-							<InputField
-								borderRadius={5}
-								variables={envVariables}
-								setVariables={setVariables}
-								fieldVisibility={fieldVisibility}
-								setFieldVisibility={setFieldVisibility}
-								inputType={HiddenInputType.DISCORD_CLIENT_SECRET}
-								placeholder="Discord Client Secret"
-							/>
-						</Center>
-					</Flex>
 					<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
 						<Center
 							w={isNotSmallerScreen ? '55px' : '35px'}
@ -386,136 +303,6 @@ const OAuthConfig = ({
 							/>
 						</Center>
 					</Flex>
-					<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
-						<Center
-							w={isNotSmallerScreen ? '55px' : '35px'}
-							h="35px"
-							marginRight="1.5%"
-							border="1px solid #3b5998"
-							borderRadius="5px"
-						>
-							<FaMicrosoft />
-						</Center>
-						<Center
-							w={isNotSmallerScreen ? '35%' : '100%'}
-							mt={isNotSmallerScreen ? '0' : '3'}
-							marginRight="1.5%"
-						>
-							<InputField
-								borderRadius={5}
-								variables={envVariables}
-								setVariables={setVariables}
-								inputType={TextInputType.MICROSOFT_ACTIVE_DIRECTORY_TENANT_ID}
-								placeholder="Microsoft Active Directory TenantID"
-							/>
-						</Center>
-						<Center
-							w={isNotSmallerScreen ? '35%' : '100%'}
-							mt={isNotSmallerScreen ? '0' : '3'}
-							marginRight="1.5%"
-						>
-							<InputField
-								borderRadius={5}
-								variables={envVariables}
-								setVariables={setVariables}
-								inputType={TextInputType.MICROSOFT_CLIENT_ID}
-								placeholder="Microsoft Client ID"
-							/>
-						</Center>
-						<Center
-							w={isNotSmallerScreen ? '70%' : '100%'}
-							mt={isNotSmallerScreen ? '0' : '3'}
-						>
-							<InputField
-								borderRadius={5}
-								variables={envVariables}
-								setVariables={setVariables}
-								fieldVisibility={fieldVisibility}
-								setFieldVisibility={setFieldVisibility}
-								inputType={HiddenInputType.MICROSOFT_CLIENT_SECRET}
-								placeholder="Microsoft Client Secret"
-							/>
-						</Center>
-					</Flex>
-					<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
-						<Center
-							w={isNotSmallerScreen ? '55px' : '35px'}
-							h="35px"
-							marginRight="1.5%"
-							border="1px solid #3b5998"
-							borderRadius="5px"
-						>
-							<FaTwitch />
-						</Center>
-						<Center
-							w={isNotSmallerScreen ? '70%' : '100%'}
-							mt={isNotSmallerScreen ? '0' : '3'}
-							marginRight="1.5%"
-						>
-							<InputField
-								borderRadius={5}
-								variables={envVariables}
-								setVariables={setVariables}
-								inputType={TextInputType.TWITCH_CLIENT_ID}
-								placeholder="Twitch Client ID"
-							/>
-						</Center>
-						<Center
-							w={isNotSmallerScreen ? '70%' : '100%'}
-							mt={isNotSmallerScreen ? '0' : '3'}
-						>
-							<InputField
-								borderRadius={5}
-								variables={envVariables}
-								setVariables={setVariables}
-								fieldVisibility={fieldVisibility}
-								setFieldVisibility={setFieldVisibility}
-								inputType={HiddenInputType.TWITCH_CLIENT_SECRET}
-								placeholder="Twitch Client Secret"
-							/>
-						</Center>
-					</Flex>
-					<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
-						<Center
-							w={isNotSmallerScreen ? '55px' : '35px'}
-							h="35px"
-							marginRight="1.5%"
-							border="1px solid #3b5998"
-							borderRadius="5px"
-						>
-							<img
-								src="https://authorizer.dev/_next/image?url=%2Fimages%2Froblox.png&w=25&q=25"
-								alt="Roblox"
-							/>
-						</Center>
-						<Center
-							w={isNotSmallerScreen ? '70%' : '100%'}
-							mt={isNotSmallerScreen ? '0' : '3'}
-							marginRight="1.5%"
-						>
-							<InputField
-								borderRadius={5}
-								variables={envVariables}
-								setVariables={setVariables}
-								inputType={TextInputType.ROBLOX_CLIENT_ID}
-								placeholder="Roblox Client ID"
-							/>
-						</Center>
-						<Center
-							w={isNotSmallerScreen ? '70%' : '100%'}
-							mt={isNotSmallerScreen ? '0' : '3'}
-						>
-							<InputField
-								borderRadius={5}
-								variables={envVariables}
-								setVariables={setVariables}
-								fieldVisibility={fieldVisibility}
-								setFieldVisibility={setFieldVisibility}
-								inputType={HiddenInputType.ROBLOX_CLIENT_SECRET}
-								placeholder="Roblox Client Secret"
-							/>
-						</Center>
-					</Flex>
 				</Stack>
 			</Box>
 		</div>
--- a/dashboard/src/components/InputField.tsx
+++ b/dashboard/src/components/InputField.tsx
@ -48,8 +48,6 @@ const InputField = ({
 	fieldVisibility,
 	setFieldVisibility,
 	availableRoles,
-	// This prop is added to improve the user experience for the boolean ENV variable having `DISABLE_` prefix, as those values need to be considered in inverted form.
-	hasReversedValue,
 	...downshiftProps
 }: any) => {
 	const props = {
@ -400,9 +398,7 @@ const InputField = ({
 				</Text>
 				<Switch
 					size="md"
-					isChecked={
-						hasReversedValue ? !variables[inputType] : variables[inputType]
-					}
+					isChecked={variables[inputType]}
 					onChange={() => {
 						setVariables({
 							...variables,
--- a/dashboard/src/components/UpdateWebhookModal.tsx
+++ b/dashboard/src/components/UpdateWebhookModal.tsx
@ -63,7 +63,6 @@ interface headersValidatorDataType {
 interface selecetdWebhookDataTypes {
 	[WebhookInputDataFields.ID]: string;
 	[WebhookInputDataFields.EVENT_NAME]: string;
-	[WebhookInputDataFields.EVENT_DESCRIPTION]?: string;
 	[WebhookInputDataFields.ENDPOINT]: string;
 	[WebhookInputDataFields.ENABLED]: boolean;
 	[WebhookInputDataFields.HEADERS]?: Record<string, string>;
@ -87,7 +86,6 @@ const initHeadersValidatorData: headersValidatorDataType = {

 interface webhookDataType {
 	[WebhookInputDataFields.EVENT_NAME]: string;
-	[WebhookInputDataFields.EVENT_DESCRIPTION]?: string;
 	[WebhookInputDataFields.ENDPOINT]: string;
 	[WebhookInputDataFields.ENABLED]: boolean;
 	[WebhookInputDataFields.HEADERS]: headersDataType[];
@ -100,7 +98,6 @@ interface validatorDataType {

 const initWebhookData: webhookDataType = {
 	[WebhookInputDataFields.EVENT_NAME]: webhookEventNames['User login'],
-	[WebhookInputDataFields.EVENT_DESCRIPTION]: '',
 	[WebhookInputDataFields.ENDPOINT]: '',
 	[WebhookInputDataFields.ENABLED]: true,
 	[WebhookInputDataFields.HEADERS]: [{ ...initHeadersData }],
@ -147,9 +144,6 @@ const UpdateWebhookModal = ({
 			case WebhookInputDataFields.EVENT_NAME:
 				setWebhook({ ...webhook, [inputType]: value });
 				break;
-			case WebhookInputDataFields.EVENT_DESCRIPTION:
-				setWebhook({ ...webhook, [inputType]: value });
-				break;
 			case WebhookInputDataFields.ENDPOINT:
 				setWebhook({ ...webhook, [inputType]: value });
 				setValidator({
@ -252,8 +246,6 @@ const UpdateWebhookModal = ({
 		let params: any = {
 			[WebhookInputDataFields.EVENT_NAME]:
 				webhook[WebhookInputDataFields.EVENT_NAME],
-			[WebhookInputDataFields.EVENT_DESCRIPTION]:
-				webhook[WebhookInputDataFields.EVENT_DESCRIPTION],
 			[WebhookInputDataFields.ENDPOINT]:
 				webhook[WebhookInputDataFields.ENDPOINT],
 			[WebhookInputDataFields.ENABLED]: webhook[WebhookInputDataFields.ENABLED],
@ -410,9 +402,7 @@ const UpdateWebhookModal = ({
 								<Flex flex="3">
 									<Select
 										size="md"
-										value={
-											webhook[WebhookInputDataFields.EVENT_NAME].split('-')[0]
-										}
+										value={webhook[WebhookInputDataFields.EVENT_NAME]}
 										onChange={(e) =>
 											inputChangehandler(
 												WebhookInputDataFields.EVENT_NAME,
@ -430,30 +420,6 @@ const UpdateWebhookModal = ({
 									</Select>
 								</Flex>
 							</Flex>
-							<Flex
-								width="100%"
-								justifyContent="start"
-								alignItems="center"
-								marginBottom="5%"
-							>
-								<Flex flex="1">Event Description</Flex>
-								<Flex flex="3">
-									<InputGroup size="md">
-										<Input
-											pr="4.5rem"
-											type="text"
-											placeholder="User event"
-											value={webhook[WebhookInputDataFields.EVENT_DESCRIPTION]}
-											onChange={(e) =>
-												inputChangehandler(
-													WebhookInputDataFields.EVENT_DESCRIPTION,
-													e.currentTarget.value,
-												)
-											}
-										/>
-									</InputGroup>
-								</Flex>
-							</Flex>
 							<Flex
 								width="100%"
 								justifyContent="start"
--- a/dashboard/src/constants.ts
+++ b/dashboard/src/constants.ts
@ -9,12 +9,7 @@ export const TextInputType = {
 	FACEBOOK_CLIENT_ID: 'FACEBOOK_CLIENT_ID',
 	LINKEDIN_CLIENT_ID: 'LINKEDIN_CLIENT_ID',
 	APPLE_CLIENT_ID: 'APPLE_CLIENT_ID',
-	DISCORD_CLIENT_ID: 'DISCORD_CLIENT_ID',
 	TWITTER_CLIENT_ID: 'TWITTER_CLIENT_ID',
-	MICROSOFT_CLIENT_ID: 'MICROSOFT_CLIENT_ID',
-	MICROSOFT_ACTIVE_DIRECTORY_TENANT_ID: 'MICROSOFT_ACTIVE_DIRECTORY_TENANT_ID',
-	TWITCH_CLIENT_ID: 'TWITCH_CLIENT_ID',
-	ROBLOX_CLIENT_ID: 'ROBLOX_CLIENT_ID',
 	JWT_ROLE_CLAIM: 'JWT_ROLE_CLAIM',
 	REDIS_URL: 'REDIS_URL',
 	SMTP_HOST: 'SMTP_HOST',
@ -22,7 +17,6 @@ export const TextInputType = {
 	SMTP_USERNAME: 'SMTP_USERNAME',
 	SMTP_LOCAL_NAME: 'SMTP_LOCAL_NAME',
 	SENDER_EMAIL: 'SENDER_EMAIL',
-	SENDER_NAME: 'SENDER_NAME',
 	ORGANIZATION_NAME: 'ORGANIZATION_NAME',
 	ORGANIZATION_LOGO: 'ORGANIZATION_LOGO',
 	DATABASE_NAME: 'DATABASE_NAME',
@ -43,11 +37,7 @@ export const HiddenInputType = {
 	FACEBOOK_CLIENT_SECRET: 'FACEBOOK_CLIENT_SECRET',
 	LINKEDIN_CLIENT_SECRET: 'LINKEDIN_CLIENT_SECRET',
 	APPLE_CLIENT_SECRET: 'APPLE_CLIENT_SECRET',
-	DISCORD_CLIENT_SECRET: 'DISCORD_CLIENT_SECRET',
 	TWITTER_CLIENT_SECRET: 'TWITTER_CLIENT_SECRET',
-	MICROSOFT_CLIENT_SECRET: 'MICROSOFT_CLIENT_SECRET',
-	TWITCH_CLIENT_SECRET: 'TWITCH_CLIENT_SECRET',
-	ROBLOX_CLIENT_SECRET: 'ROBLOX_CLIENT_SECRET',
 	JWT_SECRET: 'JWT_SECRET',
 	SMTP_PASSWORD: 'SMTP_PASSWORD',
 	ADMIN_SECRET: 'ADMIN_SECRET',
@ -64,8 +54,6 @@ export const ArrayInputType = {
 export const SelectInputType = {
 	JWT_TYPE: 'JWT_TYPE',
 	GENDER: 'gender',
-	DEFAULT_AUTHORIZE_RESPONSE_TYPE: 'DEFAULT_AUTHORIZE_RESPONSE_TYPE',
-	DEFAULT_AUTHORIZE_RESPONSE_MODE: 'DEFAULT_AUTHORIZE_RESPONSE_MODE',
 };

 export const MultiSelectInputType = {
@ -85,15 +73,11 @@ export const SwitchInputType = {
 	DISABLE_MAGIC_LINK_LOGIN: 'DISABLE_MAGIC_LINK_LOGIN',
 	DISABLE_EMAIL_VERIFICATION: 'DISABLE_EMAIL_VERIFICATION',
 	DISABLE_BASIC_AUTHENTICATION: 'DISABLE_BASIC_AUTHENTICATION',
-	DISABLE_MOBILE_BASIC_AUTHENTICATION: 'DISABLE_MOBILE_BASIC_AUTHENTICATION',
 	DISABLE_SIGN_UP: 'DISABLE_SIGN_UP',
 	DISABLE_REDIS_FOR_ENV: 'DISABLE_REDIS_FOR_ENV',
 	DISABLE_STRONG_PASSWORD: 'DISABLE_STRONG_PASSWORD',
 	DISABLE_MULTI_FACTOR_AUTHENTICATION: 'DISABLE_MULTI_FACTOR_AUTHENTICATION',
 	ENFORCE_MULTI_FACTOR_AUTHENTICATION: 'ENFORCE_MULTI_FACTOR_AUTHENTICATION',
-	DISABLE_PLAYGROUND: 'DISABLE_PLAYGROUND',
-	DISABLE_TOTP_LOGIN: 'DISABLE_TOTP_LOGIN',
-	DISABLE_MAIL_OTP_LOGIN: 'DISABLE_MAIL_OTP_LOGIN',
 };

 export const DateInputType = {
@ -134,17 +118,8 @@ export interface envVarTypes {
 	LINKEDIN_CLIENT_SECRET: string;
 	APPLE_CLIENT_ID: string;
 	APPLE_CLIENT_SECRET: string;
-	DISCORD_CLIENT_ID: string;
-	DISCORD_CLIENT_SECRET: string;
 	TWITTER_CLIENT_ID: string;
 	TWITTER_CLIENT_SECRET: string;
-	MICROSOFT_CLIENT_ID: string;
-	MICROSOFT_CLIENT_SECRET: string;
-	MICROSOFT_ACTIVE_DIRECTORY_TENANT_ID: string;
-	TWITCH_CLIENT_ID: string;
-	TWITCH_CLIENT_SECRET: string;
-	ROBLOX_CLIENT_ID: string;
-	ROBLOX_CLIENT_SECRET: string;
 	ROLES: [string] | [];
 	DEFAULT_ROLES: [string] | [];
 	PROTECTED_ROLES: [string] | [];
@ -160,7 +135,6 @@ export interface envVarTypes {
 	SMTP_PASSWORD: string;
 	SMTP_LOCAL_NAME: string;
 	SENDER_EMAIL: string;
-	SENDER_NAME: string;
 	ALLOWED_ORIGINS: [string] | [];
 	ORGANIZATION_NAME: string;
 	ORGANIZATION_LOGO: string;
@ -172,7 +146,6 @@ export interface envVarTypes {
 	DISABLE_MAGIC_LINK_LOGIN: boolean;
 	DISABLE_EMAIL_VERIFICATION: boolean;
 	DISABLE_BASIC_AUTHENTICATION: boolean;
-	DISABLE_MOBILE_BASIC_AUTHENTICATION: boolean;
 	DISABLE_SIGN_UP: boolean;
 	DISABLE_STRONG_PASSWORD: boolean;
 	OLD_ADMIN_SECRET: string;
@ -182,11 +155,6 @@ export interface envVarTypes {
 	ACCESS_TOKEN_EXPIRY_TIME: string;
 	DISABLE_MULTI_FACTOR_AUTHENTICATION: boolean;
 	ENFORCE_MULTI_FACTOR_AUTHENTICATION: boolean;
-	DEFAULT_AUTHORIZE_RESPONSE_TYPE: string;
-	DEFAULT_AUTHORIZE_RESPONSE_MODE: string;
-	DISABLE_PLAYGROUND: boolean;
-	DISABLE_TOTP_LOGIN: boolean;
-	DISABLE_MAIL_OTP_LOGIN: boolean;
 }

 export const envSubViews = {
@ -205,7 +173,6 @@ export const envSubViews = {

 export enum WebhookInputDataFields {
 	ID = 'id',
-	EVENT_DESCRIPTION = 'event_description',
 	EVENT_NAME = 'event_name',
 	ENDPOINT = 'endpoint',
 	ENABLED = 'enabled',
@ -240,7 +207,6 @@ export const webhookEventNames = {
 	'User deleted': 'user.deleted',
 	'User access enabled': 'user.access_enabled',
 	'User access revoked': 'user.access_revoked',
-	'User deactivated': 'user.deactivated',
 };

 export const emailTemplateEventNames = {
@ -376,16 +342,3 @@ export enum EmailTemplateEditors {
 	UNLAYER_EDITOR = 'unlayer_editor',
 	PLAIN_HTML_EDITOR = 'plain_html_editor',
 }
-
-export const ResponseTypes = {
-	token: 'token',
-	code: 'code',
-	id_token: 'id_token',
-};
-
-export const ResponseModes = {
-	query: 'query',
-	form_post: 'form_post',
-	fragment: 'fragment',
-	web_message: 'web_message',
-};
--- a/dashboard/src/graphql/queries/index.ts
+++ b/dashboard/src/graphql/queries/index.ts
@ -30,17 +30,8 @@ export const EnvVariablesQuery = `
      LINKEDIN_CLIENT_SECRET
      APPLE_CLIENT_ID
      APPLE_CLIENT_SECRET
-      DISCORD_CLIENT_ID
-      DISCORD_CLIENT_SECRET
      TWITTER_CLIENT_ID
      TWITTER_CLIENT_SECRET
-      MICROSOFT_CLIENT_ID
-      MICROSOFT_CLIENT_SECRET
-      MICROSOFT_ACTIVE_DIRECTORY_TENANT_ID
-      TWITCH_CLIENT_ID
-      TWITCH_CLIENT_SECRET
-      ROBLOX_CLIENT_ID
-      ROBLOX_CLIENT_SECRET
      DEFAULT_ROLES
      PROTECTED_ROLES
      ROLES
@ -56,7 +47,6 @@ export const EnvVariablesQuery = `
      SMTP_PASSWORD
      SMTP_LOCAL_NAME
      SENDER_EMAIL
-      SENDER_NAME
      ALLOWED_ORIGINS
      ORGANIZATION_NAME
      ORGANIZATION_LOGO
@ -67,7 +57,6 @@ export const EnvVariablesQuery = `
      DISABLE_MAGIC_LINK_LOGIN
      DISABLE_EMAIL_VERIFICATION
      DISABLE_BASIC_AUTHENTICATION
-      DISABLE_MOBILE_BASIC_AUTHENTICATION
      DISABLE_SIGN_UP
      DISABLE_STRONG_PASSWORD
      DISABLE_REDIS_FOR_ENV
@ -78,11 +67,6 @@ export const EnvVariablesQuery = `
      ACCESS_TOKEN_EXPIRY_TIME
      DISABLE_MULTI_FACTOR_AUTHENTICATION
      ENFORCE_MULTI_FACTOR_AUTHENTICATION
-      DEFAULT_AUTHORIZE_RESPONSE_TYPE
-      DEFAULT_AUTHORIZE_RESPONSE_MODE
-      DISABLE_PLAYGROUND
-      DISABLE_TOTP_LOGIN
-      DISABLE_MAIL_OTP_LOGIN
    }
  }
 `;
@ -100,7 +84,6 @@ export const UserDetailsQuery = `
        id
        email
        email_verified
-        phone_number_verified
        given_name
        family_name
        middle_name
@ -132,7 +115,6 @@ export const WebhooksDataQuery = `
    _webhooks(params: $params){
      webhooks{
        id
-        event_description
        event_name
        endpoint
        enabled
--- a/dashboard/src/pages/Environment.tsx
+++ b/dashboard/src/pages/Environment.tsx
@ -50,17 +50,8 @@ const Environment = () => {
 		LINKEDIN_CLIENT_SECRET: '',
 		APPLE_CLIENT_ID: '',
 		APPLE_CLIENT_SECRET: '',
-		DISCORD_CLIENT_ID: '',
-		DISCORD_CLIENT_SECRET: '',
 		TWITTER_CLIENT_ID: '',
 		TWITTER_CLIENT_SECRET: '',
-		MICROSOFT_CLIENT_ID: '',
-		MICROSOFT_CLIENT_SECRET: '',
-		MICROSOFT_ACTIVE_DIRECTORY_TENANT_ID: '',
-		TWITCH_CLIENT_ID: '',
-		TWITCH_CLIENT_SECRET: '',
-		ROBLOX_CLIENT_ID: '',
-		ROBLOX_CLIENT_SECRET: '',
 		ROLES: [],
 		DEFAULT_ROLES: [],
 		PROTECTED_ROLES: [],
@ -76,7 +67,6 @@ const Environment = () => {
 		SMTP_PASSWORD: '',
 		SMTP_LOCAL_NAME: '',
 		SENDER_EMAIL: '',
-		SENDER_NAME: '',
 		ALLOWED_ORIGINS: [],
 		ORGANIZATION_NAME: '',
 		ORGANIZATION_LOGO: '',
@ -88,7 +78,6 @@ const Environment = () => {
 		DISABLE_MAGIC_LINK_LOGIN: false,
 		DISABLE_EMAIL_VERIFICATION: false,
 		DISABLE_BASIC_AUTHENTICATION: false,
-		DISABLE_MOBILE_BASIC_AUTHENTICATION: false,
 		DISABLE_SIGN_UP: false,
 		DISABLE_STRONG_PASSWORD: false,
 		OLD_ADMIN_SECRET: '',
@ -98,11 +87,6 @@ const Environment = () => {
 		ACCESS_TOKEN_EXPIRY_TIME: '',
 		DISABLE_MULTI_FACTOR_AUTHENTICATION: false,
 		ENFORCE_MULTI_FACTOR_AUTHENTICATION: false,
-		DEFAULT_AUTHORIZE_RESPONSE_TYPE: '',
-		DEFAULT_AUTHORIZE_RESPONSE_MODE: '',
-		DISABLE_PLAYGROUND: false,
-		DISABLE_TOTP_LOGIN: false,
-		DISABLE_MAIL_OTP_LOGIN: true,
 	});

 	const [fieldVisibility, setFieldVisibility] = React.useState<
@ -113,9 +97,7 @@ const Environment = () => {
 		FACEBOOK_CLIENT_SECRET: false,
 		LINKEDIN_CLIENT_SECRET: false,
 		APPLE_CLIENT_SECRET: false,
-		DISCORD_CLIENT_SECRET: false,
 		TWITTER_CLIENT_SECRET: false,
-		TWITCH_CLIENT_SECRET: false,
 		JWT_SECRET: false,
 		SMTP_PASSWORD: false,
 		ADMIN_SECRET: false,
--- a/dashboard/src/pages/Users.tsx
+++ b/dashboard/src/pages/Users.tsx
@ -165,25 +165,14 @@ export default function Users() {
 	};

 	const userVerificationHandler = async (user: userDataTypes) => {
-		const { id, email, phone_number } = user;
-		let params = {};
-		if (email) {
-			params = {
+		const { id, email } = user;
+		const res = await client
+			.mutation(UpdateUser, {
+				params: {
 					id,
 					email,
 					email_verified: true,
-			};
-		}
-		if (phone_number) {
-			params = {
-				id,
-				phone_number,
-				phone_number_verified: true,
-			};
-		}
-		const res = await client
-			.mutation(UpdateUser, {
-				params,
+				},
 			})
 			.toPromise();
 		if (res.error) {
@ -309,7 +298,7 @@ export default function Users() {
 						<Table variant="simple">
 							<Thead>
 								<Tr>
-									<Th>Email / Phone</Th>
+									<Th>Email</Th>
 									<Th>Created At</Th>
 									<Th>Signup Methods</Th>
 									<Th>Roles</Th>
@ -325,15 +314,10 @@ export default function Users() {
 							</Thead>
 							<Tbody>
 								{userList.map((user: userDataTypes) => {
-									const {
-										email_verified,
-										phone_number_verified,
-										created_at,
-										...rest
-									}: any = user;
+									const { email_verified, created_at, ...rest }: any = user;
 									return (
 										<Tr key={user.id} style={{ fontSize: 14 }}>
-											<Td maxW="300">{user.email || user.phone_number}</Td>
+											<Td maxW="300">{user.email}</Td>
 											<Td>
 												{dayjs(user.created_at * 1000).format('MMM DD, YYYY')}
 											</Td>
@ -343,15 +327,9 @@ export default function Users() {
 												<Tag
 													size="sm"
 													variant="outline"
-													colorScheme={
-														user.email_verified || user.phone_number_verified
-															? 'green'
-															: 'yellow'
-													}
+													colorScheme={user.email_verified ? 'green' : 'yellow'}
 												>
-													{(
-														user.email_verified || user.phone_number_verified
-													).toString()}
+													{user.email_verified.toString()}
 												</Tag>
 											</Td>
 											<Td>
@ -390,8 +368,7 @@ export default function Users() {
 														</Flex>
 													</MenuButton>
 													<MenuList>
-														{!user.email_verified &&
-															!user.phone_number_verified && (
+														{!user.email_verified && (
 															<MenuItem
 																onClick={() => userVerificationHandler(user)}
 															>
--- a/dashboard/src/pages/Webhooks.tsx
+++ b/dashboard/src/pages/Webhooks.tsx
@ -56,7 +56,6 @@ interface paginationPropTypes {
 interface webhookDataTypes {
 	[WebhookInputDataFields.ID]: string;
 	[WebhookInputDataFields.EVENT_NAME]: string;
-	[WebhookInputDataFields.EVENT_DESCRIPTION]?: string;
 	[WebhookInputDataFields.ENDPOINT]: string;
 	[WebhookInputDataFields.ENABLED]: boolean;
 	[WebhookInputDataFields.HEADERS]?: Record<string, string>;
@ -135,7 +134,6 @@ const Webhooks = () => {
 						<Thead>
 							<Tr>
 								<Th>Event Name</Th>
-								<Th>Event Description</Th>
 								<Th>Endpoint</Th>
 								<Th>Enabled</Th>
 								<Th>Headers</Th>
@ -149,10 +147,7 @@ const Webhooks = () => {
 									style={{ fontSize: 14 }}
 								>
 									<Td maxW="300">
-										{webhook[WebhookInputDataFields.EVENT_NAME].split('-')[0]}
-									</Td>
-									<Td maxW="300">
-										{webhook[WebhookInputDataFields.EVENT_DESCRIPTION]}
+										{webhook[WebhookInputDataFields.EVENT_NAME]}
 									</Td>
 									<Td>{webhook[WebhookInputDataFields.ENDPOINT]}</Td>
 									<Td>
@ -269,7 +264,7 @@ const Webhooks = () => {
 											</Text>
 										</Text>
 										<Flex alignItems="center">
-											<Text>Go to page:</Text>{' '}
+											<Text flexShrink="0">Go to page:</Text>{' '}
 											<NumberInput
 												ml={2}
 												mr={8}
--- a/dashboard/yarn.lock
+++ b/dashboard/yarn.lock
--- a/go.mod
+++ b/go.mod
@ -1,20 +0,0 @@
-module server
-
-go 1.21.5
-
-require (
-	github.com/99designs/gqlgen v0.17.43 // indirect
-	github.com/agnivade/levenshtein v1.1.1 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sosodev/duration v1.1.0 // indirect
-	github.com/urfave/cli/v2 v2.25.5 // indirect
-	github.com/vektah/gqlparser/v2 v2.5.11 // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/tools v0.9.3 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)
--- a/go.sum
+++ b/go.sum
@ -1,31 +0,0 @@
-github.com/99designs/gqlgen v0.17.43 h1:I4SYg6ahjowErAQcHFVKy5EcWuwJ3+Xw9z2fLpuFCPo=
-github.com/99designs/gqlgen v0.17.43/go.mod h1:lO0Zjy8MkZgBdv4T1U91x09r0e0WFOdhVUutlQs1Rsc=
-github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8=
-github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo=
-github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE=
-github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sosodev/duration v1.1.0 h1:kQcaiGbJaIsRqgQy7VGlZrVw1giWO+lDoX3MCPnpVO4=
-github.com/sosodev/duration v1.1.0/go.mod h1:RQIBBX0+fMLc/D9+Jb/fwvVmo0eZvDDEERAikUR6SDg=
-github.com/urfave/cli/v2 v2.25.5 h1:d0NIAyhh5shGscroL7ek/Ya9QYQE0KNabJgiUinIQkc=
-github.com/urfave/cli/v2 v2.25.5/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
-github.com/vektah/gqlparser/v2 v2.5.11 h1:JJxLtXIoN7+3x6MBdtIP59TP1RANnY7pXOaDnADQSf8=
-github.com/vektah/gqlparser/v2 v2.5.11/go.mod h1:1rCcfwB2ekJofmluGWXMSEnPMZgbxzwj6FaZ/4OT8Cc=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/scripts/couchbase-test.sh
+++ b/scripts/couchbase-test.sh
@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -x
-set -m
-
-sleep 15
-
-# Setup index and memory quota
-# curl -v -X POST http://127.0.0.1:8091/pools/default -d memoryQuota=300 -d indexMemoryQuota=300
-
-# Setup services
-curl -v http://127.0.0.1:8091/node/controller/setupServices -d services=kv%2Cn1ql%2Cindex
-
-# Setup credentials
-curl -v http://127.0.0.1:8091/settings/web -d port=8091 -d username=Administrator -d password=password
-
-# Setup Memory Optimized Indexes
-curl -i -u Administrator:password -X POST http://127.0.0.1:8091/settings/indexes -d 'storageMode=memory_optimized'
-
-# Load travel-sample bucket
-#curl -v -u Administrator:password -X POST http://127.0.0.1:8091/sampleBuckets/install -d '["travel-sample"]'
-
-echo "Type: $TYPE"
-
-if [ "$TYPE" = "WORKER" ]; then
-  echo "Sleeping ..."
-  sleep 15
-
-  #IP=`hostname -s`
-  IP=`hostname -I | cut -d ' ' -f1`
-  echo "IP: " $IP
-
-  echo "Auto Rebalance: $AUTO_REBALANCE"
-  if [ "$AUTO_REBALANCE" = "true" ]; then
-    couchbase-cli rebalance --cluster=$COUCHBASE_MASTER:8091 --user=Administrator --password=password --server-add=$IP --server-add-username=Administrator --server-add-password=password
-  else
-    couchbase-cli server-add --cluster=$COUCHBASE_MASTER:8091 --user=Administrator --password=password --server-add=$IP --server-add-username=Administrator --server-add-password=password
-  fi;
-fi;
--- a/server/authenticators/providers/providers.go
+++ b/server/authenticators/providers/providers.go
@ -1,25 +0,0 @@
-package providers
-
-import "context"
-
-// AuthenticatorConfig defines authenticator config
-type AuthenticatorConfig struct {
-	// ScannerImage is the base64 of QR code image
-	ScannerImage string
-	// Secrets is the secret key
-	Secret string
-	// RecoveryCode is the list of recovery codes
-	RecoveryCodes []string
-	// RecoveryCodeMap is the map of recovery codes
-	RecoveryCodeMap map[string]bool
-}
-
-// Provider defines authenticators provider
-type Provider interface {
-	// Generate totp: to generate totp, store secret into db and returns base64 of QR code image
-	Generate(ctx context.Context, id string) (*AuthenticatorConfig, error)
-	// Validate totp: user passcode with secret stored in our db
-	Validate(ctx context.Context, passcode string, userID string) (bool, error)
-	// ValidateRecoveryCode totp: allows user to validate using recovery code incase if they lost their device
-	ValidateRecoveryCode(ctx context.Context, recoveryCode, userID string) (bool, error)
-}
--- a/server/authenticators/providers/totp/provider.go
+++ b/server/authenticators/providers/totp/provider.go
@ -1,23 +0,0 @@
-package totp
-
-import (
-	"context"
-)
-
-type provider struct {
-	ctx context.Context
-}
-
-// TOTPConfig defines totp config
-type TOTPConfig struct {
-	ScannerImage string
-	Secret       string
-}
-
-// NewProvider returns a new totp provider
-func NewProvider() (*provider, error) {
-	ctx := context.Background()
-	return &provider{
-		ctx: ctx,
-	}, nil
-}
--- a/server/authenticators/providers/totp/totp.go
+++ b/server/authenticators/providers/totp/totp.go
@ -1,151 +0,0 @@
-package totp
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"image/png"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/pquerna/otp/totp"
-	log "github.com/sirupsen/logrus"
-
-	"github.com/authorizerdev/authorizer/server/authenticators/providers"
-	"github.com/authorizerdev/authorizer/server/constants"
-	"github.com/authorizerdev/authorizer/server/crypto"
-	"github.com/authorizerdev/authorizer/server/db"
-	"github.com/authorizerdev/authorizer/server/db/models"
-	"github.com/authorizerdev/authorizer/server/refs"
-)
-
-// Generate generates a Time-Based One-Time Password (TOTP) for a user and returns the base64-encoded QR code for frontend display.
-func (p *provider) Generate(ctx context.Context, id string) (*providers.AuthenticatorConfig, error) {
-	var buf bytes.Buffer
-	//get user details
-	user, err := db.Provider.GetUserByID(ctx, id)
-	if err != nil {
-		return nil, err
-	}
-	// generate totp, Authenticators hash is valid for 30 seconds
-	key, err := totp.Generate(totp.GenerateOpts{
-		Issuer:      "authorizer",
-		AccountName: refs.StringValue(user.Email),
-	})
-	if err != nil {
-		return nil, err
-	}
-	//generating image for key and encoding to base64 for displaying in frontend
-	img, err := key.Image(200, 200)
-	if err != nil {
-		return nil, err
-	}
-	png.Encode(&buf, img)
-	encodedText := crypto.EncryptB64(buf.String())
-	secret := key.Secret()
-	recoveryCodes := []string{}
-	for i := 0; i < 10; i++ {
-		recoveryCodes = append(recoveryCodes, uuid.NewString())
-	}
-	// Converting recoveryCodes to string
-	recoverCodesMap := map[string]bool{}
-	for i := 0; i < len(recoveryCodes); i++ {
-		recoverCodesMap[recoveryCodes[i]] = false
-	}
-	// Converting recoveryCodesMap to string
-	jsonData, err := json.Marshal(recoverCodesMap)
-	if err != nil {
-		return nil, err
-	}
-	recoveryCodesString := string(jsonData)
-	totpModel := &models.Authenticator{
-		Secret:        secret,
-		RecoveryCodes: refs.NewStringRef(recoveryCodesString),
-		UserID:        user.ID,
-		Method:        constants.EnvKeyTOTPAuthenticator,
-	}
-	authenticator, err := db.Provider.GetAuthenticatorDetailsByUserId(ctx, user.ID, constants.EnvKeyTOTPAuthenticator)
-	if err != nil {
-		log.Debug("Failed to get authenticator details by user id, creating new record: ", err)
-		// continue
-	}
-	if authenticator == nil {
-		// if authenticator is nil then create new authenticator
-		_, err = db.Provider.AddAuthenticator(ctx, totpModel)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		authenticator.Secret = secret
-		authenticator.RecoveryCodes = refs.NewStringRef(recoveryCodesString)
-		// if authenticator is not nil then update authenticator
-		_, err = db.Provider.UpdateAuthenticator(ctx, authenticator)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return &providers.AuthenticatorConfig{
-		ScannerImage:    encodedText,
-		Secret:          secret,
-		RecoveryCodes:   recoveryCodes,
-		RecoveryCodeMap: recoverCodesMap,
-	}, nil
-}
-
-// Validate validates a Time-Based One-Time Password (TOTP) against the stored TOTP secret for a user.
-func (p *provider) Validate(ctx context.Context, passcode string, userID string) (bool, error) {
-	// get totp details
-	totpModel, err := db.Provider.GetAuthenticatorDetailsByUserId(ctx, userID, constants.EnvKeyTOTPAuthenticator)
-	if err != nil {
-		return false, err
-	}
-	// validate totp
-	status := totp.Validate(passcode, totpModel.Secret)
-	// checks if user not signed in for totp and totp code is correct then VerifiedAt will be stored in db
-	if totpModel.VerifiedAt == nil && status {
-		timeNow := time.Now().Unix()
-		totpModel.VerifiedAt = &timeNow
-		_, err = db.Provider.UpdateAuthenticator(ctx, totpModel)
-		if err != nil {
-			return false, err
-		}
-	}
-	return status, nil
-}
-
-// ValidateRecoveryCode validates a Time-Based One-Time Password (TOTP) recovery code against the stored TOTP recovery code for a user.
-func (p *provider) ValidateRecoveryCode(ctx context.Context, recoveryCode, userID string) (bool, error) {
-	// get totp details
-	totpModel, err := db.Provider.GetAuthenticatorDetailsByUserId(ctx, userID, constants.EnvKeyTOTPAuthenticator)
-	if err != nil {
-		return false, err
-	}
-	// convert recoveryCodes to map
-	recoveryCodesMap := map[string]bool{}
-	err = json.Unmarshal([]byte(refs.StringValue(totpModel.RecoveryCodes)), &recoveryCodesMap)
-	if err != nil {
-		return false, err
-	}
-	// check if recovery code is valid
-	if val, ok := recoveryCodesMap[recoveryCode]; !ok {
-		return false, fmt.Errorf("invalid recovery code")
-	} else if val {
-		return false, fmt.Errorf("recovery code already used")
-	}
-	// update recovery code map
-	recoveryCodesMap[recoveryCode] = true
-	// convert recoveryCodesMap to string
-	jsonData, err := json.Marshal(recoveryCodesMap)
-	if err != nil {
-		return false, err
-	}
-	recoveryCodesString := string(jsonData)
-	totpModel.RecoveryCodes = refs.NewStringRef(recoveryCodesString)
-	// update recovery code map in db
-	_, err = db.Provider.UpdateAuthenticator(ctx, totpModel)
-	if err != nil {
-		return false, err
-	}
-	return true, nil
-}
--- a/server/authenticators/totp_store.go
+++ b/server/authenticators/totp_store.go
@ -1,26 +0,0 @@
-package authenticators
-
-import (
-	"github.com/authorizerdev/authorizer/server/authenticators/providers"
-	"github.com/authorizerdev/authorizer/server/authenticators/providers/totp"
-	"github.com/authorizerdev/authorizer/server/constants"
-	"github.com/authorizerdev/authorizer/server/memorystore"
-)
-
-// Provider is the global authenticators provider.
-var Provider providers.Provider
-
-// InitTOTPStore initializes the TOTP authenticator store if it's not disabled in the environment variables.
-// It sets the global Provider variable to a new TOTP provider.
-func InitTOTPStore() error {
-	var err error
-	isTOTPEnvServiceDisabled, _ := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyDisableTOTPLogin)
-
-	if !isTOTPEnvServiceDisabled {
-		Provider, err = totp.NewProvider()
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
--- a/server/constants/auth_methods.go
+++ b/server/constants/auth_methods.go
@ -7,8 +7,6 @@ const (
 	AuthRecipeMethodMobileBasicAuth = "mobile_basic_auth"
 	// AuthRecipeMethodMagicLinkLogin is the magic_link_login auth method
 	AuthRecipeMethodMagicLinkLogin = "magic_link_login"
-	// AuthRecipeMethodMobileOTP is the mobile_otp auth method
-	AuthRecipeMethodMobileOTP = "mobile_otp"
 	// AuthRecipeMethodGoogle is the google auth method
 	AuthRecipeMethodGoogle = "google"
 	// AuthRecipeMethodGithub is the github auth method
@ -19,14 +17,6 @@ const (
 	AuthRecipeMethodLinkedIn = "linkedin"
 	// AuthRecipeMethodApple is the apple auth method
 	AuthRecipeMethodApple = "apple"
-	// AuthRecipeMethodDiscord is the discord auth method
-	AuthRecipeMethodDiscord = "discord"
 	// AuthRecipeMethodTwitter is the twitter auth method
 	AuthRecipeMethodTwitter = "twitter"
-	// AuthRecipeMethodMicrosoft is the microsoft auth method
-	AuthRecipeMethodMicrosoft = "microsoft"
-	// AuthRecipeMethodTwitch is the twitch auth method
-	AuthRecipeMethodTwitch = "twitch"
-	// AuthRecipeMethodRoblox is the roblox auth method
-	AuthRecipeMethodRoblox = "roblox"
 )
--- a/server/constants/authenticator_method.go
+++ b/server/constants/authenticator_method.go
@ -1,7 +0,0 @@
-package constants
-
-// Authenticators Methods
-const (
-	// EnvKeyTOTPAuthenticator key for env variable TOTP
-	EnvKeyTOTPAuthenticator = "totp"
-)
--- a/server/constants/cookie.go
+++ b/server/constants/cookie.go
@ -5,6 +5,4 @@ const (
 	AppCookieName = "cookie"
 	// AdminCookieName is the name of the cookie that is used to store the admin token
 	AdminCookieName = "authorizer-admin"
-	// MfaCookieName is the name of the cookie that is used to store the mfa session
-	MfaCookieName = "mfa"
 )
--- a/server/constants/db_types.go
+++ b/server/constants/db_types.go
@ -5,8 +5,6 @@ const (
 	DbTypePostgres = "postgres"
 	// DbTypeSqlite is the sqlite database type
 	DbTypeSqlite = "sqlite"
-	// DbTypeLibSQL is the libsql / Turso database type
-	DbTypeLibSQL = "libsql"
 	// DbTypeMysql is the mysql database type
 	DbTypeMysql = "mysql"
 	// DbTypeSqlserver is the sqlserver database type
--- a/server/constants/env.go
+++ b/server/constants/env.go
@ -45,9 +45,6 @@ const (
 	EnvKeyDatabaseCACert = "DATABASE_CA_CERT"
 	// EnvCouchbaseBucket key for env variable COUCHBASE_BUCKET
 	EnvCouchbaseBucket = "COUCHBASE_BUCKET"
-	// EnvCouchbaseBucketRAMQuotaMB key for env variable COUCHBASE_BUCKET_RAM_QUOTA
-	// This value should be parsed as number
-	EnvCouchbaseBucketRAMQuotaMB = "COUCHBASE_BUCKET_RAM_QUOTA"
 	// EnvCouchbaseBucket key for env variable COUCHBASE_SCOPE
 	EnvCouchbaseScope = "COUCHBASE_SCOPE"
 	// EnvKeySmtpHost key for env variable SMTP_HOST
@ -62,12 +59,8 @@ const (
 	EnvKeySmtpLocalName = "SMTP_LOCAL_NAME"
 	// EnvKeySenderEmail key for env variable SENDER_EMAIL
 	EnvKeySenderEmail = "SENDER_EMAIL"
-	// EnvKeySenderName key for env variable SENDER_NAME
-	EnvKeySenderName = "SENDER_NAME"
 	// EnvKeyIsEmailServiceEnabled key for env variable IS_EMAIL_SERVICE_ENABLED
 	EnvKeyIsEmailServiceEnabled = "IS_EMAIL_SERVICE_ENABLED"
-	// EnvKeyIsSMSServiceEnabled key for env variable IS_SMS_SERVICE_ENABLED
-	EnvKeyIsSMSServiceEnabled = "IS_SMS_SERVICE_ENABLED"
 	// EnvKeyAppCookieSecure key for env variable APP_COOKIE_SECURE
 	EnvKeyAppCookieSecure = "APP_COOKIE_SECURE"
 	// EnvKeyAdminCookieSecure key for env variable ADMIN_COOKIE_SECURE
@ -108,28 +101,10 @@ const (
 	EnvKeyAppleClientID = "APPLE_CLIENT_ID"
 	// EnvKeyAppleClientSecret key for env variable APPLE_CLIENT_SECRET
 	EnvKeyAppleClientSecret = "APPLE_CLIENT_SECRET"
-	// EnvKeyDiscordClientID key for env variable DISCORD_CLIENT_ID
-	EnvKeyDiscordClientID = "DISCORD_CLIENT_ID"
-	// EnvKeyDiscordClientSecret key for env variable DISCORD_CLIENT_SECRET
-	EnvKeyDiscordClientSecret = "DISCORD_CLIENT_SECRET"
 	// EnvKeyTwitterClientID key for env variable TWITTER_CLIENT_ID
 	EnvKeyTwitterClientID = "TWITTER_CLIENT_ID"
 	// EnvKeyTwitterClientSecret key for env variable TWITTER_CLIENT_SECRET
 	EnvKeyTwitterClientSecret = "TWITTER_CLIENT_SECRET"
-	// EnvKeyMicrosoftClientID key for env variable MICROSOFT_CLIENT_ID
-	EnvKeyMicrosoftClientID = "MICROSOFT_CLIENT_ID"
-	// EnvKeyMicrosoftActiveDirectoryTenantID key for env variable MICROSOFT_ACTIVE_DIRECTORY_TENANT_ID
-	EnvKeyMicrosoftActiveDirectoryTenantID = "MICROSOFT_ACTIVE_DIRECTORY_TENANT_ID"
-	// EnvKeyMicrosoftClientSecret key for env variable MICROSOFT_CLIENT_SECRET
-	EnvKeyMicrosoftClientSecret = "MICROSOFT_CLIENT_SECRET"
-	// EnvKeyTwitchClientID key for env variable TWITCH_CLIENT_ID
-	EnvKeyTwitchClientID = "TWITCH_CLIENT_ID"
-	// EnvKeyTwitchClientSecret key for env variable TWITCH_CLIENT_SECRET
-	EnvKeyTwitchClientSecret = "TWITCH_CLIENT_SECRET"
-	// EnvKeyRobloxClientID key for env variable ROBLOX_CLIENT_ID
-	EnvKeyRobloxClientID = "ROBLOX_CLIENT_ID"
-	// EnvKeyRobloxClientSecret key for env variable ROBLOX_CLIENT_SECRET
-	EnvKeyRobloxClientSecret = "ROBLOX_CLIENT_SECRET"
 	// EnvKeyOrganizationName key for env variable ORGANIZATION_NAME
 	EnvKeyOrganizationName = "ORGANIZATION_NAME"
 	// EnvKeyOrganizationLogo key for env variable ORGANIZATION_LOGO
@ -172,18 +147,6 @@ const (
 	// EnvKeyDisableMultiFactorAuthentication is key for env variable DISABLE_MULTI_FACTOR_AUTHENTICATION
 	// this variable is used to completely disable multi factor authentication. It will have no effect on profile preference
 	EnvKeyDisableMultiFactorAuthentication = "DISABLE_MULTI_FACTOR_AUTHENTICATION"
-	// EnvKeyDisableTOTPLogin is key for env variable DISABLE_TOTP_LOGIN
-	// this variable is used to completely disable totp verification
-	EnvKeyDisableTOTPLogin = "DISABLE_TOTP_LOGIN"
-	// EnvKeyDisableMailOTPLogin is key for env variable DISABLE_MAIL_OTP_LOGIN
-	// this variable is used to completely disable totp verification
-	EnvKeyDisableMailOTPLogin = "DISABLE_MAIL_OTP_LOGIN"
-	// EnvKeyDisablePhoneVerification is key for env variable DISABLE_PHONE_VERIFICATION
-	// this variable is used to disable phone verification
-	EnvKeyDisablePhoneVerification = "DISABLE_PHONE_VERIFICATION"
-	// EnvKeyDisablePlayGround is key for env variable DISABLE_PLAYGROUND
-	// this variable will disable or enable playground use in dashboard
-	EnvKeyDisablePlayGround = "DISABLE_PLAYGROUND"

 	// Slice variables
 	// EnvKeyRoles key for env variable ROLES
@ -194,22 +157,4 @@ const (
 	EnvKeyDefaultRoles = "DEFAULT_ROLES"
 	// EnvKeyAllowedOrigins key for env variable ALLOWED_ORIGINS
 	EnvKeyAllowedOrigins = "ALLOWED_ORIGINS"
-
-	// For oauth/openid/authorize
-	// EnvKeyDefaultAuthorizeResponseType key for env variable DEFAULT_AUTHORIZE_RESPONSE_TYPE
-	// This env is used for setting default response type in authorize handler
-	EnvKeyDefaultAuthorizeResponseType = "DEFAULT_AUTHORIZE_RESPONSE_TYPE"
-	// EnvKeyDefaultAuthorizeResponseMode key for env variable DEFAULT_AUTHORIZE_RESPONSE_MODE
-	// This env is used for setting default response mode in authorize handler
-	EnvKeyDefaultAuthorizeResponseMode = "DEFAULT_AUTHORIZE_RESPONSE_MODE"
-
-	// Twilio env variables
-	// EnvKeyTwilioAPIKey key for env variable TWILIO_API_KEY
-	EnvKeyTwilioAPIKey = "TWILIO_API_KEY"
-	// EnvKeyTwilioAPISecret key for env variable TWILIO_API_SECRET
-	EnvKeyTwilioAPISecret = "TWILIO_API_SECRET"
-	// EnvKeyTwilioAccountSID key for env variable TWILIO_ACCOUNT_SID
-	EnvKeyTwilioAccountSID = "TWILIO_ACCOUNT_SID"
-	// EnvKeyTwilioSender key for env variable TWILIO_SENDER
-	EnvKeyTwilioSender = "TWILIO_SENDER"
 )
--- a/server/constants/oauth2.go
+++ b/server/constants/oauth2.go
@ -16,7 +16,4 @@ const (
 	ResponseTypeToken = "token"
 	// For the Implicit grant of id_token, use response_type=id_token to include an identifier token.
 	ResponseTypeIDToken = "id_token"
-
-	// Constant indicating the "signup" screen hint for customizing authentication process and redirect to a signup page.
-	ScreenHintSignUp = "signup"
 )
--- a/server/constants/oauth_info_urls.go
+++ b/server/constants/oauth_info_urls.go
@ -16,12 +16,4 @@ const (
 	LinkedInEmailURL    = "https://api.linkedin.com/v2/emailAddress?q=members&projection=(elements*(handle~))"

 	TwitterUserInfoURL = "https://api.twitter.com/2/users/me?user.fields=id,name,profile_image_url,username"
-
-	// RobloxUserInfoURL is the URL to get user info from Roblox
-	RobloxUserInfoURL = "https://apis.roblox.com/oauth/v1/userinfo"
-
-	DiscordUserInfoURL = "https://discord.com/api/oauth2/@me"
-	// Get microsoft user info.
-	// Ref: https://learn.microsoft.com/en-us/azure/active-directory/develop/userinfo
-	MicrosoftUserInfoURL = "https://graph.microsoft.com/oidc/userinfo"
 )
--- a/server/constants/webhook_event.go
+++ b/server/constants/webhook_event.go
@ -15,6 +15,4 @@ const (
 	UserAccessEnabledWebhookEvent = `user.access_enabled`
 	// UserDeletedWebhookEvent name for user deleted event
 	UserDeletedWebhookEvent = `user.deleted`
-	// UserDeactivatedWebhookEvent name for user deactivated event
-	UserDeactivatedWebhookEvent = `user.deactivated`
 )
--- a/server/cookie/mfa_session.go
+++ b/server/cookie/mfa_session.go
@ -1,89 +0,0 @@
-package cookie
-
-import (
-	"net/http"
-	"net/url"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/authorizerdev/authorizer/server/constants"
-	"github.com/authorizerdev/authorizer/server/memorystore"
-	"github.com/authorizerdev/authorizer/server/parsers"
-	"github.com/gin-gonic/gin"
-)
-
-// SetMfaSession sets the mfa session cookie in the response
-func SetMfaSession(gc *gin.Context, sessionID string) {
-	appCookieSecure, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyAppCookieSecure)
-	if err != nil {
-		log.Debug("Error while getting app cookie secure from env variable: %v", err)
-		appCookieSecure = true
-	}
-
-	secure := appCookieSecure
-	httpOnly := appCookieSecure
-	hostname := parsers.GetHost(gc)
-	host, _ := parsers.GetHostParts(hostname)
-	domain := parsers.GetDomainName(hostname)
-	if domain != "localhost" {
-		domain = "." + domain
-	}
-
-	// Since app cookie can come from cross site it becomes important to set this in lax mode when insecure.
-	// Example person using custom UI on their app domain and making request to authorizer domain.
-	// For more information check:
-	// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
-	// https://github.com/gin-gonic/gin/blob/master/context.go#L86
-	// TODO add ability to sameSite = none / strict from dashboard
-	if !appCookieSecure {
-		gc.SetSameSite(http.SameSiteLaxMode)
-	} else {
-		gc.SetSameSite(http.SameSiteNoneMode)
-	}
-	// TODO allow configuring from dashboard
-	age := 60
-
-	gc.SetCookie(constants.MfaCookieName+"_session", sessionID, age, "/", host, secure, httpOnly)
-	gc.SetCookie(constants.MfaCookieName+"_session_domain", sessionID, age, "/", domain, secure, httpOnly)
-}
-
-// DeleteMfaSession deletes the mfa session cookies to expire
-func DeleteMfaSession(gc *gin.Context) {
-	appCookieSecure, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyAppCookieSecure)
-	if err != nil {
-		log.Debug("Error while getting app cookie secure from env variable: %v", err)
-		appCookieSecure = true
-	}
-
-	secure := appCookieSecure
-	httpOnly := appCookieSecure
-	hostname := parsers.GetHost(gc)
-	host, _ := parsers.GetHostParts(hostname)
-	domain := parsers.GetDomainName(hostname)
-	if domain != "localhost" {
-		domain = "." + domain
-	}
-
-	gc.SetSameSite(http.SameSiteNoneMode)
-	gc.SetCookie(constants.MfaCookieName+"_session", "", -1, "/", host, secure, httpOnly)
-	gc.SetCookie(constants.MfaCookieName+"_session_domain", "", -1, "/", domain, secure, httpOnly)
-}
-
-// GetMfaSession gets the mfa session cookie from context
-func GetMfaSession(gc *gin.Context) (string, error) {
-	var cookie *http.Cookie
-	var err error
-	cookie, err = gc.Request.Cookie(constants.MfaCookieName + "_session")
-	if err != nil {
-		cookie, err = gc.Request.Cookie(constants.MfaCookieName + "_session_domain")
-		if err != nil {
-			return "", err
-		}
-	}
-
-	decodedValue, err := url.PathUnescape(cookie.Value)
-	if err != nil {
-		return "", err
-	}
-	return decodedValue, nil
-}
--- a/server/crypto/common.go
+++ b/server/crypto/common.go
@ -1,9 +1,7 @@
 package crypto

 import (
-	"crypto/sha256"
 	"crypto/x509"
-	"encoding/hex"
 	"encoding/json"

 	"github.com/authorizerdev/authorizer/server/constants"
@ -127,27 +125,12 @@ func EncryptEnvData(data map[string]interface{}) (string, error) {
 	return EncryptB64(string(encryptedConfig)), nil
 }

-// getSHA256 calculates the SHA-256 hash of a string
-func getSHA256(input string) string {
-	hash := sha256.New()
-	hash.Write([]byte(input))
-	return hex.EncodeToString(hash.Sum(nil))
-}
-
-// VerifyPassword compares a stored hashed password with a user-provided password
-func VerifyPassword(storedHashedPassword, userProvidedPassword string) error {
-	// CompareHashAndPassword returns nil on success
-	passwordSHA256 := getSHA256(userProvidedPassword)
-	err := bcrypt.CompareHashAndPassword([]byte(storedHashedPassword), []byte(passwordSHA256))
-	return err
-}
-
 // EncryptPassword is used for encrypting password
 func EncryptPassword(password string) (string, error) {
-	passwordSHA256 := getSHA256(password)
-	pw, err := bcrypt.GenerateFromPassword([]byte(passwordSHA256), bcrypt.DefaultCost)
+	pw, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
 	if err != nil {
 		return "", err
 	}
+
 	return string(pw), nil
 }
--- a/server/crypto/rsa.go
+++ b/server/crypto/rsa.go
@ -3,9 +3,7 @@ package crypto
 import (
 	"crypto/rand"
 	"crypto/rsa"
-	"crypto/sha256"
 	"crypto/x509"
-	"encoding/base64"
 	"encoding/pem"
 	"errors"
 )
@ -118,24 +116,3 @@ func AsRSAStr(privateKey *rsa.PrivateKey, publickKey *rsa.PublicKey) (string, st

 	return privParsedPem, pubParsedPem, nil
 }
-
-func EncryptRSA(message string, key rsa.PublicKey) (string, error) {
-	label := []byte("OAEP Encrypted")
-	rng := rand.Reader
-	ciphertext, err := rsa.EncryptOAEP(sha256.New(), rng, &key, []byte(message), label)
-	if err != nil {
-		return "", err
-	}
-	return base64.StdEncoding.EncodeToString(ciphertext), nil
-}
-
-func DecryptRSA(cipherText string, privateKey rsa.PrivateKey) (string, error) {
-	ct, _ := base64.StdEncoding.DecodeString(cipherText)
-	label := []byte("OAEP Encrypted")
-	rng := rand.Reader
-	plaintext, err := rsa.DecryptOAEP(sha256.New(), rng, &privateKey, ct, label)
-	if err != nil {
-		return "", err
-	}
-	return string(plaintext), nil
-}
--- a/server/db/db.go
+++ b/server/db/db.go
@ -7,7 +7,6 @@ import (
 	"github.com/authorizerdev/authorizer/server/db/providers"
 	"github.com/authorizerdev/authorizer/server/db/providers/arangodb"
 	"github.com/authorizerdev/authorizer/server/db/providers/cassandradb"
-	"github.com/authorizerdev/authorizer/server/db/providers/couchbase"
 	"github.com/authorizerdev/authorizer/server/db/providers/dynamodb"
 	"github.com/authorizerdev/authorizer/server/db/providers/mongodb"
 	"github.com/authorizerdev/authorizer/server/db/providers/sql"
@ -27,7 +26,6 @@ func InitDB() error {
 	isMongoDB := envs.DatabaseType == constants.DbTypeMongodb
 	isCassandra := envs.DatabaseType == constants.DbTypeCassandraDB || envs.DatabaseType == constants.DbTypeScyllaDB
 	isDynamoDB := envs.DatabaseType == constants.DbTypeDynamoDB
-	isCouchbaseDB := envs.DatabaseType == constants.DbTypeCouchbaseDB

 	if isSQL {
 		log.Info("Initializing SQL Driver for: ", envs.DatabaseType)
@ -37,6 +35,7 @@ func InitDB() error {
 			return err
 		}
 	}
+
 	if isArangoDB {
 		log.Info("Initializing ArangoDB Driver")
 		Provider, err = arangodb.NewProvider()
@ -73,14 +72,5 @@ func InitDB() error {
 		}
 	}

-	if isCouchbaseDB {
-		log.Info("Initializing CouchbaseDB Driver for: ", envs.DatabaseType)
-		Provider, err = couchbase.NewProvider()
-		if err != nil {
-			log.Fatal("Failed to initialize Couchbase driver: ", err)
-			return err
-		}
-	}
-
 	return nil
 }
--- a/server/db/models/authenticators.go
+++ b/server/db/models/authenticators.go
@ -1,16 +0,0 @@
-package models
-
-// Note: any change here should be reflected in providers/casandra/provider.go as it does not have model support in collection creation
-
-// Authenticators model for db
-type Authenticator struct {
-	Key           string  `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty" dynamo:"key,omitempty"` // for arangodb
-	ID            string  `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id" dynamo:"id,hash"`
-	UserID        string  `gorm:"type:char(36)" json:"user_id" bson:"user_id" cql:"user_id" dynamo:"user_id" index:"user_id,hash"`
-	Method        string  `json:"method" bson:"method" cql:"method" dynamo:"method"`
-	Secret        string  `json:"secret" bson:"secret" cql:"secret" dynamo:"secret"`
-	RecoveryCodes *string `json:"recovery_codes" bson:"recovery_codes" cql:"recovery_codes" dynamo:"recovery_codes"`
-	VerifiedAt    *int64  `json:"verified_at" bson:"verified_at" cql:"verified_at" dynamo:"verified_at"`
-	CreatedAt     int64   `json:"created_at" bson:"created_at" cql:"created_at" dynamo:"created_at"`
-	UpdatedAt     int64   `json:"updated_at" bson:"updated_at" cql:"updated_at" dynamo:"updated_at"`
-}
--- a/server/db/models/env.go
+++ b/server/db/models/env.go
@ -8,7 +8,6 @@ type Env struct {
 	ID        string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id" dynamo:"id,hash"`
 	EnvData   string `json:"env" bson:"env" cql:"env" dynamo:"env"`
 	Hash      string `json:"hash" bson:"hash" cql:"hash" dynamo:"hash"`
-	EncryptionKey string `json:"encryption_key" bson:"encryption_key" cql:"encryption_key" dynamo:"encryption_key"` // couchbase has "hash" as reserved keyword so we cannot use it. This will be empty for other dbs.
 	UpdatedAt int64  `json:"updated_at" bson:"updated_at" cql:"updated_at" dynamo:"updated_at"`
 	CreatedAt int64  `json:"created_at" bson:"created_at" cql:"created_at" dynamo:"created_at"`
 }
--- a/server/db/models/model.go
+++ b/server/db/models/model.go
@ -1,6 +1,6 @@
 package models

-// CollectionList / Tables available for authorizer in the database
+// Collections / Tables available for authorizer in the database
 type CollectionList struct {
 	User                string
 	VerificationRequest string
@ -10,8 +10,6 @@ type CollectionList struct {
 	WebhookLog          string
 	EmailTemplate       string
 	OTP                 string
-	SMSVerificationRequest string
-	Authenticators         string
 }

 var (
@ -27,7 +25,5 @@ var (
 		WebhookLog:          Prefix + "webhook_logs",
 		EmailTemplate:       Prefix + "email_templates",
 		OTP:                 Prefix + "otps",
-		SMSVerificationRequest: Prefix + "sms_verification_requests",
-		Authenticators:         Prefix + "authenticators",
 	}
 )
--- a/server/db/models/otp.go
+++ b/server/db/models/otp.go
@ -1,18 +1,10 @@
 package models

-const (
-	// FieldName email is the field name for email
-	FieldNameEmail = "email"
-	// FieldNamePhoneNumber is the field name for phone number
-	FieldNamePhoneNumber = "phone_number"
-)
-
 // OTP model for database
 type OTP struct {
 	Key       string `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty" dynamo:"key,omitempty"` // for arangodb
 	ID        string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id" dynamo:"id,hash"`
-	Email       string `gorm:"index" json:"email" bson:"email" cql:"email" dynamo:"email" index:"email,hash"`
-	PhoneNumber string `gorm:"index" json:"phone_number" bson:"phone_number" cql:"phone_number" dynamo:"phone_number"`
+	Email     string `gorm:"unique" json:"email" bson:"email" cql:"email" dynamo:"email" index:"email,hash"`
 	Otp       string `json:"otp" bson:"otp" cql:"otp" dynamo:"otp"`
 	ExpiresAt int64  `json:"expires_at" bson:"expires_at" cql:"expires_at" dynamo:"expires_at"`
 	CreatedAt int64  `json:"created_at" bson:"created_at" cql:"created_at" dynamo:"created_at"`
--- a/server/db/models/user.go
+++ b/server/db/models/user.go
@ -15,7 +15,7 @@ type User struct {
 	Key string `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty" dynamo:"key,omitempty"` // for arangodb
 	ID  string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id" dynamo:"id,hash"`

-	Email                    *string `gorm:"index" json:"email" bson:"email" cql:"email" dynamo:"email" index:"email,hash"`
+	Email                    string  `gorm:"unique" json:"email" bson:"email" cql:"email" dynamo:"email" index:"email,hash"`
 	EmailVerifiedAt          *int64  `json:"email_verified_at" bson:"email_verified_at" cql:"email_verified_at" dynamo:"email_verified_at"`
 	Password                 *string `json:"password" bson:"password" cql:"password" dynamo:"password"`
 	SignupMethods            string  `json:"signup_methods" bson:"signup_methods" cql:"signup_methods" dynamo:"signup_methods"`
@ -33,14 +33,12 @@ type User struct {
 	IsMultiFactorAuthEnabled *bool   `json:"is_multi_factor_auth_enabled" bson:"is_multi_factor_auth_enabled" cql:"is_multi_factor_auth_enabled" dynamo:"is_multi_factor_auth_enabled"`
 	UpdatedAt                int64   `json:"updated_at" bson:"updated_at" cql:"updated_at" dynamo:"updated_at"`
 	CreatedAt                int64   `json:"created_at" bson:"created_at" cql:"created_at" dynamo:"created_at"`
-	AppData                  *string `json:"app_data" bson:"app_data" cql:"app_data" dynamo:"app_data"`
 }

 func (user *User) AsAPIUser() *model.User {
 	isEmailVerified := user.EmailVerifiedAt != nil
 	isPhoneVerified := user.PhoneNumberVerifiedAt != nil
-	appDataMap := make(map[string]interface{})
-	json.Unmarshal([]byte(refs.StringValue(user.AppData)), &appDataMap)
+
 	// id := user.ID
 	// if strings.Contains(id, Collections.User+"/") {
 	// 	id = strings.TrimPrefix(id, Collections.User+"/")
@ -54,7 +52,7 @@ func (user *User) AsAPIUser() *model.User {
 		FamilyName:               user.FamilyName,
 		MiddleName:               user.MiddleName,
 		Nickname:                 user.Nickname,
-		PreferredUsername:        user.Email,
+		PreferredUsername:        refs.NewStringRef(user.Email),
 		Gender:                   user.Gender,
 		Birthdate:                user.Birthdate,
 		PhoneNumber:              user.PhoneNumber,
@ -65,7 +63,6 @@ func (user *User) AsAPIUser() *model.User {
 		IsMultiFactorAuthEnabled: user.IsMultiFactorAuthEnabled,
 		CreatedAt:                refs.NewInt64Ref(user.CreatedAt),
 		UpdatedAt:                refs.NewInt64Ref(user.UpdatedAt),
-		AppData:                  appDataMap,
 	}
 }

--- a/server/db/models/webhook.go
+++ b/server/db/models/webhook.go
@ -10,15 +10,11 @@ import (

 // Note: any change here should be reflected in providers/casandra/provider.go as it does not have model support in collection creation

-// Event name has been kept unique as per initial design. But later on decided that we can have
-// multiple hooks for same event so will be in a pattern `event_name-TIMESTAMP`
-
 // Webhook model for db
 type Webhook struct {
 	Key       string `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty" dynamo:"key,omitempty"` // for arangodb
 	ID        string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id" dynamo:"id,hash"`
 	EventName string `gorm:"unique" json:"event_name" bson:"event_name" cql:"event_name" dynamo:"event_name" index:"event_name,hash"`
-	EventDescription string `json:"event_description" bson:"event_description" cql:"event_description" dynamo:"event_description"`
 	EndPoint  string `json:"endpoint" bson:"endpoint" cql:"endpoint" dynamo:"endpoint"`
 	Headers   string `json:"headers" bson:"headers" cql:"headers" dynamo:"headers"`
 	Enabled   bool   `json:"enabled" bson:"enabled" cql:"enabled" dynamo:"enabled"`
@ -30,18 +26,15 @@ type Webhook struct {
 func (w *Webhook) AsAPIWebhook() *model.Webhook {
 	headersMap := make(map[string]interface{})
 	json.Unmarshal([]byte(w.Headers), &headersMap)
+
 	id := w.ID
 	if strings.Contains(id, Collections.Webhook+"/") {
 		id = strings.TrimPrefix(id, Collections.Webhook+"/")
 	}
-	// set default title to event name without dot(.)
-	if w.EventDescription == "" {
-		w.EventDescription = strings.Join(strings.Split(w.EventName, "."), " ")
-	}
+
 	return &model.Webhook{
 		ID:        id,
 		EventName: refs.NewStringRef(w.EventName),
-		EventDescription: refs.NewStringRef(w.EventDescription),
 		Endpoint:  refs.NewStringRef(w.EndPoint),
 		Headers:   headersMap,
 		Enabled:   refs.NewBoolRef(w.Enabled),
--- a/server/db/providers/arangodb/authenticator.go
+++ b/server/db/providers/arangodb/authenticator.go
@ -1,78 +0,0 @@
-package arangodb
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/google/uuid"
-
-	arangoDriver "github.com/arangodb/go-driver"
-
-	"github.com/authorizerdev/authorizer/server/db/models"
-)
-
-func (p *provider) AddAuthenticator(ctx context.Context, authenticators *models.Authenticator) (*models.Authenticator, error) {
-	exists, _ := p.GetAuthenticatorDetailsByUserId(ctx, authenticators.UserID, authenticators.Method)
-	if exists != nil {
-		return authenticators, nil
-	}
-	if authenticators.ID == "" {
-		authenticators.ID = uuid.New().String()
-	}
-
-	authenticators.Key = authenticators.ID
-	authenticators.CreatedAt = time.Now().Unix()
-	authenticators.UpdatedAt = time.Now().Unix()
-
-	authenticatorsCollection, _ := p.db.Collection(ctx, models.Collections.Authenticators)
-	meta, err := authenticatorsCollection.CreateDocument(arangoDriver.WithOverwrite(ctx), authenticators)
-	if err != nil {
-		return nil, err
-	}
-	authenticators.Key = meta.Key
-	authenticators.ID = meta.ID.String()
-
-	return authenticators, nil
-}
-
-func (p *provider) UpdateAuthenticator(ctx context.Context, authenticators *models.Authenticator) (*models.Authenticator, error) {
-	authenticators.UpdatedAt = time.Now().Unix()
-
-	collection, _ := p.db.Collection(ctx, models.Collections.Authenticators)
-	meta, err := collection.UpdateDocument(ctx, authenticators.Key, authenticators)
-	if err != nil {
-		return nil, err
-	}
-
-	authenticators.Key = meta.Key
-	authenticators.ID = meta.ID.String()
-	return authenticators, nil
-}
-
-func (p *provider) GetAuthenticatorDetailsByUserId(ctx context.Context, userId string, authenticatorType string) (*models.Authenticator, error) {
-	var authenticators *models.Authenticator
-	query := fmt.Sprintf("FOR d in %s FILTER d.user_id == @user_id AND d.method == @method LIMIT 1 RETURN d", models.Collections.Authenticators)
-	bindVars := map[string]interface{}{
-		"user_id": userId,
-		"method":  authenticatorType,
-	}
-	cursor, err := p.db.Query(ctx, query, bindVars)
-	if err != nil {
-		return nil, err
-	}
-	defer cursor.Close()
-	for {
-		if !cursor.HasMore() {
-			if authenticators == nil {
-				return authenticators, fmt.Errorf("authenticator not found")
-			}
-			break
-		}
-		_, err := cursor.ReadDocument(ctx, &authenticators)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return authenticators, nil
-}
--- a/server/db/providers/arangodb/email_template.go
+++ b/server/db/providers/arangodb/email_template.go
@ -5,6 +5,7 @@ import (
 	"fmt"
 	"time"

+	"github.com/arangodb/go-driver"
 	arangoDriver "github.com/arangodb/go-driver"
 	"github.com/authorizerdev/authorizer/server/db/models"
 	"github.com/authorizerdev/authorizer/server/graph/model"
@ -12,14 +13,16 @@ import (
 )

 // AddEmailTemplate to add EmailTemplate
-func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate *models.EmailTemplate) (*model.EmailTemplate, error) {
+func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate models.EmailTemplate) (*model.EmailTemplate, error) {
 	if emailTemplate.ID == "" {
 		emailTemplate.ID = uuid.New().String()
 		emailTemplate.Key = emailTemplate.ID
 	}
+
 	emailTemplate.Key = emailTemplate.ID
 	emailTemplate.CreatedAt = time.Now().Unix()
 	emailTemplate.UpdatedAt = time.Now().Unix()
+
 	emailTemplateCollection, _ := p.db.Collection(ctx, models.Collections.EmailTemplate)
 	_, err := emailTemplateCollection.CreateDocument(ctx, emailTemplate)
 	if err != nil {
@ -29,63 +32,74 @@ func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate *models.E
 }

 // UpdateEmailTemplate to update EmailTemplate
-func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate *models.EmailTemplate) (*model.EmailTemplate, error) {
+func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate models.EmailTemplate) (*model.EmailTemplate, error) {
 	emailTemplate.UpdatedAt = time.Now().Unix()
+
 	emailTemplateCollection, _ := p.db.Collection(ctx, models.Collections.EmailTemplate)
 	meta, err := emailTemplateCollection.UpdateDocument(ctx, emailTemplate.Key, emailTemplate)
 	if err != nil {
 		return nil, err
 	}
+
 	emailTemplate.Key = meta.Key
 	emailTemplate.ID = meta.ID.String()
 	return emailTemplate.AsAPIEmailTemplate(), nil
 }

 // ListEmailTemplates to list EmailTemplate
-func (p *provider) ListEmailTemplate(ctx context.Context, pagination *model.Pagination) (*model.EmailTemplates, error) {
+func (p *provider) ListEmailTemplate(ctx context.Context, pagination model.Pagination) (*model.EmailTemplates, error) {
 	emailTemplates := []*model.EmailTemplate{}
+
 	query := fmt.Sprintf("FOR d in %s SORT d.created_at DESC LIMIT %d, %d RETURN d", models.Collections.EmailTemplate, pagination.Offset, pagination.Limit)
-	sctx := arangoDriver.WithQueryFullCount(ctx)
+
+	sctx := driver.WithQueryFullCount(ctx)
 	cursor, err := p.db.Query(sctx, query, nil)
 	if err != nil {
 		return nil, err
 	}
 	defer cursor.Close()
+
 	paginationClone := pagination
 	paginationClone.Total = cursor.Statistics().FullCount()
+
 	for {
-		var emailTemplate *models.EmailTemplate
+		var emailTemplate models.EmailTemplate
 		meta, err := cursor.ReadDocument(ctx, &emailTemplate)
+
 		if arangoDriver.IsNoMoreDocuments(err) {
 			break
 		} else if err != nil {
 			return nil, err
 		}
+
 		if meta.Key != "" {
 			emailTemplates = append(emailTemplates, emailTemplate.AsAPIEmailTemplate())
 		}
 	}
+
 	return &model.EmailTemplates{
-		Pagination:     paginationClone,
+		Pagination:     &paginationClone,
 		EmailTemplates: emailTemplates,
 	}, nil
 }

 // GetEmailTemplateByID to get EmailTemplate by id
 func (p *provider) GetEmailTemplateByID(ctx context.Context, emailTemplateID string) (*model.EmailTemplate, error) {
-	var emailTemplate *models.EmailTemplate
+	var emailTemplate models.EmailTemplate
 	query := fmt.Sprintf("FOR d in %s FILTER d._key == @email_template_id RETURN d", models.Collections.EmailTemplate)
 	bindVars := map[string]interface{}{
 		"email_template_id": emailTemplateID,
 	}
+
 	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
 		return nil, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if emailTemplate == nil {
+			if emailTemplate.Key == "" {
 				return nil, fmt.Errorf("email template not found")
 			}
 			break
@ -100,19 +114,21 @@ func (p *provider) GetEmailTemplateByID(ctx context.Context, emailTemplateID str

 // GetEmailTemplateByEventName to get EmailTemplate by event_name
 func (p *provider) GetEmailTemplateByEventName(ctx context.Context, eventName string) (*model.EmailTemplate, error) {
-	var emailTemplate *models.EmailTemplate
+	var emailTemplate models.EmailTemplate
 	query := fmt.Sprintf("FOR d in %s FILTER d.event_name == @event_name RETURN d", models.Collections.EmailTemplate)
 	bindVars := map[string]interface{}{
 		"event_name": eventName,
 	}
+
 	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
 		return nil, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if emailTemplate == nil {
+			if emailTemplate.Key == "" {
 				return nil, fmt.Errorf("email template not found")
 			}
 			break
--- a/server/db/providers/arangodb/env.go
+++ b/server/db/providers/arangodb/env.go
@ -12,7 +12,7 @@ import (
 )

 // AddEnv to save environment information in database
-func (p *provider) AddEnv(ctx context.Context, env *models.Env) (*models.Env, error) {
+func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	if env.ID == "" {
 		env.ID = uuid.New().String()
 		env.Key = env.ID
@ -23,7 +23,7 @@ func (p *provider) AddEnv(ctx context.Context, env *models.Env) (*models.Env, er
 	configCollection, _ := p.db.Collection(ctx, models.Collections.Env)
 	meta, err := configCollection.CreateDocument(arangoDriver.WithOverwrite(ctx), env)
 	if err != nil {
-		return nil, err
+		return env, err
 	}
 	env.Key = meta.Key
 	env.ID = meta.ID.String()
@ -31,12 +31,12 @@ func (p *provider) AddEnv(ctx context.Context, env *models.Env) (*models.Env, er
 }

 // UpdateEnv to update environment information in database
-func (p *provider) UpdateEnv(ctx context.Context, env *models.Env) (*models.Env, error) {
+func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	env.UpdatedAt = time.Now().Unix()
 	collection, _ := p.db.Collection(ctx, models.Collections.Env)
 	meta, err := collection.UpdateDocument(ctx, env.Key, env)
 	if err != nil {
-		return nil, err
+		return env, err
 	}

 	env.Key = meta.Key
@ -45,24 +45,26 @@ func (p *provider) UpdateEnv(ctx context.Context, env *models.Env) (*models.Env,
 }

 // GetEnv to get environment information from database
-func (p *provider) GetEnv(ctx context.Context) (*models.Env, error) {
-	var env *models.Env
+func (p *provider) GetEnv(ctx context.Context) (models.Env, error) {
+	var env models.Env
 	query := fmt.Sprintf("FOR d in %s RETURN d", models.Collections.Env)
+
 	cursor, err := p.db.Query(ctx, query, nil)
 	if err != nil {
-		return nil, err
+		return env, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if env == nil {
+			if env.Key == "" {
 				return env, fmt.Errorf("config not found")
 			}
 			break
 		}
 		_, err := cursor.ReadDocument(ctx, &env)
 		if err != nil {
-			return nil, err
+			return env, err
 		}
 	}

--- a/server/db/providers/arangodb/otp.go
+++ b/server/db/providers/arangodb/otp.go
@ -2,7 +2,6 @@ package arangodb

 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"

@ -13,20 +12,7 @@ import (

 // UpsertOTP to add or update otp
 func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models.OTP, error) {
-	// check if email or phone number is present
-	if otpParam.Email == "" && otpParam.PhoneNumber == "" {
-		return nil, errors.New("email or phone_number is required")
-	}
-	uniqueField := models.FieldNameEmail
-	if otpParam.Email == "" && otpParam.PhoneNumber != "" {
-		uniqueField = models.FieldNamePhoneNumber
-	}
-	var otp *models.OTP
-	if uniqueField == models.FieldNameEmail {
-		otp, _ = p.GetOTPByEmail(ctx, otpParam.Email)
-	} else {
-		otp, _ = p.GetOTPByPhoneNumber(ctx, otpParam.PhoneNumber)
-	}
+	otp, _ := p.GetOTPByEmail(ctx, otpParam.Email)
 	shouldCreate := false
 	if otp == nil {
 		id := uuid.NewString()
@ -35,7 +21,6 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 			Key:       id,
 			Otp:       otpParam.Otp,
 			Email:     otpParam.Email,
-			PhoneNumber: otpParam.PhoneNumber,
 			ExpiresAt: otpParam.ExpiresAt,
 			CreatedAt: time.Now().Unix(),
 		}
@ -44,8 +29,10 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 		otp.Otp = otpParam.Otp
 		otp.ExpiresAt = otpParam.ExpiresAt
 	}
+
 	otp.UpdatedAt = time.Now().Unix()
 	otpCollection, _ := p.db.Collection(ctx, models.Collections.OTP)
+
 	var meta driver.DocumentMeta
 	var err error
 	if shouldCreate {
@ -53,9 +40,11 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 	} else {
 		meta, err = otpCollection.UpdateDocument(ctx, otp.Key, otp)
 	}
+
 	if err != nil {
 		return nil, err
 	}
+
 	otp.Key = meta.Key
 	otp.ID = meta.ID.String()
 	return otp, nil
@ -63,20 +52,22 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models

 // GetOTPByEmail to get otp for a given email address
 func (p *provider) GetOTPByEmail(ctx context.Context, emailAddress string) (*models.OTP, error) {
-	var otp *models.OTP
+	var otp models.OTP
 	query := fmt.Sprintf("FOR d in %s FILTER d.email == @email RETURN d", models.Collections.OTP)
 	bindVars := map[string]interface{}{
 		"email": emailAddress,
 	}
+
 	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
 		return nil, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if otp == nil {
-				return nil, fmt.Errorf("otp with given email not found")
+			if otp.Key == "" {
+				return nil, fmt.Errorf("email template not found")
 			}
 			break
 		}
@ -85,34 +76,8 @@ func (p *provider) GetOTPByEmail(ctx context.Context, emailAddress string) (*mod
 			return nil, err
 		}
 	}
-	return otp, nil
-}

-// GetOTPByPhoneNumber to get otp for a given phone number
-func (p *provider) GetOTPByPhoneNumber(ctx context.Context, phoneNumber string) (*models.OTP, error) {
-	var otp *models.OTP
-	query := fmt.Sprintf("FOR d in %s FILTER d.phone_number == @phone_number RETURN d", models.Collections.OTP)
-	bindVars := map[string]interface{}{
-		"phone_number": phoneNumber,
-	}
-	cursor, err := p.db.Query(ctx, query, bindVars)
-	if err != nil {
-		return nil, err
-	}
-	defer cursor.Close()
-	for {
-		if !cursor.HasMore() {
-			if otp == nil {
-				return nil, fmt.Errorf("otp with given phone_number not found")
-			}
-			break
-		}
-		_, err := cursor.ReadDocument(ctx, &otp)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return otp, nil
+	return &otp, nil
 }

 // DeleteOTP to delete otp
@ -122,5 +87,6 @@ func (p *provider) DeleteOTP(ctx context.Context, otp *models.OTP) error {
 	if err != nil {
 		return err
 	}
+
 	return nil
 }
--- a/server/db/providers/arangodb/provider.go
+++ b/server/db/providers/arangodb/provider.go
@ -2,11 +2,8 @@ package arangodb

 import (
 	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/base64"
-	"fmt"

+	"github.com/arangodb/go-driver"
 	arangoDriver "github.com/arangodb/go-driver"
 	"github.com/arangodb/go-driver/http"
 	"github.com/authorizerdev/authorizer/server/db/models"
@ -25,73 +22,44 @@ type provider struct {
 func NewProvider() (*provider, error) {
 	ctx := context.Background()
 	dbURL := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseURL
-	dbUsername := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseUsername
-	dbPassword := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabasePassword
-	dbCACertificate := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseCACert
-	httpConfig := http.ConnectionConfig{
+	conn, err := http.NewConnection(http.ConnectionConfig{
 		Endpoints: []string{dbURL},
-	}
-	// If ca certificate if present, create tls config
-	if dbCACertificate != "" {
-		caCert, err := base64.StdEncoding.DecodeString(dbCACertificate)
+	})
 	if err != nil {
 		return nil, err
 	}
-		// Prepare TLS Config
-		tlsConfig := &tls.Config{}
-		certPool := x509.NewCertPool()
-		if success := certPool.AppendCertsFromPEM(caCert); !success {
-			return nil, fmt.Errorf("invalid certificate")
-		}
-		tlsConfig.RootCAs = certPool
-		httpConfig.TLSConfig = tlsConfig
-	}
-	// Create new http connection
-	conn, err := http.NewConnection(httpConfig)
-	if err != nil {
-		return nil, err
-	}
-	clientConfig := arangoDriver.ClientConfig{
+
+	arangoClient, err := arangoDriver.NewClient(arangoDriver.ClientConfig{
 		Connection: conn,
-	}
-	if dbUsername != "" && dbPassword != "" {
-		clientConfig.Authentication = arangoDriver.BasicAuthentication(dbUsername, dbPassword)
-	}
-	arangoClient, err := arangoDriver.NewClient(clientConfig)
+	})
 	if err != nil {
 		return nil, err
 	}
-	var arangodb arangoDriver.Database
+
+	var arangodb driver.Database
 	dbName := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseName
-	arangodb_exists, err := arangoClient.DatabaseExists(ctx, dbName)
-	if err != nil {
-		return nil, err
-	}
+	arangodb_exists, err := arangoClient.DatabaseExists(nil, dbName)
+
 	if arangodb_exists {
-		arangodb, err = arangoClient.Database(ctx, dbName)
+		arangodb, err = arangoClient.Database(nil, dbName)
 		if err != nil {
 			return nil, err
 		}
 	} else {
-		arangodb, err = arangoClient.CreateDatabase(ctx, dbName, nil)
+		arangodb, err = arangoClient.CreateDatabase(nil, dbName, nil)
 		if err != nil {
 			return nil, err
 		}
 	}
+
 	userCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.User)
-	if err != nil {
-		return nil, err
-	}
 	if !userCollectionExists {
 		_, err = arangodb.CreateCollection(ctx, models.Collections.User, nil)
 		if err != nil {
 			return nil, err
 		}
 	}
-	userCollection, err := arangodb.Collection(ctx, models.Collections.User)
-	if err != nil {
-		return nil, err
-	}
+	userCollection, _ := arangodb.Collection(nil, models.Collections.User)
 	userCollection.EnsureHashIndex(ctx, []string{"email"}, &arangoDriver.EnsureHashIndexOptions{
 		Unique: true,
 		Sparse: true,
@ -102,19 +70,14 @@ func NewProvider() (*provider, error) {
 	})

 	verificationRequestCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.VerificationRequest)
-	if err != nil {
-		return nil, err
-	}
 	if !verificationRequestCollectionExists {
 		_, err = arangodb.CreateCollection(ctx, models.Collections.VerificationRequest, nil)
 		if err != nil {
 			return nil, err
 		}
 	}
-	verificationRequestCollection, err := arangodb.Collection(ctx, models.Collections.VerificationRequest)
-	if err != nil {
-		return nil, err
-	}
+
+	verificationRequestCollection, _ := arangodb.Collection(nil, models.Collections.VerificationRequest)
 	verificationRequestCollection.EnsureHashIndex(ctx, []string{"email", "identifier"}, &arangoDriver.EnsureHashIndexOptions{
 		Unique: true,
 		Sparse: true,
@ -124,123 +87,78 @@ func NewProvider() (*provider, error) {
 	})

 	sessionCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.Session)
-	if err != nil {
-		return nil, err
-	}
 	if !sessionCollectionExists {
 		_, err = arangodb.CreateCollection(ctx, models.Collections.Session, nil)
 		if err != nil {
 			return nil, err
 		}
 	}
-	sessionCollection, err := arangodb.Collection(ctx, models.Collections.Session)
-	if err != nil {
-		return nil, err
-	}
+
+	sessionCollection, _ := arangodb.Collection(nil, models.Collections.Session)
 	sessionCollection.EnsureHashIndex(ctx, []string{"user_id"}, &arangoDriver.EnsureHashIndexOptions{
 		Sparse: true,
 	})
-	envCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.Env)
-	if err != nil {
-		return nil, err
-	}
-	if !envCollectionExists {
+
+	configCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.Env)
+	if !configCollectionExists {
 		_, err = arangodb.CreateCollection(ctx, models.Collections.Env, nil)
 		if err != nil {
 			return nil, err
 		}
 	}
+
 	webhookCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.Webhook)
-	if err != nil {
-		return nil, err
-	}
 	if !webhookCollectionExists {
 		_, err = arangodb.CreateCollection(ctx, models.Collections.Webhook, nil)
 		if err != nil {
 			return nil, err
 		}
 	}
-	webhookCollection, err := arangodb.Collection(ctx, models.Collections.Webhook)
-	if err != nil {
-		return nil, err
-	}
+
+	webhookCollection, _ := arangodb.Collection(nil, models.Collections.Webhook)
 	webhookCollection.EnsureHashIndex(ctx, []string{"event_name"}, &arangoDriver.EnsureHashIndexOptions{
 		Unique: true,
 		Sparse: true,
 	})

 	webhookLogCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.WebhookLog)
-	if err != nil {
-		return nil, err
-	}
 	if !webhookLogCollectionExists {
 		_, err = arangodb.CreateCollection(ctx, models.Collections.WebhookLog, nil)
 		if err != nil {
 			return nil, err
 		}
 	}
-	webhookLogCollection, err := arangodb.Collection(ctx, models.Collections.WebhookLog)
-	if err != nil {
-		return nil, err
-	}
+
+	webhookLogCollection, _ := arangodb.Collection(nil, models.Collections.WebhookLog)
 	webhookLogCollection.EnsureHashIndex(ctx, []string{"webhook_id"}, &arangoDriver.EnsureHashIndexOptions{
 		Sparse: true,
 	})

 	emailTemplateCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.EmailTemplate)
-	if err != nil {
-		return nil, err
-	}
 	if !emailTemplateCollectionExists {
 		_, err = arangodb.CreateCollection(ctx, models.Collections.EmailTemplate, nil)
 		if err != nil {
 			return nil, err
 		}
 	}
-	emailTemplateCollection, err := arangodb.Collection(ctx, models.Collections.EmailTemplate)
-	if err != nil {
-		return nil, err
-	}
+
+	emailTemplateCollection, _ := arangodb.Collection(nil, models.Collections.EmailTemplate)
 	emailTemplateCollection.EnsureHashIndex(ctx, []string{"event_name"}, &arangoDriver.EnsureHashIndexOptions{
 		Unique: true,
 		Sparse: true,
 	})

 	otpCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.OTP)
-	if err != nil {
-		return nil, err
-	}
 	if !otpCollectionExists {
 		_, err = arangodb.CreateCollection(ctx, models.Collections.OTP, nil)
 		if err != nil {
 			return nil, err
 		}
 	}
-	otpCollection, err := arangodb.Collection(ctx, models.Collections.OTP)
-	if err != nil {
-		return nil, err
-	}
-	otpCollection.EnsureHashIndex(ctx, []string{models.FieldNameEmail, models.FieldNamePhoneNumber}, &arangoDriver.EnsureHashIndexOptions{
-		Unique: true,
-		Sparse: true,
-	})

-	//authenticators table define
-	authenticatorsCollectionExists, err := arangodb.CollectionExists(ctx, models.Collections.Authenticators)
-	if err != nil {
-		return nil, err
-	}
-	if !authenticatorsCollectionExists {
-		_, err = arangodb.CreateCollection(ctx, models.Collections.Authenticators, nil)
-		if err != nil {
-			return nil, err
-		}
-	}
-	authenticatorsCollection, err := arangodb.Collection(ctx, models.Collections.Authenticators)
-	if err != nil {
-		return nil, err
-	}
-	authenticatorsCollection.EnsureHashIndex(ctx, []string{"user_id"}, &arangoDriver.EnsureHashIndexOptions{
+	otpCollection, _ := arangodb.Collection(nil, models.Collections.OTP)
+	otpCollection.EnsureHashIndex(ctx, []string{"email"}, &arangoDriver.EnsureHashIndexOptions{
+		Unique: true,
 		Sparse: true,
 	})

--- a/server/db/providers/arangodb/session.go
+++ b/server/db/providers/arangodb/session.go
@ -9,11 +9,12 @@ import (
 )

 // AddSession to save session information in database
-func (p *provider) AddSession(ctx context.Context, session *models.Session) error {
+func (p *provider) AddSession(ctx context.Context, session models.Session) error {
 	if session.ID == "" {
 		session.ID = uuid.New().String()
 		session.Key = session.ID
 	}
+
 	session.CreatedAt = time.Now().Unix()
 	session.UpdatedAt = time.Now().Unix()
 	sessionCollection, _ := p.db.Collection(ctx, models.Collections.Session)
@ -23,8 +24,3 @@ func (p *provider) AddSession(ctx context.Context, session *models.Session) erro
 	}
 	return nil
 }
-
-// DeleteSession to delete session information from database
-func (p *provider) DeleteSession(ctx context.Context, userId string) error {
-	return nil
-}
--- a/server/db/providers/arangodb/user.go
+++ b/server/db/providers/arangodb/user.go
@ -7,6 +7,7 @@ import (
 	"strings"
 	"time"

+	"github.com/arangodb/go-driver"
 	arangoDriver "github.com/arangodb/go-driver"
 	"github.com/google/uuid"

@ -18,7 +19,7 @@ import (
 )

 // AddUser to save user information in database
-func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User, error) {
+func (p *provider) AddUser(ctx context.Context, user models.User) (models.User, error) {
 	if user.ID == "" {
 		user.ID = uuid.New().String()
 		user.Key = user.ID
@ -27,7 +28,7 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User
 	if user.Roles == "" {
 		defaultRoles, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyDefaultRoles)
 		if err != nil {
-			return nil, err
+			return user, err
 		}
 		user.Roles = defaultRoles
 	}
@ -36,10 +37,6 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User
 		if u, _ := p.GetUserByPhoneNumber(ctx, refs.StringValue(user.PhoneNumber)); u != nil && u.ID != user.ID {
 			return user, fmt.Errorf("user with given phone number already exists")
 		}
-	} else if user.Email != nil && strings.TrimSpace(refs.StringValue(user.Email)) != "" {
-		if u, _ := p.GetUserByEmail(ctx, refs.StringValue(user.Email)); u != nil && u.ID != user.ID {
-			return user, fmt.Errorf("user with given email already exists")
-		}
 	}

 	user.CreatedAt = time.Now().Unix()
@ -47,7 +44,7 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User
 	userCollection, _ := p.db.Collection(ctx, models.Collections.User)
 	meta, err := userCollection.CreateDocument(arangoDriver.WithOverwrite(ctx), user)
 	if err != nil {
-		return nil, err
+		return user, err
 	}
 	user.Key = meta.Key
 	user.ID = meta.ID.String()
@ -56,13 +53,13 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User
 }

 // UpdateUser to update user information in database
-func (p *provider) UpdateUser(ctx context.Context, user *models.User) (*models.User, error) {
+func (p *provider) UpdateUser(ctx context.Context, user models.User) (models.User, error) {
 	user.UpdatedAt = time.Now().Unix()

 	collection, _ := p.db.Collection(ctx, models.Collections.User)
 	meta, err := collection.UpdateDocument(ctx, user.Key, user)
 	if err != nil {
-		return nil, err
+		return user, err
 	}

 	user.Key = meta.Key
@ -71,12 +68,13 @@ func (p *provider) UpdateUser(ctx context.Context, user *models.User) (*models.U
 }

 // DeleteUser to delete user information from database
-func (p *provider) DeleteUser(ctx context.Context, user *models.User) error {
+func (p *provider) DeleteUser(ctx context.Context, user models.User) error {
 	collection, _ := p.db.Collection(ctx, models.Collections.User)
 	_, err := collection.RemoveDocument(ctx, user.Key)
 	if err != nil {
 		return err
 	}
+
 	query := fmt.Sprintf(`FOR d IN %s FILTER d.user_id == @user_id REMOVE { _key: d._key } IN %s`, models.Collections.Session, models.Collections.Session)
 	bindVars := map[string]interface{}{
 		"user_id": user.Key,
@ -86,91 +84,106 @@ func (p *provider) DeleteUser(ctx context.Context, user *models.User) error {
 		return err
 	}
 	defer cursor.Close()
+
 	return nil
 }

 // ListUsers to get list of users from database
-func (p *provider) ListUsers(ctx context.Context, pagination *model.Pagination) (*model.Users, error) {
+func (p *provider) ListUsers(ctx context.Context, pagination model.Pagination) (*model.Users, error) {
 	var users []*model.User
-	sctx := arangoDriver.WithQueryFullCount(ctx)
+	sctx := driver.WithQueryFullCount(ctx)

 	query := fmt.Sprintf("FOR d in %s SORT d.created_at DESC LIMIT %d, %d RETURN d", models.Collections.User, pagination.Offset, pagination.Limit)
+
 	cursor, err := p.db.Query(sctx, query, nil)
 	if err != nil {
 		return nil, err
 	}
 	defer cursor.Close()
+
 	paginationClone := pagination
 	paginationClone.Total = cursor.Statistics().FullCount()
+
 	for {
-		var user *models.User
+		var user models.User
 		meta, err := cursor.ReadDocument(ctx, &user)
+
 		if arangoDriver.IsNoMoreDocuments(err) {
 			break
 		} else if err != nil {
 			return nil, err
 		}
+
 		if meta.Key != "" {
 			users = append(users, user.AsAPIUser())
 		}
 	}
+
 	return &model.Users{
-		Pagination: paginationClone,
+		Pagination: &paginationClone,
 		Users:      users,
 	}, nil
 }

 // GetUserByEmail to get user information from database using email address
-func (p *provider) GetUserByEmail(ctx context.Context, email string) (*models.User, error) {
-	var user *models.User
+func (p *provider) GetUserByEmail(ctx context.Context, email string) (models.User, error) {
+	var user models.User
+
 	query := fmt.Sprintf("FOR d in %s FILTER d.email == @email RETURN d", models.Collections.User)
 	bindVars := map[string]interface{}{
 		"email": email,
 	}
+
 	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
-		return nil, err
+		return user, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if user == nil {
-				return nil, fmt.Errorf("user not found")
+			if user.Key == "" {
+				return user, fmt.Errorf("user not found")
 			}
 			break
 		}
 		_, err := cursor.ReadDocument(ctx, &user)
 		if err != nil {
-			return nil, err
+			return user, err
 		}
 	}
+
 	return user, nil
 }

 // GetUserByID to get user information from database using user ID
-func (p *provider) GetUserByID(ctx context.Context, id string) (*models.User, error) {
-	var user *models.User
+func (p *provider) GetUserByID(ctx context.Context, id string) (models.User, error) {
+	var user models.User
+
 	query := fmt.Sprintf("FOR d in %s FILTER d._id == @id LIMIT 1 RETURN d", models.Collections.User)
 	bindVars := map[string]interface{}{
 		"id": id,
 	}
+
 	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
-		return nil, err
+		return user, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if user == nil {
-				return nil, fmt.Errorf("user not found")
+			if user.Key == "" {
+				return user, fmt.Errorf("user not found")
 			}
 			break
 		}
 		_, err := cursor.ReadDocument(ctx, &user)
 		if err != nil {
-			return nil, err
+			return user, err
 		}
 	}
+
 	return user, nil
 }

@ -179,12 +192,14 @@ func (p *provider) GetUserByID(ctx context.Context, id string) (*models.User, er
 func (p *provider) UpdateUsers(ctx context.Context, data map[string]interface{}, ids []string) error {
 	// set updated_at time for all users
 	data["updated_at"] = time.Now().Unix()
+
 	userInfoBytes, err := json.Marshal(data)
 	if err != nil {
 		return err
 	}
+
 	query := ""
-	if len(ids) > 0 {
+	if ids != nil && len(ids) > 0 {
 		keysArray := ""
 		for _, id := range ids {
 			keysArray += fmt.Sprintf("'%s', ", id)
@ -195,28 +210,34 @@ func (p *provider) UpdateUsers(ctx context.Context, data map[string]interface{},
 	} else {
 		query = fmt.Sprintf("FOR u IN %s UPDATE u._key with %s IN %s", models.Collections.User, string(userInfoBytes), models.Collections.User)
 	}
+
 	_, err = p.db.Query(ctx, query, nil)
+
 	if err != nil {
 		return err
 	}
+
 	return nil
 }

 // GetUserByPhoneNumber to get user information from database using phone number
 func (p *provider) GetUserByPhoneNumber(ctx context.Context, phoneNumber string) (*models.User, error) {
-	var user *models.User
+	var user models.User
+
 	query := fmt.Sprintf("FOR d in %s FILTER d.phone_number == @phone_number RETURN d", models.Collections.User)
 	bindVars := map[string]interface{}{
 		"phone_number": phoneNumber,
 	}
+
 	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
 		return nil, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if user == nil {
+			if user.Key == "" {
 				return nil, fmt.Errorf("user not found")
 			}
 			break
@ -226,5 +247,6 @@ func (p *provider) GetUserByPhoneNumber(ctx context.Context, phoneNumber string)
 			return nil, err
 		}
 	}
-	return user, nil
+
+	return &user, nil
 }
--- a/server/db/providers/arangodb/verification_requests.go
+++ b/server/db/providers/arangodb/verification_requests.go
@ -5,102 +5,114 @@ import (
 	"fmt"
 	"time"

-	arangoDriver "github.com/arangodb/go-driver"
+	"github.com/arangodb/go-driver"
 	"github.com/authorizerdev/authorizer/server/db/models"
 	"github.com/authorizerdev/authorizer/server/graph/model"
 	"github.com/google/uuid"
 )

 // AddVerification to save verification request in database
-func (p *provider) AddVerificationRequest(ctx context.Context, verificationRequest *models.VerificationRequest) (*models.VerificationRequest, error) {
+func (p *provider) AddVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) (models.VerificationRequest, error) {
 	if verificationRequest.ID == "" {
 		verificationRequest.ID = uuid.New().String()
 		verificationRequest.Key = verificationRequest.ID
 	}
+
 	verificationRequest.CreatedAt = time.Now().Unix()
 	verificationRequest.UpdatedAt = time.Now().Unix()
 	verificationRequestRequestCollection, _ := p.db.Collection(ctx, models.Collections.VerificationRequest)
 	meta, err := verificationRequestRequestCollection.CreateDocument(ctx, verificationRequest)
 	if err != nil {
-		return nil, err
+		return verificationRequest, err
 	}
 	verificationRequest.Key = meta.Key
 	verificationRequest.ID = meta.ID.String()
+
 	return verificationRequest, nil
 }

 // GetVerificationRequestByToken to get verification request from database using token
-func (p *provider) GetVerificationRequestByToken(ctx context.Context, token string) (*models.VerificationRequest, error) {
-	var verificationRequest *models.VerificationRequest
+func (p *provider) GetVerificationRequestByToken(ctx context.Context, token string) (models.VerificationRequest, error) {
+	var verificationRequest models.VerificationRequest
 	query := fmt.Sprintf("FOR d in %s FILTER d.token == @token LIMIT 1 RETURN d", models.Collections.VerificationRequest)
 	bindVars := map[string]interface{}{
 		"token": token,
 	}
+
 	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
-		return nil, err
+		return verificationRequest, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if verificationRequest == nil {
+			if verificationRequest.Key == "" {
 				return verificationRequest, fmt.Errorf("verification request not found")
 			}
 			break
 		}
 		_, err := cursor.ReadDocument(ctx, &verificationRequest)
 		if err != nil {
-			return nil, err
+			return verificationRequest, err
 		}
 	}
+
 	return verificationRequest, nil
 }

 // GetVerificationRequestByEmail to get verification request by email from database
-func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email string, identifier string) (*models.VerificationRequest, error) {
-	var verificationRequest *models.VerificationRequest
+func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email string, identifier string) (models.VerificationRequest, error) {
+	var verificationRequest models.VerificationRequest
+
 	query := fmt.Sprintf("FOR d in %s FILTER d.email == @email FILTER d.identifier == @identifier LIMIT 1 RETURN d", models.Collections.VerificationRequest)
 	bindVars := map[string]interface{}{
 		"email":      email,
 		"identifier": identifier,
 	}
+
 	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
-		return nil, err
+		return verificationRequest, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if verificationRequest == nil {
+			if verificationRequest.Key == "" {
 				return verificationRequest, fmt.Errorf("verification request not found")
 			}
 			break
 		}
 		_, err := cursor.ReadDocument(ctx, &verificationRequest)
 		if err != nil {
-			return nil, err
+			return verificationRequest, err
 		}
 	}
+
 	return verificationRequest, nil
 }

 // ListVerificationRequests to get list of verification requests from database
-func (p *provider) ListVerificationRequests(ctx context.Context, pagination *model.Pagination) (*model.VerificationRequests, error) {
+func (p *provider) ListVerificationRequests(ctx context.Context, pagination model.Pagination) (*model.VerificationRequests, error) {
 	var verificationRequests []*model.VerificationRequest
-	sctx := arangoDriver.WithQueryFullCount(ctx)
+	sctx := driver.WithQueryFullCount(ctx)
 	query := fmt.Sprintf("FOR d in %s SORT d.created_at DESC LIMIT %d, %d RETURN d", models.Collections.VerificationRequest, pagination.Offset, pagination.Limit)
+
 	cursor, err := p.db.Query(sctx, query, nil)
 	if err != nil {
 		return nil, err
 	}
 	defer cursor.Close()
+
 	paginationClone := pagination
 	paginationClone.Total = cursor.Statistics().FullCount()
+
 	for {
-		var verificationRequest *models.VerificationRequest
+		var verificationRequest models.VerificationRequest
 		meta, err := cursor.ReadDocument(ctx, &verificationRequest)

-		if arangoDriver.IsNoMoreDocuments(err) {
+		if driver.IsNoMoreDocuments(err) {
 			break
 		} else if err != nil {
 			return nil, err
@ -111,16 +123,17 @@ func (p *provider) ListVerificationRequests(ctx context.Context, pagination *mod
 		}

 	}
+
 	return &model.VerificationRequests{
 		VerificationRequests: verificationRequests,
-		Pagination:           paginationClone,
+		Pagination:           &paginationClone,
 	}, nil
 }

 // DeleteVerificationRequest to delete verification request from database
-func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest *models.VerificationRequest) error {
-	collection, _ := p.db.Collection(ctx, models.Collections.VerificationRequest)
-	_, err := collection.RemoveDocument(ctx, verificationRequest.Key)
+func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) error {
+	collection, _ := p.db.Collection(nil, models.Collections.VerificationRequest)
+	_, err := collection.RemoveDocument(nil, verificationRequest.Key)
 	if err != nil {
 		return err
 	}
--- a/server/db/providers/arangodb/webhook.go
+++ b/server/db/providers/arangodb/webhook.go
@ -3,7 +3,6 @@ package arangodb
 import (
 	"context"
 	"fmt"
-	"strings"
 	"time"

 	"github.com/arangodb/go-driver"
@ -14,14 +13,13 @@ import (
 )

 // AddWebhook to add webhook
-func (p *provider) AddWebhook(ctx context.Context, webhook *models.Webhook) (*model.Webhook, error) {
+func (p *provider) AddWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	if webhook.ID == "" {
 		webhook.ID = uuid.New().String()
 		webhook.Key = webhook.ID
 	}
+
 	webhook.Key = webhook.ID
-	// Add timestamp to make event name unique for legacy version
-	webhook.EventName = fmt.Sprintf("%s-%d", webhook.EventName, time.Now().Unix())
 	webhook.CreatedAt = time.Now().Unix()
 	webhook.UpdatedAt = time.Now().Unix()
 	webhookCollection, _ := p.db.Collection(ctx, models.Collections.Webhook)
@ -33,37 +31,39 @@ func (p *provider) AddWebhook(ctx context.Context, webhook *models.Webhook) (*mo
 }

 // UpdateWebhook to update webhook
-func (p *provider) UpdateWebhook(ctx context.Context, webhook *models.Webhook) (*model.Webhook, error) {
+func (p *provider) UpdateWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	webhook.UpdatedAt = time.Now().Unix()
-	// Event is changed
-	if !strings.Contains(webhook.EventName, "-") {
-		webhook.EventName = fmt.Sprintf("%s-%d", webhook.EventName, time.Now().Unix())
-	}
 	webhookCollection, _ := p.db.Collection(ctx, models.Collections.Webhook)
 	meta, err := webhookCollection.UpdateDocument(ctx, webhook.Key, webhook)
 	if err != nil {
 		return nil, err
 	}
+
 	webhook.Key = meta.Key
 	webhook.ID = meta.ID.String()
 	return webhook.AsAPIWebhook(), nil
 }

 // ListWebhooks to list webhook
-func (p *provider) ListWebhook(ctx context.Context, pagination *model.Pagination) (*model.Webhooks, error) {
+func (p *provider) ListWebhook(ctx context.Context, pagination model.Pagination) (*model.Webhooks, error) {
 	webhooks := []*model.Webhook{}
+
 	query := fmt.Sprintf("FOR d in %s SORT d.created_at DESC LIMIT %d, %d RETURN d", models.Collections.Webhook, pagination.Offset, pagination.Limit)
-	sctx := arangoDriver.WithQueryFullCount(ctx)
+
+	sctx := driver.WithQueryFullCount(ctx)
 	cursor, err := p.db.Query(sctx, query, nil)
 	if err != nil {
 		return nil, err
 	}
 	defer cursor.Close()
+
 	paginationClone := pagination
 	paginationClone.Total = cursor.Statistics().FullCount()
+
 	for {
-		var webhook *models.Webhook
+		var webhook models.Webhook
 		meta, err := cursor.ReadDocument(ctx, &webhook)
+
 		if arangoDriver.IsNoMoreDocuments(err) {
 			break
 		} else if err != nil {
@ -76,26 +76,28 @@ func (p *provider) ListWebhook(ctx context.Context, pagination *model.Pagination
 	}

 	return &model.Webhooks{
-		Pagination: paginationClone,
+		Pagination: &paginationClone,
 		Webhooks:   webhooks,
 	}, nil
 }

 // GetWebhookByID to get webhook by id
 func (p *provider) GetWebhookByID(ctx context.Context, webhookID string) (*model.Webhook, error) {
-	var webhook *models.Webhook
+	var webhook models.Webhook
 	query := fmt.Sprintf("FOR d in %s FILTER d._key == @webhook_id RETURN d", models.Collections.Webhook)
 	bindVars := map[string]interface{}{
 		"webhook_id": webhookID,
 	}
+
 	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
 		return nil, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if webhook == nil {
+			if webhook.Key == "" {
 				return nil, fmt.Errorf("webhook not found")
 			}
 			break
@ -109,28 +111,32 @@ func (p *provider) GetWebhookByID(ctx context.Context, webhookID string) (*model
 }

 // GetWebhookByEventName to get webhook by event_name
-func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string) ([]*model.Webhook, error) {
-	query := fmt.Sprintf("FOR d in %s FILTER d.event_name LIKE @event_name RETURN d", models.Collections.Webhook)
+func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string) (*model.Webhook, error) {
+	var webhook models.Webhook
+	query := fmt.Sprintf("FOR d in %s FILTER d.event_name == @event_name RETURN d", models.Collections.Webhook)
 	bindVars := map[string]interface{}{
-		"event_name": eventName + "%",
+		"event_name": eventName,
 	}
+
 	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
 		return nil, err
 	}
 	defer cursor.Close()
-	webhooks := []*model.Webhook{}
+
 	for {
-		var webhook *models.Webhook
-		if _, err := cursor.ReadDocument(ctx, &webhook); driver.IsNoMoreDocuments(err) {
-			// We're done
+		if !cursor.HasMore() {
+			if webhook.Key == "" {
+				return nil, fmt.Errorf("webhook not found")
+			}
 			break
-		} else if err != nil {
+		}
+		_, err := cursor.ReadDocument(ctx, &webhook)
+		if err != nil {
 			return nil, err
 		}
-		webhooks = append(webhooks, webhook.AsAPIWebhook())
 	}
-	return webhooks, nil
+	return webhook.AsAPIWebhook(), nil
 }

 // DeleteWebhook to delete webhook
@ -140,14 +146,17 @@ func (p *provider) DeleteWebhook(ctx context.Context, webhook *model.Webhook) er
 	if err != nil {
 		return err
 	}
+
 	query := fmt.Sprintf("FOR d IN %s FILTER d.webhook_id == @webhook_id REMOVE { _key: d._key } IN %s", models.Collections.WebhookLog, models.Collections.WebhookLog)
 	bindVars := map[string]interface{}{
 		"webhook_id": webhook.ID,
 	}
+
 	cursor, err := p.db.Query(ctx, query, bindVars)
 	if err != nil {
 		return err
 	}
 	defer cursor.Close()
+
 	return nil
 }
--- a/server/db/providers/arangodb/webhook_log.go
+++ b/server/db/providers/arangodb/webhook_log.go
@ -5,6 +5,7 @@ import (
 	"fmt"
 	"time"

+	"github.com/arangodb/go-driver"
 	arangoDriver "github.com/arangodb/go-driver"
 	"github.com/authorizerdev/authorizer/server/db/models"
 	"github.com/authorizerdev/authorizer/server/graph/model"
@ -12,11 +13,12 @@ import (
 )

 // AddWebhookLog to add webhook log
-func (p *provider) AddWebhookLog(ctx context.Context, webhookLog *models.WebhookLog) (*model.WebhookLog, error) {
+func (p *provider) AddWebhookLog(ctx context.Context, webhookLog models.WebhookLog) (*model.WebhookLog, error) {
 	if webhookLog.ID == "" {
 		webhookLog.ID = uuid.New().String()
 		webhookLog.Key = webhookLog.ID
 	}
+
 	webhookLog.Key = webhookLog.ID
 	webhookLog.CreatedAt = time.Now().Unix()
 	webhookLog.UpdatedAt = time.Now().Unix()
@ -29,38 +31,46 @@ func (p *provider) AddWebhookLog(ctx context.Context, webhookLog *models.Webhook
 }

 // ListWebhookLogs to list webhook logs
-func (p *provider) ListWebhookLogs(ctx context.Context, pagination *model.Pagination, webhookID string) (*model.WebhookLogs, error) {
+func (p *provider) ListWebhookLogs(ctx context.Context, pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
 	webhookLogs := []*model.WebhookLog{}
 	bindVariables := map[string]interface{}{}
+
 	query := fmt.Sprintf("FOR d in %s SORT d.created_at DESC LIMIT %d, %d RETURN d", models.Collections.WebhookLog, pagination.Offset, pagination.Limit)
+
 	if webhookID != "" {
 		query = fmt.Sprintf("FOR d in %s FILTER d.webhook_id == @webhook_id SORT d.created_at DESC LIMIT %d, %d RETURN d", models.Collections.WebhookLog, pagination.Offset, pagination.Limit)
 		bindVariables = map[string]interface{}{
 			"webhook_id": webhookID,
 		}
 	}
-	sctx := arangoDriver.WithQueryFullCount(ctx)
+
+	sctx := driver.WithQueryFullCount(ctx)
 	cursor, err := p.db.Query(sctx, query, bindVariables)
 	if err != nil {
 		return nil, err
 	}
 	defer cursor.Close()
+
 	paginationClone := pagination
 	paginationClone.Total = cursor.Statistics().FullCount()
+
 	for {
-		var webhookLog *models.WebhookLog
+		var webhookLog models.WebhookLog
 		meta, err := cursor.ReadDocument(ctx, &webhookLog)
+
 		if arangoDriver.IsNoMoreDocuments(err) {
 			break
 		} else if err != nil {
 			return nil, err
 		}
+
 		if meta.Key != "" {
 			webhookLogs = append(webhookLogs, webhookLog.AsAPIWebhookLog())
 		}
 	}
+
 	return &model.WebhookLogs{
-		Pagination:  paginationClone,
+		Pagination:  &paginationClone,
 		WebhookLogs: webhookLogs,
 	}, nil
 }
--- a/server/db/providers/cassandradb/authenticator.go
+++ b/server/db/providers/cassandradb/authenticator.go
@ -1,133 +0,0 @@
-package cassandradb
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"strings"
-	"time"
-
-	"github.com/gocql/gocql"
-	"github.com/google/uuid"
-
-	"github.com/authorizerdev/authorizer/server/db/models"
-)
-
-func (p *provider) AddAuthenticator(ctx context.Context, authenticators *models.Authenticator) (*models.Authenticator, error) {
-	exists, _ := p.GetAuthenticatorDetailsByUserId(ctx, authenticators.UserID, authenticators.Method)
-	if exists != nil {
-		return authenticators, nil
-	}
-
-	if authenticators.ID == "" {
-		authenticators.ID = uuid.New().String()
-	}
-
-	authenticators.CreatedAt = time.Now().Unix()
-	authenticators.UpdatedAt = time.Now().Unix()
-
-	bytes, err := json.Marshal(authenticators)
-	if err != nil {
-		return nil, err
-	}
-
-	// use decoder instead of json.Unmarshall, because it converts int64 -> float64 after unmarshalling
-	decoder := json.NewDecoder(strings.NewReader(string(bytes)))
-	decoder.UseNumber()
-	authenticatorsMap := map[string]interface{}{}
-	err = decoder.Decode(&authenticatorsMap)
-	if err != nil {
-		return nil, err
-	}
-
-	fields := "("
-	values := "("
-	for key, value := range authenticatorsMap {
-		if value != nil {
-			if key == "_id" {
-				fields += "id,"
-			} else {
-				fields += key + ","
-			}
-
-			valueType := reflect.TypeOf(value)
-			if valueType.Name() == "string" {
-				values += fmt.Sprintf("'%s',", value.(string))
-			} else {
-				values += fmt.Sprintf("%v,", value)
-			}
-		}
-	}
-
-	fields = fields[:len(fields)-1] + ")"
-	values = values[:len(values)-1] + ")"
-
-	query := fmt.Sprintf("INSERT INTO %s %s VALUES %s IF NOT EXISTS", KeySpace+"."+models.Collections.Authenticators, fields, values)
-	err = p.db.Query(query).Exec()
-	if err != nil {
-		return nil, err
-	}
-
-	return authenticators, nil
-}
-
-func (p *provider) UpdateAuthenticator(ctx context.Context, authenticators *models.Authenticator) (*models.Authenticator, error) {
-	authenticators.UpdatedAt = time.Now().Unix()
-
-	bytes, err := json.Marshal(authenticators)
-	if err != nil {
-		return nil, err
-	}
-	// use decoder instead of json.Unmarshall, because it converts int64 -> float64 after unmarshalling
-	decoder := json.NewDecoder(strings.NewReader(string(bytes)))
-	decoder.UseNumber()
-	authenticatorsMap := map[string]interface{}{}
-	err = decoder.Decode(&authenticatorsMap)
-	if err != nil {
-		return nil, err
-	}
-
-	updateFields := ""
-	for key, value := range authenticatorsMap {
-		if key == "_id" {
-			continue
-		}
-
-		if key == "_key" {
-			continue
-		}
-
-		if value == nil {
-			updateFields += fmt.Sprintf("%s = null, ", key)
-			continue
-		}
-
-		valueType := reflect.TypeOf(value)
-		if valueType.Name() == "string" {
-			updateFields += fmt.Sprintf("%s = '%s', ", key, value.(string))
-		} else {
-			updateFields += fmt.Sprintf("%s = %v, ", key, value)
-		}
-	}
-	updateFields = strings.Trim(updateFields, " ")
-	updateFields = strings.TrimSuffix(updateFields, ",")
-
-	query := fmt.Sprintf("UPDATE %s SET %s WHERE id = '%s'", KeySpace+"."+models.Collections.Authenticators, updateFields, authenticators.ID)
-	err = p.db.Query(query).Exec()
-	if err != nil {
-		return nil, err
-	}
-
-	return authenticators, nil
-}
-
-func (p *provider) GetAuthenticatorDetailsByUserId(ctx context.Context, userId string, authenticatorType string) (*models.Authenticator, error) {
-	var authenticators models.Authenticator
-	query := fmt.Sprintf("SELECT id, user_id, method, secret, recovery_codes, verified_at, created_at, updated_at FROM %s WHERE user_id = '%s' AND method = '%s' LIMIT 1 ALLOW FILTERING", KeySpace+"."+models.Collections.Authenticators, userId, authenticatorType)
-	err := p.db.Query(query).Consistency(gocql.One).Scan(&authenticators.ID, &authenticators.UserID, &authenticators.Method, &authenticators.Secret, &authenticators.RecoveryCodes, &authenticators.VerifiedAt, &authenticators.CreatedAt, &authenticators.UpdatedAt)
-	if err != nil {
-		return nil, err
-	}
-	return &authenticators, nil
-}
--- a/server/db/providers/cassandradb/email_template.go
+++ b/server/db/providers/cassandradb/email_template.go
@ -15,28 +15,33 @@ import (
 )

 // AddEmailTemplate to add EmailTemplate
-func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate *models.EmailTemplate) (*model.EmailTemplate, error) {
+func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate models.EmailTemplate) (*model.EmailTemplate, error) {
 	if emailTemplate.ID == "" {
 		emailTemplate.ID = uuid.New().String()
 	}
+
 	emailTemplate.Key = emailTemplate.ID
 	emailTemplate.CreatedAt = time.Now().Unix()
 	emailTemplate.UpdatedAt = time.Now().Unix()
+
 	existingEmailTemplate, _ := p.GetEmailTemplateByEventName(ctx, emailTemplate.EventName)
 	if existingEmailTemplate != nil {
 		return nil, fmt.Errorf("Email template with %s event_name already exists", emailTemplate.EventName)
 	}
+
 	insertQuery := fmt.Sprintf("INSERT INTO %s (id, event_name, subject, design, template,  created_at, updated_at) VALUES ('%s', '%s', '%s','%s','%s', %d, %d)", KeySpace+"."+models.Collections.EmailTemplate, emailTemplate.ID, emailTemplate.EventName, emailTemplate.Subject, emailTemplate.Design, emailTemplate.Template, emailTemplate.CreatedAt, emailTemplate.UpdatedAt)
 	err := p.db.Query(insertQuery).Exec()
 	if err != nil {
 		return nil, err
 	}
+
 	return emailTemplate.AsAPIEmailTemplate(), nil
 }

 // UpdateEmailTemplate to update EmailTemplate
-func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate *models.EmailTemplate) (*model.EmailTemplate, error) {
+func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate models.EmailTemplate) (*model.EmailTemplate, error) {
 	emailTemplate.UpdatedAt = time.Now().Unix()
+
 	bytes, err := json.Marshal(emailTemplate)
 	if err != nil {
 		return nil, err
@ -49,18 +54,22 @@ func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate *model
 	if err != nil {
 		return nil, err
 	}
+
 	updateFields := ""
 	for key, value := range emailTemplateMap {
 		if key == "_id" {
 			continue
 		}
+
 		if key == "_key" {
 			continue
 		}
+
 		if value == nil {
 			updateFields += fmt.Sprintf("%s = null,", key)
 			continue
 		}
+
 		valueType := reflect.TypeOf(value)
 		if valueType.Name() == "string" {
 			updateFields += fmt.Sprintf("%s = '%s', ", key, value.(string))
@ -81,7 +90,7 @@ func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate *model
 }

 // ListEmailTemplates to list EmailTemplate
-func (p *provider) ListEmailTemplate(ctx context.Context, pagination *model.Pagination) (*model.EmailTemplates, error) {
+func (p *provider) ListEmailTemplate(ctx context.Context, pagination model.Pagination) (*model.EmailTemplates, error) {
 	emailTemplates := []*model.EmailTemplate{}
 	paginationClone := pagination

@ -111,7 +120,7 @@ func (p *provider) ListEmailTemplate(ctx context.Context, pagination *model.Pagi
 	}

 	return &model.EmailTemplates{
-		Pagination:     paginationClone,
+		Pagination:     &paginationClone,
 		EmailTemplates: emailTemplates,
 	}, nil
 }
--- a/server/db/providers/cassandradb/env.go
+++ b/server/db/providers/cassandradb/env.go
@ -11,39 +11,43 @@ import (
 )

 // AddEnv to save environment information in database
-func (p *provider) AddEnv(ctx context.Context, env *models.Env) (*models.Env, error) {
+func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	if env.ID == "" {
 		env.ID = uuid.New().String()
 	}
+
 	env.CreatedAt = time.Now().Unix()
 	env.UpdatedAt = time.Now().Unix()
 	insertEnvQuery := fmt.Sprintf("INSERT INTO %s (id, env, hash, created_at, updated_at) VALUES ('%s', '%s', '%s', %d, %d)", KeySpace+"."+models.Collections.Env, env.ID, env.EnvData, env.Hash, env.CreatedAt, env.UpdatedAt)
 	err := p.db.Query(insertEnvQuery).Exec()
 	if err != nil {
-		return nil, err
+		return env, err
 	}

 	return env, nil
 }

 // UpdateEnv to update environment information in database
-func (p *provider) UpdateEnv(ctx context.Context, env *models.Env) (*models.Env, error) {
+func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	env.UpdatedAt = time.Now().Unix()
+
 	updateEnvQuery := fmt.Sprintf("UPDATE %s SET env = '%s', updated_at = %d WHERE id = '%s'", KeySpace+"."+models.Collections.Env, env.EnvData, env.UpdatedAt, env.ID)
 	err := p.db.Query(updateEnvQuery).Exec()
 	if err != nil {
-		return nil, err
+		return env, err
 	}
 	return env, nil
 }

 // GetEnv to get environment information from database
-func (p *provider) GetEnv(ctx context.Context) (*models.Env, error) {
+func (p *provider) GetEnv(ctx context.Context) (models.Env, error) {
 	var env models.Env
+
 	query := fmt.Sprintf("SELECT id, env, hash, created_at, updated_at FROM %s LIMIT 1", KeySpace+"."+models.Collections.Env)
 	err := p.db.Query(query).Consistency(gocql.One).Scan(&env.ID, &env.EnvData, &env.Hash, &env.CreatedAt, &env.UpdatedAt)
 	if err != nil {
-		return nil, err
+		return env, err
 	}
-	return &env, nil
+
+	return env, nil
 }
--- a/server/db/providers/cassandradb/otp.go
+++ b/server/db/providers/cassandradb/otp.go
@ -2,7 +2,6 @@ package cassandradb

 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"

@ -13,20 +12,7 @@ import (

 // UpsertOTP to add or update otp
 func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models.OTP, error) {
-	// check if email or phone number is present
-	if otpParam.Email == "" && otpParam.PhoneNumber == "" {
-		return nil, errors.New("email or phone_number is required")
-	}
-	uniqueField := models.FieldNameEmail
-	if otpParam.Email == "" && otpParam.PhoneNumber != "" {
-		uniqueField = models.FieldNamePhoneNumber
-	}
-	var otp *models.OTP
-	if uniqueField == models.FieldNameEmail {
-		otp, _ = p.GetOTPByEmail(ctx, otpParam.Email)
-	} else {
-		otp, _ = p.GetOTPByPhoneNumber(ctx, otpParam.PhoneNumber)
-	}
+	otp, _ := p.GetOTPByEmail(ctx, otpParam.Email)
 	shouldCreate := false
 	if otp == nil {
 		shouldCreate = true
@ -34,7 +20,6 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 			ID:        uuid.NewString(),
 			Otp:       otpParam.Otp,
 			Email:     otpParam.Email,
-			PhoneNumber: otpParam.PhoneNumber,
 			ExpiresAt: otpParam.ExpiresAt,
 			CreatedAt: time.Now().Unix(),
 			UpdatedAt: time.Now().Unix(),
@ -47,7 +32,7 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 	otp.UpdatedAt = time.Now().Unix()
 	query := ""
 	if shouldCreate {
-		query = fmt.Sprintf(`INSERT INTO %s (id, email, phone_number, otp, expires_at, created_at, updated_at) VALUES ('%s', '%s', '%s', '%s', %d, %d, %d)`, KeySpace+"."+models.Collections.OTP, otp.ID, otp.Email, otp.PhoneNumber, otp.Otp, otp.ExpiresAt, otp.CreatedAt, otp.UpdatedAt)
+		query = fmt.Sprintf(`INSERT INTO %s (id, email, otp, expires_at, created_at, updated_at) VALUES ('%s', '%s', '%s', %d, %d, %d)`, KeySpace+"."+models.Collections.OTP, otp.ID, otp.Email, otp.Otp, otp.ExpiresAt, otp.CreatedAt, otp.UpdatedAt)
 	} else {
 		query = fmt.Sprintf(`UPDATE %s SET otp = '%s', expires_at = %d, updated_at = %d WHERE id = '%s'`, KeySpace+"."+models.Collections.OTP, otp.Otp, otp.ExpiresAt, otp.UpdatedAt, otp.ID)
 	}
@ -63,19 +48,8 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 // GetOTPByEmail to get otp for a given email address
 func (p *provider) GetOTPByEmail(ctx context.Context, emailAddress string) (*models.OTP, error) {
 	var otp models.OTP
-	query := fmt.Sprintf(`SELECT id, email, phone_number, otp, expires_at, created_at, updated_at FROM %s WHERE email = '%s' LIMIT 1 ALLOW FILTERING`, KeySpace+"."+models.Collections.OTP, emailAddress)
-	err := p.db.Query(query).Consistency(gocql.One).Scan(&otp.ID, &otp.Email, &otp.PhoneNumber, &otp.Otp, &otp.ExpiresAt, &otp.CreatedAt, &otp.UpdatedAt)
-	if err != nil {
-		return nil, err
-	}
-	return &otp, nil
-}
-
-// GetOTPByPhoneNumber to get otp for a given phone number
-func (p *provider) GetOTPByPhoneNumber(ctx context.Context, phoneNumber string) (*models.OTP, error) {
-	var otp models.OTP
-	query := fmt.Sprintf(`SELECT id, email, phone_number, otp, expires_at, created_at, updated_at FROM %s WHERE phone_number = '%s' LIMIT 1 ALLOW FILTERING`, KeySpace+"."+models.Collections.OTP, phoneNumber)
-	err := p.db.Query(query).Consistency(gocql.One).Scan(&otp.ID, &otp.Email, &otp.PhoneNumber, &otp.Otp, &otp.ExpiresAt, &otp.CreatedAt, &otp.UpdatedAt)
+	query := fmt.Sprintf(`SELECT id, email, otp, expires_at, created_at, updated_at FROM %s WHERE email = '%s' LIMIT 1 ALLOW FILTERING`, KeySpace+"."+models.Collections.OTP, emailAddress)
+	err := p.db.Query(query).Consistency(gocql.One).Scan(&otp.ID, &otp.Email, &otp.Otp, &otp.ExpiresAt, &otp.CreatedAt, &otp.UpdatedAt)
 	if err != nil {
 		return nil, err
 	}
--- a/server/db/providers/cassandradb/provider.go
+++ b/server/db/providers/cassandradb/provider.go
@ -207,13 +207,6 @@ func NewProvider() (*provider, error) {
 	if err != nil {
 		return nil, err
 	}
-	// add event_description to webhook table
-	webhookAlterQuery := fmt.Sprintf(`ALTER TABLE %s.%s ADD (event_description text);`, KeySpace, models.Collections.Webhook)
-	err = session.Query(webhookAlterQuery).Exec()
-	if err != nil {
-		log.Debug("Failed to alter table as column exists: ", err)
-		// continue
-	}

 	webhookLogCollectionQuery := fmt.Sprintf("CREATE TABLE IF NOT EXISTS %s.%s (id text, http_status bigint, response text, request text, webhook_id text,updated_at bigint, created_at bigint, PRIMARY KEY (id))", KeySpace, models.Collections.WebhookLog)
 	err = session.Query(webhookLogCollectionQuery).Exec()
@ -254,32 +247,6 @@ func NewProvider() (*provider, error) {
 	if err != nil {
 		return nil, err
 	}
-	// Add phone_number column to otp table
-	otpAlterQuery := fmt.Sprintf(`ALTER TABLE %s.%s ADD (phone_number text);`, KeySpace, models.Collections.OTP)
-	err = session.Query(otpAlterQuery).Exec()
-	if err != nil {
-		log.Debug("Failed to alter table as column exists: ", err)
-		// continue
-	}
-	// Add app_data column to users table
-	appDataAlterQuery := fmt.Sprintf(`ALTER TABLE %s.%s ADD (app_data text);`, KeySpace, models.Collections.User)
-	err = session.Query(appDataAlterQuery).Exec()
-	if err != nil {
-		log.Debug("Failed to alter user table as app_data column exists: ", err)
-		// continue
-	}
-	// Add phone number index
-	otpIndexQueryPhoneNumber := fmt.Sprintf("CREATE INDEX IF NOT EXISTS authorizer_otp_phone_number ON %s.%s (phone_number)", KeySpace, models.Collections.OTP)
-	err = session.Query(otpIndexQueryPhoneNumber).Exec()
-	if err != nil {
-		return nil, err
-	}
-	// add authenticators table
-	totpCollectionQuery := fmt.Sprintf("CREATE TABLE IF NOT EXISTS %s.%s (id text, user_id text, method text, secret text, recovery_codes text, verified_at bigint, updated_at bigint, created_at bigint, PRIMARY KEY (id))", KeySpace, models.Collections.Authenticators)
-	err = session.Query(totpCollectionQuery).Exec()
-	if err != nil {
-		return nil, err
-	}

 	return &provider{
 		db: session,
--- a/server/db/providers/cassandradb/session.go
+++ b/server/db/providers/cassandradb/session.go
@ -10,12 +10,14 @@ import (
 )

 // AddSession to save session information in database
-func (p *provider) AddSession(ctx context.Context, session *models.Session) error {
+func (p *provider) AddSession(ctx context.Context, session models.Session) error {
 	if session.ID == "" {
 		session.ID = uuid.New().String()
 	}
+
 	session.CreatedAt = time.Now().Unix()
 	session.UpdatedAt = time.Now().Unix()
+
 	insertSessionQuery := fmt.Sprintf("INSERT INTO %s (id, user_id, user_agent, ip, created_at, updated_at) VALUES ('%s', '%s', '%s', '%s', %d, %d)", KeySpace+"."+models.Collections.Session, session.ID, session.UserID, session.UserAgent, session.IP, session.CreatedAt, session.UpdatedAt)
 	err := p.db.Query(insertSessionQuery).Exec()
 	if err != nil {
@ -23,8 +25,3 @@ func (p *provider) AddSession(ctx context.Context, session *models.Session) erro
 	}
 	return nil
 }
-
-// DeleteSession to delete session information from database
-func (p *provider) DeleteSession(ctx context.Context, userId string) error {
-	return nil
-}
--- a/server/db/providers/cassandradb/user.go
+++ b/server/db/providers/cassandradb/user.go
@ -18,7 +18,7 @@ import (
 )

 // AddUser to save user information in database
-func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User, error) {
+func (p *provider) AddUser(ctx context.Context, user models.User) (models.User, error) {
 	if user.ID == "" {
 		user.ID = uuid.New().String()
 	}
@ -26,7 +26,7 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User
 	if user.Roles == "" {
 		defaultRoles, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyDefaultRoles)
 		if err != nil {
-			return nil, err
+			return user, err
 		}
 		user.Roles = defaultRoles
 	}
@ -35,10 +35,6 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User
 		if u, _ := p.GetUserByPhoneNumber(ctx, refs.StringValue(user.PhoneNumber)); u != nil && u.ID != user.ID {
 			return user, fmt.Errorf("user with given phone number already exists")
 		}
-	} else if user.Email != nil && strings.TrimSpace(refs.StringValue(user.Email)) != "" {
-		if u, _ := p.GetUserByEmail(ctx, refs.StringValue(user.Email)); u != nil && u.ID != user.ID {
-			return user, fmt.Errorf("user with given email already exists")
-		}
 	}

 	user.CreatedAt = time.Now().Unix()
@ -46,7 +42,7 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User

 	bytes, err := json.Marshal(user)
 	if err != nil {
-		return nil, err
+		return user, err
 	}

 	// use decoder instead of json.Unmarshall, because it converts int64 -> float64 after unmarshalling
@ -55,7 +51,7 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User
 	userMap := map[string]interface{}{}
 	err = decoder.Decode(&userMap)
 	if err != nil {
-		return nil, err
+		return user, err
 	}

 	fields := "("
@ -81,22 +77,22 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User
 	values = values[:len(values)-1] + ")"

 	query := fmt.Sprintf("INSERT INTO %s %s VALUES %s IF NOT EXISTS", KeySpace+"."+models.Collections.User, fields, values)
-	err = p.db.Query(query).Exec()

+	err = p.db.Query(query).Exec()
 	if err != nil {
-		return nil, err
+		return user, err
 	}

 	return user, nil
 }

 // UpdateUser to update user information in database
-func (p *provider) UpdateUser(ctx context.Context, user *models.User) (*models.User, error) {
+func (p *provider) UpdateUser(ctx context.Context, user models.User) (models.User, error) {
 	user.UpdatedAt = time.Now().Unix()

 	bytes, err := json.Marshal(user)
 	if err != nil {
-		return nil, err
+		return user, err
 	}
 	// use decoder instead of json.Unmarshall, because it converts int64 -> float64 after unmarshalling
 	decoder := json.NewDecoder(strings.NewReader(string(bytes)))
@ -104,7 +100,7 @@ func (p *provider) UpdateUser(ctx context.Context, user *models.User) (*models.U
 	userMap := map[string]interface{}{}
 	err = decoder.Decode(&userMap)
 	if err != nil {
-		return nil, err
+		return user, err
 	}

 	updateFields := ""
@ -135,19 +131,20 @@ func (p *provider) UpdateUser(ctx context.Context, user *models.User) (*models.U
 	query := fmt.Sprintf("UPDATE %s SET %s WHERE id = '%s'", KeySpace+"."+models.Collections.User, updateFields, user.ID)
 	err = p.db.Query(query).Exec()
 	if err != nil {
-		return nil, err
+		return user, err
 	}

 	return user, nil
 }

 // DeleteUser to delete user information from database
-func (p *provider) DeleteUser(ctx context.Context, user *models.User) error {
+func (p *provider) DeleteUser(ctx context.Context, user models.User) error {
 	query := fmt.Sprintf("DELETE FROM %s WHERE id = '%s'", KeySpace+"."+models.Collections.User, user.ID)
 	err := p.db.Query(query).Exec()
 	if err != nil {
 		return err
 	}
+
 	getSessionsQuery := fmt.Sprintf("SELECT id FROM %s WHERE user_id = '%s' ALLOW FILTERING", KeySpace+"."+models.Collections.Session, user.ID)
 	scanner := p.db.Query(getSessionsQuery).Iter().Scanner()
 	sessionIDs := ""
@ -170,7 +167,7 @@ func (p *provider) DeleteUser(ctx context.Context, user *models.User) error {
 }

 // ListUsers to get list of users from database
-func (p *provider) ListUsers(ctx context.Context, pagination *model.Pagination) (*model.Users, error) {
+func (p *provider) ListUsers(ctx context.Context, pagination model.Pagination) (*model.Users, error) {
 	responseUsers := []*model.User{}
 	paginationClone := pagination
 	totalCountQuery := fmt.Sprintf(`SELECT COUNT(*) FROM %s`, KeySpace+"."+models.Collections.User)
@ -182,17 +179,14 @@ func (p *provider) ListUsers(ctx context.Context, pagination *model.Pagination)
 	// there is no offset in cassandra
 	// so we fetch till limit + offset
 	// and return the results from offset to limit
-	query := fmt.Sprintf("SELECT id, email, email_verified_at, password, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, app_data, created_at, updated_at FROM %s LIMIT %d", KeySpace+"."+models.Collections.User,
-		pagination.Limit+pagination.Offset)
+	query := fmt.Sprintf("SELECT id, email, email_verified_at, password, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, created_at, updated_at FROM %s LIMIT %d", KeySpace+"."+models.Collections.User, pagination.Limit+pagination.Offset)
+
 	scanner := p.db.Query(query).Iter().Scanner()
 	counter := int64(0)
 	for scanner.Next() {
 		if counter >= pagination.Offset {
 			var user models.User
-			err := scanner.Scan(&user.ID, &user.Email, &user.EmailVerifiedAt, &user.Password, &user.SignupMethods,
-				&user.GivenName, &user.FamilyName, &user.MiddleName, &user.Nickname, &user.Birthdate, &user.PhoneNumber,
-				&user.PhoneNumberVerifiedAt, &user.Picture, &user.Roles, &user.RevokedTimestamp, &user.IsMultiFactorAuthEnabled,
-				&user.AppData, &user.CreatedAt, &user.UpdatedAt)
+			err := scanner.Scan(&user.ID, &user.Email, &user.EmailVerifiedAt, &user.Password, &user.SignupMethods, &user.GivenName, &user.FamilyName, &user.MiddleName, &user.Nickname, &user.Birthdate, &user.PhoneNumber, &user.PhoneNumberVerifiedAt, &user.Picture, &user.Roles, &user.RevokedTimestamp, &user.IsMultiFactorAuthEnabled, &user.CreatedAt, &user.UpdatedAt)
 			if err != nil {
 				return nil, err
 			}
@ -201,31 +195,31 @@ func (p *provider) ListUsers(ctx context.Context, pagination *model.Pagination)
 		counter++
 	}
 	return &model.Users{
-		Pagination: paginationClone,
 		Users:      responseUsers,
+		Pagination: &paginationClone,
 	}, nil
 }

 // GetUserByEmail to get user information from database using email address
-func (p *provider) GetUserByEmail(ctx context.Context, email string) (*models.User, error) {
+func (p *provider) GetUserByEmail(ctx context.Context, email string) (models.User, error) {
 	var user models.User
-	query := fmt.Sprintf("SELECT id, email, email_verified_at, password, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, app_data, created_at, updated_at FROM %s WHERE email = '%s' LIMIT 1 ALLOW FILTERING", KeySpace+"."+models.Collections.User, email)
-	err := p.db.Query(query).Consistency(gocql.One).Scan(&user.ID, &user.Email, &user.EmailVerifiedAt, &user.Password, &user.SignupMethods, &user.GivenName, &user.FamilyName, &user.MiddleName, &user.Nickname, &user.Birthdate, &user.PhoneNumber, &user.PhoneNumberVerifiedAt, &user.Picture, &user.Roles, &user.RevokedTimestamp, &user.IsMultiFactorAuthEnabled, &user.AppData, &user.CreatedAt, &user.UpdatedAt)
+	query := fmt.Sprintf("SELECT id, email, email_verified_at, password, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, created_at, updated_at FROM %s WHERE email = '%s' LIMIT 1 ALLOW FILTERING", KeySpace+"."+models.Collections.User, email)
+	err := p.db.Query(query).Consistency(gocql.One).Scan(&user.ID, &user.Email, &user.EmailVerifiedAt, &user.Password, &user.SignupMethods, &user.GivenName, &user.FamilyName, &user.MiddleName, &user.Nickname, &user.Birthdate, &user.PhoneNumber, &user.PhoneNumberVerifiedAt, &user.Picture, &user.Roles, &user.RevokedTimestamp, &user.IsMultiFactorAuthEnabled, &user.CreatedAt, &user.UpdatedAt)
 	if err != nil {
-		return nil, err
+		return user, err
 	}
-	return &user, nil
+	return user, nil
 }

 // GetUserByID to get user information from database using user ID
-func (p *provider) GetUserByID(ctx context.Context, id string) (*models.User, error) {
+func (p *provider) GetUserByID(ctx context.Context, id string) (models.User, error) {
 	var user models.User
-	query := fmt.Sprintf("SELECT id, email, email_verified_at, password, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, app_data, created_at, updated_at FROM %s WHERE id = '%s' LIMIT 1", KeySpace+"."+models.Collections.User, id)
-	err := p.db.Query(query).Consistency(gocql.One).Scan(&user.ID, &user.Email, &user.EmailVerifiedAt, &user.Password, &user.SignupMethods, &user.GivenName, &user.FamilyName, &user.MiddleName, &user.Nickname, &user.Birthdate, &user.PhoneNumber, &user.PhoneNumberVerifiedAt, &user.Picture, &user.Roles, &user.RevokedTimestamp, &user.IsMultiFactorAuthEnabled, &user.AppData, &user.CreatedAt, &user.UpdatedAt)
+	query := fmt.Sprintf("SELECT id, email, email_verified_at, password, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, created_at, updated_at FROM %s WHERE id = '%s' LIMIT 1", KeySpace+"."+models.Collections.User, id)
+	err := p.db.Query(query).Consistency(gocql.One).Scan(&user.ID, &user.Email, &user.EmailVerifiedAt, &user.Password, &user.SignupMethods, &user.GivenName, &user.FamilyName, &user.MiddleName, &user.Nickname, &user.Birthdate, &user.PhoneNumber, &user.PhoneNumberVerifiedAt, &user.Picture, &user.Roles, &user.RevokedTimestamp, &user.IsMultiFactorAuthEnabled, &user.CreatedAt, &user.UpdatedAt)
 	if err != nil {
-		return nil, err
+		return user, err
 	}
-	return &user, nil
+	return user, nil
 }

 // UpdateUsers to update multiple users, with parameters of user IDs slice
@ -258,8 +252,9 @@ func (p *provider) UpdateUsers(ctx context.Context, data map[string]interface{},
 	}
 	updateFields = strings.Trim(updateFields, " ")
 	updateFields = strings.TrimSuffix(updateFields, ",")
+
 	query := ""
-	if len(ids) > 0 {
+	if ids != nil && len(ids) > 0 {
 		idsString := ""
 		for _, id := range ids {
 			idsString += fmt.Sprintf("'%s', ", id)
@ -306,15 +301,17 @@ func (p *provider) UpdateUsers(ctx context.Context, data map[string]interface{},
 				return err
 			}
 		}
+
 	}
+
 	return nil
 }

 // GetUserByPhoneNumber to get user information from database using phone number
 func (p *provider) GetUserByPhoneNumber(ctx context.Context, phoneNumber string) (*models.User, error) {
 	var user models.User
-	query := fmt.Sprintf("SELECT id, email, email_verified_at, password, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, app_data, created_at, updated_at FROM %s WHERE phone_number = '%s' LIMIT 1 ALLOW FILTERING", KeySpace+"."+models.Collections.User, phoneNumber)
-	err := p.db.Query(query).Consistency(gocql.One).Scan(&user.ID, &user.Email, &user.EmailVerifiedAt, &user.Password, &user.SignupMethods, &user.GivenName, &user.FamilyName, &user.MiddleName, &user.Nickname, &user.Birthdate, &user.PhoneNumber, &user.PhoneNumberVerifiedAt, &user.Picture, &user.Roles, &user.RevokedTimestamp, &user.IsMultiFactorAuthEnabled, &user.AppData, &user.CreatedAt, &user.UpdatedAt)
+	query := fmt.Sprintf("SELECT id, email, email_verified_at, password, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, created_at, updated_at FROM %s WHERE phone_number = '%s' LIMIT 1 ALLOW FILTERING", KeySpace+"."+models.Collections.User, phoneNumber)
+	err := p.db.Query(query).Consistency(gocql.One).Scan(&user.ID, &user.Email, &user.EmailVerifiedAt, &user.Password, &user.SignupMethods, &user.GivenName, &user.FamilyName, &user.MiddleName, &user.Nickname, &user.Birthdate, &user.PhoneNumber, &user.PhoneNumberVerifiedAt, &user.Picture, &user.Roles, &user.RevokedTimestamp, &user.IsMultiFactorAuthEnabled, &user.CreatedAt, &user.UpdatedAt)
 	if err != nil {
 		return nil, err
 	}
--- a/server/db/providers/cassandradb/verification_requests.go
+++ b/server/db/providers/cassandradb/verification_requests.go
@ -12,7 +12,7 @@ import (
 )

 // AddVerification to save verification request in database
-func (p *provider) AddVerificationRequest(ctx context.Context, verificationRequest *models.VerificationRequest) (*models.VerificationRequest, error) {
+func (p *provider) AddVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) (models.VerificationRequest, error) {
 	if verificationRequest.ID == "" {
 		verificationRequest.ID = uuid.New().String()
 	}
@ -23,45 +23,47 @@ func (p *provider) AddVerificationRequest(ctx context.Context, verificationReque
 	query := fmt.Sprintf("INSERT INTO %s (id, jwt_token, identifier, expires_at, email, nonce, redirect_uri, created_at, updated_at) VALUES ('%s', '%s', '%s', %d, '%s', '%s', '%s', %d, %d)", KeySpace+"."+models.Collections.VerificationRequest, verificationRequest.ID, verificationRequest.Token, verificationRequest.Identifier, verificationRequest.ExpiresAt, verificationRequest.Email, verificationRequest.Nonce, verificationRequest.RedirectURI, verificationRequest.CreatedAt, verificationRequest.UpdatedAt)
 	err := p.db.Query(query).Exec()
 	if err != nil {
-		return nil, err
+		return verificationRequest, err
 	}
 	return verificationRequest, nil
 }

 // GetVerificationRequestByToken to get verification request from database using token
-func (p *provider) GetVerificationRequestByToken(ctx context.Context, token string) (*models.VerificationRequest, error) {
+func (p *provider) GetVerificationRequestByToken(ctx context.Context, token string) (models.VerificationRequest, error) {
 	var verificationRequest models.VerificationRequest
 	query := fmt.Sprintf(`SELECT id, jwt_token, identifier, expires_at, email, nonce, redirect_uri, created_at, updated_at FROM %s WHERE jwt_token = '%s' LIMIT 1`, KeySpace+"."+models.Collections.VerificationRequest, token)

 	err := p.db.Query(query).Consistency(gocql.One).Scan(&verificationRequest.ID, &verificationRequest.Token, &verificationRequest.Identifier, &verificationRequest.ExpiresAt, &verificationRequest.Email, &verificationRequest.Nonce, &verificationRequest.RedirectURI, &verificationRequest.CreatedAt, &verificationRequest.UpdatedAt)
 	if err != nil {
-		return nil, err
+		return verificationRequest, err
 	}
-	return &verificationRequest, nil
+	return verificationRequest, nil
 }

 // GetVerificationRequestByEmail to get verification request by email from database
-func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email string, identifier string) (*models.VerificationRequest, error) {
+func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email string, identifier string) (models.VerificationRequest, error) {
 	var verificationRequest models.VerificationRequest
 	query := fmt.Sprintf(`SELECT id, jwt_token, identifier, expires_at, email, nonce, redirect_uri, created_at, updated_at FROM %s WHERE email = '%s' AND identifier = '%s' LIMIT 1 ALLOW FILTERING`, KeySpace+"."+models.Collections.VerificationRequest, email, identifier)

 	err := p.db.Query(query).Consistency(gocql.One).Scan(&verificationRequest.ID, &verificationRequest.Token, &verificationRequest.Identifier, &verificationRequest.ExpiresAt, &verificationRequest.Email, &verificationRequest.Nonce, &verificationRequest.RedirectURI, &verificationRequest.CreatedAt, &verificationRequest.UpdatedAt)
 	if err != nil {
-		return nil, err
+		return verificationRequest, err
 	}

-	return &verificationRequest, nil
+	return verificationRequest, nil
 }

 // ListVerificationRequests to get list of verification requests from database
-func (p *provider) ListVerificationRequests(ctx context.Context, pagination *model.Pagination) (*model.VerificationRequests, error) {
+func (p *provider) ListVerificationRequests(ctx context.Context, pagination model.Pagination) (*model.VerificationRequests, error) {
 	var verificationRequests []*model.VerificationRequest
+
 	paginationClone := pagination
 	totalCountQuery := fmt.Sprintf(`SELECT COUNT(*) FROM %s`, KeySpace+"."+models.Collections.VerificationRequest)
 	err := p.db.Query(totalCountQuery).Consistency(gocql.One).Scan(&paginationClone.Total)
 	if err != nil {
 		return nil, err
 	}
+
 	// there is no offset in cassandra
 	// so we fetch till limit + offset
 	// and return the results from offset to limit
@ -83,12 +85,12 @@ func (p *provider) ListVerificationRequests(ctx context.Context, pagination *mod

 	return &model.VerificationRequests{
 		VerificationRequests: verificationRequests,
-		Pagination:           paginationClone,
+		Pagination:           &paginationClone,
 	}, nil
 }

 // DeleteVerificationRequest to delete verification request from database
-func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest *models.VerificationRequest) error {
+func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) error {
 	query := fmt.Sprintf("DELETE FROM %s WHERE id = '%s'", KeySpace+"."+models.Collections.VerificationRequest, verificationRequest.ID)
 	err := p.db.Query(query).Exec()
 	if err != nil {
--- a/server/db/providers/cassandradb/webhook.go
+++ b/server/db/providers/cassandradb/webhook.go
@ -15,30 +15,33 @@ import (
 )

 // AddWebhook to add webhook
-func (p *provider) AddWebhook(ctx context.Context, webhook *models.Webhook) (*model.Webhook, error) {
+func (p *provider) AddWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	if webhook.ID == "" {
 		webhook.ID = uuid.New().String()
 	}
+
 	webhook.Key = webhook.ID
 	webhook.CreatedAt = time.Now().Unix()
 	webhook.UpdatedAt = time.Now().Unix()
-	// Add timestamp to make event name unique for legacy version
-	webhook.EventName = fmt.Sprintf("%s-%d", webhook.EventName, time.Now().Unix())
-	insertQuery := fmt.Sprintf("INSERT INTO %s (id, event_description, event_name, endpoint, headers, enabled,  created_at, updated_at) VALUES ('%s', '%s', '%s', '%s', '%s', %t, %d, %d)", KeySpace+"."+models.Collections.Webhook, webhook.ID, webhook.EventDescription, webhook.EventName, webhook.EndPoint, webhook.Headers, webhook.Enabled, webhook.CreatedAt, webhook.UpdatedAt)
+
+	existingHook, _ := p.GetWebhookByEventName(ctx, webhook.EventName)
+	if existingHook != nil {
+		return nil, fmt.Errorf("Webhook with %s event_name already exists", webhook.EventName)
+	}
+
+	insertQuery := fmt.Sprintf("INSERT INTO %s (id, event_name, endpoint, headers, enabled,  created_at, updated_at) VALUES ('%s', '%s', '%s', '%s', %t, %d, %d)", KeySpace+"."+models.Collections.Webhook, webhook.ID, webhook.EventName, webhook.EndPoint, webhook.Headers, webhook.Enabled, webhook.CreatedAt, webhook.UpdatedAt)
 	err := p.db.Query(insertQuery).Exec()
 	if err != nil {
 		return nil, err
 	}
+
 	return webhook.AsAPIWebhook(), nil
 }

 // UpdateWebhook to update webhook
-func (p *provider) UpdateWebhook(ctx context.Context, webhook *models.Webhook) (*model.Webhook, error) {
+func (p *provider) UpdateWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	webhook.UpdatedAt = time.Now().Unix()
-	// Event is changed
-	if !strings.Contains(webhook.EventName, "-") {
-		webhook.EventName = fmt.Sprintf("%s-%d", webhook.EventName, time.Now().Unix())
-	}
+
 	bytes, err := json.Marshal(webhook)
 	if err != nil {
 		return nil, err
@ -51,18 +54,22 @@ func (p *provider) UpdateWebhook(ctx context.Context, webhook *models.Webhook) (
 	if err != nil {
 		return nil, err
 	}
+
 	updateFields := ""
 	for key, value := range webhookMap {
 		if key == "_id" {
 			continue
 		}
+
 		if key == "_key" {
 			continue
 		}
+
 		if value == nil {
 			updateFields += fmt.Sprintf("%s = null,", key)
 			continue
 		}
+
 		valueType := reflect.TypeOf(value)
 		if valueType.Name() == "string" {
 			updateFields += fmt.Sprintf("%s = '%s', ", key, value.(string))
@ -72,6 +79,7 @@ func (p *provider) UpdateWebhook(ctx context.Context, webhook *models.Webhook) (
 	}
 	updateFields = strings.Trim(updateFields, " ")
 	updateFields = strings.TrimSuffix(updateFields, ",")
+
 	query := fmt.Sprintf("UPDATE %s SET %s WHERE id = '%s'", KeySpace+"."+models.Collections.Webhook, updateFields, webhook.ID)
 	err = p.db.Query(query).Exec()
 	if err != nil {
@ -81,24 +89,27 @@ func (p *provider) UpdateWebhook(ctx context.Context, webhook *models.Webhook) (
 }

 // ListWebhooks to list webhook
-func (p *provider) ListWebhook(ctx context.Context, pagination *model.Pagination) (*model.Webhooks, error) {
+func (p *provider) ListWebhook(ctx context.Context, pagination model.Pagination) (*model.Webhooks, error) {
 	webhooks := []*model.Webhook{}
 	paginationClone := pagination
+
 	totalCountQuery := fmt.Sprintf(`SELECT COUNT(*) FROM %s`, KeySpace+"."+models.Collections.Webhook)
 	err := p.db.Query(totalCountQuery).Consistency(gocql.One).Scan(&paginationClone.Total)
 	if err != nil {
 		return nil, err
 	}
+
 	// there is no offset in cassandra
 	// so we fetch till limit + offset
 	// and return the results from offset to limit
-	query := fmt.Sprintf("SELECT id, event_description, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s LIMIT %d", KeySpace+"."+models.Collections.Webhook, pagination.Limit+pagination.Offset)
+	query := fmt.Sprintf("SELECT id, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s LIMIT %d", KeySpace+"."+models.Collections.Webhook, pagination.Limit+pagination.Offset)
+
 	scanner := p.db.Query(query).Iter().Scanner()
 	counter := int64(0)
 	for scanner.Next() {
 		if counter >= pagination.Offset {
 			var webhook models.Webhook
-			err := scanner.Scan(&webhook.ID, &webhook.EventDescription, &webhook.EventName, &webhook.EndPoint, &webhook.Headers, &webhook.Enabled, &webhook.CreatedAt, &webhook.UpdatedAt)
+			err := scanner.Scan(&webhook.ID, &webhook.EventName, &webhook.EndPoint, &webhook.Headers, &webhook.Enabled, &webhook.CreatedAt, &webhook.UpdatedAt)
 			if err != nil {
 				return nil, err
 			}
@ -108,7 +119,7 @@ func (p *provider) ListWebhook(ctx context.Context, pagination *model.Pagination
 	}

 	return &model.Webhooks{
-		Pagination: paginationClone,
+		Pagination: &paginationClone,
 		Webhooks:   webhooks,
 	}, nil
 }
@ -116,8 +127,8 @@ func (p *provider) ListWebhook(ctx context.Context, pagination *model.Pagination
 // GetWebhookByID to get webhook by id
 func (p *provider) GetWebhookByID(ctx context.Context, webhookID string) (*model.Webhook, error) {
 	var webhook models.Webhook
-	query := fmt.Sprintf(`SELECT id, event_description, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s WHERE id = '%s' LIMIT 1`, KeySpace+"."+models.Collections.Webhook, webhookID)
-	err := p.db.Query(query).Consistency(gocql.One).Scan(&webhook.ID, &webhook.EventDescription, &webhook.EventName, &webhook.EndPoint, &webhook.Headers, &webhook.Enabled, &webhook.CreatedAt, &webhook.UpdatedAt)
+	query := fmt.Sprintf(`SELECT id, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s WHERE id = '%s' LIMIT 1`, KeySpace+"."+models.Collections.Webhook, webhookID)
+	err := p.db.Query(query).Consistency(gocql.One).Scan(&webhook.ID, &webhook.EventName, &webhook.EndPoint, &webhook.Headers, &webhook.Enabled, &webhook.CreatedAt, &webhook.UpdatedAt)
 	if err != nil {
 		return nil, err
 	}
@ -125,19 +136,14 @@ func (p *provider) GetWebhookByID(ctx context.Context, webhookID string) (*model
 }

 // GetWebhookByEventName to get webhook by event_name
-func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string) ([]*model.Webhook, error) {
-	query := fmt.Sprintf(`SELECT id, event_description, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s WHERE event_name LIKE '%s' ALLOW FILTERING`, KeySpace+"."+models.Collections.Webhook, eventName+"%")
-	scanner := p.db.Query(query).Iter().Scanner()
-	webhooks := []*model.Webhook{}
-	for scanner.Next() {
+func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string) (*model.Webhook, error) {
 	var webhook models.Webhook
-		err := scanner.Scan(&webhook.ID, &webhook.EventDescription, &webhook.EventName, &webhook.EndPoint, &webhook.Headers, &webhook.Enabled, &webhook.CreatedAt, &webhook.UpdatedAt)
+	query := fmt.Sprintf(`SELECT id, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s WHERE event_name = '%s' LIMIT 1 ALLOW FILTERING`, KeySpace+"."+models.Collections.Webhook, eventName)
+	err := p.db.Query(query).Consistency(gocql.One).Scan(&webhook.ID, &webhook.EventName, &webhook.EndPoint, &webhook.Headers, &webhook.Enabled, &webhook.CreatedAt, &webhook.UpdatedAt)
 	if err != nil {
 		return nil, err
 	}
-		webhooks = append(webhooks, webhook.AsAPIWebhook())
-	}
-	return webhooks, nil
+	return webhook.AsAPIWebhook(), nil
 }

 // DeleteWebhook to delete webhook
--- a/server/db/providers/cassandradb/webhook_log.go
+++ b/server/db/providers/cassandradb/webhook_log.go
@ -12,7 +12,7 @@ import (
 )

 // AddWebhookLog to add webhook log
-func (p *provider) AddWebhookLog(ctx context.Context, webhookLog *models.WebhookLog) (*model.WebhookLog, error) {
+func (p *provider) AddWebhookLog(ctx context.Context, webhookLog models.WebhookLog) (*model.WebhookLog, error) {
 	if webhookLog.ID == "" {
 		webhookLog.ID = uuid.New().String()
 	}
@ -30,7 +30,7 @@ func (p *provider) AddWebhookLog(ctx context.Context, webhookLog *models.Webhook
 }

 // ListWebhookLogs to list webhook logs
-func (p *provider) ListWebhookLogs(ctx context.Context, pagination *model.Pagination, webhookID string) (*model.WebhookLogs, error) {
+func (p *provider) ListWebhookLogs(ctx context.Context, pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
 	webhookLogs := []*model.WebhookLog{}
 	paginationClone := pagination
 	totalCountQuery := fmt.Sprintf(`SELECT COUNT(*) FROM %s`, KeySpace+"."+models.Collections.WebhookLog)
@ -38,6 +38,7 @@ func (p *provider) ListWebhookLogs(ctx context.Context, pagination *model.Pagina
 	// so we fetch till limit + offset
 	// and return the results from offset to limit
 	query := fmt.Sprintf("SELECT id, http_status, response, request, webhook_id, created_at, updated_at FROM %s LIMIT %d", KeySpace+"."+models.Collections.WebhookLog, pagination.Limit+pagination.Offset)
+
 	if webhookID != "" {
 		totalCountQuery = fmt.Sprintf(`SELECT COUNT(*) FROM %s WHERE webhook_id='%s' ALLOW FILTERING`, KeySpace+"."+models.Collections.WebhookLog, webhookID)
 		query = fmt.Sprintf("SELECT id, http_status, response, request, webhook_id, created_at, updated_at FROM %s WHERE webhook_id = '%s' LIMIT %d ALLOW FILTERING", KeySpace+"."+models.Collections.WebhookLog, webhookID, pagination.Limit+pagination.Offset)
@ -63,7 +64,7 @@ func (p *provider) ListWebhookLogs(ctx context.Context, pagination *model.Pagina
 	}

 	return &model.WebhookLogs{
-		Pagination:  paginationClone,
+		Pagination:  &paginationClone,
 		WebhookLogs: webhookLogs,
 	}, nil
 }
--- a/server/db/providers/couchbase/authenticator.go
+++ b/server/db/providers/couchbase/authenticator.go
@ -1,81 +0,0 @@
-package couchbase
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/couchbase/gocb/v2"
-	"github.com/google/uuid"
-
-	"github.com/authorizerdev/authorizer/server/db/models"
-)
-
-func (p *provider) AddAuthenticator(ctx context.Context, authenticators *models.Authenticator) (*models.Authenticator, error) {
-	exists, _ := p.GetAuthenticatorDetailsByUserId(ctx, authenticators.UserID, authenticators.Method)
-	if exists != nil {
-		return authenticators, nil
-	}
-
-	if authenticators.ID == "" {
-		authenticators.ID = uuid.New().String()
-	}
-	authenticators.Key = authenticators.ID
-	authenticators.CreatedAt = time.Now().Unix()
-	authenticators.UpdatedAt = time.Now().Unix()
-	insertOpt := gocb.InsertOptions{
-		Context: ctx,
-	}
-	_, err := p.db.Collection(models.Collections.Authenticators).Insert(authenticators.ID, authenticators, &insertOpt)
-	if err != nil {
-		return nil, err
-	}
-	return authenticators, nil
-}
-
-func (p *provider) UpdateAuthenticator(ctx context.Context, authenticators *models.Authenticator) (*models.Authenticator, error) {
-	authenticators.UpdatedAt = time.Now().Unix()
-	bytes, err := json.Marshal(authenticators)
-	if err != nil {
-		return nil, err
-	}
-	// use decoder instead of json.Unmarshall, because it converts int64 -> float64 after unmarshalling
-	decoder := json.NewDecoder(strings.NewReader(string(bytes)))
-	decoder.UseNumber()
-	authenticator := map[string]interface{}{}
-	err = decoder.Decode(&authenticator)
-	if err != nil {
-		return nil, err
-	}
-	updateFields, params := GetSetFields(authenticator)
-	query := fmt.Sprintf("UPDATE %s.%s SET %s WHERE _id = '%s'", p.scopeName, models.Collections.Authenticators, updateFields, authenticators.ID)
-	_, err = p.db.Query(query, &gocb.QueryOptions{
-		Context:         ctx,
-		ScanConsistency: gocb.QueryScanConsistencyRequestPlus,
-		NamedParameters: params,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return authenticators, nil
-}
-
-func (p *provider) GetAuthenticatorDetailsByUserId(ctx context.Context, userId string, authenticatorType string) (*models.Authenticator, error) {
-	var authenticators *models.Authenticator
-	query := fmt.Sprintf("SELECT _id, user_id, method, secret, recovery_code, verified_at, created_at, updated_at FROM %s.%s WHERE user_id = $1 AND method = $2 LIMIT 1", p.scopeName, models.Collections.Authenticators)
-	q, err := p.db.Query(query, &gocb.QueryOptions{
-		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
-		Context:              ctx,
-		PositionalParameters: []interface{}{userId, authenticatorType},
-	})
-	if err != nil {
-		return nil, err
-	}
-	err = q.One(&authenticators)
-	if err != nil {
-		return nil, err
-	}
-	return authenticators, nil
-}
--- a/server/db/providers/couchbase/email_template.go
+++ b/server/db/providers/couchbase/email_template.go
@ -15,7 +15,7 @@ import (
 )

 // AddEmailTemplate to add EmailTemplate
-func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate *models.EmailTemplate) (*model.EmailTemplate, error) {
+func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate models.EmailTemplate) (*model.EmailTemplate, error) {

 	if emailTemplate.ID == "" {
 		emailTemplate.ID = uuid.New().String()
@ -37,7 +37,7 @@ func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate *models.E
 }

 // UpdateEmailTemplate to update EmailTemplate
-func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate *models.EmailTemplate) (*model.EmailTemplate, error) {
+func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate models.EmailTemplate) (*model.EmailTemplate, error) {
 	bytes, err := json.Marshal(emailTemplate)
 	if err != nil {
 		return nil, err
@ -67,14 +67,12 @@ func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate *model
 }

 // ListEmailTemplates to list EmailTemplate
-func (p *provider) ListEmailTemplate(ctx context.Context, pagination *model.Pagination) (*model.EmailTemplates, error) {
+func (p *provider) ListEmailTemplate(ctx context.Context, pagination model.Pagination) (*model.EmailTemplates, error) {
 	emailTemplates := []*model.EmailTemplate{}
 	paginationClone := pagination
-	total, err := p.GetTotalDocs(ctx, models.Collections.EmailTemplate)
-	if err != nil {
-		return nil, err
-	}
-	paginationClone.Total = total
+
+	_, paginationClone.Total = p.GetTotalDocs(ctx, models.Collections.EmailTemplate)
+
 	userQuery := fmt.Sprintf("SELECT _id, event_name, subject, design, template, created_at, updated_at FROM %s.%s ORDER BY _id OFFSET $1 LIMIT $2", p.scopeName, models.Collections.EmailTemplate)

 	queryResult, err := p.db.Query(userQuery, &gocb.QueryOptions{
@ -88,7 +86,7 @@ func (p *provider) ListEmailTemplate(ctx context.Context, pagination *model.Pagi
 	}

 	for queryResult.Next() {
-		var emailTemplate *models.EmailTemplate
+		emailTemplate := models.EmailTemplate{}
 		err := queryResult.Row(&emailTemplate)
 		if err != nil {
 			log.Fatal(err)
@ -102,46 +100,54 @@ func (p *provider) ListEmailTemplate(ctx context.Context, pagination *model.Pagi
 	}

 	return &model.EmailTemplates{
-		Pagination:     paginationClone,
+		Pagination:     &paginationClone,
 		EmailTemplates: emailTemplates,
 	}, nil
 }

 // GetEmailTemplateByID to get EmailTemplate by id
 func (p *provider) GetEmailTemplateByID(ctx context.Context, emailTemplateID string) (*model.EmailTemplate, error) {
-	var emailTemplate *models.EmailTemplate
+	emailTemplate := models.EmailTemplate{}
+
 	query := fmt.Sprintf(`SELECT  _id, event_name, subject, design, template, created_at, updated_at  FROM %s.%s WHERE _id = $1 LIMIT 1`, p.scopeName, models.Collections.EmailTemplate)
 	q, err := p.db.Query(query, &gocb.QueryOptions{
 		Context:              ctx,
 		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
 		PositionalParameters: []interface{}{emailTemplateID},
 	})
+
 	if err != nil {
 		return nil, err
 	}
 	err = q.One(&emailTemplate)
+
 	if err != nil {
 		return nil, err
 	}
+
 	return emailTemplate.AsAPIEmailTemplate(), nil
 }

 // GetEmailTemplateByEventName to get EmailTemplate by event_name
 func (p *provider) GetEmailTemplateByEventName(ctx context.Context, eventName string) (*model.EmailTemplate, error) {
-	var emailTemplate models.EmailTemplate
+	emailTemplate := models.EmailTemplate{}
+
 	query := fmt.Sprintf("SELECT  _id, event_name, subject, design, template, created_at, updated_at  FROM %s.%s WHERE event_name=$1 LIMIT 1", p.scopeName, models.Collections.EmailTemplate)
 	q, err := p.db.Query(query, &gocb.QueryOptions{
 		Context:              ctx,
 		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
 		PositionalParameters: []interface{}{eventName},
 	})
+
 	if err != nil {
 		return nil, err
 	}
 	err = q.One(&emailTemplate)
+
 	if err != nil {
 		return nil, err
 	}
+
 	return emailTemplate.AsAPIEmailTemplate(), nil
 }

--- a/server/db/providers/couchbase/env.go
+++ b/server/db/providers/couchbase/env.go
@ -11,56 +11,57 @@ import (
 )

 // AddEnv to save environment information in database
-func (p *provider) AddEnv(ctx context.Context, env *models.Env) (*models.Env, error) {
+func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	if env.ID == "" {
 		env.ID = uuid.New().String()
 	}
 	env.CreatedAt = time.Now().Unix()
 	env.UpdatedAt = time.Now().Unix()
 	env.Key = env.ID
-	env.EncryptionKey = env.Hash
+
 	insertOpt := gocb.InsertOptions{
 		Context: ctx,
 	}
 	_, err := p.db.Collection(models.Collections.Env).Insert(env.ID, env, &insertOpt)
 	if err != nil {
-		return nil, err
+		return env, err
 	}
 	return env, nil
 }

 // UpdateEnv to update environment information in database
-func (p *provider) UpdateEnv(ctx context.Context, env *models.Env) (*models.Env, error) {
+func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	env.UpdatedAt = time.Now().Unix()
-	env.EncryptionKey = env.Hash

 	updateEnvQuery := fmt.Sprintf("UPDATE %s.%s SET env = $1, updated_at = $2 WHERE _id = $3", p.scopeName, models.Collections.Env)
 	_, err := p.db.Query(updateEnvQuery, &gocb.QueryOptions{
 		Context:              ctx,
 		PositionalParameters: []interface{}{env.EnvData, env.UpdatedAt, env.UpdatedAt, env.ID},
 	})
+
 	if err != nil {
-		return nil, err
+		return env, err
 	}
+
 	return env, nil
 }

 // GetEnv to get environment information from database
-func (p *provider) GetEnv(ctx context.Context) (*models.Env, error) {
-	var env *models.Env
+func (p *provider) GetEnv(ctx context.Context) (models.Env, error) {
+	var env models.Env

-	query := fmt.Sprintf("SELECT _id, env, encryption_key, created_at, updated_at FROM %s.%s LIMIT 1", p.scopeName, models.Collections.Env)
+	query := fmt.Sprintf("SELECT _id, env, created_at, updated_at FROM %s.%s LIMIT 1", p.scopeName, models.Collections.Env)
 	q, err := p.db.Query(query, &gocb.QueryOptions{
 		Context:         ctx,
 		ScanConsistency: gocb.QueryScanConsistencyRequestPlus,
 	})
 	if err != nil {
-		return nil, err
+		return env, err
 	}
 	err = q.One(&env)
+
 	if err != nil {
-		return nil, err
+		return env, err
 	}
-	env.Hash = env.EncryptionKey
 	return env, nil
 }
--- a/server/db/providers/couchbase/otp.go
+++ b/server/db/providers/couchbase/otp.go
@ -2,7 +2,6 @@ package couchbase

 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"

@ -13,20 +12,8 @@ import (

 // UpsertOTP to add or update otp
 func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models.OTP, error) {
-	// check if email or phone number is present
-	if otpParam.Email == "" && otpParam.PhoneNumber == "" {
-		return nil, errors.New("email or phone_number is required")
-	}
-	uniqueField := models.FieldNameEmail
-	if otpParam.Email == "" && otpParam.PhoneNumber != "" {
-		uniqueField = models.FieldNamePhoneNumber
-	}
-	var otp *models.OTP
-	if uniqueField == models.FieldNameEmail {
-		otp, _ = p.GetOTPByEmail(ctx, otpParam.Email)
-	} else {
-		otp, _ = p.GetOTPByPhoneNumber(ctx, otpParam.PhoneNumber)
-	}
+	otp, _ := p.GetOTPByEmail(ctx, otpParam.Email)
+
 	shouldCreate := false
 	if otp == nil {
 		shouldCreate = true
@ -34,7 +21,6 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 			ID:        uuid.NewString(),
 			Otp:       otpParam.Otp,
 			Email:     otpParam.Email,
-			PhoneNumber: otpParam.PhoneNumber,
 			ExpiresAt: otpParam.ExpiresAt,
 			CreatedAt: time.Now().Unix(),
 			UpdatedAt: time.Now().Unix(),
@ -43,6 +29,7 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 		otp.Otp = otpParam.Otp
 		otp.ExpiresAt = otpParam.ExpiresAt
 	}
+
 	otp.UpdatedAt = time.Now().Unix()
 	if shouldCreate {
 		insertOpt := gocb.InsertOptions{
@ -50,7 +37,7 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 		}
 		_, err := p.db.Collection(models.Collections.OTP).Insert(otp.ID, otp, &insertOpt)
 		if err != nil {
-			return nil, err
+			return otp, err
 		}
 	} else {
 		query := fmt.Sprintf(`UPDATE %s.%s SET otp=$1, expires_at=$2, updated_at=$3 WHERE _id=$4`, p.scopeName, models.Collections.OTP)
@ -58,7 +45,7 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 			PositionalParameters: []interface{}{otp.Otp, otp.ExpiresAt, otp.UpdatedAt, otp.ID},
 		})
 		if err != nil {
-			return nil, err
+			return otp, err
 		}
 	}
 	return otp, nil
@ -67,7 +54,7 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 // GetOTPByEmail to get otp for a given email address
 func (p *provider) GetOTPByEmail(ctx context.Context, emailAddress string) (*models.OTP, error) {
 	otp := models.OTP{}
-	query := fmt.Sprintf(`SELECT _id, email, phone_number, otp, expires_at, created_at, updated_at FROM %s.%s WHERE email = $1 LIMIT 1`, p.scopeName, models.Collections.OTP)
+	query := fmt.Sprintf(`SELECT _id, email, otp, expires_at, created_at, updated_at FROM %s.%s WHERE email = $1 LIMIT 1`, p.scopeName, models.Collections.OTP)
 	q, err := p.db.Query(query, &gocb.QueryOptions{
 		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
 		PositionalParameters: []interface{}{emailAddress},
@ -76,27 +63,11 @@ func (p *provider) GetOTPByEmail(ctx context.Context, emailAddress string) (*mod
 		return nil, err
 	}
 	err = q.One(&otp)
+
 	if err != nil {
 		return nil, err
 	}
-	return &otp, nil
-}

-// GetOTPByPhoneNumber to get otp for a given phone number
-func (p *provider) GetOTPByPhoneNumber(ctx context.Context, phoneNumber string) (*models.OTP, error) {
-	otp := models.OTP{}
-	query := fmt.Sprintf(`SELECT _id, email, phone_number, otp, expires_at, created_at, updated_at FROM %s.%s WHERE phone_number = $1 LIMIT 1`, p.scopeName, models.Collections.OTP)
-	q, err := p.db.Query(query, &gocb.QueryOptions{
-		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
-		PositionalParameters: []interface{}{phoneNumber},
-	})
-	if err != nil {
-		return nil, err
-	}
-	err = q.One(&otp)
-	if err != nil {
-		return nil, err
-	}
 	return &otp, nil
 }

--- a/server/db/providers/couchbase/provider.go
+++ b/server/db/providers/couchbase/provider.go
@ -4,77 +4,70 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
 	"reflect"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/couchbase/gocb/v2"

+	"github.com/authorizerdev/authorizer/server/constants"
 	"github.com/authorizerdev/authorizer/server/db/models"
 	"github.com/authorizerdev/authorizer/server/memorystore"
+	"github.com/couchbase/gocb/v2"
 )

-const (
-	defaultBucketName = "authorizer"
-	defaultScope      = "_default"
-)
-
+// TODO change following provider to new db provider
 type provider struct {
 	db        *gocb.Scope
 	scopeName string
 }

-// NewProvider returns a new Couchbase provider
+// NewProvider returns a new SQL provider
+// TODO change following provider to new db provider
 func NewProvider() (*provider, error) {
-	bucketName := memorystore.RequiredEnvStoreObj.GetRequiredEnv().CouchbaseBucket
-	scopeName := memorystore.RequiredEnvStoreObj.GetRequiredEnv().CouchbaseScope
+	// scopeName := os.Getenv(constants.EnvCouchbaseScope)
+	bucketName := os.Getenv(constants.EnvCouchbaseBucket)
+	scopeName := os.Getenv(constants.EnvCouchbaseScope)
+
 	dbURL := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseURL
 	userName := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseUsername
 	password := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabasePassword
+
 	opts := gocb.ClusterOptions{
 		Username: userName,
 		Password: password,
 	}
-	if bucketName == "" {
-		bucketName = defaultBucketName
-	}
-	if scopeName == "" {
-		scopeName = defaultScope
-	}
+
 	cluster, err := gocb.Connect(dbURL, opts)
+
 	if err != nil {
 		return nil, err
 	}
+
 	// To create the bucket and scope if not exist
 	bucket, err := CreateBucketAndScope(cluster, bucketName, scopeName)
+
 	if err != nil {
 		return nil, err
 	}
+
 	scope := bucket.Scope(scopeName)
+
 	scopeIdentifier := fmt.Sprintf("%s.%s", bucketName, scopeName)
+
 	v := reflect.ValueOf(models.Collections)
 	for i := 0; i < v.NumField(); i++ {
-		collectionName := v.Field(i)
+		field := v.Field(i)
 		user := gocb.CollectionSpec{
-			Name:      collectionName.String(),
+			Name:      field.String(),
 			ScopeName: scopeName,
 		}
 		collectionOpts := gocb.CreateCollectionOptions{
 			Context: context.TODO(),
 		}
-		err = bucket.Collections().CreateCollection(user, &collectionOpts)
-		if err != nil && !errors.Is(err, gocb.ErrCollectionExists) {
-			return nil, err
-		}
-		// TODO: find how to fix this sleep time.
-		// Add wait time for successful collection creation
-		time.Sleep(5 * time.Second)
-		indexQuery := fmt.Sprintf("CREATE PRIMARY INDEX ON %s.%s", scopeIdentifier, collectionName.String())
-		_, err = scope.Query(indexQuery, nil)
-		if err != nil && !strings.Contains(err.Error(), "The index #primary already exists") {
-			return nil, err
-		}
+		_ = bucket.Collections().CreateCollection(user, &collectionOpts)
+		// if err != nil && !errors.Is(err, gocb.ErrCollectionExists) {
+		// 	return nil, err
+		// }
+		indexQuery := fmt.Sprintf("CREATE PRIMARY INDEX ON %s.%s", scopeIdentifier, field.String())
+		scope.Query(indexQuery, nil)
 	}

 	indices := GetIndex(scopeIdentifier)
@ -91,45 +84,33 @@ func NewProvider() (*provider, error) {
 }

 func CreateBucketAndScope(cluster *gocb.Cluster, bucketName string, scopeName string) (*gocb.Bucket, error) {
-	bucketRAMQuotaMB := memorystore.RequiredEnvStoreObj.GetRequiredEnv().CouchbaseBucketRAMQuotaMB
-	if bucketRAMQuotaMB == "" {
-		bucketRAMQuotaMB = "1000"
-	}
-	bucketRAMQuota, err := strconv.ParseInt(bucketRAMQuotaMB, 10, 64)
-	if err != nil {
-		return nil, err
-	}
 	settings := gocb.BucketSettings{
 		Name:            bucketName,
-		RAMQuotaMB:      uint64(bucketRAMQuota),
+		RAMQuotaMB:      1000,
+		NumReplicas:     1,
 		BucketType:      gocb.CouchbaseBucketType,
 		EvictionPolicy:  gocb.EvictionPolicyTypeValueOnly,
 		FlushEnabled:    true,
 		CompressionMode: gocb.CompressionModeActive,
 	}
-	shouldCreateBucket := false
-	// check if bucket exists
-	_, err = cluster.Buckets().GetBucket(bucketName, nil)
-	if err != nil {
-		// bucket not found
-		shouldCreateBucket = true
-	}
-	if shouldCreateBucket {
-		err = cluster.Buckets().CreateBucket(gocb.CreateBucketSettings{
+
+	err := cluster.Buckets().CreateBucket(gocb.CreateBucketSettings{
 		BucketSettings:         settings,
 		ConflictResolutionType: gocb.ConflictResolutionTypeSequenceNumber,
 	}, nil)
-		if err != nil {
-			return nil, err
-		}
-	}
+
 	bucket := cluster.Bucket(bucketName)
-	if scopeName != defaultScope {
+
+	if err != nil && !errors.Is(err, gocb.ErrBucketExists) {
+		return bucket, err
+	}
+
 	err = bucket.Collections().CreateScope(scopeName, nil)
+
 	if err != nil && !errors.Is(err, gocb.ErrScopeExists) {
-			return nil, err
-		}
+		return bucket, err
 	}
+
 	return bucket, nil
 }

@ -166,9 +147,5 @@ func GetIndex(scopeName string) map[string][]string {
 	otpIndex1 := fmt.Sprintf("CREATE INDEX OTPEmailIndex ON %s.%s(email)", scopeName, models.Collections.OTP)
 	indices[models.Collections.OTP] = []string{otpIndex1}

-	// OTP index
-	otpIndex2 := fmt.Sprintf("CREATE INDEX OTPPhoneNumberIndex ON %s.%s(phone_number)", scopeName, models.Collections.OTP)
-	indices[models.Collections.OTP] = []string{otpIndex2}
-
 	return indices
 }
--- a/server/db/providers/couchbase/session.go
+++ b/server/db/providers/couchbase/session.go
@ -10,10 +10,11 @@ import (
 )

 // AddSession to save session information in database
-func (p *provider) AddSession(ctx context.Context, session *models.Session) error {
+func (p *provider) AddSession(ctx context.Context, session models.Session) error {
 	if session.ID == "" {
 		session.ID = uuid.New().String()
 	}
+
 	session.CreatedAt = time.Now().Unix()
 	session.UpdatedAt = time.Now().Unix()
 	insertOpt := gocb.InsertOptions{
@ -23,6 +24,7 @@ func (p *provider) AddSession(ctx context.Context, session *models.Session) erro
 	if err != nil {
 		return err
 	}
+
 	return nil
 }

--- a/server/db/providers/couchbase/shared.go
+++ b/server/db/providers/couchbase/shared.go
@ -11,19 +11,24 @@ import (

 func GetSetFields(webhookMap map[string]interface{}) (string, map[string]interface{}) {
 	params := make(map[string]interface{}, 1)
+
 	updateFields := ""
+
 	for key, value := range webhookMap {
 		if key == "_id" {
 			continue
 		}
+
 		if key == "_key" {
 			continue
 		}
+
 		if value == nil {
 			updateFields += fmt.Sprintf("%s=$%s,", key, key)
 			params[key] = "null"
 			continue
 		}
+
 		valueType := reflect.TypeOf(value)
 		if valueType.Name() == "string" {
 			updateFields += fmt.Sprintf("%s = $%s, ", key, key)
@ -39,17 +44,20 @@ func GetSetFields(webhookMap map[string]interface{}) (string, map[string]interfa
 	return updateFields, params
 }

-func (p *provider) GetTotalDocs(ctx context.Context, collection string) (int64, error) {
+func (p *provider) GetTotalDocs(ctx context.Context, collection string) (error, int64) {
 	totalDocs := TotalDocs{}
+
 	countQuery := fmt.Sprintf("SELECT COUNT(*) as Total FROM %s.%s", p.scopeName, collection)
 	queryRes, err := p.db.Query(countQuery, &gocb.QueryOptions{
 		Context: ctx,
 	})
+
 	queryRes.One(&totalDocs)
+
 	if err != nil {
-		return 0, err
+		return err, totalDocs.Total
 	}
-	return totalDocs.Total, nil
+	return nil, totalDocs.Total
 }

 type TotalDocs struct {
--- a/server/db/providers/couchbase/user.go
+++ b/server/db/providers/couchbase/user.go
@ -4,20 +4,18 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"strings"
 	"time"

 	"github.com/authorizerdev/authorizer/server/constants"
 	"github.com/authorizerdev/authorizer/server/db/models"
 	"github.com/authorizerdev/authorizer/server/graph/model"
 	"github.com/authorizerdev/authorizer/server/memorystore"
-	"github.com/authorizerdev/authorizer/server/refs"
 	"github.com/couchbase/gocb/v2"
 	"github.com/google/uuid"
 )

 // AddUser to save user information in database
-func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User, error) {
+func (p *provider) AddUser(ctx context.Context, user models.User) (models.User, error) {
 	if user.ID == "" {
 		user.ID = uuid.New().String()
 	}
@ -25,21 +23,11 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User
 	if user.Roles == "" {
 		defaultRoles, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyDefaultRoles)
 		if err != nil {
-			return nil, err
+			return user, err
 		}
 		user.Roles = defaultRoles
 	}

-	if user.PhoneNumber != nil && strings.TrimSpace(refs.StringValue(user.PhoneNumber)) != "" {
-		if u, _ := p.GetUserByPhoneNumber(ctx, refs.StringValue(user.PhoneNumber)); u != nil && u.ID != user.ID {
-			return user, fmt.Errorf("user with given phone number already exists")
-		}
-	} else if user.Email != nil && strings.TrimSpace(refs.StringValue(user.Email)) != "" {
-		if u, _ := p.GetUserByEmail(ctx, refs.StringValue(user.Email)); u != nil && u.ID != user.ID {
-			return user, fmt.Errorf("user with given email already exists")
-		}
-	}
-
 	user.CreatedAt = time.Now().Unix()
 	user.UpdatedAt = time.Now().Unix()
 	insertOpt := gocb.InsertOptions{
@ -47,26 +35,26 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User
 	}
 	_, err := p.db.Collection(models.Collections.User).Insert(user.ID, user, &insertOpt)
 	if err != nil {
-		return nil, err
+		return user, err
 	}
 	return user, nil
 }

 // UpdateUser to update user information in database
-func (p *provider) UpdateUser(ctx context.Context, user *models.User) (*models.User, error) {
+func (p *provider) UpdateUser(ctx context.Context, user models.User) (models.User, error) {
 	user.UpdatedAt = time.Now().Unix()
-	upsertOpt := gocb.UpsertOptions{
+	unsertOpt := gocb.UpsertOptions{
 		Context: ctx,
 	}
-	_, err := p.db.Collection(models.Collections.User).Upsert(user.ID, user, &upsertOpt)
+	_, err := p.db.Collection(models.Collections.User).Upsert(user.ID, user, &unsertOpt)
 	if err != nil {
-		return nil, err
+		return user, err
 	}
 	return user, nil
 }

 // DeleteUser to delete user information from database
-func (p *provider) DeleteUser(ctx context.Context, user *models.User) error {
+func (p *provider) DeleteUser(ctx context.Context, user models.User) error {
 	removeOpt := gocb.RemoveOptions{
 		Context: ctx,
 	}
@ -78,23 +66,24 @@ func (p *provider) DeleteUser(ctx context.Context, user *models.User) error {
 }

 // ListUsers to get list of users from database
-func (p *provider) ListUsers(ctx context.Context, pagination *model.Pagination) (*model.Users, error) {
+func (p *provider) ListUsers(ctx context.Context, pagination model.Pagination) (*model.Users, error) {
 	users := []*model.User{}
 	paginationClone := pagination
-	userQuery := fmt.Sprintf("SELECT _id, email, email_verified_at, `password`, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, app_data, created_at, updated_at FROM %s.%s ORDER BY id OFFSET $1 LIMIT $2", p.scopeName, models.Collections.User)
+
+	userQuery := fmt.Sprintf("SELECT _id, email, email_verified_at, `password`, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, created_at, updated_at FROM %s.%s ORDER BY id OFFSET $1 LIMIT $2", p.scopeName, models.Collections.User)
+
 	queryResult, err := p.db.Query(userQuery, &gocb.QueryOptions{
 		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
 		Context:              ctx,
 		PositionalParameters: []interface{}{paginationClone.Offset, paginationClone.Limit},
 	})
+
+	_, paginationClone.Total = p.GetTotalDocs(ctx, models.Collections.User)
+
 	if err != nil {
 		return nil, err
 	}
-	total, err := p.GetTotalDocs(ctx, models.Collections.User)
-	if err != nil {
-		return nil, err
-	}
-	paginationClone.Total = total
+
 	for queryResult.Next() {
 		var user models.User
 		err := queryResult.Row(&user)
@ -103,50 +92,56 @@ func (p *provider) ListUsers(ctx context.Context, pagination *model.Pagination)
 		}
 		users = append(users, user.AsAPIUser())
 	}
+
 	if err := queryResult.Err(); err != nil {
 		return nil, err
+
 	}
+
 	return &model.Users{
-		Pagination: paginationClone,
+		Pagination: &paginationClone,
 		Users:      users,
 	}, nil
 }

 // GetUserByEmail to get user information from database using email address
-func (p *provider) GetUserByEmail(ctx context.Context, email string) (*models.User, error) {
-	var user *models.User
-	query := fmt.Sprintf("SELECT _id, email, email_verified_at, `password`, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, app_data, created_at, updated_at FROM %s.%s WHERE email = $1 LIMIT 1", p.scopeName, models.Collections.User)
+func (p *provider) GetUserByEmail(ctx context.Context, email string) (models.User, error) {
+	user := models.User{}
+	query := fmt.Sprintf("SELECT _id, email, email_verified_at, `password`, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, created_at, updated_at FROM %s.%s WHERE email = $1 LIMIT 1", p.scopeName, models.Collections.User)
 	q, err := p.db.Query(query, &gocb.QueryOptions{
 		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
 		Context:              ctx,
 		PositionalParameters: []interface{}{email},
 	})
+
 	if err != nil {
-		return nil, err
+		return user, err
 	}
 	err = q.One(&user)
 	if err != nil {
-		return nil, err
+		return user, err
 	}
+
 	return user, nil
 }

 // GetUserByID to get user information from database using user ID
-func (p *provider) GetUserByID(ctx context.Context, id string) (*models.User, error) {
-	var user *models.User
-	query := fmt.Sprintf("SELECT _id, email, email_verified_at, `password`, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, app_data, created_at, updated_at FROM %s.%s WHERE _id = $1 LIMIT 1", p.scopeName, models.Collections.User)
+func (p *provider) GetUserByID(ctx context.Context, id string) (models.User, error) {
+	user := models.User{}
+	query := fmt.Sprintf("SELECT _id, email, email_verified_at, `password`, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, created_at, updated_at FROM %s.%s WHERE _id = $1 LIMIT 1", p.scopeName, models.Collections.User)
 	q, err := p.db.Query(query, &gocb.QueryOptions{
 		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
 		Context:              ctx,
 		PositionalParameters: []interface{}{id},
 	})
 	if err != nil {
-		return nil, err
+		return user, err
 	}
 	err = q.One(&user)
 	if err != nil {
-		return nil, err
+		return user, err
 	}
+
 	return user, nil
 }

@ -155,8 +150,10 @@ func (p *provider) GetUserByID(ctx context.Context, id string) (*models.User, er
 func (p *provider) UpdateUsers(ctx context.Context, data map[string]interface{}, ids []string) error {
 	// set updated_at time for all users
 	data["updated_at"] = time.Now().Unix()
+
 	updateFields, params := GetSetFields(data)
-	if len(ids) > 0 {
+
+	if ids != nil && len(ids) > 0 {
 		for _, id := range ids {
 			params["id"] = id
 			userQuery := fmt.Sprintf("UPDATE %s.%s SET %s WHERE _id = $id", p.scopeName, models.Collections.User, updateFields)
@ -181,24 +178,26 @@ func (p *provider) UpdateUsers(ctx context.Context, data map[string]interface{},
 			return err
 		}
 	}
+
 	return nil
 }

 // GetUserByPhoneNumber to get user information from database using phone number
 func (p *provider) GetUserByPhoneNumber(ctx context.Context, phoneNumber string) (*models.User, error) {
 	var user *models.User
-	query := fmt.Sprintf("SELECT _id, email, email_verified_at, `password`, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, app_data, created_at, updated_at FROM %s.%s WHERE phone_number = $1 LIMIT 1", p.scopeName, models.Collections.User)
+	query := fmt.Sprintf("SELECT _id, email, email_verified_at, `password`, signup_methods, given_name, family_name, middle_name, nickname, birthdate, phone_number, phone_number_verified_at, picture, roles, revoked_timestamp, is_multi_factor_auth_enabled, created_at, updated_at FROM %s.%s WHERE phone_number = $1 LIMIT 1", p.scopeName, models.Collections.User)
 	q, err := p.db.Query(query, &gocb.QueryOptions{
 		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
 		Context:              ctx,
 		PositionalParameters: []interface{}{phoneNumber},
 	})
 	if err != nil {
-		return nil, err
+		return user, err
 	}
 	err = q.One(&user)
 	if err != nil {
-		return nil, err
+		return user, err
 	}
+
 	return user, nil
 }
--- a/server/db/providers/couchbase/verification_requests.go
+++ b/server/db/providers/couchbase/verification_requests.go
@ -13,10 +13,11 @@ import (
 )

 // AddVerification to save verification request in database
-func (p *provider) AddVerificationRequest(ctx context.Context, verificationRequest *models.VerificationRequest) (*models.VerificationRequest, error) {
+func (p *provider) AddVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) (models.VerificationRequest, error) {
 	if verificationRequest.ID == "" {
 		verificationRequest.ID = uuid.New().String()
 	}
+
 	verificationRequest.Key = verificationRequest.ID
 	verificationRequest.CreatedAt = time.Now().Unix()
 	verificationRequest.UpdatedAt = time.Now().Unix()
@ -25,14 +26,15 @@ func (p *provider) AddVerificationRequest(ctx context.Context, verificationReque
 	}
 	_, err := p.db.Collection(models.Collections.VerificationRequest).Insert(verificationRequest.ID, verificationRequest, &insertOpt)
 	if err != nil {
-		return nil, err
+		return verificationRequest, err
 	}
+
 	return verificationRequest, nil
 }

 // GetVerificationRequestByToken to get verification request from database using token
-func (p *provider) GetVerificationRequestByToken(ctx context.Context, token string) (*models.VerificationRequest, error) {
-	var verificationRequest *models.VerificationRequest
+func (p *provider) GetVerificationRequestByToken(ctx context.Context, token string) (models.VerificationRequest, error) {
+	verificationRequest := models.VerificationRequest{}
 	params := make(map[string]interface{}, 1)
 	params["token"] = token
 	query := fmt.Sprintf("SELECT _id, token, identifier, expires_at, email, nonce, redirect_uri, created_at, updated_at FROM %s.%s WHERE token=$1 LIMIT 1", p.scopeName, models.Collections.VerificationRequest)
@ -44,18 +46,18 @@ func (p *provider) GetVerificationRequestByToken(ctx context.Context, token stri
 	})

 	if err != nil {
-		return nil, err
+		return verificationRequest, err
 	}
 	err = queryResult.One(&verificationRequest)

 	if err != nil {
-		return nil, err
+		return verificationRequest, err
 	}
 	return verificationRequest, nil
 }

 // GetVerificationRequestByEmail to get verification request by email from database
-func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email string, identifier string) (*models.VerificationRequest, error) {
+func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email string, identifier string) (models.VerificationRequest, error) {

 	query := fmt.Sprintf("SELECT _id, identifier, token, expires_at, email, nonce, redirect_uri, created_at, updated_at FROM %s.%s WHERE email=$1 AND identifier=$2 LIMIT 1", p.scopeName, models.Collections.VerificationRequest)
 	queryResult, err := p.db.Query(query, &gocb.QueryOptions{
@ -63,32 +65,34 @@ func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email stri
 		PositionalParameters: []interface{}{email, identifier},
 		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
 	})
+	verificationRequest := models.VerificationRequest{}
+
 	if err != nil {
-		return nil, err
+		return verificationRequest, err
 	}
-	var verificationRequest *models.VerificationRequest
+
 	err = queryResult.One(&verificationRequest)
+
 	if err != nil {
-		return nil, err
+		return verificationRequest, err
 	}
 	return verificationRequest, nil
 }

 // ListVerificationRequests to get list of verification requests from database
-func (p *provider) ListVerificationRequests(ctx context.Context, pagination *model.Pagination) (*model.VerificationRequests, error) {
+func (p *provider) ListVerificationRequests(ctx context.Context, pagination model.Pagination) (*model.VerificationRequests, error) {
 	var verificationRequests []*model.VerificationRequest
 	paginationClone := pagination
-	total, err := p.GetTotalDocs(ctx, models.Collections.VerificationRequest)
-	if err != nil {
-		return nil, err
-	}
-	paginationClone.Total = total
+
+	_, paginationClone.Total = p.GetTotalDocs(ctx, models.Collections.VerificationRequest)
+
 	query := fmt.Sprintf("SELECT _id, env, created_at, updated_at FROM %s.%s OFFSET $1 LIMIT $2", p.scopeName, models.Collections.VerificationRequest)
 	queryResult, err := p.db.Query(query, &gocb.QueryOptions{
 		Context:              ctx,
 		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
 		PositionalParameters: []interface{}{paginationClone.Offset, paginationClone.Limit},
 	})
+
 	if err != nil {
 		return nil, err
 	}
@ -100,18 +104,19 @@ func (p *provider) ListVerificationRequests(ctx context.Context, pagination *mod
 		}
 		verificationRequests = append(verificationRequests, verificationRequest.AsAPIVerificationRequest())
 	}
+
 	if err := queryResult.Err(); err != nil {
 		return nil, err

 	}
 	return &model.VerificationRequests{
 		VerificationRequests: verificationRequests,
-		Pagination:           paginationClone,
+		Pagination:           &paginationClone,
 	}, nil
 }

 // DeleteVerificationRequest to delete verification request from database
-func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest *models.VerificationRequest) error {
+func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) error {
 	removeOpt := gocb.RemoveOptions{
 		Context: ctx,
 	}
--- a/server/db/providers/couchbase/webhook.go
+++ b/server/db/providers/couchbase/webhook.go
@ -15,32 +15,29 @@ import (
 )

 // AddWebhook to add webhook
-func (p *provider) AddWebhook(ctx context.Context, webhook *models.Webhook) (*model.Webhook, error) {
+func (p *provider) AddWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	if webhook.ID == "" {
 		webhook.ID = uuid.New().String()
 	}
+
 	webhook.Key = webhook.ID
 	webhook.CreatedAt = time.Now().Unix()
 	webhook.UpdatedAt = time.Now().Unix()
-	// Add timestamp to make event name unique for legacy version
-	webhook.EventName = fmt.Sprintf("%s-%d", webhook.EventName, time.Now().Unix())
+
 	insertOpt := gocb.InsertOptions{
 		Context: ctx,
 	}
 	_, err := p.db.Collection(models.Collections.Webhook).Insert(webhook.ID, webhook, &insertOpt)
 	if err != nil {
-		return nil, err
+		return webhook.AsAPIWebhook(), err
 	}
 	return webhook.AsAPIWebhook(), nil
 }

 // UpdateWebhook to update webhook
-func (p *provider) UpdateWebhook(ctx context.Context, webhook *models.Webhook) (*model.Webhook, error) {
+func (p *provider) UpdateWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	webhook.UpdatedAt = time.Now().Unix()
-	// Event is changed
-	if !strings.Contains(webhook.EventName, "-") {
-		webhook.EventName = fmt.Sprintf("%s-%d", webhook.EventName, time.Now().Unix())
-	}
+
 	bytes, err := json.Marshal(webhook)
 	if err != nil {
 		return nil, err
@ -53,13 +50,17 @@ func (p *provider) UpdateWebhook(ctx context.Context, webhook *models.Webhook) (
 	if err != nil {
 		return nil, err
 	}
+
 	updateFields, params := GetSetFields(webhookMap)
+
 	query := fmt.Sprintf(`UPDATE %s.%s SET %s WHERE _id='%s'`, p.scopeName, models.Collections.Webhook, updateFields, webhook.ID)
+
 	_, err = p.db.Query(query, &gocb.QueryOptions{
 		Context:         ctx,
 		ScanConsistency: gocb.QueryScanConsistencyRequestPlus,
 		NamedParameters: params,
 	})
+
 	if err != nil {
 		return nil, err
 	}
@ -68,23 +69,24 @@ func (p *provider) UpdateWebhook(ctx context.Context, webhook *models.Webhook) (
 }

 // ListWebhooks to list webhook
-func (p *provider) ListWebhook(ctx context.Context, pagination *model.Pagination) (*model.Webhooks, error) {
+func (p *provider) ListWebhook(ctx context.Context, pagination model.Pagination) (*model.Webhooks, error) {
 	webhooks := []*model.Webhook{}
 	paginationClone := pagination
+
 	params := make(map[string]interface{}, 1)
 	params["offset"] = paginationClone.Offset
 	params["limit"] = paginationClone.Limit
-	total, err := p.GetTotalDocs(ctx, models.Collections.Webhook)
-	if err != nil {
-		return nil, err
-	}
-	paginationClone.Total = total
-	query := fmt.Sprintf("SELECT _id, event_description, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s.%s OFFSET $offset LIMIT $limit", p.scopeName, models.Collections.Webhook)
+
+	query := fmt.Sprintf("SELECT _id, env, created_at, updated_at FROM %s.%s OFFSET $offset LIMIT $limit", p.scopeName, models.Collections.Webhook)
+
+	_, paginationClone.Total = p.GetTotalDocs(ctx, models.Collections.Webhook)
+
 	queryResult, err := p.db.Query(query, &gocb.QueryOptions{
 		Context:         ctx,
 		ScanConsistency: gocb.QueryScanConsistencyRequestPlus,
 		NamedParameters: params,
 	})
+
 	if err != nil {
 		return nil, err
 	}
@ -96,21 +98,25 @@ func (p *provider) ListWebhook(ctx context.Context, pagination *model.Pagination
 		}
 		webhooks = append(webhooks, webhook.AsAPIWebhook())
 	}
+
 	if err := queryResult.Err(); err != nil {
 		return nil, err
+
 	}
 	return &model.Webhooks{
-		Pagination: paginationClone,
+		Pagination: &paginationClone,
 		Webhooks:   webhooks,
 	}, nil
 }

 // GetWebhookByID to get webhook by id
 func (p *provider) GetWebhookByID(ctx context.Context, webhookID string) (*model.Webhook, error) {
-	var webhook *models.Webhook
+	var webhook models.Webhook
+
 	params := make(map[string]interface{}, 1)
 	params["_id"] = webhookID
-	query := fmt.Sprintf(`SELECT _id, event_description, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s.%s WHERE _id=$_id LIMIT 1`, p.scopeName, models.Collections.Webhook)
+
+	query := fmt.Sprintf(`SELECT _id, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s.%s WHERE _id=$_id LIMIT 1`, p.scopeName, models.Collections.Webhook)
 	q, err := p.db.Query(query, &gocb.QueryOptions{
 		Context:         ctx,
 		ScanConsistency: gocb.QueryScanConsistencyRequestPlus,
@ -120,51 +126,53 @@ func (p *provider) GetWebhookByID(ctx context.Context, webhookID string) (*model
 		return nil, err
 	}
 	err = q.One(&webhook)
+
 	if err != nil {
 		return nil, err
 	}
+
 	return webhook.AsAPIWebhook(), nil
 }

 // GetWebhookByEventName to get webhook by event_name
-func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string) ([]*model.Webhook, error) {
+func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string) (*model.Webhook, error) {
+	var webhook models.Webhook
 	params := make(map[string]interface{}, 1)
-	// params["event_name"] = eventName + "%"
-	query := fmt.Sprintf(`SELECT _id, event_description, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s.%s WHERE event_name LIKE '%s'`, p.scopeName, models.Collections.Webhook, eventName+"%")
-	queryResult, err := p.db.Query(query, &gocb.QueryOptions{
+	params["event_name"] = eventName
+
+	query := fmt.Sprintf(`SELECT _id, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s.%s WHERE event_name=$event_name LIMIT 1`, p.scopeName, models.Collections.Webhook)
+	q, err := p.db.Query(query, &gocb.QueryOptions{
 		Context:         ctx,
 		ScanConsistency: gocb.QueryScanConsistencyRequestPlus,
 		NamedParameters: params,
 	})
+
 	if err != nil {
 		return nil, err
 	}
-	webhooks := []*model.Webhook{}
-	for queryResult.Next() {
-		var webhook *models.Webhook
-		err := queryResult.Row(&webhook)
+	err = q.One(&webhook)
+
 	if err != nil {
-			log.Fatal(err)
-		}
-		webhooks = append(webhooks, webhook.AsAPIWebhook())
-	}
-	if err := queryResult.Err(); err != nil {
 		return nil, err
 	}
-	return webhooks, nil
+
+	return webhook.AsAPIWebhook(), nil
 }

 // DeleteWebhook to delete webhook
 func (p *provider) DeleteWebhook(ctx context.Context, webhook *model.Webhook) error {
+
 	params := make(map[string]interface{}, 1)
 	params["webhook_id"] = webhook.ID
 	removeOpt := gocb.RemoveOptions{
 		Context: ctx,
 	}
 	_, err := p.db.Collection(models.Collections.Webhook).Remove(webhook.ID, &removeOpt)
+
 	if err != nil {
 		return err
 	}
+
 	query := fmt.Sprintf(`DELETE FROM %s.%s WHERE webhook_id=$webhook_id`, p.scopeName, models.Collections.WebhookLog)
 	_, err = p.db.Query(query, &gocb.QueryOptions{
 		Context:         ctx,
@ -174,5 +182,6 @@ func (p *provider) DeleteWebhook(ctx context.Context, webhook *model.Webhook) er
 	if err != nil {
 		return err
 	}
+
 	return nil
 }
--- a/server/db/providers/couchbase/webhook_log.go
+++ b/server/db/providers/couchbase/webhook_log.go
@ -13,48 +13,53 @@ import (
 )

 // AddWebhookLog to add webhook log
-func (p *provider) AddWebhookLog(ctx context.Context, webhookLog *models.WebhookLog) (*model.WebhookLog, error) {
+func (p *provider) AddWebhookLog(ctx context.Context, webhookLog models.WebhookLog) (*model.WebhookLog, error) {
 	if webhookLog.ID == "" {
 		webhookLog.ID = uuid.New().String()
 	}
+
 	webhookLog.Key = webhookLog.ID
 	webhookLog.CreatedAt = time.Now().Unix()
 	webhookLog.UpdatedAt = time.Now().Unix()
+
 	insertOpt := gocb.InsertOptions{
 		Context: ctx,
 	}
 	_, err := p.db.Collection(models.Collections.WebhookLog).Insert(webhookLog.ID, webhookLog, &insertOpt)
 	if err != nil {
-		return nil, err
+		return webhookLog.AsAPIWebhookLog(), err
 	}
+
 	return webhookLog.AsAPIWebhookLog(), nil
 }

 // ListWebhookLogs to list webhook logs
-func (p *provider) ListWebhookLogs(ctx context.Context, pagination *model.Pagination, webhookID string) (*model.WebhookLogs, error) {
+func (p *provider) ListWebhookLogs(ctx context.Context, pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
 	var query string
 	var err error
+
 	webhookLogs := []*model.WebhookLog{}
 	params := make(map[string]interface{}, 1)
 	paginationClone := pagination
+
 	params["webhookID"] = webhookID
 	params["offset"] = paginationClone.Offset
 	params["limit"] = paginationClone.Limit
-	total, err := p.GetTotalDocs(ctx, models.Collections.WebhookLog)
-	if err != nil {
-		return nil, err
-	}
-	paginationClone.Total = total
+
+	_, paginationClone.Total = p.GetTotalDocs(ctx, models.Collections.WebhookLog)
+
 	if webhookID != "" {
 		query = fmt.Sprintf(`SELECT _id, http_status, response, request, webhook_id, created_at, updated_at FROM %s.%s WHERE webhook_id=$webhookID`, p.scopeName, models.Collections.WebhookLog)
 	} else {
 		query = fmt.Sprintf("SELECT _id, http_status, response, request, webhook_id, created_at, updated_at FROM %s.%s OFFSET $offset LIMIT $limit", p.scopeName, models.Collections.WebhookLog)
 	}
+
 	queryResult, err := p.db.Query(query, &gocb.QueryOptions{
 		Context:         ctx,
 		ScanConsistency: gocb.QueryScanConsistencyRequestPlus,
 		NamedParameters: params,
 	})
+
 	if err != nil {
 		return nil, err
 	}
@ -66,12 +71,13 @@ func (p *provider) ListWebhookLogs(ctx context.Context, pagination *model.Pagina
 		}
 		webhookLogs = append(webhookLogs, webhookLog.AsAPIWebhookLog())
 	}
+
 	if err := queryResult.Err(); err != nil {
 		return nil, err

 	}
 	return &model.WebhookLogs{
-		Pagination:  paginationClone,
+		Pagination:  &paginationClone,
 		WebhookLogs: webhookLogs,
 	}, nil
 }
--- a/server/db/providers/dynamodb/authenticator.go
+++ b/server/db/providers/dynamodb/authenticator.go
@ -1,57 +0,0 @@
-package dynamodb
-
-import (
-	"context"
-	"time"
-
-	"github.com/google/uuid"
-
-	"github.com/authorizerdev/authorizer/server/db/models"
-)
-
-func (p *provider) AddAuthenticator(ctx context.Context, authenticators *models.Authenticator) (*models.Authenticator, error) {
-	exists, _ := p.GetAuthenticatorDetailsByUserId(ctx, authenticators.UserID, authenticators.Method)
-	if exists != nil {
-		return authenticators, nil
-	}
-
-	collection := p.db.Table(models.Collections.Authenticators)
-	if authenticators.ID == "" {
-		authenticators.ID = uuid.New().String()
-	}
-
-	authenticators.CreatedAt = time.Now().Unix()
-	authenticators.UpdatedAt = time.Now().Unix()
-	err := collection.Put(authenticators).RunWithContext(ctx)
-	if err != nil {
-		return nil, err
-	}
-	return authenticators, nil
-}
-
-func (p *provider) UpdateAuthenticator(ctx context.Context, authenticators *models.Authenticator) (*models.Authenticator, error) {
-	collection := p.db.Table(models.Collections.Authenticators)
-	if authenticators.ID != "" {
-		authenticators.UpdatedAt = time.Now().Unix()
-		err := UpdateByHashKey(collection, "id", authenticators.ID, authenticators)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return authenticators, nil
-
-}
-
-func (p *provider) GetAuthenticatorDetailsByUserId(ctx context.Context, userId string, authenticatorType string) (*models.Authenticator, error) {
-	var authenticators *models.Authenticator
-	collection := p.db.Table(models.Collections.Authenticators)
-	iter := collection.Scan().Filter("'user_id' = ?", userId).Filter("'method' = ?", authenticatorType).Iter()
-	for iter.NextWithContext(ctx, &authenticators) {
-		return authenticators, nil
-	}
-	err := iter.Err()
-	if err != nil {
-		return nil, err
-	}
-	return authenticators, nil
-}
--- a/server/db/providers/dynamodb/email_template.go
+++ b/server/db/providers/dynamodb/email_template.go
@ -12,7 +12,7 @@ import (
 )

 // AddEmailTemplate to add EmailTemplate
-func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate *models.EmailTemplate) (*model.EmailTemplate, error) {
+func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate models.EmailTemplate) (*model.EmailTemplate, error) {
 	collection := p.db.Table(models.Collections.EmailTemplate)
 	if emailTemplate.ID == "" {
 		emailTemplate.ID = uuid.New().String()
@ -31,7 +31,7 @@ func (p *provider) AddEmailTemplate(ctx context.Context, emailTemplate *models.E
 }

 // UpdateEmailTemplate to update EmailTemplate
-func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate *models.EmailTemplate) (*model.EmailTemplate, error) {
+func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate models.EmailTemplate) (*model.EmailTemplate, error) {
 	collection := p.db.Table(models.Collections.EmailTemplate)
 	emailTemplate.UpdatedAt = time.Now().Unix()
 	err := UpdateByHashKey(collection, "id", emailTemplate.ID, emailTemplate)
@ -42,19 +42,23 @@ func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate *model
 }

 // ListEmailTemplates to list EmailTemplate
-func (p *provider) ListEmailTemplate(ctx context.Context, pagination *model.Pagination) (*model.EmailTemplates, error) {
-	var emailTemplate *models.EmailTemplate
+func (p *provider) ListEmailTemplate(ctx context.Context, pagination model.Pagination) (*model.EmailTemplates, error) {
+
+	var emailTemplate models.EmailTemplate
 	var iter dynamo.PagingIter
 	var lastEval dynamo.PagingKey
 	var iteration int64 = 0
+
 	collection := p.db.Table(models.Collections.EmailTemplate)
 	emailTemplates := []*model.EmailTemplate{}
 	paginationClone := pagination
 	scanner := collection.Scan()
 	count, err := scanner.Count()
+
 	if err != nil {
 		return nil, err
 	}
+
 	for (paginationClone.Offset + paginationClone.Limit) > iteration {
 		iter = scanner.StartFrom(lastEval).Limit(paginationClone.Limit).Iter()
 		for iter.NextWithContext(ctx, &emailTemplate) {
@ -65,9 +69,11 @@ func (p *provider) ListEmailTemplate(ctx context.Context, pagination *model.Pagi
 		lastEval = iter.LastEvaluatedKey()
 		iteration += paginationClone.Limit
 	}
+
 	paginationClone.Total = count
+
 	return &model.EmailTemplates{
-		Pagination:     paginationClone,
+		Pagination:     &paginationClone,
 		EmailTemplates: emailTemplates,
 	}, nil
 }
@ -75,7 +81,7 @@ func (p *provider) ListEmailTemplate(ctx context.Context, pagination *model.Pagi
 // GetEmailTemplateByID to get EmailTemplate by id
 func (p *provider) GetEmailTemplateByID(ctx context.Context, emailTemplateID string) (*model.EmailTemplate, error) {
 	collection := p.db.Table(models.Collections.EmailTemplate)
-	var emailTemplate *models.EmailTemplate
+	var emailTemplate models.EmailTemplate
 	err := collection.Get("id", emailTemplateID).OneWithContext(ctx, &emailTemplate)
 	if err != nil {
 		return nil, err
@ -86,8 +92,9 @@ func (p *provider) GetEmailTemplateByID(ctx context.Context, emailTemplateID str
 // GetEmailTemplateByEventName to get EmailTemplate by event_name
 func (p *provider) GetEmailTemplateByEventName(ctx context.Context, eventName string) (*model.EmailTemplate, error) {
 	collection := p.db.Table(models.Collections.EmailTemplate)
-	var emailTemplates []*models.EmailTemplate
-	var emailTemplate *models.EmailTemplate
+	var emailTemplates []models.EmailTemplate
+	var emailTemplate models.EmailTemplate
+
 	err := collection.Scan().Index("event_name").Filter("'event_name' = ?", eventName).Limit(1).AllWithContext(ctx, &emailTemplates)
 	if err != nil {
 		return nil, err
@ -105,6 +112,7 @@ func (p *provider) GetEmailTemplateByEventName(ctx context.Context, eventName st
 func (p *provider) DeleteEmailTemplate(ctx context.Context, emailTemplate *model.EmailTemplate) error {
 	collection := p.db.Table(models.Collections.EmailTemplate)
 	err := collection.Delete("id", emailTemplate.ID).RunWithContext(ctx)
+
 	if err != nil {
 		return err
 	}
--- a/server/db/providers/dynamodb/env.go
+++ b/server/db/providers/dynamodb/env.go
@ -11,48 +11,61 @@ import (
 )

 // AddEnv to save environment information in database
-func (p *provider) AddEnv(ctx context.Context, env *models.Env) (*models.Env, error) {
+func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	collection := p.db.Table(models.Collections.Env)
+
 	if env.ID == "" {
 		env.ID = uuid.New().String()
 	}
+
 	env.Key = env.ID
+
 	env.CreatedAt = time.Now().Unix()
 	env.UpdatedAt = time.Now().Unix()
+
 	err := collection.Put(env).RunWithContext(ctx)
+
 	if err != nil {
-		return nil, err
+		return env, err
 	}
+
 	return env, nil
 }

 // UpdateEnv to update environment information in database
-func (p *provider) UpdateEnv(ctx context.Context, env *models.Env) (*models.Env, error) {
+func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, error) {
 	collection := p.db.Table(models.Collections.Env)
 	env.UpdatedAt = time.Now().Unix()
+
 	err := UpdateByHashKey(collection, "id", env.ID, env)
+
 	if err != nil {
-		return nil, err
+		return env, err
 	}
 	return env, nil
 }

 // GetEnv to get environment information from database
-func (p *provider) GetEnv(ctx context.Context) (*models.Env, error) {
-	var env *models.Env
+func (p *provider) GetEnv(ctx context.Context) (models.Env, error) {
+	var env models.Env
+
 	collection := p.db.Table(models.Collections.Env)
 	// As there is no Findone supported.
 	iter := collection.Scan().Limit(1).Iter()
+
 	for iter.NextWithContext(ctx, &env) {
-		if env == nil {
-			return nil, errors.New("no documets found")
+		if env.ID == "" {
+			return env, errors.New("no documets found")
 		} else {
 			return env, nil
 		}
 	}
+
 	err := iter.Err()
+
 	if err != nil {
 		return env, fmt.Errorf("config not found")
 	}
+
 	return env, nil
 }
--- a/server/db/providers/dynamodb/otp.go
+++ b/server/db/providers/dynamodb/otp.go
@ -11,20 +11,7 @@ import (

 // UpsertOTP to add or update otp
 func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models.OTP, error) {
-	// check if email or phone number is present
-	if otpParam.Email == "" && otpParam.PhoneNumber == "" {
-		return nil, errors.New("email or phone_number is required")
-	}
-	uniqueField := models.FieldNameEmail
-	if otpParam.Email == "" && otpParam.PhoneNumber != "" {
-		uniqueField = models.FieldNamePhoneNumber
-	}
-	var otp *models.OTP
-	if uniqueField == models.FieldNameEmail {
-		otp, _ = p.GetOTPByEmail(ctx, otpParam.Email)
-	} else {
-		otp, _ = p.GetOTPByPhoneNumber(ctx, otpParam.PhoneNumber)
-	}
+	otp, _ := p.GetOTPByEmail(ctx, otpParam.Email)
 	shouldCreate := false
 	if otp == nil {
 		id := uuid.NewString()
@ -33,7 +20,6 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 			Key:       id,
 			Otp:       otpParam.Otp,
 			Email:     otpParam.Email,
-			PhoneNumber: otpParam.PhoneNumber,
 			ExpiresAt: otpParam.ExpiresAt,
 			CreatedAt: time.Now().Unix(),
 		}
@ -42,8 +28,10 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 		otp.Otp = otpParam.Otp
 		otp.ExpiresAt = otpParam.ExpiresAt
 	}
+
 	collection := p.db.Table(models.Collections.OTP)
 	otp.UpdatedAt = time.Now().Unix()
+
 	var err error
 	if shouldCreate {
 		err = collection.Put(otp).RunWithContext(ctx)
@ -53,6 +41,7 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 	if err != nil {
 		return nil, err
 	}
+
 	return otp, nil
 }

@ -60,42 +49,32 @@ func (p *provider) UpsertOTP(ctx context.Context, otpParam *models.OTP) (*models
 func (p *provider) GetOTPByEmail(ctx context.Context, emailAddress string) (*models.OTP, error) {
 	var otps []models.OTP
 	var otp models.OTP
-	collection := p.db.Table(models.Collections.OTP)
-	err := collection.Scan().Index("email").Filter("'email' = ?", emailAddress).Limit(1).AllWithContext(ctx, &otps)
-	if err != nil {
-		return nil, err
-	}
-	if len(otps) > 0 {
-		otp = otps[0]
-		return &otp, nil
-	}
-	return nil, errors.New("no docuemnt found")
-}

-// GetOTPByPhoneNumber to get otp for a given phone number
-func (p *provider) GetOTPByPhoneNumber(ctx context.Context, phoneNumber string) (*models.OTP, error) {
-	var otps []models.OTP
-	var otp models.OTP
 	collection := p.db.Table(models.Collections.OTP)
-	err := collection.Scan().Filter("'phone_number' = ?", phoneNumber).Limit(1).AllWithContext(ctx, &otps)
+
+	err := collection.Scan().Index("email").Filter("'email' = ?", emailAddress).Limit(1).AllWithContext(ctx, &otps)
+
 	if err != nil {
 		return nil, err
 	}
 	if len(otps) > 0 {
 		otp = otps[0]
 		return &otp, nil
-	}
+	} else {
 		return nil, errors.New("no docuemnt found")
 	}
+}

 // DeleteOTP to delete otp
 func (p *provider) DeleteOTP(ctx context.Context, otp *models.OTP) error {
 	collection := p.db.Table(models.Collections.OTP)
+
 	if otp.ID != "" {
 		err := collection.Delete("id", otp.ID).RunWithContext(ctx)
 		if err != nil {
 			return err
 		}
 	}
+
 	return nil
 }
--- a/server/db/providers/dynamodb/provider.go
+++ b/server/db/providers/dynamodb/provider.go
@ -31,19 +31,21 @@ func NewProvider() (*provider, error) {
 	if awsRegion != "" {
 		config.Region = aws.String(awsRegion)
 	}
+
 	// custom awsAccessKeyID, awsSecretAccessKey took first priority, if not then fetch config from aws credentials
 	if awsAccessKeyID != "" && awsSecretAccessKey != "" {
 		config.Credentials = credentials.NewStaticCredentials(awsAccessKeyID, awsSecretAccessKey, "")
 	} else if dbURL != "" {
-		log.Debug("Tring to use database url for dynamodb")
 		// static config in case of testing or local-setup
 		config.Credentials = credentials.NewStaticCredentials("key", "key", "")
 		config.Endpoint = aws.String(dbURL)
 	} else {
 		log.Debugf("%s or %s or %s not found. Trying to load default credentials from aws config", constants.EnvAwsRegion, constants.EnvAwsAccessKeyID, constants.EnvAwsSecretAccessKey)
 	}
+
 	session := session.Must(session.NewSession(&config))
 	db := dynamo.New(session)
+
 	db.CreateTable(models.Collections.User, models.User{}).Wait()
 	db.CreateTable(models.Collections.Session, models.Session{}).Wait()
 	db.CreateTable(models.Collections.EmailTemplate, models.EmailTemplate{}).Wait()
@ -52,7 +54,7 @@ func NewProvider() (*provider, error) {
 	db.CreateTable(models.Collections.VerificationRequest, models.VerificationRequest{}).Wait()
 	db.CreateTable(models.Collections.Webhook, models.Webhook{}).Wait()
 	db.CreateTable(models.Collections.WebhookLog, models.WebhookLog{}).Wait()
-	db.CreateTable(models.Collections.Authenticators, models.Authenticator{}).Wait()
+
 	return &provider{
 		db: db,
 	}, nil
--- a/server/db/providers/dynamodb/session.go
+++ b/server/db/providers/dynamodb/session.go
@ -9,11 +9,13 @@ import (
 )

 // AddSession to save session information in database
-func (p *provider) AddSession(ctx context.Context, session *models.Session) error {
+func (p *provider) AddSession(ctx context.Context, session models.Session) error {
 	collection := p.db.Table(models.Collections.Session)
+
 	if session.ID == "" {
 		session.ID = uuid.New().String()
 	}
+
 	session.CreatedAt = time.Now().Unix()
 	session.UpdatedAt = time.Now().Unix()
 	err := collection.Put(session).RunWithContext(ctx)
--- a/server/db/providers/dynamodb/shared.go
+++ b/server/db/providers/dynamodb/shared.go
@ -9,13 +9,16 @@ import (
 func UpdateByHashKey(table dynamo.Table, hashKey string, hashValue string, item interface{}) error {
 	existingValue, err := dynamo.MarshalItem(item)
 	var i interface{}
+
 	if err != nil {
 		return err
 	}
+
 	nullableValue, err := dynamodbattribute.MarshalMap(item)
 	if err != nil {
 		return err
 	}
+
 	u := table.Update(hashKey, hashValue)
 	for k, v := range existingValue {
 		if k == hashKey {
@ -23,6 +26,7 @@ func UpdateByHashKey(table dynamo.Table, hashKey string, hashValue string, item
 		}
 		u = u.Set(k, v)
 	}
+
 	for k, v := range nullableValue {
 		if k == hashKey {
 			continue
@ -32,9 +36,11 @@ func UpdateByHashKey(table dynamo.Table, hashKey string, hashValue string, item
 			u = u.SetNullable(k, v)
 		}
 	}
+
 	err = u.Run()
 	if err != nil {
 		return err
 	}
+
 	return nil
 }
--- a/server/db/providers/dynamodb/user.go
+++ b/server/db/providers/dynamodb/user.go
@ -18,59 +18,72 @@ import (
 )

 // AddUser to save user information in database
-func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User, error) {
+func (p *provider) AddUser(ctx context.Context, user models.User) (models.User, error) {
 	collection := p.db.Table(models.Collections.User)
+
 	if user.ID == "" {
 		user.ID = uuid.New().String()
 	}
+
 	if user.Roles == "" {
 		defaultRoles, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyDefaultRoles)
 		if err != nil {
-			return nil, err
+			return user, err
 		}
 		user.Roles = defaultRoles
 	}
+
 	if user.PhoneNumber != nil && strings.TrimSpace(refs.StringValue(user.PhoneNumber)) != "" {
-		if u, _ := p.GetUserByPhoneNumber(ctx, refs.StringValue(user.PhoneNumber)); u != nil && u.ID != user.ID {
+		if u, _ := p.GetUserByPhoneNumber(ctx, refs.StringValue(user.PhoneNumber)); u != nil {
 			return user, fmt.Errorf("user with given phone number already exists")
 		}
-	} else if user.Email != nil && strings.TrimSpace(refs.StringValue(user.Email)) != "" {
-		if u, _ := p.GetUserByEmail(ctx, refs.StringValue(user.Email)); u != nil && u.ID != user.ID {
-			return user, fmt.Errorf("user with given email already exists")
-		}
 	}
+
 	user.CreatedAt = time.Now().Unix()
 	user.UpdatedAt = time.Now().Unix()
+
 	err := collection.Put(user).RunWithContext(ctx)
+
 	if err != nil {
-		return nil, err
+		return user, err
 	}
 	return user, nil
 }

 // UpdateUser to update user information in database
-func (p *provider) UpdateUser(ctx context.Context, user *models.User) (*models.User, error) {
+func (p *provider) UpdateUser(ctx context.Context, user models.User) (models.User, error) {
 	collection := p.db.Table(models.Collections.User)
+
 	if user.ID != "" {
+
 		user.UpdatedAt = time.Now().Unix()
+
 		err := UpdateByHashKey(collection, "id", user.ID, user)
 		if err != nil {
-			return nil, err
+			return user, err
 		}
+
+		if err != nil {
+			return user, err
+		}
+
 	}
 	return user, nil
 }

 // DeleteUser to delete user information from database
-func (p *provider) DeleteUser(ctx context.Context, user *models.User) error {
+func (p *provider) DeleteUser(ctx context.Context, user models.User) error {
 	collection := p.db.Table(models.Collections.User)
 	sessionCollection := p.db.Table(models.Collections.Session)
+
 	if user.ID != "" {
 		err := collection.Delete("id", user.ID).Run()
 		if err != nil {
 			return err
 		}
+
 		_, err = sessionCollection.Batch("id").Write().Delete(dynamo.Keys{"user_id", user.ID}).RunWithContext(ctx)
+
 		if err != nil {
 			return err
 		}
@ -79,19 +92,23 @@ func (p *provider) DeleteUser(ctx context.Context, user *models.User) error {
 }

 // ListUsers to get list of users from database
-func (p *provider) ListUsers(ctx context.Context, pagination *model.Pagination) (*model.Users, error) {
-	var user *models.User
+func (p *provider) ListUsers(ctx context.Context, pagination model.Pagination) (*model.Users, error) {
+	var user models.User
 	var lastEval dynamo.PagingKey
 	var iter dynamo.PagingIter
 	var iteration int64 = 0
+
 	collection := p.db.Table(models.Collections.User)
 	users := []*model.User{}
+
 	paginationClone := pagination
 	scanner := collection.Scan()
 	count, err := scanner.Count()
+
 	if err != nil {
 		return nil, err
 	}
+
 	for (paginationClone.Offset + paginationClone.Limit) > iteration {
 		iter = scanner.StartFrom(lastEval).Limit(paginationClone.Limit).Iter()
 		for iter.NextWithContext(ctx, &user) {
@ -102,42 +119,51 @@ func (p *provider) ListUsers(ctx context.Context, pagination *model.Pagination)
 		lastEval = iter.LastEvaluatedKey()
 		iteration += paginationClone.Limit
 	}
+
 	err = iter.Err()
+
 	if err != nil {
 		return nil, err
 	}
+
 	paginationClone.Total = count
+
 	return &model.Users{
-		Pagination: paginationClone,
+		Pagination: &paginationClone,
 		Users:      users,
 	}, nil
 }

 // GetUserByEmail to get user information from database using email address
-func (p *provider) GetUserByEmail(ctx context.Context, email string) (*models.User, error) {
-	var users []*models.User
-	var user *models.User
+func (p *provider) GetUserByEmail(ctx context.Context, email string) (models.User, error) {
+	var users []models.User
+	var user models.User
+
 	collection := p.db.Table(models.Collections.User)
 	err := collection.Scan().Index("email").Filter("'email' = ?", email).AllWithContext(ctx, &users)
+
 	if err != nil {
 		return user, nil
 	}
+
 	if len(users) > 0 {
 		user = users[0]
 		return user, nil
 	} else {
-		return nil, errors.New("no record found")
+		return user, errors.New("no record found")
 	}
+
 }

 // GetUserByID to get user information from database using user ID
-func (p *provider) GetUserByID(ctx context.Context, id string) (*models.User, error) {
+func (p *provider) GetUserByID(ctx context.Context, id string) (models.User, error) {
 	collection := p.db.Table(models.Collections.User)
-	var user *models.User
+	var user models.User
 	err := collection.Get("id", id).OneWithContext(ctx, &user)
+
 	if err != nil {
-		if refs.StringValue(user.Email) == "" {
-			return nil, errors.New("no documets found")
+		if user.Email == "" {
+			return user, errors.New("no documets found")
 		} else {
 			return user, nil
 		}
@ -160,6 +186,7 @@ func (p *provider) UpdateUsers(ctx context.Context, data map[string]interface{},
 	} else {
 		// as there is no facility to update all doc - https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/SQLtoNoSQL.UpdateData.html
 		userCollection.Scan().All(&allUsers)
+
 		for _, user := range allUsers {
 			err = UpdateByHashKey(userCollection, "id", user.ID, data)
 			if err == nil {
@ -167,6 +194,7 @@ func (p *provider) UpdateUsers(ctx context.Context, data map[string]interface{},
 			}
 		}
 	}
+
 	if err != nil {
 		return err
 	} else {
@ -177,16 +205,19 @@ func (p *provider) UpdateUsers(ctx context.Context, data map[string]interface{},

 // GetUserByPhoneNumber to get user information from database using phone number
 func (p *provider) GetUserByPhoneNumber(ctx context.Context, phoneNumber string) (*models.User, error) {
-	var users []*models.User
-	var user *models.User
+	var users []models.User
+	var user models.User
+
 	collection := p.db.Table(models.Collections.User)
 	err := collection.Scan().Filter("'phone_number' = ?", phoneNumber).AllWithContext(ctx, &users)
+
 	if err != nil {
 		return nil, err
 	}
+
 	if len(users) > 0 {
 		user = users[0]
-		return user, nil
+		return &user, nil
 	} else {
 		return nil, errors.New("no record found")
 	}
--- a/server/db/providers/dynamodb/verification_requests.go
+++ b/server/db/providers/dynamodb/verification_requests.go
@ -11,64 +11,73 @@ import (
 )

 // AddVerification to save verification request in database
-func (p *provider) AddVerificationRequest(ctx context.Context, verificationRequest *models.VerificationRequest) (*models.VerificationRequest, error) {
+func (p *provider) AddVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) (models.VerificationRequest, error) {
 	collection := p.db.Table(models.Collections.VerificationRequest)
+
 	if verificationRequest.ID == "" {
 		verificationRequest.ID = uuid.New().String()
 		verificationRequest.CreatedAt = time.Now().Unix()
 		verificationRequest.UpdatedAt = time.Now().Unix()
 		err := collection.Put(verificationRequest).RunWithContext(ctx)
 		if err != nil {
-			return nil, err
+			return verificationRequest, err
 		}
 	}
+
 	return verificationRequest, nil
 }

 // GetVerificationRequestByToken to get verification request from database using token
-func (p *provider) GetVerificationRequestByToken(ctx context.Context, token string) (*models.VerificationRequest, error) {
+func (p *provider) GetVerificationRequestByToken(ctx context.Context, token string) (models.VerificationRequest, error) {
 	collection := p.db.Table(models.Collections.VerificationRequest)
-	var verificationRequest *models.VerificationRequest
+	var verificationRequest models.VerificationRequest
+
 	iter := collection.Scan().Filter("'token' = ?", token).Iter()
 	for iter.NextWithContext(ctx, &verificationRequest) {
 		return verificationRequest, nil
 	}
+
 	err := iter.Err()
 	if err != nil {
-		return nil, err
+		return verificationRequest, err
 	}
 	return verificationRequest, nil
 }

 // GetVerificationRequestByEmail to get verification request by email from database
-func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email string, identifier string) (*models.VerificationRequest, error) {
-	var verificationRequest *models.VerificationRequest
+func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email string, identifier string) (models.VerificationRequest, error) {
+	var verificationRequest models.VerificationRequest
 	collection := p.db.Table(models.Collections.VerificationRequest)
 	iter := collection.Scan().Filter("'email' = ?", email).Filter("'identifier' = ?", identifier).Iter()
 	for iter.NextWithContext(ctx, &verificationRequest) {
 		return verificationRequest, nil
 	}
+
 	err := iter.Err()
 	if err != nil {
-		return nil, err
+		return verificationRequest, err
 	}
 	return verificationRequest, nil
 }

 // ListVerificationRequests to get list of verification requests from database
-func (p *provider) ListVerificationRequests(ctx context.Context, pagination *model.Pagination) (*model.VerificationRequests, error) {
+func (p *provider) ListVerificationRequests(ctx context.Context, pagination model.Pagination) (*model.VerificationRequests, error) {
 	verificationRequests := []*model.VerificationRequest{}
-	var verificationRequest *models.VerificationRequest
+	var verificationRequest models.VerificationRequest
 	var lastEval dynamo.PagingKey
 	var iter dynamo.PagingIter
 	var iteration int64 = 0
+
 	collection := p.db.Table(models.Collections.VerificationRequest)
 	paginationClone := pagination
+
 	scanner := collection.Scan()
 	count, err := scanner.Count()
+
 	if err != nil {
 		return nil, err
 	}
+
 	for (paginationClone.Offset + paginationClone.Limit) > iteration {
 		iter = scanner.StartFrom(lastEval).Limit(paginationClone.Limit).Iter()
 		for iter.NextWithContext(ctx, &verificationRequest) {
@ -83,17 +92,20 @@ func (p *provider) ListVerificationRequests(ctx context.Context, pagination *mod
 		lastEval = iter.LastEvaluatedKey()
 		iteration += paginationClone.Limit
 	}
+
 	paginationClone.Total = count
+
 	return &model.VerificationRequests{
 		VerificationRequests: verificationRequests,
-		Pagination:           paginationClone,
+		Pagination:           &paginationClone,
 	}, nil
 }

 // DeleteVerificationRequest to delete verification request from database
-func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest *models.VerificationRequest) error {
+func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) error {
 	collection := p.db.Table(models.Collections.VerificationRequest)
-	if verificationRequest != nil {
+
+	if verificationRequest.ID != "" {
 		err := collection.Delete("id", verificationRequest.ID).RunWithContext(ctx)

 		if err != nil {
--- a/server/db/providers/dynamodb/webhook.go
+++ b/server/db/providers/dynamodb/webhook.go
@ -3,29 +3,28 @@ package dynamodb
 import (
 	"context"
 	"errors"
-	"fmt"
-	"strings"
 	"time"

-	"github.com/google/uuid"
-	"github.com/guregu/dynamo"
-
 	"github.com/authorizerdev/authorizer/server/db/models"
 	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/google/uuid"
+	"github.com/guregu/dynamo"
 )

 // AddWebhook to add webhook
-func (p *provider) AddWebhook(ctx context.Context, webhook *models.Webhook) (*model.Webhook, error) {
+func (p *provider) AddWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	collection := p.db.Table(models.Collections.Webhook)
+
 	if webhook.ID == "" {
 		webhook.ID = uuid.New().String()
 	}
+
 	webhook.Key = webhook.ID
 	webhook.CreatedAt = time.Now().Unix()
 	webhook.UpdatedAt = time.Now().Unix()
-	// Add timestamp to make event name unique for legacy version
-	webhook.EventName = fmt.Sprintf("%s-%d", webhook.EventName, time.Now().Unix())
+
 	err := collection.Put(webhook).RunWithContext(ctx)
+
 	if err != nil {
 		return nil, err
 	}
@ -33,14 +32,12 @@ func (p *provider) AddWebhook(ctx context.Context, webhook *models.Webhook) (*mo
 }

 // UpdateWebhook to update webhook
-func (p *provider) UpdateWebhook(ctx context.Context, webhook *models.Webhook) (*model.Webhook, error) {
-	webhook.UpdatedAt = time.Now().Unix()
-	// Event is changed
-	if !strings.Contains(webhook.EventName, "-") {
-		webhook.EventName = fmt.Sprintf("%s-%d", webhook.EventName, time.Now().Unix())
-	}
+func (p *provider) UpdateWebhook(ctx context.Context, webhook models.Webhook) (*model.Webhook, error) {
 	collection := p.db.Table(models.Collections.Webhook)
+
+	webhook.UpdatedAt = time.Now().Unix()
 	err := UpdateByHashKey(collection, "id", webhook.ID, webhook)
+
 	if err != nil {
 		return nil, err
 	}
@ -48,19 +45,22 @@ func (p *provider) UpdateWebhook(ctx context.Context, webhook *models.Webhook) (
 }

 // ListWebhooks to list webhook
-func (p *provider) ListWebhook(ctx context.Context, pagination *model.Pagination) (*model.Webhooks, error) {
+func (p *provider) ListWebhook(ctx context.Context, pagination model.Pagination) (*model.Webhooks, error) {
 	webhooks := []*model.Webhook{}
-	var webhook *models.Webhook
+	var webhook models.Webhook
 	var lastEval dynamo.PagingKey
 	var iter dynamo.PagingIter
 	var iteration int64 = 0
+
 	collection := p.db.Table(models.Collections.Webhook)
 	paginationClone := pagination
 	scanner := collection.Scan()
 	count, err := scanner.Count()
+
 	if err != nil {
 		return nil, err
 	}
+
 	for (paginationClone.Offset + paginationClone.Limit) > iteration {
 		iter = scanner.StartFrom(lastEval).Limit(paginationClone.Limit).Iter()
 		for iter.NextWithContext(ctx, &webhook) {
@ -75,9 +75,11 @@ func (p *provider) ListWebhook(ctx context.Context, pagination *model.Pagination
 		lastEval = iter.LastEvaluatedKey()
 		iteration += paginationClone.Limit
 	}
+
 	paginationClone.Total = count
+
 	return &model.Webhooks{
-		Pagination: paginationClone,
+		Pagination: &paginationClone,
 		Webhooks:   webhooks,
 	}, nil
 }
@ -85,44 +87,53 @@ func (p *provider) ListWebhook(ctx context.Context, pagination *model.Pagination
 // GetWebhookByID to get webhook by id
 func (p *provider) GetWebhookByID(ctx context.Context, webhookID string) (*model.Webhook, error) {
 	collection := p.db.Table(models.Collections.Webhook)
-	var webhook *models.Webhook
+	var webhook models.Webhook
+
 	err := collection.Get("id", webhookID).OneWithContext(ctx, &webhook)
+
 	if err != nil {
 		return nil, err
 	}
+
 	if webhook.ID == "" {
-		return nil, errors.New("no documets found")
+		return webhook.AsAPIWebhook(), errors.New("no documets found")
 	}
+
 	return webhook.AsAPIWebhook(), nil
 }

 // GetWebhookByEventName to get webhook by event_name
-func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string) ([]*model.Webhook, error) {
-	webhooks := []models.Webhook{}
+func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string) (*model.Webhook, error) {
+	var webhook models.Webhook
 	collection := p.db.Table(models.Collections.Webhook)
-	err := collection.Scan().Index("event_name").Filter("contains(event_name, ?)", eventName).AllWithContext(ctx, &webhooks)
+
+	iter := collection.Scan().Index("event_name").Filter("'event_name' = ?", eventName).Iter()
+
+	for iter.NextWithContext(ctx, &webhook) {
+		return webhook.AsAPIWebhook(), nil
+	}
+
+	err := iter.Err()
+
 	if err != nil {
-		return nil, err
+		return webhook.AsAPIWebhook(), err
 	}
-	resWebhooks := []*model.Webhook{}
-	for _, w := range webhooks {
-		resWebhooks = append(resWebhooks, w.AsAPIWebhook())
-	}
-	return resWebhooks, nil
+	return webhook.AsAPIWebhook(), nil
 }

 // DeleteWebhook to delete webhook
 func (p *provider) DeleteWebhook(ctx context.Context, webhook *model.Webhook) error {
 	// Also delete webhook logs for given webhook id
-	if webhook != nil {
+	if webhook.ID != "" {
 		webhookCollection := p.db.Table(models.Collections.Webhook)
+		pagination := model.Pagination{}
 		webhookLogCollection := p.db.Table(models.Collections.WebhookLog)
 		err := webhookCollection.Delete("id", webhook.ID).RunWithContext(ctx)
 		if err != nil {
 			return err
 		}
-		pagination := &model.Pagination{}
 		webhookLogs, errIs := p.ListWebhookLogs(ctx, pagination, webhook.ID)
+
 		for _, webhookLog := range webhookLogs.WebhookLogs {
 			err = webhookLogCollection.Delete("id", webhookLog.ID).RunWithContext(ctx)
 			if err != nil {
--- a/server/db/providers/dynamodb/webhook_log.go
+++ b/server/db/providers/dynamodb/webhook_log.go
@ -11,15 +11,18 @@ import (
 )

 // AddWebhookLog to add webhook log
-func (p *provider) AddWebhookLog(ctx context.Context, webhookLog *models.WebhookLog) (*model.WebhookLog, error) {
+func (p *provider) AddWebhookLog(ctx context.Context, webhookLog models.WebhookLog) (*model.WebhookLog, error) {
 	collection := p.db.Table(models.Collections.WebhookLog)
+
 	if webhookLog.ID == "" {
 		webhookLog.ID = uuid.New().String()
 	}
+
 	webhookLog.Key = webhookLog.ID
 	webhookLog.CreatedAt = time.Now().Unix()
 	webhookLog.UpdatedAt = time.Now().Unix()
 	err := collection.Put(webhookLog).RunWithContext(ctx)
+
 	if err != nil {
 		return nil, err
 	}
@ -27,9 +30,9 @@ func (p *provider) AddWebhookLog(ctx context.Context, webhookLog *models.Webhook
 }

 // ListWebhookLogs to list webhook logs
-func (p *provider) ListWebhookLogs(ctx context.Context, pagination *model.Pagination, webhookID string) (*model.WebhookLogs, error) {
+func (p *provider) ListWebhookLogs(ctx context.Context, pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
 	webhookLogs := []*model.WebhookLog{}
-	var webhookLog *models.WebhookLog
+	var webhookLog models.WebhookLog
 	var lastEval dynamo.PagingKey
 	var iter dynamo.PagingIter
 	var iteration int64 = 0
@ -39,6 +42,7 @@ func (p *provider) ListWebhookLogs(ctx context.Context, pagination *model.Pagina
 	collection := p.db.Table(models.Collections.WebhookLog)
 	paginationClone := pagination
 	scanner := collection.Scan()
+
 	if webhookID != "" {
 		iter = scanner.Index("webhook_id").Filter("'webhook_id' = ?", webhookID).Iter()
 		for iter.NextWithContext(ctx, &webhookLog) {
@ -64,10 +68,11 @@ func (p *provider) ListWebhookLogs(ctx context.Context, pagination *model.Pagina
 			iteration += paginationClone.Limit
 		}
 	}
+
 	paginationClone.Total = count
 	// paginationClone.Cursor = iter.LastEvaluatedKey()
 	return &model.WebhookLogs{
-		Pagination:  paginationClone,
+		Pagination:  &paginationClone,
 		WebhookLogs: webhookLogs,
 	}, nil
 }
--- a/server/db/providers/mongodb/authenticator.go
+++ b/server/db/providers/mongodb/authenticator.go
@ -1,52 +0,0 @@
-package mongodb
-
-import (
-	"context"
-	"time"
-
-	"github.com/google/uuid"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo/options"
-
-	"github.com/authorizerdev/authorizer/server/db/models"
-)
-
-func (p *provider) AddAuthenticator(ctx context.Context, authenticators *models.Authenticator) (*models.Authenticator, error) {
-	exists, _ := p.GetAuthenticatorDetailsByUserId(ctx, authenticators.UserID, authenticators.Method)
-	if exists != nil {
-		return authenticators, nil
-	}
-
-	if authenticators.ID == "" {
-		authenticators.ID = uuid.New().String()
-	}
-	authenticators.CreatedAt = time.Now().Unix()
-	authenticators.UpdatedAt = time.Now().Unix()
-	authenticators.Key = authenticators.ID
-	authenticatorsCollection := p.db.Collection(models.Collections.Authenticators, options.Collection())
-	_, err := authenticatorsCollection.InsertOne(ctx, authenticators)
-	if err != nil {
-		return nil, err
-	}
-	return authenticators, nil
-}
-
-func (p *provider) UpdateAuthenticator(ctx context.Context, authenticators *models.Authenticator) (*models.Authenticator, error) {
-	authenticators.UpdatedAt = time.Now().Unix()
-	authenticatorsCollection := p.db.Collection(models.Collections.Authenticators, options.Collection())
-	_, err := authenticatorsCollection.UpdateOne(ctx, bson.M{"_id": bson.M{"$eq": authenticators.ID}}, bson.M{"$set": authenticators})
-	if err != nil {
-		return nil, err
-	}
-	return authenticators, nil
-}
-
-func (p *provider) GetAuthenticatorDetailsByUserId(ctx context.Context, userId string, authenticatorType string) (*models.Authenticator, error) {
-	var authenticators *models.Authenticator
-	authenticatorsCollection := p.db.Collection(models.Collections.Authenticators, options.Collection())
-	err := authenticatorsCollection.FindOne(ctx, bson.M{"user_id": userId, "method": authenticatorType}).Decode(&authenticators)
-	if err != nil {
-		return nil, err
-	}
-	return authenticators, nil
-}
--- a/Show More
+++ b/Show More