feat: add cursor for pagination

2022-09-26 23:50:24 +05:30
255 changed files with 5502 additions and 22432 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,3 @@ 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/.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
@@ -19,27 +19,19 @@ on:

 jobs:
  releases:
-    name: Release Authorizer
+    name: Release Authorizer Binary
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - uses: actions/setup-node@v2
        with:
          node-version: '16'
-      - # Add support for more platforms with QEMU (optional)
-        # https://github.com/docker/setup-qemu-action
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          platforms: linux/amd64,linux/arm64
      - uses: actions/setup-go@v2
        with:
-          go-version: '^1.19.1'
+          go-version: '^1.17.3'
      - name: Install dependencies
        run: |
-          sudo apt-get install build-essential wget zip  libc6-dev-arm64-cross && \
+          sudo apt-get install build-essential wget zip gcc-mingw-w64 && \
          echo "/usr/bin/x86_64-w64-mingw32-gcc" >> GITHUB_PATH && \
          wget --no-check-certificate --progress=dot:mega https://github.com/wangyoucao577/assets-uploader/releases/download/v0.3.0/github-assets-uploader-v0.3.0-linux-amd64.tar.gz -O github-assets-uploader.tar.gz && \
          tar -zxf github-assets-uploader.tar.gz && \
@@ -52,28 +44,25 @@ jobs:
        run: whereis go
      - name: Print Go Version
        run: go version
-      - name: Install gox
-        run: go install github.com/mitchellh/gox@latest
      - name: Set VERSION env
        run: echo VERSION=$(basename ${GITHUB_REF}) >> ${GITHUB_ENV}
      - name: Copy .env file
        run: mv .env.sample .env
-      - name: Build package
+      - name: Package files for windows
        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
+          CGO_ENABLED=1 GOOS=windows CC=/usr/bin/x86_64-w64-mingw32-gcc make && \
+          mv build/server build/server.exe && \
+          zip -vr authorizer-${VERSION}-windows-amd64.zip .env app/build build templates dashboard/build
+      - name: Package files for linux
+        run: |
+          make clean && \
+          CGO_ENABLED=1 make && \
+          tar cvfz authorizer-${VERSION}-linux-amd64.tar.gz .env app/build build templates dashboard/build
      - 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}-windows-amd64.zip -mediatype application/zip -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}
-          github-assets-uploader -f authorizer-${VERSION}-windows-amd64.zip -mediatype application/zip -repo authorizerdev/authorizer -token ${{secrets.RELEASE_TOKEN}} -tag ${VERSION}
      - name: Log in to Docker Hub
        uses: docker/login-action@v1
        with:
@@ -85,11 +74,6 @@ jobs:
        uses: docker/metadata-action@v3
        with:
          images: lakhansamani/authorizer
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=tag
-            type=ref,event=pr

      - name: Build and push Docker image
        uses: docker/build-push-action@v2
@@ -98,6 +82,5 @@ jobs:
          push: true
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64
          build-args: |
            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,3 @@ test.db
 .yalc
 yalc.lock
 certs/
-*-shm
-*-wal
-.idea
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM golang:1.21.1-alpine as go-builder
+FROM golang:1.17-alpine as go-builder
 WORKDIR /authorizer
 COPY server server
 COPY Makefile .
--- a/38
+++ b/38
@@ -3,12 +3,6 @@ VERSION := $(or $(VERSION),$(DEFAULT_VERSION))

 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" \
-		-ldflags "-w -X main.VERSION=$(VERSION)" \
-		-output="../build/{{.OS}}/{{.Arch}}/server" \
-		./...
 build-app:
 	cd app && npm i && npm run build
 build-dashboard:
@@ -16,7 +10,7 @@ build-dashboard:
 clean:
 	rm -rf build
 test:
-	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 && cd server && go clean --testcache && TEST_DBS="sqlite" go test -p 1 -v ./test
+	rm -rf server/test/test.db && rm -rf test.db && cd server && go clean --testcache && TEST_DBS="sqlite" go test -p 1 -v ./test
 test-mongodb:
 	docker run -d --name authorizer_mongodb_db -p 27017:27017 mongo:4.4.15
 	cd server && go clean --testcache && TEST_DBS="mongodb" go test -p 1 -v ./test
@@ -26,34 +20,18 @@ 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:
-	docker run -d --name dynamodb-local-test  -p 8000:8000 amazon/dynamodb-local:latest
-	cd server && go clean --testcache && TEST_DBS="dynamodb" go test -p 1 -v ./test
-	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
+	rm -rf server/test/test.db && rm -rf test.db
 	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 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" go test -p 1 -v ./test
+	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="sqlite,mongodb,arangodb,scylladb" 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:
-	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' {} \;
+generate:
+	cd server && go get github.com/99designs/gqlgen/cmd@v0.14.0 && go run github.com/99designs/gqlgen generate
+	
--- a/README.md
+++ b/README.md
@@ -68,7 +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)  |

 ### Deploy Authorizer Using Source Code

--- a/app/.prettierrc.json
+++ b/app/.prettierrc.json
@@ -1,6 +0,0 @@
-{
-	"tabWidth": 2,
-	"singleQuote": true,
-	"trailingComma": "all",
-	"useTabs": true
-}
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -9,7 +9,7 @@
 			"version": "1.0.0",
 			"license": "ISC",
 			"dependencies": {
-				"@authorizerdev/authorizer-react": "^1.1.13",
+				"@authorizerdev/authorizer-react": "^1.1.0",
 				"@types/react": "^17.0.15",
 				"@types/react-dom": "^17.0.9",
 				"esbuild": "^0.12.17",
@@ -22,30 +22,29 @@
 			},
 			"devDependencies": {
 				"@types/react-router-dom": "^5.1.8",
-				"@types/styled-components": "^5.1.11",
-				"prettier": "2.7.1"
+				"@types/styled-components": "^5.1.11"
 			}
 		},
 		"node_modules/@authorizerdev/authorizer-js": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.2.6.tgz",
-			"integrity": "sha512-9+9phHUMF+AeDM0y+XQvIRDoerOXnQ1vfTfYN6KxWN1apdrkAd9nzS1zUsA2uJSnX3fFZOErn83GjbYYCYF1BA==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.1.0.tgz",
+			"integrity": "sha512-MdEw1SjhIm7pXq20AscHSbnAta2PC3w7GNBY52/OzmlBXUGH3ooUQX/aszbYOse3FlhapcrGrRvg4sNM7faGAg==",
 			"dependencies": {
 				"cross-fetch": "^3.1.5"
 			},
 			"engines": {
-				"node": ">=16"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/authorizerdev"
+				"node": ">=10"
 			}
 		},
 		"node_modules/@authorizerdev/authorizer-react": {
-			"version": "1.1.13",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.13.tgz",
-			"integrity": "sha512-LmpzyfR0+nEn+bjUrb/QU9b3kiVoYzMBIvcQ1nV4TNvrvVSqbLPKk+GmoIPkiBEtfy/QSM6XFLkiGNGD9BRP+g==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.0.tgz",
+			"integrity": "sha512-8ooyBREFI6ohHApVOPQitFr7T0w0SlpEVZruvU9oqa8OQ77UBxLQh+PCRKKPw7FeQRdCdh/VQyl17W7Xphp1NA==",
 			"dependencies": {
-				"@authorizerdev/authorizer-js": "^1.2.6"
+				"@authorizerdev/authorizer-js": "^1.1.0",
+				"final-form": "^4.20.2",
+				"react-final-form": "^6.5.3",
+				"styled-components": "^5.3.0"
 			},
 			"engines": {
 				"node": ">=10"
@@ -406,11 +405,11 @@
 			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
 		},
 		"node_modules/cross-fetch": {
-			"version": "3.1.8",
-			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
-			"integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+			"integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
 			"dependencies": {
-				"node-fetch": "^2.6.12"
+				"node-fetch": "2.6.7"
 			}
 		},
 		"node_modules/css-color-keywords": {
@@ -469,6 +468,18 @@
 				"node": ">=0.8.0"
 			}
 		},
+		"node_modules/final-form": {
+			"version": "4.20.6",
+			"resolved": "https://registry.npmjs.org/final-form/-/final-form-4.20.6.tgz",
+			"integrity": "sha512-fCdwIj49KOaFfDRlXB57Eo+GghIMZQWrA9TakQI3C9uQxHwaFHXqZSNRlUdfnQmNNeySwGOaGPZCvjy58hyv4w==",
+			"dependencies": {
+				"@babel/runtime": "^7.10.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/final-form"
+			}
+		},
 		"node_modules/globals": {
 			"version": "11.12.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -567,9 +578,9 @@
 			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
 		},
 		"node_modules/node-fetch": {
-			"version": "2.6.12",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-			"integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
+			"version": "2.6.7",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+			"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
 			"dependencies": {
 				"whatwg-url": "^5.0.0"
 			},
@@ -606,21 +617,6 @@
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
 			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
-		"node_modules/prettier": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-			"integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
-			"dev": true,
-			"bin": {
-				"prettier": "bin-prettier.js"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			},
-			"funding": {
-				"url": "https://github.com/prettier/prettier?sponsor=1"
-			}
-		},
 		"node_modules/prop-types": {
 			"version": "15.7.2",
 			"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
@@ -661,6 +657,33 @@
 				"react": "17.0.2"
 			}
 		},
+		"node_modules/react-final-form": {
+			"version": "6.5.7",
+			"resolved": "https://registry.npmjs.org/react-final-form/-/react-final-form-6.5.7.tgz",
+			"integrity": "sha512-o7tvJXB+McGiXOILqIC8lnOcX4aLhIBiF/Xi9Qet35b7XOS8R7KL8HLRKTfnZWQJm6MCE15v1U0SFive0NcxyA==",
+			"dependencies": {
+				"@babel/runtime": "^7.15.4"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/final-form"
+			},
+			"peerDependencies": {
+				"final-form": "4.20.4",
+				"react": "^16.8.0 || ^17.0.0"
+			}
+		},
+		"node_modules/react-final-form/node_modules/@babel/runtime": {
+			"version": "7.16.7",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
+			"integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
+			"dependencies": {
+				"regenerator-runtime": "^0.13.4"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
 		"node_modules/react-is": {
 			"version": "17.0.2",
 			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -837,19 +860,22 @@
 	},
 	"dependencies": {
 		"@authorizerdev/authorizer-js": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.2.6.tgz",
-			"integrity": "sha512-9+9phHUMF+AeDM0y+XQvIRDoerOXnQ1vfTfYN6KxWN1apdrkAd9nzS1zUsA2uJSnX3fFZOErn83GjbYYCYF1BA==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.1.0.tgz",
+			"integrity": "sha512-MdEw1SjhIm7pXq20AscHSbnAta2PC3w7GNBY52/OzmlBXUGH3ooUQX/aszbYOse3FlhapcrGrRvg4sNM7faGAg==",
 			"requires": {
 				"cross-fetch": "^3.1.5"
 			}
 		},
 		"@authorizerdev/authorizer-react": {
-			"version": "1.1.13",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.13.tgz",
-			"integrity": "sha512-LmpzyfR0+nEn+bjUrb/QU9b3kiVoYzMBIvcQ1nV4TNvrvVSqbLPKk+GmoIPkiBEtfy/QSM6XFLkiGNGD9BRP+g==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.0.tgz",
+			"integrity": "sha512-8ooyBREFI6ohHApVOPQitFr7T0w0SlpEVZruvU9oqa8OQ77UBxLQh+PCRKKPw7FeQRdCdh/VQyl17W7Xphp1NA==",
 			"requires": {
-				"@authorizerdev/authorizer-js": "^1.2.6"
+				"@authorizerdev/authorizer-js": "^1.1.0",
+				"final-form": "^4.20.2",
+				"react-final-form": "^6.5.3",
+				"styled-components": "^5.3.0"
 			}
 		},
 		"@babel/code-frame": {
@@ -1144,11 +1170,11 @@
 			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
 		},
 		"cross-fetch": {
-			"version": "3.1.8",
-			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
-			"integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+			"integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
 			"requires": {
-				"node-fetch": "^2.6.12"
+				"node-fetch": "2.6.7"
 			}
 		},
 		"css-color-keywords": {
@@ -1189,6 +1215,14 @@
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
 			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
 		},
+		"final-form": {
+			"version": "4.20.6",
+			"resolved": "https://registry.npmjs.org/final-form/-/final-form-4.20.6.tgz",
+			"integrity": "sha512-fCdwIj49KOaFfDRlXB57Eo+GghIMZQWrA9TakQI3C9uQxHwaFHXqZSNRlUdfnQmNNeySwGOaGPZCvjy58hyv4w==",
+			"requires": {
+				"@babel/runtime": "^7.10.0"
+			}
+		},
 		"globals": {
 			"version": "11.12.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -1270,9 +1304,9 @@
 			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
 		},
 		"node-fetch": {
-			"version": "2.6.12",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-			"integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
+			"version": "2.6.7",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+			"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
 			"requires": {
 				"whatwg-url": "^5.0.0"
 			}
@@ -1295,12 +1329,6 @@
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
 			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
-		"prettier": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-			"integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
-			"dev": true
-		},
 		"prop-types": {
 			"version": "15.7.2",
 			"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
@@ -1337,6 +1365,24 @@
 				"scheduler": "^0.20.2"
 			}
 		},
+		"react-final-form": {
+			"version": "6.5.7",
+			"resolved": "https://registry.npmjs.org/react-final-form/-/react-final-form-6.5.7.tgz",
+			"integrity": "sha512-o7tvJXB+McGiXOILqIC8lnOcX4aLhIBiF/Xi9Qet35b7XOS8R7KL8HLRKTfnZWQJm6MCE15v1U0SFive0NcxyA==",
+			"requires": {
+				"@babel/runtime": "^7.15.4"
+			},
+			"dependencies": {
+				"@babel/runtime": {
+					"version": "7.16.7",
+					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
+					"integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
+					"requires": {
+						"regenerator-runtime": "^0.13.4"
+					}
+				}
+			}
+		},
 		"react-is": {
 			"version": "17.0.2",
 			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
--- a/app/package.json
+++ b/app/package.json
@@ -5,14 +5,13 @@
 	"main": "index.js",
 	"scripts": {
 		"build": "rm -rf build && NODE_ENV=production node ./esbuild.config.js",
-		"start": "NODE_ENV=development node ./esbuild.config.js",
-		"format": "prettier --write 'src/**/*.(ts|tsx|js|jsx)'"
+		"start": "NODE_ENV=development node ./esbuild.config.js"
 	},
 	"keywords": [],
 	"author": "Lakhan Samani",
 	"license": "ISC",
 	"dependencies": {
-		"@authorizerdev/authorizer-react": "^1.1.13",
+		"@authorizerdev/authorizer-react": "^1.1.0",
 		"@types/react": "^17.0.15",
 		"@types/react-dom": "^17.0.9",
 		"esbuild": "^0.12.17",
@@ -20,12 +19,11 @@
 		"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"
+		"typescript": "^4.3.5",
+		"styled-components": "^5.3.0"
 	},
 	"devDependencies": {
 		"@types/react-router-dom": "^5.1.8",
-		"@types/styled-components": "^5.1.11",
-		"prettier": "2.7.1"
+		"@types/styled-components": "^5.1.11"
 	}
 }
--- 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/Root.tsx
+++ b/app/src/Root.tsx
@@ -32,14 +32,12 @@ export default function Root({
 	const { token, loading, config } = useAuthorizer();

 	const searchParams = new URLSearchParams(
-		hasWindow() ? window.location.search : ``,
+		hasWindow() ? window.location.search : ``
 	);
 	const state = searchParams.get('state') || createRandomString();
 	const scope = searchParams.get('scope')
 		? searchParams.get('scope')?.toString().split(' ')
 		: ['openid', 'profile', 'email'];
-	const code = searchParams.get('code') || '';
-	const nonce = searchParams.get('nonce') || '';

 	const urlProps: Record<string, any> = {
 		state,
@@ -60,19 +58,9 @@ export default function Root({
 		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}`;
-
-			if (code !== '') {
-				params += `&code=${code}`;
-			}
-
-			if (nonce !== '') {
-				params += `&nonce=${nonce}`;
-			}
-
 			if (token.refresh_token) {
 				params += `&refresh_token=${token.refresh_token}`;
 			}
-
 			const url = new URL(redirectURL);
 			if (redirectURL.includes('?')) {
 				redirectURL = `${redirectURL}&${params}`;
@@ -86,7 +74,7 @@ export default function Root({
 			}
 		}
 		return () => {};
-	}, [token, config]);
+	}, [token]);

 	if (loading) {
 		return <h1>Loading...</h1>;
@@ -112,7 +100,7 @@ export default function Root({
 						<Route path="/app" exact>
 							<Login urlProps={urlProps} />
 						</Route>
-						<Route path="/app/signup">
+						<Route path="/app/signup" exact>
 							<SignUp urlProps={urlProps} />
 						</Route>
 						<Route path="/app/reset-password">
--- a/app/src/pages/login.tsx
+++ b/app/src/pages/login.tsx
@@ -60,12 +60,7 @@ export default function Login({ urlProps }: { urlProps: Record<string, any> }) {
 			{view === VIEW_TYPES.FORGOT_PASSWORD && (
 				<Fragment>
 					<h1 style={{ textAlign: 'center' }}>Forgot Password</h1>
-					<AuthorizerForgotPassword
-						urlProps={{
-							...urlProps,
-							redirect_uri: `${window.location.origin}/app/reset-password`,
-						}}
-					/>
+					<AuthorizerForgotPassword urlProps={urlProps} />
 					<Footer>
 						<Link
 							to="#"
--- a/app/src/utils/common.ts
+++ b/app/src/utils/common.ts
@@ -8,7 +8,7 @@ export const createRandomString = () => {
 		'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_~.';
 	let random = '';
 	const randomValues = Array.from(
-		getCrypto().getRandomValues(new Uint8Array(43)),
+		getCrypto().getRandomValues(new Uint8Array(43))
 	);
 	randomValues.forEach((v) => (random += charset[v % charset.length]));
 	return random;
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -1,588 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@authorizerdev/authorizer-js@^1.2.6":
-  version "1.2.6"
-  resolved "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.2.6.tgz"
-  integrity sha512-9+9phHUMF+AeDM0y+XQvIRDoerOXnQ1vfTfYN6KxWN1apdrkAd9nzS1zUsA2uJSnX3fFZOErn83GjbYYCYF1BA==
-  dependencies:
-    cross-fetch "^3.1.5"
-
-"@authorizerdev/authorizer-react@^1.1.13":
-  version "1.1.13"
-  resolved "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.13.tgz"
-  integrity sha512-LmpzyfR0+nEn+bjUrb/QU9b3kiVoYzMBIvcQ1nV4TNvrvVSqbLPKk+GmoIPkiBEtfy/QSM6XFLkiGNGD9BRP+g==
-  dependencies:
-    "@authorizerdev/authorizer-js" "^1.2.6"
-
-"@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
-  dependencies:
-    "@babel/highlight" "^7.16.7"
-
-"@babel/generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz"
-  integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
-  dependencies:
-    "@babel/types" "^7.16.8"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@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.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"
-  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-get-function-arity@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"
-  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-hoist-variables@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"
-  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@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.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"
-  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
-
-"@babel/highlight@^7.16.7":
-  version "7.16.10"
-  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz"
-  integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.16.10", "@babel/parser@^7.16.7":
-  version "7.16.12"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz"
-  integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
-
-"@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.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/traverse@^7.4.5":
-  version "7.16.10"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz"
-  integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.8"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.16.10"
-    "@babel/types" "^7.16.8"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/types@^7.16.7", "@babel/types@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz"
-  integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    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==
-
-"@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.0.0:
-  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 sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-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 sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-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.6.12"
-  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz"
-  integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==
-  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==
-
-source-map@^0.5.0:
-  version "0.5.7"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-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==
-
-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/.prettierrc.json
+++ b/dashboard/.prettierrc.json
@@ -1,6 +0,0 @@
-{
-	"tabWidth": 2,
-	"singleQuote": true,
-	"trailingComma": "all",
-	"useTabs": true
-}
--- a/dashboard/package-lock.json
+++ b/dashboard/package-lock.json
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -5,8 +5,7 @@
 	"main": "index.js",
 	"scripts": {
 		"build": "rm -rf build && NODE_ENV=production node ./esbuild.config.js",
-		"start": "NODE_ENV=development node ./esbuild.config.js",
-		"format": "prettier --write --use-tabs 'src/**/*.(ts|tsx|js|jsx)'"
+		"start": "NODE_ENV=development node ./esbuild.config.js"
 	},
 	"keywords": [],
 	"author": "Lakhan Samani",
@@ -36,7 +35,6 @@
 		"urql": "^2.0.6"
 	},
 	"devDependencies": {
-		"@types/react-email-editor": "^1.1.7",
-		"prettier": "2.7.1"
+		"@types/react-email-editor": "^1.1.7"
 	}
 }
--- a/dashboard/src/components/DeleteEmailTemplateModal.tsx
+++ b/dashboard/src/components/DeleteEmailTemplateModal.tsx
@@ -44,7 +44,7 @@ const DeleteEmailTemplateModal = ({
 				title: capitalizeFirstLetter(res.error.message),
 				isClosable: true,
 				status: 'error',
-				position: 'top-right',
+				position: 'bottom-right',
 			});

 			return;
@@ -53,7 +53,7 @@ const DeleteEmailTemplateModal = ({
 				title: capitalizeFirstLetter(res.data?._delete_email_template.message),
 				isClosable: true,
 				status: 'success',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 		}
 		onClose();
--- a/dashboard/src/components/DeleteUserModal.tsx
+++ b/dashboard/src/components/DeleteUserModal.tsx
@@ -51,7 +51,7 @@ const DeleteUserModal = ({
 				title: capitalizeFirstLetter(res.error.message),
 				isClosable: true,
 				status: 'error',
-				position: 'top-right',
+				position: 'bottom-right',
 			});

 			return;
@@ -60,7 +60,7 @@ const DeleteUserModal = ({
 				title: capitalizeFirstLetter(res.data?._delete_user.message),
 				isClosable: true,
 				status: 'success',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 		}
 		onClose();
--- a/dashboard/src/components/DeleteWebhookModal.tsx
+++ b/dashboard/src/components/DeleteWebhookModal.tsx
@@ -44,7 +44,7 @@ const DeleteWebhookModal = ({
 				title: capitalizeFirstLetter(res.error.message),
 				isClosable: true,
 				status: 'error',
-				position: 'top-right',
+				position: 'bottom-right',
 			});

 			return;
@@ -53,7 +53,7 @@ const DeleteWebhookModal = ({
 				title: capitalizeFirstLetter(res.data?._delete_webhook.message),
 				isClosable: true,
 				status: 'success',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 		}
 		onClose();
--- a/dashboard/src/components/EditUserModal.tsx
+++ b/dashboard/src/components/EditUserModal.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import {
 	Button,
 	Center,
@@ -20,14 +20,13 @@ import { useClient } from 'urql';
 import { FaSave } from 'react-icons/fa';
 import InputField from './InputField';
 import {
+	ArrayInputType,
 	DateInputType,
-	MultiSelectInputType,
 	SelectInputType,
 	TextInputType,
 } from '../constants';
 import { getObjectDiff } from '../utils';
 import { UpdateUser } from '../graphql/mutation';
-import { GetAvailableRolesQuery } from '../graphql/queries';

 const GenderTypes = {
 	Undisclosed: null,
@@ -58,9 +57,8 @@ const EditUserModal = ({
 }) => {
 	const client = useClient();
 	const toast = useToast();
-	const [availableRoles, setAvailableRoles] = useState<string[]>([]);
 	const { isOpen, onOpen, onClose } = useDisclosure();
-	const [userData, setUserData] = useState<userDataTypes>({
+	const [userData, setUserData] = React.useState<userDataTypes>({
 		id: '',
 		email: '',
 		given_name: '',
@@ -75,17 +73,7 @@ const EditUserModal = ({
 	});
 	React.useEffect(() => {
 		setUserData(user);
-		fetchAvailableRoles();
 	}, []);
-	const fetchAvailableRoles = async () => {
-		const res = await client.query(GetAvailableRolesQuery).toPromise();
-		if (res.data?._env?.ROLES && res.data?._env?.PROTECTED_ROLES) {
-			setAvailableRoles([
-				...res.data._env.ROLES,
-				...res.data._env.PROTECTED_ROLES,
-			]);
-		}
-	};
 	const saveHandler = async () => {
 		const diff = getObjectDiff(user, userData);
 		const updatedUserData = diff.reduce(
@@ -94,7 +82,7 @@ const EditUserModal = ({
 				// @ts-ignore
 				[property]: userData[property],
 			}),
-			{},
+			{}
 		);
 		const res = await client
 			.mutation(UpdateUser, { params: { ...updatedUserData, id: userData.id } })
@@ -104,14 +92,14 @@ const EditUserModal = ({
 				title: 'User data update failed',
 				isClosable: true,
 				status: 'error',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 		} else if (res.data?._update_user?.id) {
 			toast({
 				title: 'User data update successful',
 				isClosable: true,
 				status: 'success',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 		}
 		onClose();
@@ -233,8 +221,7 @@ const EditUserModal = ({
 									<InputField
 										variables={userData}
 										setVariables={setUserData}
-										availableRoles={availableRoles}
-										inputType={MultiSelectInputType.USER_ROLES}
+										inputType={ArrayInputType.USER_ROLES}
 									/>
 								</Center>
 							</Flex>
--- a/dashboard/src/components/EnvComponents/AccessToken.tsx
+++ b/dashboard/src/components/EnvComponents/AccessToken.tsx
@@ -1,28 +1,28 @@
-import React from 'react';
-import { Flex, Stack, Text, useMediaQuery } from '@chakra-ui/react';
-import InputField from '../../components/InputField';
-import { TextInputType, TextAreaInputType } from '../../constants';
+import React from "react";
+import { Flex, Stack, Text, useMediaQuery } from "@chakra-ui/react";
+import InputField from "../../components/InputField";
+import { TextInputType, TextAreaInputType } from "../../constants";

 const AccessToken = ({ variables, setVariables }: any) => {
-	const [isNotSmallerScreen] = useMediaQuery('(min-width:600px)');
+  const [isNotSmallerScreen] = useMediaQuery("(min-width:600px)");
  return (
    <div>
-			{' '}
+      {" "}
      <Text fontSize="md" paddingTop="2%" fontWeight="bold" mb={5}>
        Access Token
      </Text>
      <Stack spacing={6} padding="2% 0%">
-				<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
+        <Flex direction={isNotSmallerScreen ? "row" : "column"}>
          <Flex
-						w={isNotSmallerScreen ? '30%' : '50%'}
+            w={isNotSmallerScreen ? "30%" : "50%"}
            justifyContent="start"
            alignItems="center"
          >
            <Text fontSize="sm">Access Token Expiry Time:</Text>
          </Flex>
          <Flex
-						w={isNotSmallerScreen ? '70%' : '100%'}
-						mt={isNotSmallerScreen ? '0' : '3'}
+            w={isNotSmallerScreen ? "70%" : "100%"}
+            mt={isNotSmallerScreen ? "0" : "3"}
          >
            <InputField
              borderRadius={5}
@@ -33,9 +33,9 @@ const AccessToken = ({ variables, setVariables }: any) => {
            />
          </Flex>
        </Flex>
-				<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
+        <Flex direction={isNotSmallerScreen ? "row" : "column"}>
          <Flex
-						w={isNotSmallerScreen ? '30%' : '60%'}
+            w={isNotSmallerScreen ? "30%" : "60%"}
            justifyContent="start"
            direction="column"
          >
@@ -45,8 +45,8 @@ const AccessToken = ({ variables, setVariables }: any) => {
            </Text>
          </Flex>
          <Flex
-						w={isNotSmallerScreen ? '70%' : '100%'}
-						mt={isNotSmallerScreen ? '0' : '3'}
+            w={isNotSmallerScreen ? "70%" : "100%"}
+            mt={isNotSmallerScreen ? "0" : "3"}
          >
            <InputField
              variables={variables}
--- a/dashboard/src/components/EnvComponents/DomainWhitelisting.tsx
+++ b/dashboard/src/components/EnvComponents/DomainWhitelisting.tsx
@@ -1,24 +1,24 @@
-import React from 'react';
-import { Flex, Stack, Center, Text, useMediaQuery } from '@chakra-ui/react';
-import InputField from '../../components/InputField';
-import { ArrayInputType } from '../../constants';
+import React from "react";
+import { Flex, Stack, Center, Text, useMediaQuery } from "@chakra-ui/react";
+import InputField from "../../components/InputField";
+import { ArrayInputType} from "../../constants";

 const DomainWhiteListing = ({ variables, setVariables }: any) => {
-	const [isNotSmallerScreen] = useMediaQuery('(min-width:600px)');
+  const [isNotSmallerScreen] = useMediaQuery("(min-width:600px)");
  return (
    <div>
-			{' '}
+      {" "}
      <Text fontSize="md" paddingTop="2%" fontWeight="bold" mb={5}>
        Domain White Listing
      </Text>
      <Stack spacing={6} padding="2% 0%">
-				<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
+        <Flex direction={isNotSmallerScreen ? "row" : "column"}>
          <Flex w="30%" justifyContent="start" alignItems="center">
            <Text fontSize="sm">Allowed Origins:</Text>
          </Flex>
          <Center
-						w={isNotSmallerScreen ? '70%' : '100%'}
-						mt={isNotSmallerScreen ? '0' : '3'}
+            w={isNotSmallerScreen ? "70%" : "100%"}
+            mt={isNotSmallerScreen ? "0" : "3"}
          >
            <InputField
              variables={variables}
--- a/dashboard/src/components/EnvComponents/EmailConfiguration.tsx
+++ b/dashboard/src/components/EnvComponents/EmailConfiguration.tsx
@@ -1,28 +1,28 @@
-import React from 'react';
-import { Flex, Stack, Center, Text, useMediaQuery } from '@chakra-ui/react';
-import InputField from '../../components/InputField';
-import { TextInputType, HiddenInputType } from '../../constants';
+import React from "react";
+import { Flex, Stack, Center, Text, useMediaQuery } from "@chakra-ui/react";
+import InputField from "../../components/InputField";
+import { TextInputType, HiddenInputType} from "../../constants";
 const EmailConfigurations = ({
  variables,
  setVariables,
  fieldVisibility,
  setFieldVisibility,
 }: any) => {
-	const [isNotSmallerScreen] = useMediaQuery('(min-width:600px)');
+  const [isNotSmallerScreen] = useMediaQuery("(min-width:600px)");
  return (
    <div>
-			{' '}
+      {" "}
      <Text fontSize="md" paddingTop="2%" fontWeight="bold" mb={5}>
        Email Configurations
      </Text>
      <Stack spacing={6} padding="2% 0%">
-				<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
+        <Flex direction={isNotSmallerScreen ? "row" : "column"}>
          <Flex w="30%" justifyContent="start" alignItems="center">
            <Text fontSize="sm">SMTP Host:</Text>
          </Flex>
          <Center
-						w={isNotSmallerScreen ? '70%' : '100%'}
-						mt={isNotSmallerScreen ? '0' : '3'}
+            w={isNotSmallerScreen ? "70%" : "100%"}
+            mt={isNotSmallerScreen ? "0" : "3"}
          >
            <InputField
              borderRadius={5}
@@ -32,13 +32,13 @@ const EmailConfigurations = ({
            />
          </Center>
        </Flex>
-				<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
+        <Flex direction={isNotSmallerScreen ? "row" : "column"}>
          <Flex w="30%" justifyContent="start" alignItems="center">
            <Text fontSize="sm">SMTP Port:</Text>
          </Flex>
          <Center
-						w={isNotSmallerScreen ? '70%' : '100%'}
-						mt={isNotSmallerScreen ? '0' : '3'}
+            w={isNotSmallerScreen ? "70%" : "100%"}
+            mt={isNotSmallerScreen ? "0" : "3"}
          >
            <InputField
              borderRadius={5}
@@ -48,37 +48,17 @@ const EmailConfigurations = ({
            />
          </Center>
        </Flex>
-				<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
+        <Flex direction={isNotSmallerScreen ? "row" : "column"}>
          <Flex
-						w={isNotSmallerScreen ? '30%' : '40%'}
-						justifyContent="start"
-						alignItems="center"
-					>
-						<Text fontSize="sm">SMTP Local Name:</Text>
-					</Flex>
-					<Center
-						w={isNotSmallerScreen ? '70%' : '100%'}
-						mt={isNotSmallerScreen ? '0' : '3'}
-					>
-						<InputField
-							borderRadius={5}
-							variables={variables}
-							setVariables={setVariables}
-							inputType={TextInputType.SMTP_LOCAL_NAME}
-						/>
-					</Center>
-				</Flex>
-				<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
-					<Flex
-						w={isNotSmallerScreen ? '30%' : '40%'}
+            w={isNotSmallerScreen ? "30%" : "40%"}
            justifyContent="start"
            alignItems="center"
          >
            <Text fontSize="sm">SMTP Username:</Text>
          </Flex>
          <Center
-						w={isNotSmallerScreen ? '70%' : '100%'}
-						mt={isNotSmallerScreen ? '0' : '3'}
+            w={isNotSmallerScreen ? "70%" : "100%"}
+            mt={isNotSmallerScreen ? "0" : "3"}
          >
            <InputField
              borderRadius={5}
@@ -88,17 +68,17 @@ const EmailConfigurations = ({
            />
          </Center>
        </Flex>
-				<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
+        <Flex direction={isNotSmallerScreen ? "row" : "column"}>
          <Flex
-						w={isNotSmallerScreen ? '30%' : '40%'}
+            w={isNotSmallerScreen ? "30%" : "40%"}
            justifyContent="start"
            alignItems="center"
          >
            <Text fontSize="sm">SMTP Password:</Text>
          </Flex>
          <Center
-						w={isNotSmallerScreen ? '70%' : '100%'}
-						mt={isNotSmallerScreen ? '0' : '3'}
+            w={isNotSmallerScreen ? "70%" : "100%"}
+            mt={isNotSmallerScreen ? "0" : "3"}
          >
            <InputField
              borderRadius={5}
@@ -110,13 +90,13 @@ const EmailConfigurations = ({
            />
          </Center>
        </Flex>
-				<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
+        <Flex direction={isNotSmallerScreen ? "row" : "column"}>
          <Flex w="30%" justifyContent="start" alignItems="center">
            <Text fontSize="sm">From Email:</Text>
          </Flex>
          <Center
-						w={isNotSmallerScreen ? '70%' : '100%'}
-						mt={isNotSmallerScreen ? '0' : '3'}
+            w={isNotSmallerScreen ? "70%" : "100%"}
+            mt={isNotSmallerScreen ? "0" : "3"}
          >
            <InputField
              borderRadius={5}
@@ -126,22 +106,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,90 +8,86 @@ 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">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">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.
@@ -102,10 +98,15 @@ const Features = ({ variables, setVariables }: any) => {
 							variables={variables}
 							setVariables={setVariables}
 							inputType={SwitchInputType.DISABLE_MULTI_FACTOR_AUTHENTICATION}
-							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">
@@ -124,53 +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}>
-				Cookie Security Features
-			</Text>
-			<Stack spacing={6}>
-				<Flex>
-					<Flex w="100%" alignItems="baseline" flexDir="column">
-						<Text fontSize="sm">Use Secure App Cookie:</Text>
-						<Text fontSize="x-small">
-							Note: If you set this to insecure, it will set{' '}
-							<code>sameSite</code> property of cookie to <code>lax</code> mode
-						</Text>
-					</Flex>
-					<Flex justifyContent="start">
-						<InputField
-							variables={variables}
-							setVariables={setVariables}
-							inputType={SwitchInputType.APP_COOKIE_SECURE}
-						/>
-					</Flex>
-				</Flex>
-				<Flex>
-					<Flex w="100%" alignItems="baseline" flexDir="column">
-						<Text fontSize="sm">Use Secure Admin Cookie:</Text>
-					</Flex>
-					<Flex justifyContent="start">
-						<InputField
-							variables={variables}
-							setVariables={setVariables}
-							inputType={SwitchInputType.ADMIN_COOKIE_SECURE}
-						/>
-					</Flex>
-				</Flex>
 			</Stack>
 		</div>
 	);
--- a/dashboard/src/components/EnvComponents/JWTConfiguration.tsx
+++ b/dashboard/src/components/EnvComponents/JWTConfiguration.tsx
@@ -37,13 +37,13 @@ const JSTConfigurations = ({
 				JSON.stringify({
 					type: variables.JWT_TYPE,
 					key: variables.JWT_PUBLIC_KEY || variables.JWT_SECRET,
-				}),
+				})
 			);
 			toast({
 				title: `JWT config copied successfully`,
 				isClosable: true,
 				status: 'success',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 		} catch (err) {
 			console.error({
@@ -54,13 +54,14 @@ const JSTConfigurations = ({
 				title: `Failed to copy JWT config`,
 				isClosable: true,
 				status: 'error',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 		}
 	};

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

 const OAuthConfig = ({
 	envVariables,
@@ -76,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}>
@@ -346,57 +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>
 				</Stack>
 			</Box>
 		</div>
--- a/dashboard/src/components/EnvComponents/OrganizationInfo.tsx
+++ b/dashboard/src/components/EnvComponents/OrganizationInfo.tsx
@@ -1,28 +1,28 @@
-import React from 'react';
-import { Flex, Stack, Center, Text, useMediaQuery } from '@chakra-ui/react';
-import InputField from '../InputField';
-import { TextInputType } from '../../constants';
+import React from "react";
+import { Flex, Stack, Center, Text, useMediaQuery } from "@chakra-ui/react";
+import InputField from "../InputField";
+import { TextInputType } from "../../constants";

 const OrganizationInfo = ({ variables, setVariables }: any) => {
-	const [isNotSmallerScreen] = useMediaQuery('(min-width:600px)');
+  const [isNotSmallerScreen] = useMediaQuery("(min-width:600px)");
  return (
    <div>
-			{' '}
+      {" "}
      <Text fontSize="md" paddingTop="2%" fontWeight="bold" mb={5}>
        Organization Information
      </Text>
      <Stack spacing={6} padding="2% 0%">
-				<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
+        <Flex direction={isNotSmallerScreen ? "row" : "column"}>
          <Flex
-						w={isNotSmallerScreen ? '30%' : '40%'}
+            w={isNotSmallerScreen ? "30%" : "40%"}
            justifyContent="start"
            alignItems="center"
          >
            <Text fontSize="sm">Organization Name:</Text>
          </Flex>
          <Center
-						w={isNotSmallerScreen ? '70%' : '100%'}
-						mt={isNotSmallerScreen ? '0' : '3'}
+            w={isNotSmallerScreen ? "70%" : "100%"}
+            mt={isNotSmallerScreen ? "0" : "3"}
          >
            <InputField
              borderRadius={5}
@@ -32,17 +32,17 @@ const OrganizationInfo = ({ variables, setVariables }: any) => {
            />
          </Center>
        </Flex>
-				<Flex direction={isNotSmallerScreen ? 'row' : 'column'}>
+        <Flex direction={isNotSmallerScreen ? "row" : "column"}>
          <Flex
-						w={isNotSmallerScreen ? '30%' : '40%'}
+            w={isNotSmallerScreen ? "30%" : "40%"}
            justifyContent="start"
            alignItems="center"
          >
            <Text fontSize="sm">Organization Logo:</Text>
          </Flex>
          <Center
-						w={isNotSmallerScreen ? '70%' : '100%'}
-						mt={isNotSmallerScreen ? '0' : '3'}
+            w={isNotSmallerScreen ? "70%" : "100%"}
+            mt={isNotSmallerScreen ? "0" : "3"}
          >
            <InputField
              borderRadius={5}
--- a/dashboard/src/components/EnvComponents/SecurityAdminSecret.tsx
+++ b/dashboard/src/components/EnvComponents/SecurityAdminSecret.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React from "react";
 import {
  Flex,
  Stack,
@@ -8,10 +8,10 @@ import {
  InputGroup,
  InputRightElement,
  useMediaQuery,
-} from '@chakra-ui/react';
-import { FaRegEyeSlash, FaRegEye } from 'react-icons/fa';
-import InputField from '../InputField';
-import { HiddenInputType } from '../../constants';
+} from "@chakra-ui/react";
+import { FaRegEyeSlash, FaRegEye } from "react-icons/fa";
+import InputField from "../InputField";
+import { HiddenInputType } from "../../constants";
 const SecurityAdminSecret = ({
  variables,
  setVariables,
@@ -20,10 +20,10 @@ const SecurityAdminSecret = ({
  validateAdminSecretHandler,
  adminSecret,
 }: any) => {
-	const [isNotSmallerScreen] = useMediaQuery('(min-width:600px)');
+  const [isNotSmallerScreen] = useMediaQuery("(min-width:600px)");
  return (
    <div>
-			{' '}
+      {" "}
      <Text fontSize="md" paddingTop="2%" fontWeight="bold">
        Security (Admin Secret)
      </Text>
@@ -35,20 +35,20 @@ const SecurityAdminSecret = ({
        borderRadius="5px"
      >
        <Flex
-					marginTop={isNotSmallerScreen ? '3%' : '5%'}
-					direction={isNotSmallerScreen ? 'row' : 'column'}
+          marginTop={isNotSmallerScreen ? "3%" : "5%"}
+          direction={isNotSmallerScreen ? "row" : "column"}
        >
          <Flex
            mt={3}
-						w={isNotSmallerScreen ? '30%' : '40%'}
+            w={isNotSmallerScreen ? "30%" : "40%"}
            justifyContent="start"
            alignItems="center"
          >
            <Text fontSize="sm">Old Admin Secret:</Text>
          </Flex>
          <Center
-						w={isNotSmallerScreen ? '70%' : '100%'}
-						mt={isNotSmallerScreen ? '0' : '3'}
+            w={isNotSmallerScreen ? "70%" : "100%"}
+            mt={isNotSmallerScreen ? "0" : "3"}
          >
            <InputGroup size="sm">
              <Input
@@ -59,8 +59,8 @@ const SecurityAdminSecret = ({
                onChange={(event: any) => validateAdminSecretHandler(event)}
                type={
                  !fieldVisibility[HiddenInputType.OLD_ADMIN_SECRET]
-										? 'password'
-										: 'text'
+                    ? "password"
+                    : "text"
                }
              />
              <InputRightElement
@@ -104,18 +104,18 @@ const SecurityAdminSecret = ({
        </Flex>
        <Flex
          paddingBottom="3%"
-					direction={isNotSmallerScreen ? 'row' : 'column'}
+          direction={isNotSmallerScreen ? "row" : "column"}
        >
          <Flex
-						w={isNotSmallerScreen ? '30%' : '50%'}
+            w={isNotSmallerScreen ? "30%" : "50%"}
            justifyContent="start"
            alignItems="center"
          >
            <Text fontSize="sm">New Admin Secret:</Text>
          </Flex>
          <Center
-						w={isNotSmallerScreen ? '70%' : '100%'}
-						mt={isNotSmallerScreen ? '0' : '3'}
+            w={isNotSmallerScreen ? "70%" : "100%"}
+            mt={isNotSmallerScreen ? "0" : "3"}
          >
            <InputField
              borderRadius={5}
--- a/dashboard/src/components/GenerateKeysModal.tsx
+++ b/dashboard/src/components/GenerateKeysModal.tsx
@@ -73,7 +73,7 @@ const GenerateKeysModal = ({ jwtType, getData }: propTypes) => {
 					title: 'Error occurred generating jwt keys',
 					isClosable: true,
 					status: 'error',
-					position: 'top-right',
+					position: 'bottom-right',
 				});
 				closeHandler();
 			} else {
@@ -107,7 +107,7 @@ const GenerateKeysModal = ({ jwtType, getData }: propTypes) => {
 				title: 'Error occurred setting jwt keys',
 				isClosable: true,
 				status: 'error',
-				position: 'top-right',
+				position: 'bottom-right',
 			});

 			return;
@@ -116,7 +116,7 @@ const GenerateKeysModal = ({ jwtType, getData }: propTypes) => {
 			title: 'JWT keys updated successfully',
 			isClosable: true,
 			status: 'success',
-			position: 'top-right',
+			position: 'bottom-right',
 		});
 		closeHandler();
 	};
@@ -167,7 +167,7 @@ const GenerateKeysModal = ({ jwtType, getData }: propTypes) => {
 						) : (
 							<>
 								{Object.values(HMACEncryptionType).includes(
-									stateVariables.JWT_TYPE,
+									stateVariables.JWT_TYPE
 								) ? (
 									<Flex marginTop="8">
 										<Flex w="23%" justifyContent="start" alignItems="center">
--- a/dashboard/src/components/InputField.tsx
+++ b/dashboard/src/components/InputField.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import {
 	Box,
 	Flex,
@@ -13,12 +13,6 @@ import {
 	Textarea,
 	Switch,
 	Text,
-	MenuButton,
-	MenuList,
-	MenuItemOption,
-	MenuOptionGroup,
-	Button,
-	Menu,
 } from '@chakra-ui/react';
 import {
 	FaRegClone,
@@ -26,7 +20,6 @@ import {
 	FaRegEyeSlash,
 	FaPlus,
 	FaTimes,
-	FaAngleDown,
 } from 'react-icons/fa';
 import {
 	ArrayInputOperations,
@@ -37,7 +30,6 @@ import {
 	TextAreaInputType,
 	SwitchInputType,
 	DateInputType,
-	MultiSelectInputType,
 } from '../constants';
 import { copyTextToClipboard } from '../utils';

@@ -47,18 +39,13 @@ const InputField = ({
 	setVariables,
 	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 = {
 		size: 'sm',
 		...downshiftProps,
 	};
-	const [availableUserRoles, setAvailableUserRoles] =
-		useState<string[]>(availableRoles);
-	const [inputFieldVisibility, setInputFieldVisibility] = useState<
+	const [inputFieldVisibility, setInputFieldVisibility] = React.useState<
 		Record<string, boolean>
 	>({
 		ROLES: false,
@@ -67,7 +54,7 @@ const InputField = ({
 		ALLOWED_ORIGINS: false,
 		roles: false,
 	});
-	const [inputData, setInputData] = useState<Record<string, string>>({
+	const [inputData, setInputData] = React.useState<Record<string, string>>({
 		ROLES: '',
 		DEFAULT_ROLES: '',
 		PROTECTED_ROLES: '',
@@ -77,7 +64,7 @@ const InputField = ({
 	const updateInputHandler = (
 		type: string,
 		operation: any,
-		role: string = '',
+		role: string = ''
 	) => {
 		if (operation === ArrayInputOperations.APPEND) {
 			if (inputData[type] !== '') {
@@ -91,7 +78,7 @@ const InputField = ({
 		}
 		if (operation === ArrayInputOperations.REMOVE) {
 			let updatedEnvVars = variables[type].filter(
-				(item: string) => item !== role,
+				(item: string) => item !== role
 			);
 			setVariables({
 				...variables,
@@ -108,7 +95,7 @@ const InputField = ({
 					onChange={(
 						event: Event & {
 							target: HTMLInputElement;
-						},
+						}
 					) =>
 						setVariables({
 							...variables,
@@ -129,11 +116,11 @@ const InputField = ({
 			<InputGroup size="sm">
 				<Input
 					{...props}
-					value={variables[inputType] || ''}
+					value={variables[inputType] ?? ''}
 					onChange={(
 						event: Event & {
 							target: HTMLInputElement;
-						},
+						}
 					) =>
 						setVariables({
 							...variables,
@@ -220,7 +207,7 @@ const InputField = ({
 									updateInputHandler(
 										inputType,
 										ArrayInputOperations.REMOVE,
-										role,
+										role
 									)
 								}
 							/>
@@ -234,7 +221,7 @@ const InputField = ({
 							size="xs"
 							minW="150px"
 							placeholder="add a new value"
-							value={inputData[inputType] || ''}
+							value={inputData[inputType] ?? ''}
 							onChange={(e: any) => {
 								setInputData({ ...inputData, [inputType]: e.target.value });
 							}}
@@ -291,87 +278,6 @@ const InputField = ({
 			</Select>
 		);
 	}
-	if (Object.values(MultiSelectInputType).includes(inputType)) {
-		return (
-			<Flex w="100%" style={{ position: 'relative' }}>
-				<Flex
-					border="1px solid #e2e8f0"
-					w="100%"
-					borderRadius="var(--chakra-radii-sm)"
-					p="1% 0 0 2.5%"
-					overflowX={variables[inputType].length > 3 ? 'scroll' : 'hidden'}
-					overflowY="hidden"
-					justifyContent="space-between"
-					alignItems="center"
-				>
-					<Flex justifyContent="start" alignItems="center" w="100%" wrap="wrap">
-						{variables[inputType].map((role: string, index: number) => (
-							<Box key={index} margin="0.5%" role="group">
-								<Tag
-									size="sm"
-									variant="outline"
-									colorScheme="gray"
-									minW="fit-content"
-								>
-									<TagLabel cursor="default">{role}</TagLabel>
-									<TagRightIcon
-										boxSize="12px"
-										as={FaTimes}
-										display="none"
-										cursor="pointer"
-										_groupHover={{ display: 'block' }}
-										onClick={() =>
-											updateInputHandler(
-												inputType,
-												ArrayInputOperations.REMOVE,
-												role,
-											)
-										}
-									/>
-								</Tag>
-							</Box>
-						))}
-					</Flex>
-					<Menu matchWidth={true}>
-						<MenuButton px="10px" py="7.5px">
-							<FaAngleDown />
-						</MenuButton>
-						<MenuList
-							position="absolute"
-							top="0"
-							right="0"
-							zIndex="10"
-							maxH="150"
-							overflowX="scroll"
-						>
-							<MenuOptionGroup
-								title={undefined}
-								value={variables[inputType]}
-								type="checkbox"
-								onChange={(values: string[] | string) => {
-									setVariables({
-										...variables,
-										[inputType]: values,
-									});
-								}}
-							>
-								{availableUserRoles.map((role) => {
-									return (
-										<MenuItemOption
-											key={`multiselect-menu-${role}`}
-											value={role}
-										>
-											{role}
-										</MenuItemOption>
-									);
-								})}
-							</MenuOptionGroup>
-						</MenuList>
-					</Menu>
-				</Flex>
-			</Flex>
-		);
-	}
 	if (Object.values(TextAreaInputType).includes(inputType)) {
 		return (
 			<Textarea
@@ -382,7 +288,7 @@ const InputField = ({
 				onChange={(
 					event: Event & {
 						target: HTMLInputElement;
-					},
+					}
 				) =>
 					setVariables({
 						...variables,
@@ -400,9 +306,7 @@ const InputField = ({
 				</Text>
 				<Switch
 					size="md"
-					isChecked={
-						hasReversedValue ? !variables[inputType] : variables[inputType]
-					}
+					isChecked={variables[inputType]}
 					onChange={() => {
 						setVariables({
 							...variables,
--- a/dashboard/src/components/InviteMembersModal.tsx
+++ b/dashboard/src/components/InviteMembersModal.tsx
@@ -105,7 +105,7 @@ const InviteMembersModal = ({
 					title: 'Invites sent successfully!',
 					isClosable: true,
 					status: 'success',
-					position: 'top-right',
+					position: 'bottom-right',
 				});
 				setLoading(false);
 				updateUserList();
@@ -117,7 +117,7 @@ const InviteMembersModal = ({
 				title: error?.message || 'Error occurred, try again!',
 				isClosable: true,
 				status: 'error',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 			setLoading(false);
 		}
@@ -304,7 +304,7 @@ const InviteMembersModal = ({
 																onClick={() =>
 																	updateEmailListHandler(
 																		ArrayInputOperations.REMOVE,
-																		index,
+																		index
 																	)
 																}
 															>
--- a/dashboard/src/components/Menu.tsx
+++ b/dashboard/src/components/Menu.tsx
@@ -218,7 +218,7 @@ export const Sidebar = ({ onClose, ...rest }: SidebarProps) => {
 									</NavItem>{' '}
 								</Text>
 							</NavLink>
-						),
+						)
 					)}
 					<Link
 						href="/playground"
--- a/dashboard/src/components/UpdateEmailTemplateModal.tsx
+++ b/dashboard/src/components/UpdateEmailTemplateModal.tsx
@@ -29,10 +29,6 @@ import {
 	Tbody,
 	Td,
 	Code,
-	Radio,
-	RadioGroup,
-	Stack,
-	Textarea,
 } from '@chakra-ui/react';
 import { FaPlus, FaAngleDown, FaAngleUp } from 'react-icons/fa';
 import { useClient } from 'urql';
@@ -42,7 +38,6 @@ import {
 	EmailTemplateInputDataFields,
 	emailTemplateEventNames,
 	emailTemplateVariables,
-	EmailTemplateEditors,
 } from '../constants';
 import { capitalizeFirstLetter } from '../utils';
 import { AddEmailTemplate, EditEmailTemplate } from '../graphql/mutation';
@@ -71,8 +66,6 @@ interface templateVariableDataTypes {
 interface emailTemplateDataType {
 	[EmailTemplateInputDataFields.EVENT_NAME]: string;
 	[EmailTemplateInputDataFields.SUBJECT]: string;
-	[EmailTemplateInputDataFields.TEMPLATE]: string;
-	[EmailTemplateInputDataFields.DESIGN]: string;
 }

 interface validatorDataType {
@@ -82,8 +75,6 @@ interface validatorDataType {
 const initTemplateData: emailTemplateDataType = {
 	[EmailTemplateInputDataFields.EVENT_NAME]: emailTemplateEventNames.Signup,
 	[EmailTemplateInputDataFields.SUBJECT]: '',
-	[EmailTemplateInputDataFields.TEMPLATE]: '',
-	[EmailTemplateInputDataFields.DESIGN]: '',
 };

 const initTemplateValidatorData: validatorDataType = {
@@ -100,9 +91,6 @@ const UpdateEmailTemplate = ({
 	const emailEditorRef = useRef(null);
 	const { isOpen, onOpen, onClose } = useDisclosure();
 	const [loading, setLoading] = useState<boolean>(false);
-	const [editor, setEditor] = useState<string>(
-		EmailTemplateEditors.PLAIN_HTML_EDITOR,
-	);
 	const [templateVariables, setTemplateVariables] = useState<
 		templateVariableDataTypes[]
 	>([]);
@@ -119,11 +107,9 @@ const UpdateEmailTemplate = ({
 		if (selectedTemplate) {
 			const { design } = selectedTemplate;
 			try {
-				if (design) {
 				const designData = JSON.parse(design);
 				// @ts-ignore
 				emailEditorRef.current.editor.loadDesign(designData);
-				}
 			} catch (error) {
 				console.error(error);
 				onClose();
@@ -150,7 +136,24 @@ const UpdateEmailTemplate = ({
 		);
 	};

-	const updateTemplate = async (params: emailTemplateDataType) => {
+	const saveData = async () => {
+		if (!validateData()) return;
+		setLoading(true);
+		// @ts-ignore
+		return await emailEditorRef.current.editor.exportHtml(async (data) => {
+			const { design, html } = data;
+			if (!html || !design) {
+				setLoading(false);
+				return;
+			}
+			const params = {
+				[EmailTemplateInputDataFields.EVENT_NAME]:
+					templateData[EmailTemplateInputDataFields.EVENT_NAME],
+				[EmailTemplateInputDataFields.SUBJECT]:
+					templateData[EmailTemplateInputDataFields.SUBJECT],
+				[EmailTemplateInputDataFields.TEMPLATE]: html.trim(),
+				[EmailTemplateInputDataFields.DESIGN]: JSON.stringify(design),
+			};
 			let res: any = {};
 			if (
 				view === UpdateModalViews.Edit &&
@@ -173,7 +176,7 @@ const UpdateEmailTemplate = ({
 					title: capitalizeFirstLetter(res.error.message),
 					isClosable: true,
 					status: 'error',
-				position: 'top-right',
+					position: 'bottom-right',
 				});
 			} else if (
 				res.data?._add_email_template ||
@@ -182,11 +185,11 @@ const UpdateEmailTemplate = ({
 				toast({
 					title: capitalizeFirstLetter(
 						res.data?._add_email_template?.message ||
-						res.data?._update_email_template?.message,
+							res.data?._update_email_template?.message
 					),
 					isClosable: true,
 					status: 'success',
-				position: 'top-right',
+					position: 'bottom-right',
 				});
 				setTemplateData({
 					...initTemplateData,
@@ -194,41 +197,9 @@ const UpdateEmailTemplate = ({
 				setValidator({ ...initTemplateValidatorData });
 				fetchEmailTemplatesData();
 			}
-	};
-
-	const saveData = async () => {
-		if (!validateData()) return;
-		setLoading(true);
-		let params: emailTemplateDataType = {
-			[EmailTemplateInputDataFields.EVENT_NAME]:
-				templateData[EmailTemplateInputDataFields.EVENT_NAME],
-			[EmailTemplateInputDataFields.SUBJECT]:
-				templateData[EmailTemplateInputDataFields.SUBJECT],
-			[EmailTemplateInputDataFields.TEMPLATE]:
-				templateData[EmailTemplateInputDataFields.TEMPLATE],
-			[EmailTemplateInputDataFields.DESIGN]: '',
-		};
-		if (editor === EmailTemplateEditors.UNLAYER_EDITOR) {
-			// @ts-ignore
-			await emailEditorRef.current.editor.exportHtml(async (data) => {
-				const { design, html } = data;
-				if (!html || !design) {
-					setLoading(false);
-					return;
-				}
-				params = {
-					...params,
-					[EmailTemplateInputDataFields.TEMPLATE]: html.trim(),
-					[EmailTemplateInputDataFields.DESIGN]: JSON.stringify(design),
-				};
-				await updateTemplate(params);
-			});
-		} else {
-			await updateTemplate(params);
-		}
 			view === UpdateModalViews.ADD && onClose();
+		});
 	};
-
 	const resetData = () => {
 		if (selectedTemplate) {
 			setTemplateData(selectedTemplate);
@@ -236,8 +207,6 @@ const UpdateEmailTemplate = ({
 			setTemplateData({ ...initTemplateData });
 		}
 	};
-
-	// set template data if edit modal is open
 	useEffect(() => {
 		if (
 			isOpen &&
@@ -245,15 +214,13 @@ const UpdateEmailTemplate = ({
 			selectedTemplate &&
 			Object.keys(selectedTemplate || {}).length
 		) {
-			const { id, created_at, ...rest } = selectedTemplate;
+			const { id, created_at, template, design, ...rest } = selectedTemplate;
 			setTemplateData(rest);
 		}
 	}, [isOpen]);
-
-	// set template variables
 	useEffect(() => {
 		const updatedTemplateVariables = Object.entries(
-			emailTemplateVariables,
+			emailTemplateVariables
 		).reduce((acc, [key, val]): any => {
 			if (
 				(templateData[EmailTemplateInputDataFields.EVENT_NAME] !==
@@ -277,51 +244,6 @@ const UpdateEmailTemplate = ({
 		setTemplateVariables(updatedTemplateVariables);
 	}, [templateData[EmailTemplateInputDataFields.EVENT_NAME]]);

-	// change editor
-	useEffect(() => {
-		if (isOpen && selectedTemplate) {
-			const { design } = selectedTemplate;
-			if (design) {
-				setEditor(EmailTemplateEditors.UNLAYER_EDITOR);
-			} else {
-				setEditor(EmailTemplateEditors.PLAIN_HTML_EDITOR);
-			}
-		}
-	}, [isOpen, selectedTemplate]);
-
-	// reset fields when editor is changed
-	useEffect(() => {
-		if (selectedTemplate?.design) {
-			if (editor === EmailTemplateEditors.UNLAYER_EDITOR) {
-				setTemplateData({
-					...templateData,
-					[EmailTemplateInputDataFields.TEMPLATE]: selectedTemplate.template,
-					[EmailTemplateInputDataFields.DESIGN]: selectedTemplate.design,
-				});
-			} else {
-				setTemplateData({
-					...templateData,
-					[EmailTemplateInputDataFields.TEMPLATE]: '',
-					[EmailTemplateInputDataFields.DESIGN]: '',
-				});
-			}
-		} else if (selectedTemplate?.template) {
-			if (editor === EmailTemplateEditors.UNLAYER_EDITOR) {
-				setTemplateData({
-					...templateData,
-					[EmailTemplateInputDataFields.TEMPLATE]: '',
-					[EmailTemplateInputDataFields.DESIGN]: '',
-				});
-			} else {
-				setTemplateData({
-					...templateData,
-					[EmailTemplateInputDataFields.TEMPLATE]: selectedTemplate?.template,
-					[EmailTemplateInputDataFields.DESIGN]: '',
-				});
-			}
-		}
-	}, [editor]);
-
 	return (
 		<>
 			{view === UpdateModalViews.ADD ? (
@@ -445,7 +367,7 @@ const UpdateEmailTemplate = ({
 										onChange={(e) =>
 											inputChangehandler(
 												EmailTemplateInputDataFields.EVENT_NAME,
-												e.currentTarget.value,
+												e.currentTarget.value
 											)
 										}
 									>
@@ -454,7 +376,7 @@ const UpdateEmailTemplate = ({
 												<option value={value} key={key}>
 													{key}
 												</option>
-											),
+											)
 										)}
 									</Select>
 								</Flex>
@@ -479,7 +401,7 @@ const UpdateEmailTemplate = ({
 											onChange={(e) =>
 												inputChangehandler(
 													EmailTemplateInputDataFields.SUBJECT,
-													e.currentTarget.value,
+													e.currentTarget.value
 												)
 											}
 										/>
@@ -492,22 +414,7 @@ const UpdateEmailTemplate = ({
 								alignItems="center"
 								marginBottom="2%"
 							>
-								<Flex flex="1">Template Body</Flex>
-								<Flex flex="3">
-									<RadioGroup
-										onChange={(value) => setEditor(value)}
-										value={editor}
-									>
-										<Stack direction="row" spacing="50px">
-											<Radio value={EmailTemplateEditors.PLAIN_HTML_EDITOR}>
-												Plain HTML
-											</Radio>
-											<Radio value={EmailTemplateEditors.UNLAYER_EDITOR}>
-												Unlayer Editor
-											</Radio>
-										</Stack>
-									</RadioGroup>
-								</Flex>
+								Template Body
 							</Flex>
 							<Flex
 								width="100%"
@@ -516,22 +423,7 @@ const UpdateEmailTemplate = ({
 								border="1px solid"
 								borderColor="gray.200"
 							>
-								{editor === EmailTemplateEditors.UNLAYER_EDITOR ? (
 								<EmailEditor ref={emailEditorRef} onReady={onReady} />
-								) : (
-									<Textarea
-										value={templateData.template}
-										onChange={(e) => {
-											setTemplateData({
-												...templateData,
-												[EmailTemplateInputDataFields.TEMPLATE]: e.target.value,
-											});
-										}}
-										placeholder="Template HTML"
-										border="0"
-										height="500px"
-									/>
-								)}
 							</Flex>
 						</Flex>
 					</ModalBody>
--- 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 }],
@@ -129,13 +126,13 @@ const UpdateWebhookModal = ({
 		...initWebhookValidatorData,
 	});
 	const [verifiedStatus, setVerifiedStatus] = useState<webhookVerifiedStatus>(
-		webhookVerifiedStatus.PENDING,
+		webhookVerifiedStatus.PENDING
 	);
 	const inputChangehandler = (
 		inputType: string,
 		value: any,
 		headerInputType: string = WebhookInputHeaderFields.KEY,
-		headerIndex: number = 0,
+		headerIndex: number = 0
 	) => {
 		if (
 			verifiedStatus !== webhookVerifiedStatus.PENDING &&
@@ -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({
@@ -244,7 +238,7 @@ const UpdateWebhookModal = ({
 			validator[WebhookInputDataFields.ENDPOINT] &&
 			!validator[WebhookInputDataFields.HEADERS].some(
 				(headerData: headersValidatorDataType) =>
-					!headerData.key || !headerData.value,
+					!headerData.key || !headerData.value
 			)
 		);
 	};
@@ -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],
@@ -264,7 +256,7 @@ const UpdateWebhookModal = ({
 				(acc, data) => {
 					return data.key ? { ...acc, [data.key]: data.value } : acc;
 				},
-				{},
+				{}
 			);
 			if (Object.keys(headers).length) {
 				params[WebhookInputDataFields.HEADERS] = headers;
@@ -298,16 +290,16 @@ const UpdateWebhookModal = ({
 				title: capitalizeFirstLetter(res.error.message),
 				isClosable: true,
 				status: 'error',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 		} else if (res.data?._add_webhook || res.data?._update_webhook) {
 			toast({
 				title: capitalizeFirstLetter(
-					res.data?._add_webhook?.message || res.data?._update_webhook?.message,
+					res.data?._add_webhook?.message || res.data?._update_webhook?.message
 				),
 				isClosable: true,
 				status: 'success',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 			setWebhook({
 				...initWebhookData,
@@ -341,7 +333,7 @@ const UpdateWebhookModal = ({
 				setValidator({
 					...validator,
 					[WebhookInputDataFields.HEADERS]: new Array(
-						formattedHeadersData.length,
+						formattedHeadersData.length
 					)
 						.fill({})
 						.map(() => ({ ...initHeadersValidatorData })),
@@ -410,13 +402,11 @@ 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,
-												e.currentTarget.value,
+												e.currentTarget.value
 											)
 										}
 									>
@@ -425,35 +415,11 @@ const UpdateWebhookModal = ({
 												<option value={value} key={key}>
 													{key}
 												</option>
-											),
+											)
 										)}
 									</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"
@@ -472,7 +438,7 @@ const UpdateWebhookModal = ({
 											onChange={(e) =>
 												inputChangehandler(
 													WebhookInputDataFields.ENDPOINT,
-													e.currentTarget.value,
+													e.currentTarget.value
 												)
 											}
 										/>
@@ -496,7 +462,7 @@ const UpdateWebhookModal = ({
 										onChange={() =>
 											inputChangehandler(
 												WebhookInputDataFields.ENABLED,
-												!webhook[WebhookInputDataFields.ENABLED],
+												!webhook[WebhookInputDataFields.ENABLED]
 											)
 										}
 									/>
@@ -551,7 +517,7 @@ const UpdateWebhookModal = ({
 															WebhookInputDataFields.HEADERS,
 															e.target.value,
 															WebhookInputHeaderFields.KEY,
-															index,
+															index
 														)
 													}
 													width="30%"
@@ -574,7 +540,7 @@ const UpdateWebhookModal = ({
 															WebhookInputDataFields.HEADERS,
 															e.target.value,
 															WebhookInputHeaderFields.VALUE,
-															index,
+															index
 														)
 													}
 													width="65%"
@@ -594,7 +560,7 @@ const UpdateWebhookModal = ({
 												</InputRightElement>
 											</InputGroup>
 										</Flex>
-									),
+									)
 								)}
 							</Flex>
 							<Divider marginY={5} />
--- a/dashboard/src/components/ViewWebhookLogsModal.tsx
+++ b/dashboard/src/components/ViewWebhookLogsModal.tsx
@@ -161,15 +161,15 @@ const ViewWebhookLogsModal = ({
 													<Td>
 														<Text fontSize="sm">{`${logData.id.substring(
 															0,
-															5,
+															5
 														)}***${logData.id.substring(
 															logData.id.length - 5,
-															logData.id.length,
+															logData.id.length
 														)}`}</Text>
 													</Td>
 													<Td>
 														{dayjs(logData.created_at * 1000).format(
-															'MMM DD, YYYY',
+															'MMM DD, YYYY'
 														)}
 													</Td>
 													<Td>
--- a/dashboard/src/constants.ts
+++ b/dashboard/src/constants.ts
@@ -10,16 +10,12 @@ export const TextInputType = {
 	LINKEDIN_CLIENT_ID: 'LINKEDIN_CLIENT_ID',
 	APPLE_CLIENT_ID: 'APPLE_CLIENT_ID',
 	TWITTER_CLIENT_ID: 'TWITTER_CLIENT_ID',
-	MICROSOFT_CLIENT_ID: 'MICROSOFT_CLIENT_ID',
-	MICROSOFT_ACTIVE_DIRECTORY_TENANT_ID: 'MICROSOFT_ACTIVE_DIRECTORY_TENANT_ID',
 	JWT_ROLE_CLAIM: 'JWT_ROLE_CLAIM',
 	REDIS_URL: 'REDIS_URL',
 	SMTP_HOST: 'SMTP_HOST',
 	SMTP_PORT: 'SMTP_PORT',
 	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',
@@ -41,7 +37,6 @@ export const HiddenInputType = {
 	LINKEDIN_CLIENT_SECRET: 'LINKEDIN_CLIENT_SECRET',
 	APPLE_CLIENT_SECRET: 'APPLE_CLIENT_SECRET',
 	TWITTER_CLIENT_SECRET: 'TWITTER_CLIENT_SECRET',
-	MICROSOFT_CLIENT_SECRET: 'MICROSOFT_CLIENT_SECRET',
 	JWT_SECRET: 'JWT_SECRET',
 	SMTP_PASSWORD: 'SMTP_PASSWORD',
 	ADMIN_SECRET: 'ADMIN_SECRET',
@@ -53,17 +48,12 @@ export const ArrayInputType = {
 	DEFAULT_ROLES: 'DEFAULT_ROLES',
 	PROTECTED_ROLES: 'PROTECTED_ROLES',
 	ALLOWED_ORIGINS: 'ALLOWED_ORIGINS',
+	USER_ROLES: 'roles',
 };

 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 = {
-	USER_ROLES: 'roles',
 };

 export const TextAreaInputType = {
@@ -73,8 +63,6 @@ export const TextAreaInputType = {
 };

 export const SwitchInputType = {
-	APP_COOKIE_SECURE: 'APP_COOKIE_SECURE',
-	ADMIN_COOKIE_SECURE: 'ADMIN_COOKIE_SECURE',
 	DISABLE_LOGIN_PAGE: 'DISABLE_LOGIN_PAGE',
 	DISABLE_MAGIC_LINK_LOGIN: 'DISABLE_MAGIC_LINK_LOGIN',
 	DISABLE_EMAIL_VERIFICATION: 'DISABLE_EMAIL_VERIFICATION',
@@ -84,7 +72,6 @@ export const SwitchInputType = {
 	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',
 };

 export const DateInputType = {
@@ -127,9 +114,6 @@ export interface envVarTypes {
 	APPLE_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;
 	ROLES: [string] | [];
 	DEFAULT_ROLES: [string] | [];
 	PROTECTED_ROLES: [string] | [];
@@ -143,16 +127,12 @@ export interface envVarTypes {
 	SMTP_PORT: string;
 	SMTP_USERNAME: string;
 	SMTP_PASSWORD: string;
-	SMTP_LOCAL_NAME: string;
 	SENDER_EMAIL: string;
-	SENDER_NAME: string;
 	ALLOWED_ORIGINS: [string] | [];
 	ORGANIZATION_NAME: string;
 	ORGANIZATION_LOGO: string;
 	CUSTOM_ACCESS_TOKEN_SCRIPT: string;
 	ADMIN_SECRET: string;
-	APP_COOKIE_SECURE: boolean;
-	ADMIN_COOKIE_SECURE: boolean;
 	DISABLE_LOGIN_PAGE: boolean;
 	DISABLE_MAGIC_LINK_LOGIN: boolean;
 	DISABLE_EMAIL_VERIFICATION: boolean;
@@ -166,9 +146,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;
 }

 export const envSubViews = {
@@ -187,7 +164,6 @@ export const envSubViews = {

 export enum WebhookInputDataFields {
 	ID = 'id',
-	EVENT_DESCRIPTION = 'event_description',
 	EVENT_NAME = 'event_name',
 	ENDPOINT = 'endpoint',
 	ENABLED = 'enabled',
@@ -222,7 +198,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 = {
@@ -353,21 +328,3 @@ export const webhookPayloadExample: string = `{
 	},
 	"auth_recipe":"google"
 }`;
-
-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
@@ -32,9 +32,6 @@ export const EnvVariablesQuery = `
      APPLE_CLIENT_SECRET
      TWITTER_CLIENT_ID
      TWITTER_CLIENT_SECRET
-      MICROSOFT_CLIENT_ID
-      MICROSOFT_CLIENT_SECRET
-      MICROSOFT_ACTIVE_DIRECTORY_TENANT_ID
      DEFAULT_ROLES
      PROTECTED_ROLES
      ROLES
@@ -48,15 +45,11 @@ export const EnvVariablesQuery = `
      SMTP_PORT
      SMTP_USERNAME
      SMTP_PASSWORD
-      SMTP_LOCAL_NAME
      SENDER_EMAIL
-      SENDER_NAME
      ALLOWED_ORIGINS
      ORGANIZATION_NAME
      ORGANIZATION_LOGO
      ADMIN_SECRET
-      APP_COOKIE_SECURE
-      ADMIN_COOKIE_SECURE
      DISABLE_LOGIN_PAGE
      DISABLE_MAGIC_LINK_LOGIN
      DISABLE_EMAIL_VERIFICATION
@@ -71,9 +64,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
    }
  }
 `;
@@ -122,7 +112,6 @@ export const WebhooksDataQuery = `
    _webhooks(params: $params){
      webhooks{
        id
-        event_description
        event_name
        endpoint
        enabled
@@ -178,12 +167,3 @@ export const WebhookLogsQuery = `
    }
  }
 `;
-
-export const GetAvailableRolesQuery = `
-  query {
-    _env {
-      ROLES
-      PROTECTED_ROLES
-    }
-  }
-`;
--- a/dashboard/src/index.tsx
+++ b/dashboard/src/index.tsx
@@ -6,5 +6,5 @@ ReactDOM.render(
 	<div>
 		<App />
 	</div>,
-	document.getElementById('root'),
+	document.getElementById('root')
 );
--- a/dashboard/src/pages/Auth.tsx
+++ b/dashboard/src/pages/Auth.tsx
@@ -57,7 +57,7 @@ export default function Auth() {
 					title: capitalizeFirstLetter(error.message),
 					isClosable: true,
 					status: 'error',
-					position: 'top-right',
+					position: 'bottom-right',
 				});
 			});
 		}
--- a/dashboard/src/pages/EmailTemplates.tsx
+++ b/dashboard/src/pages/EmailTemplates.tsx
@@ -154,7 +154,7 @@ const EmailTemplates = () => {
 									<Td>{templateData[EmailTemplateInputDataFields.SUBJECT]}</Td>
 									<Td>
 										{dayjs(templateData.created_at * 1000).format(
-											'MMM DD, YYYY',
+											'MMM DD, YYYY'
 										)}
 									</Td>
 									<Td>
--- a/dashboard/src/pages/Environment.tsx
+++ b/dashboard/src/pages/Environment.tsx
@@ -52,9 +52,6 @@ const Environment = () => {
 		APPLE_CLIENT_SECRET: '',
 		TWITTER_CLIENT_ID: '',
 		TWITTER_CLIENT_SECRET: '',
-		MICROSOFT_CLIENT_ID: '',
-		MICROSOFT_CLIENT_SECRET: '',
-		MICROSOFT_ACTIVE_DIRECTORY_TENANT_ID: '',
 		ROLES: [],
 		DEFAULT_ROLES: [],
 		PROTECTED_ROLES: [],
@@ -68,16 +65,12 @@ const Environment = () => {
 		SMTP_PORT: '',
 		SMTP_USERNAME: '',
 		SMTP_PASSWORD: '',
-		SMTP_LOCAL_NAME: '',
 		SENDER_EMAIL: '',
-		SENDER_NAME: '',
 		ALLOWED_ORIGINS: [],
 		ORGANIZATION_NAME: '',
 		ORGANIZATION_LOGO: '',
 		CUSTOM_ACCESS_TOKEN_SCRIPT: '',
 		ADMIN_SECRET: '',
-		APP_COOKIE_SECURE: false,
-		ADMIN_COOKIE_SECURE: false,
 		DISABLE_LOGIN_PAGE: false,
 		DISABLE_MAGIC_LINK_LOGIN: false,
 		DISABLE_EMAIL_VERIFICATION: false,
@@ -91,9 +84,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,
 	});

 	const [fieldVisibility, setFieldVisibility] = React.useState<
@@ -165,7 +155,7 @@ const Environment = () => {
 				// @ts-ignore
 				[property]: envVariables[property],
 			}),
-			{},
+			{}
 		);
 		if (
 			updatedEnvVariables[HiddenInputType.ADMIN_SECRET] === '' ||
@@ -210,7 +200,7 @@ const Environment = () => {
 			} variables`,
 			isClosable: true,
 			status: 'success',
-			position: 'top-right',
+			position: 'bottom-right',
 		});
 	};

--- a/dashboard/src/pages/Users.tsx
+++ b/dashboard/src/pages/Users.tsx
@@ -29,7 +29,7 @@ import {
 	MenuItem,
 	useToast,
 	Spinner,
-	TableContainer,
+	TableContainer
 } from '@chakra-ui/react';
 import {
 	FaAngleLeft,
@@ -180,14 +180,14 @@ export default function Users() {
 				title: 'User verification failed',
 				isClosable: true,
 				status: 'error',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 		} else if (res.data?._update_user?.id) {
 			toast({
 				title: 'User verification successful',
 				isClosable: true,
 				status: 'success',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 		}
 		updateUserList();
@@ -195,7 +195,7 @@ export default function Users() {

 	const updateAccessHandler = async (
 		id: string,
-		action: updateAccessActions,
+		action: updateAccessActions
 	) => {
 		switch (action) {
 			case updateAccessActions.ENABLE:
@@ -211,14 +211,14 @@ export default function Users() {
 						title: 'User access enable failed',
 						isClosable: true,
 						status: 'error',
-						position: 'top-right',
+						position: 'bottom-right',
 					});
 				} else {
 					toast({
 						title: 'User access enabled successfully',
 						isClosable: true,
 						status: 'success',
-						position: 'top-right',
+						position: 'bottom-right',
 					});
 				}
 				updateUserList();
@@ -236,14 +236,14 @@ export default function Users() {
 						title: 'User access revoke failed',
 						isClosable: true,
 						status: 'error',
-						position: 'top-right',
+						position: 'bottom-right',
 					});
 				} else {
 					toast({
 						title: 'User access revoked successfully',
 						isClosable: true,
 						status: 'success',
-						position: 'top-right',
+						position: 'bottom-right',
 					});
 				}
 				updateUserList();
@@ -263,12 +263,11 @@ export default function Users() {
 			.toPromise();
 		if (res.data?._update_user?.id) {
 			toast({
-				title: `Multi factor authentication ${
-					user.is_multi_factor_auth_enabled ? 'disabled' : 'enabled'
+				title: `Multi factor authentication ${user.is_multi_factor_auth_enabled ? 'disabled' : 'enabled'
 					} for user`,
 				isClosable: true,
 				status: 'success',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 			updateUserList();
 			return;
@@ -277,7 +276,7 @@ export default function Users() {
 			title: 'Multi factor authentication update failed for user',
 			isClosable: true,
 			status: 'error',
-			position: 'top-right',
+			position: 'bottom-right',
 		});
 	};

@@ -388,7 +387,7 @@ export default function Users() {
 																onClick={() =>
 																	updateAccessHandler(
 																		user.id,
-																		updateAccessActions.ENABLE,
+																		updateAccessActions.ENABLE
 																	)
 																}
 															>
@@ -399,7 +398,7 @@ export default function Users() {
 																onClick={() =>
 																	updateAccessHandler(
 																		user.id,
-																		updateAccessActions.REVOKE,
+																		updateAccessActions.REVOKE
 																	)
 																}
 															>
@@ -408,17 +407,13 @@ export default function Users() {
 														)}
 														{user.is_multi_factor_auth_enabled ? (
 															<MenuItem
-																onClick={() =>
-																	multiFactorAuthUpdateHandler(user)
-																}
+																onClick={() => multiFactorAuthUpdateHandler(user)}
 															>
 																Disable MultiFactor Authentication
 															</MenuItem>
 														) : (
 															<MenuItem
-																onClick={() =>
-																	multiFactorAuthUpdateHandler(user)
-																}
+																onClick={() => multiFactorAuthUpdateHandler(user)}
 															>
 																Enable MultiFactor Authentication
 															</MenuItem>
--- 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>
@@ -175,12 +170,12 @@ const Webhooks = () => {
 											label={JSON.stringify(
 												webhook[WebhookInputDataFields.HEADERS],
 												null,
-												' ',
+												' '
 											)}
 										>
 											<Tag size="sm" variant="outline" colorScheme="gray">
 												{Object.keys(
-													webhook[WebhookInputDataFields.HEADERS] || {},
+													webhook[WebhookInputDataFields.HEADERS] || {}
 												)?.length.toString()}
 											</Tag>
 										</Tooltip>
@@ -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/src/utils/index.ts
+++ b/dashboard/src/utils/index.ts
@@ -67,7 +67,7 @@ export const validateEmail = (email: string) => {
 	return email
 		.toLowerCase()
 		.match(
-			/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
+			/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
 		)
 		? true
 		: false;
@@ -78,7 +78,7 @@ export const validateURI = (uri: string) => {
 	return uri
 		.toLowerCase()
 		.match(
-			/(?:^|\s)((https?:\/\/)?(?:localhost|[\w-]+(?:\.[\w-]+)+)(:\d+)?(\/\S*)?)/,
+			/(?:^|\s)((https?:\/\/)?(?:localhost|[\w-]+(?:\.[\w-]+)+)(:\d+)?(\/\S*)?)/
 		)
 		? true
 		: false;
--- a/dashboard/src/utils/parseCSV.ts
+++ b/dashboard/src/utils/parseCSV.ts
@@ -27,7 +27,7 @@ const parseCSV = (file: File, delimiter: string): Promise<dataTypes[]> => {
 						value: email.trim(),
 						isInvalid: !validateEmail(email.trim()),
 					};
-				}),
+				})
 			);
 		};

--- a/dashboard/yarn.lock
+++ b/dashboard/yarn.lock
--- 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/constants/auth_methods.go
+++ b/server/constants/auth_methods.go
@@ -3,12 +3,8 @@ package constants
 const (
 	// AuthRecipeMethodBasicAuth is the basic_auth auth method
 	AuthRecipeMethodBasicAuth = "basic_auth"
-	// AuthRecipeMethodMobileBasicAuth is the mobile basic_auth method, where user can signup using mobile number and password
-	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
@@ -21,6 +17,4 @@ const (
 	AuthRecipeMethodApple = "apple"
 	// AuthRecipeMethodTwitter is the twitter auth method
 	AuthRecipeMethodTwitter = "twitter"
-	// AuthRecipeMethodMicrosoft is the microsoft auth method
-	AuthRecipeMethodMicrosoft = "microsoft"
 )
--- 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
@@ -25,8 +25,4 @@ const (
 	DbTypeCockroachDB = "cockroachdb"
 	// DbTypePlanetScaleDB is the planetscale database type
 	DbTypePlanetScaleDB = "planetscale"
-	// DbTypeDynamoDB is the Dynamo database type
-	DbTypeDynamoDB = "dynamodb"
-	// DbTypeCouchbaseDB is the Couchbase database type
-	DbTypeCouchbaseDB = "couchbase"
 )
--- a/server/constants/env.go
+++ b/server/constants/env.go
@@ -21,12 +21,6 @@ const (
 	EnvKeyDatabaseType = "DATABASE_TYPE"
 	// EnvKeyDatabaseURL key for env variable DATABASE_URL
 	EnvKeyDatabaseURL = "DATABASE_URL"
-	// EnvAwsRegion key for env variable AWS REGION
-	EnvAwsRegion = "AWS_REGION"
-	// EnvAwsAccessKeyID key for env variable AWS_ACCESS_KEY_ID
-	EnvAwsAccessKeyID = "AWS_ACCESS_KEY_ID"
-	// EnvAwsAccessKey key for env variable AWS_SECRET_ACCESS_KEY
-	EnvAwsSecretAccessKey = "AWS_SECRET_ACCESS_KEY"
 	// EnvKeyDatabaseName key for env variable DATABASE_NAME
 	EnvKeyDatabaseName = "DATABASE_NAME"
 	// EnvKeyDatabaseUsername key for env variable DATABASE_USERNAME
@@ -43,13 +37,6 @@ const (
 	EnvKeyDatabaseCertKey = "DATABASE_CERT_KEY"
 	// EnvKeyDatabaseCACert key for env variable DATABASE_CA_CERT
 	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
 	EnvKeySmtpHost = "SMTP_HOST"
 	// EnvKeySmtpPort key for env variable SMTP_PORT
@@ -58,16 +45,10 @@ const (
 	EnvKeySmtpUsername = "SMTP_USERNAME"
 	// EnvKeySmtpPassword key for env variable SMTP_PASSWORD
 	EnvKeySmtpPassword = "SMTP_PASSWORD"
-	// EnvKeySmtpLocalName key for env variable SMTP_LOCAL_NAME
-	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
@@ -112,12 +93,6 @@ const (
 	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"
 	// EnvKeyOrganizationName key for env variable ORGANIZATION_NAME
 	EnvKeyOrganizationName = "ORGANIZATION_NAME"
 	// EnvKeyOrganizationLogo key for env variable ORGANIZATION_LOGO
@@ -142,8 +117,6 @@ const (
 	EnvKeyDisableEmailVerification = "DISABLE_EMAIL_VERIFICATION"
 	// EnvKeyDisableBasicAuthentication key for env variable DISABLE_BASIC_AUTH
 	EnvKeyDisableBasicAuthentication = "DISABLE_BASIC_AUTHENTICATION"
-	// EnvKeyDisableBasicAuthentication key for env variable DISABLE_MOBILE_BASIC_AUTH
-	EnvKeyDisableMobileBasicAuthentication = "DISABLE_MOBILE_BASIC_AUTHENTICATION"
 	// EnvKeyDisableMagicLinkLogin key for env variable DISABLE_MAGIC_LINK_LOGIN
 	EnvKeyDisableMagicLinkLogin = "DISABLE_MAGIC_LINK_LOGIN"
 	// EnvKeyDisableLoginPage key for env variable DISABLE_LOGIN_PAGE
@@ -160,12 +133,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"
-	// 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
@@ -176,22 +143,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
@@ -1,19 +0,0 @@
-package constants
-
-const (
-	// - query: for Authorization Code grant. 302 Found triggers redirect.
-	ResponseModeQuery = "query"
-	// - fragment: for Implicit grant. 302 Found triggers redirect.
-	ResponseModeFragment = "fragment"
-	// - form_post: 200 OK with response parameters embedded in an HTML form as hidden parameters.
-	ResponseModeFormPost = "form_post"
-	// - web_message: For Silent Authentication. Uses HTML5 web messaging.
-	ResponseModeWebMessage = "web_message"
-
-	// For the Authorization Code grant, use response_type=code to include the authorization code.
-	ResponseTypeCode = "code"
-	// For the Implicit grant, use response_type=token to include an access token.
-	ResponseTypeToken = "token"
-	// For the Implicit grant of id_token, use response_type=id_token to include an identifier token.
-	ResponseTypeIDToken = "id_token"
-)
--- a/server/constants/oauth_info_urls.go
+++ b/server/constants/oauth_info_urls.go
@@ -16,8 +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"
-
-	// 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/verification_types.go
+++ b/server/constants/verification_types.go
@@ -14,14 +14,3 @@ const (
 	// VerificationTypeOTP is the otp verification type
 	VerificationTypeOTP = "verify_otp"
 )
-
-var (
-	// VerificationTypes is slice of all verification types
-	VerificationTypes = []string{
-		VerificationTypeBasicAuthSignup,
-		VerificationTypeMagicLinkLogin,
-		VerificationTypeUpdateEmail,
-		VerificationTypeForgotPassword,
-		VerificationTypeInviteMember,
-	}
-)
--- 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/cookie.go
+++ b/server/cookie/cookie.go
@@ -29,20 +29,10 @@ func SetSession(gc *gin.Context, sessionID string) {
 		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
 	year := 60 * 60 * 24 * 365

+	gc.SetSameSite(http.SameSiteNoneMode)
 	gc.SetCookie(constants.AppCookieName+"_session", sessionID, year, "/", host, secure, httpOnly)
 	gc.SetCookie(constants.AppCookieName+"_session_domain", sessionID, year, "/", domain, secure, httpOnly)
 }
--- 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/db/db.go
+++ b/server/db/db.go
@@ -7,8 +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"
 	"github.com/authorizerdev/authorizer/server/memorystore"
@@ -22,12 +20,10 @@ func InitDB() error {

 	envs := memorystore.RequiredEnvStoreObj.GetRequiredEnv()

-	isSQL := envs.DatabaseType != constants.DbTypeArangodb && envs.DatabaseType != constants.DbTypeMongodb && envs.DatabaseType != constants.DbTypeCassandraDB && envs.DatabaseType != constants.DbTypeScyllaDB && envs.DatabaseType != constants.DbTypeDynamoDB && envs.DatabaseType != constants.DbTypeCouchbaseDB
+	isSQL := envs.DatabaseType != constants.DbTypeArangodb && envs.DatabaseType != constants.DbTypeMongodb && envs.DatabaseType != constants.DbTypeCassandraDB && envs.DatabaseType != constants.DbTypeScyllaDB
 	isArangoDB := envs.DatabaseType == constants.DbTypeArangodb
 	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)
@@ -65,23 +61,5 @@ func InitDB() error {
 		}
 	}

-	if isDynamoDB {
-		log.Info("Initializing DynamoDB Driver for: ", envs.DatabaseType)
-		Provider, err = dynamodb.NewProvider()
-		if err != nil {
-			log.Fatal("Failed to initialize DynamoDB driver: ", err)
-			return err
-		}
-	}
-
-	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/email_templates.go
+++ b/server/db/models/email_templates.go
@@ -9,14 +9,14 @@ import (

 // EmailTemplate model for database
 type EmailTemplate 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"`
-	Subject   string `json:"subject" bson:"subject" cql:"subject" dynamo:"subject"`
-	Template  string `json:"template" bson:"template" cql:"template" dynamo:"template"`
-	Design    string `json:"design" bson:"design" cql:"design" dynamo:"design"`
-	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"`
+	Key       string `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty"` // for arangodb
+	ID        string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id"`
+	EventName string `gorm:"unique" json:"event_name" bson:"event_name" cql:"event_name"`
+	Subject   string `gorm:"type:text" json:"subject" bson:"subject" cql:"subject"`
+	Template  string `gorm:"type:text" json:"template" bson:"template" cql:"template"`
+	Design    string `gorm:"type:text" json:"design" bson:"design" cql:"design"`
+	CreatedAt int64  `json:"created_at" bson:"created_at" cql:"created_at"`
+	UpdatedAt int64  `json:"updated_at" bson:"updated_at" cql:"updated_at"`
 }

 // AsAPIEmailTemplate to return email template as graphql response object
--- a/server/db/models/env.go
+++ b/server/db/models/env.go
@@ -4,11 +4,10 @@ package models

 // Env model for db
 type Env 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"`
-	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"`
+	Key       string `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty"` // for arangodb
+	ID        string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id"`
+	EnvData   string `gorm:"type:text" json:"env" bson:"env" cql:"env"`
+	Hash      string `gorm:"type:text" json:"hash" bson:"hash" cql:"hash"`
+	UpdatedAt int64  `json:"updated_at" bson:"updated_at" cql:"updated_at"`
+	CreatedAt int64  `json:"created_at" bson:"created_at" cql:"created_at"`
 }
--- a/server/db/models/model.go
+++ b/server/db/models/model.go
@@ -10,7 +10,6 @@ type CollectionList struct {
 	WebhookLog          string
 	EmailTemplate       string
 	OTP                 string
-	SMSVerificationRequest string
 }

 var (
@@ -26,6 +25,5 @@ var (
 		WebhookLog:          Prefix + "webhook_logs",
 		EmailTemplate:       Prefix + "email_templates",
 		OTP:                 Prefix + "otps",
-		SMSVerificationRequest: Prefix + "sms_verification_requests",
 	}
 )
--- a/server/db/models/otp.go
+++ b/server/db/models/otp.go
@@ -1,24 +1,12 @@
 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:"unique" json:"email" bson:"email" cql:"email" dynamo:"email" index:"email,hash"`
-	PhoneNumber string `gorm:"index:unique_index_phone_number,unique" json:"phone_number" bson:"phone_number" cql:"phone_number" dynamo:"phone_number"`
-	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"`
-	UpdatedAt   int64  `json:"updated_at" bson:"updated_at" cql:"updated_at" dynamo:"updated_at"`
-}
-
-type Paging struct {
-	ID string `json:"id,omitempty" dynamo:"id,hash"`
+	Key       string `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty"` // for arangodb
+	ID        string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id"`
+	Email     string `gorm:"unique" json:"email" bson:"email" cql:"email"`
+	Otp       string `json:"otp" bson:"otp" cql:"otp"`
+	ExpiresAt int64  `json:"expires_at" bson:"expires_at" cql:"expires_at"`
+	CreatedAt int64  `json:"created_at" bson:"created_at" cql:"created_at"`
+	UpdatedAt int64  `json:"updated_at" bson:"updated_at" cql:"updated_at"`
 }
--- a/server/db/models/session.go
+++ b/server/db/models/session.go
@@ -4,11 +4,11 @@ package models

 // Session model for db
 type Session 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"`
-	UserAgent string `json:"user_agent" bson:"user_agent" cql:"user_agent" dynamo:"user_agent"`
-	IP        string `json:"ip" bson:"ip" cql:"ip" dynamo:"ip"`
-	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"`
+	Key       string `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty"` // for arangodb
+	ID        string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id"`
+	UserID    string `gorm:"type:char(36)" json:"user_id" bson:"user_id" cql:"user_id"`
+	UserAgent string `json:"user_agent" bson:"user_agent" cql:"user_agent"`
+	IP        string `json:"ip" bson:"ip" cql:"ip"`
+	CreatedAt int64  `json:"created_at" bson:"created_at" cql:"created_at"`
+	UpdatedAt int64  `json:"updated_at" bson:"updated_at" cql:"updated_at"`
 }
--- a/server/db/models/user.go
+++ b/server/db/models/user.go
@@ -12,35 +12,33 @@ import (

 // User model for db
 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"`
+	Key string `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty"` // for arangodb
+	ID  string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id"`

-	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"`
-	GivenName                *string `json:"given_name" bson:"given_name" cql:"given_name" dynamo:"given_name"`
-	FamilyName               *string `json:"family_name" bson:"family_name" cql:"family_name" dynamo:"family_name"`
-	MiddleName               *string `json:"middle_name" bson:"middle_name" cql:"middle_name" dynamo:"middle_name"`
-	Nickname                 *string `json:"nickname" bson:"nickname" cql:"nickname" dynamo:"nickname"`
-	Gender                   *string `json:"gender" bson:"gender" cql:"gender" dynamo:"gender"`
-	Birthdate                *string `json:"birthdate" bson:"birthdate" cql:"birthdate" dynamo:"birthdate"`
-	PhoneNumber              *string `gorm:"index" json:"phone_number" bson:"phone_number" cql:"phone_number" dynamo:"phone_number"`
-	PhoneNumberVerifiedAt    *int64  `json:"phone_number_verified_at" bson:"phone_number_verified_at" cql:"phone_number_verified_at" dynamo:"phone_number_verified_at"`
-	Picture                  *string `json:"picture" bson:"picture" cql:"picture" dynamo:"picture"`
-	Roles                    string  `json:"roles" bson:"roles" cql:"roles" dynamo:"roles"`
-	RevokedTimestamp         *int64  `json:"revoked_timestamp" bson:"revoked_timestamp" cql:"revoked_timestamp" dynamo:"revoked_timestamp"`
-	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"`
+	Email                    string  `gorm:"unique" json:"email" bson:"email" cql:"email"`
+	EmailVerifiedAt          *int64  `json:"email_verified_at" bson:"email_verified_at" cql:"email_verified_at"`
+	Password                 *string `gorm:"type:text" json:"password" bson:"password" cql:"password"`
+	SignupMethods            string  `json:"signup_methods" bson:"signup_methods" cql:"signup_methods"`
+	GivenName                *string `json:"given_name" bson:"given_name" cql:"given_name"`
+	FamilyName               *string `json:"family_name" bson:"family_name" cql:"family_name"`
+	MiddleName               *string `json:"middle_name" bson:"middle_name" cql:"middle_name"`
+	Nickname                 *string `json:"nickname" bson:"nickname" cql:"nickname"`
+	Gender                   *string `json:"gender" bson:"gender" cql:"gender"`
+	Birthdate                *string `json:"birthdate" bson:"birthdate" cql:"birthdate"`
+	PhoneNumber              *string `gorm:"unique" json:"phone_number" bson:"phone_number" cql:"phone_number"`
+	PhoneNumberVerifiedAt    *int64  `json:"phone_number_verified_at" bson:"phone_number_verified_at" cql:"phone_number_verified_at"`
+	Picture                  *string `gorm:"type:text" json:"picture" bson:"picture" cql:"picture"`
+	Roles                    string  `json:"roles" bson:"roles" cql:"roles"`
+	RevokedTimestamp         *int64  `json:"revoked_timestamp" bson:"revoked_timestamp" cql:"revoked_timestamp"`
+	IsMultiFactorAuthEnabled *bool   `json:"is_multi_factor_auth_enabled" bson:"is_multi_factor_auth_enabled" cql:"is_multi_factor_auth_enabled"`
+	UpdatedAt                int64   `json:"updated_at" bson:"updated_at" cql:"updated_at"`
+	CreatedAt                int64   `json:"created_at" bson:"created_at" cql:"created_at"`
 }

 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+"/")
@@ -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/verification_requests.go
+++ b/server/db/models/verification_requests.go
@@ -11,16 +11,16 @@ import (

 // VerificationRequest model for db
 type VerificationRequest struct {
-	Key         string `json:"_key,omitempty" bson:"_key" cql:"_key,omitempty" dynamo:"key,omitempty"` // for arangodb
-	ID          string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id" dynamo:"id,hash"`
-	Token       string `json:"token" bson:"token" cql:"jwt_token" dynamo:"token" index:"token,hash"`
-	Identifier  string `gorm:"uniqueIndex:idx_email_identifier;type:varchar(64)" json:"identifier" bson:"identifier" cql:"identifier" dynamo:"identifier"`
-	ExpiresAt   int64  `json:"expires_at" bson:"expires_at" cql:"expires_at" dynamo:"expires_at"`
-	Email       string `gorm:"uniqueIndex:idx_email_identifier;type:varchar(256)" json:"email" bson:"email" cql:"email" dynamo:"email"`
-	Nonce       string `json:"nonce" bson:"nonce" cql:"nonce" dynamo:"nonce"`
-	RedirectURI string `json:"redirect_uri" bson:"redirect_uri" cql:"redirect_uri" dynamo:"redirect_uri"`
-	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"`
+	Key         string `json:"_key,omitempty" bson:"_key" cql:"_key,omitempty"` // for arangodb
+	ID          string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id"`
+	Token       string `gorm:"type:text" json:"token" bson:"token" cql:"jwt_token"` // token is reserved keyword in cassandra
+	Identifier  string `gorm:"uniqueIndex:idx_email_identifier;type:varchar(64)" json:"identifier" bson:"identifier" cql:"identifier"`
+	ExpiresAt   int64  `json:"expires_at" bson:"expires_at" cql:"expires_at"`
+	Email       string `gorm:"uniqueIndex:idx_email_identifier;type:varchar(256)" json:"email" bson:"email" cql:"email"`
+	Nonce       string `gorm:"type:text" json:"nonce" bson:"nonce" cql:"nonce"`
+	RedirectURI string `gorm:"type:text" json:"redirect_uri" bson:"redirect_uri" cql:"redirect_uri"`
+	CreatedAt   int64  `json:"created_at" bson:"created_at" cql:"created_at"`
+	UpdatedAt   int64  `json:"updated_at" bson:"updated_at" cql:"updated_at"`
 }

 func (v *VerificationRequest) AsAPIVerificationRequest() *model.VerificationRequest {
--- a/server/db/models/webhook.go
+++ b/server/db/models/webhook.go
@@ -10,38 +10,31 @@ 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"`
-	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"`
+	Key       string `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty"` // for arangodb
+	ID        string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id"`
+	EventName string `gorm:"unique" json:"event_name" bson:"event_name" cql:"event_name"`
+	EndPoint  string `gorm:"type:text" json:"endpoint" bson:"endpoint" cql:"endpoint"`
+	Headers   string `gorm:"type:text" json:"headers" bson:"headers" cql:"headers"`
+	Enabled   bool   `json:"enabled" bson:"enabled" cql:"enabled"`
+	CreatedAt int64  `json:"created_at" bson:"created_at" cql:"created_at"`
+	UpdatedAt int64  `json:"updated_at" bson:"updated_at" cql:"updated_at"`
 }

 // AsAPIWebhook to return webhook as graphql response object
 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/models/webhook_log.go
+++ b/server/db/models/webhook_log.go
@@ -11,14 +11,14 @@ import (

 // WebhookLog model for db
 type WebhookLog 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"`
-	HttpStatus int64  `json:"http_status" bson:"http_status" cql:"http_status" dynamo:"http_status"`
-	Response   string `json:"response" bson:"response" cql:"response" dynamo:"response"`
-	Request    string `json:"request" bson:"request" cql:"request" dynamo:"request"`
-	WebhookID  string `gorm:"type:char(36)" json:"webhook_id" bson:"webhook_id" cql:"webhook_id" dynamo:"webhook_id" index:"webhook_id,hash"`
-	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"`
+	Key        string `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty"` // for arangodb
+	ID         string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id"`
+	HttpStatus int64  `json:"http_status" bson:"http_status" cql:"http_status"`
+	Response   string `gorm:"type:text" json:"response" bson:"response" cql:"response"`
+	Request    string `gorm:"type:text" json:"request" bson:"request" cql:"request"`
+	WebhookID  string `gorm:"type:char(36)" json:"webhook_id" bson:"webhook_id" cql:"webhook_id"`
+	CreatedAt  int64  `json:"created_at" bson:"created_at" cql:"created_at"`
+	UpdatedAt  int64  `json:"updated_at" bson:"updated_at" cql:"updated_at"`
 }

 // AsAPIWebhookLog to return webhook log as graphql response object
--- 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
@@ -31,7 +31,7 @@ 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)
@@ -45,17 +45,19 @@ 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 env, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if env == nil {
+			if env.Key == "" {
 				return env, fmt.Errorf("config not found")
 			}
 			break
--- 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,47 +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")
-			}
-			break
-		}
-		_, err := cursor.ReadDocument(ctx, &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) {
-	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")
+			if otp.Key == "" {
+				return nil, fmt.Errorf("email template not found")
 			}
 			break
 		}
@@ -112,7 +76,8 @@ func (p *provider) GetOTPByPhoneNumber(ctx context.Context, phoneNumber string)
 			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,104 +87,81 @@ 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{
+
+	otpCollection, _ := arangodb.Collection(nil, models.Collections.OTP)
+	otpCollection.EnsureHashIndex(ctx, []string{"email"}, &arangoDriver.EnsureHashIndexOptions{
 		Unique: true,
 		Sparse: true,
 	})
+
 	return &provider{
 		db: arangodb,
 	}, err
--- 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"

@@ -14,11 +15,10 @@ import (
 	"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"
 )

 // 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
@@ -32,12 +32,6 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User
 		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")
-		}
-	}
-
 	user.CreatedAt = time.Now().Unix()
 	user.UpdatedAt = time.Now().Unix()
 	userCollection, _ := p.db.Collection(ctx, models.Collections.User)
@@ -52,9 +46,8 @@ 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 {
@@ -67,12 +60,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,
@@ -82,55 +76,65 @@ 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 user, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if user == nil {
+			if user.Key == "" {
 				return user, fmt.Errorf("user not found")
 			}
 			break
@@ -140,24 +144,28 @@ func (p *provider) GetUserByEmail(ctx context.Context, email string) (*models.Us
 			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 user, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if user == nil {
+			if user.Key == "" {
 				return user, fmt.Errorf("user not found")
 			}
 			break
@@ -167,6 +175,7 @@ func (p *provider) GetUserByID(ctx context.Context, id string) (*models.User, er
 			return user, err
 		}
 	}
+
 	return user, nil
 }

@@ -175,12 +184,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)
@@ -191,36 +202,12 @@ 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
-	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 {
-				return nil, fmt.Errorf("user not found")
-			}
-			break
-		}
-		_, err := cursor.ReadDocument(ctx, &user)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return user, nil
-}
--- a/server/db/providers/arangodb/verification_requests.go
+++ b/server/db/providers/arangodb/verification_requests.go
@@ -5,18 +5,19 @@ 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)
@@ -26,24 +27,27 @@ func (p *provider) AddVerificationRequest(ctx context.Context, verificationReque
 	}
 	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 verificationRequest, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if verificationRequest == nil {
+			if verificationRequest.Key == "" {
 				return verificationRequest, fmt.Errorf("verification request not found")
 			}
 			break
@@ -53,25 +57,29 @@ func (p *provider) GetVerificationRequestByToken(ctx context.Context, token stri
 			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 verificationRequest, err
 	}
 	defer cursor.Close()
+
 	for {
 		if !cursor.HasMore() {
-			if verificationRequest == nil {
+			if verificationRequest.Key == "" {
 				return verificationRequest, fmt.Errorf("verification request not found")
 			}
 			break
@@ -81,26 +89,30 @@ func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email stri
 			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/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,10 +11,11 @@ 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)
@@ -27,8 +28,9 @@ 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()
+
 	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 {
@@ -38,12 +40,14 @@ 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) {
+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
@@ -161,12 +161,6 @@ func NewProvider() (*provider, error) {
 	if err != nil {
 		return nil, err
 	}
-
-	userPhoneNumberIndexQuery := fmt.Sprintf("CREATE INDEX IF NOT EXISTS authorizer_user_phone_number ON %s.%s (phone_number)", KeySpace, models.Collections.User)
-	err = session.Query(userPhoneNumberIndexQuery).Exec()
-	if err != nil {
-		return nil, err
-	}
 	// add is_multi_factor_auth_enabled on users table
 	userTableAlterQuery := fmt.Sprintf(`ALTER TABLE %s.%s ADD is_multi_factor_auth_enabled boolean`, KeySpace, models.Collections.User)
 	err = session.Query(userTableAlterQuery).Exec()
@@ -207,13 +201,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,19 +241,7 @@ 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 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
-	}
+
 	return &provider{
 		db: session,
 	}, err
--- 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
@@ -12,13 +12,12 @@ import (
 	"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/gocql/gocql"
 	"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()
 	}
@@ -31,12 +30,6 @@ func (p *provider) AddUser(ctx context.Context, user *models.User) (*models.User
 		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")
-		}
-	}
-
 	user.CreatedAt = time.Now().Unix()
 	user.UpdatedAt = time.Now().Unix()

@@ -77,6 +70,7 @@ 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()
 	if err != nil {
 		return user, err
@@ -86,7 +80,7 @@ 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()

 	bytes, err := json.Marshal(user)
@@ -137,12 +131,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 {
 	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 := ""
@@ -165,7 +160,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)
@@ -178,6 +173,7 @@ func (p *provider) ListUsers(ctx context.Context, pagination *model.Pagination)
 	// 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, 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() {
@@ -192,31 +188,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, 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, 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
@@ -249,8 +245,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)
@@ -302,14 +299,3 @@ func (p *provider) UpdateUsers(ctx context.Context, data map[string]interface{},

 	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, 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
-	}
-	return &user, nil
-}
--- 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()
 	}
@@ -29,39 +29,41 @@ func (p *provider) AddVerificationRequest(ctx context.Context, verificationReque
 }

 // 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/email_template.go
+++ b/server/db/providers/couchbase/email_template.go
@@ -1,158 +0,0 @@
-package couchbase
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"log"
-	"strings"
-	"time"
-
-	"github.com/authorizerdev/authorizer/server/db/models"
-	"github.com/authorizerdev/authorizer/server/graph/model"
-	"github.com/couchbase/gocb/v2"
-	"github.com/google/uuid"
-)
-
-// AddEmailTemplate to add EmailTemplate
-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()
-	insertOpt := gocb.InsertOptions{
-		Context: ctx,
-	}
-
-	_, err := p.db.Collection(models.Collections.EmailTemplate).Insert(emailTemplate.ID, emailTemplate, &insertOpt)
-	if err != nil {
-		return emailTemplate.AsAPIEmailTemplate(), err
-	}
-
-	return emailTemplate.AsAPIEmailTemplate(), nil
-}
-
-// UpdateEmailTemplate to update EmailTemplate
-func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate *models.EmailTemplate) (*model.EmailTemplate, error) {
-	bytes, err := json.Marshal(emailTemplate)
-	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()
-	emailTemplateMap := map[string]interface{}{}
-	err = decoder.Decode(&emailTemplateMap)
-	if err != nil {
-		return nil, err
-	}
-
-	updateFields, params := GetSetFields(emailTemplateMap)
-	params["emailId"] = emailTemplate.ID
-
-	query := fmt.Sprintf("UPDATE %s.%s SET %s WHERE _id = $emailId", p.scopeName, models.Collections.EmailTemplate, updateFields)
-
-	_, err = p.db.Query(query, &gocb.QueryOptions{
-		Context:         ctx,
-		NamedParameters: params,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return emailTemplate.AsAPIEmailTemplate(), nil
-}
-
-// ListEmailTemplates to list EmailTemplate
-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
-	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{
-		Context:              ctx,
-		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
-		PositionalParameters: []interface{}{paginationClone.Offset, paginationClone.Limit},
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	for queryResult.Next() {
-		var emailTemplate *models.EmailTemplate
-		err := queryResult.Row(&emailTemplate)
-		if err != nil {
-			log.Fatal(err)
-		}
-		emailTemplates = append(emailTemplates, emailTemplate.AsAPIEmailTemplate())
-	}
-
-	if err := queryResult.Err(); err != nil {
-		return nil, err
-
-	}
-
-	return &model.EmailTemplates{
-		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
-	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
-	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
-}
-
-// DeleteEmailTemplate to delete EmailTemplate
-func (p *provider) DeleteEmailTemplate(ctx context.Context, emailTemplate *model.EmailTemplate) error {
-	removeOpt := gocb.RemoveOptions{
-		Context: ctx,
-	}
-	_, err := p.db.Collection(models.Collections.EmailTemplate).Remove(emailTemplate.ID, &removeOpt)
-	if err != nil {
-		return err
-	}
-	return nil
-}
--- a/server/db/providers/couchbase/env.go
+++ b/server/db/providers/couchbase/env.go
@@ -1,66 +0,0 @@
-package couchbase
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/authorizerdev/authorizer/server/db/models"
-	"github.com/couchbase/gocb/v2"
-	"github.com/google/uuid"
-)
-
-// AddEnv to save environment information in database
-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 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) {
-	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 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
-
-	query := fmt.Sprintf("SELECT _id, env, encryption_key, 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 env, err
-	}
-	err = q.One(&env)
-	if err != nil {
-		return env, err
-	}
-	env.Hash = env.EncryptionKey
-	return env, nil
-}
--- a/server/db/providers/couchbase/otp.go
+++ b/server/db/providers/couchbase/otp.go
@@ -1,113 +0,0 @@
-package couchbase
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/authorizerdev/authorizer/server/db/models"
-	"github.com/couchbase/gocb/v2"
-	"github.com/google/uuid"
-)
-
-// 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)
-	}
-	shouldCreate := false
-	if otp == nil {
-		shouldCreate = true
-		otp = &models.OTP{
-			ID:          uuid.NewString(),
-			Otp:         otpParam.Otp,
-			Email:       otpParam.Email,
-			PhoneNumber: otpParam.PhoneNumber,
-			ExpiresAt:   otpParam.ExpiresAt,
-			CreatedAt:   time.Now().Unix(),
-			UpdatedAt:   time.Now().Unix(),
-		}
-	} else {
-		otp.Otp = otpParam.Otp
-		otp.ExpiresAt = otpParam.ExpiresAt
-	}
-	otp.UpdatedAt = time.Now().Unix()
-	if shouldCreate {
-		insertOpt := gocb.InsertOptions{
-			Context: ctx,
-		}
-		_, err := p.db.Collection(models.Collections.OTP).Insert(otp.ID, otp, &insertOpt)
-		if err != nil {
-			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)
-		_, err := p.db.Query(query, &gocb.QueryOptions{
-			PositionalParameters: []interface{}{otp.Otp, otp.ExpiresAt, otp.UpdatedAt, otp.ID},
-		})
-		if err != nil {
-			return otp, err
-		}
-	}
-	return otp, nil
-}
-
-// 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)
-	q, err := p.db.Query(query, &gocb.QueryOptions{
-		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
-		PositionalParameters: []interface{}{emailAddress},
-	})
-	if err != nil {
-		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
-}
-
-// DeleteOTP to delete otp
-func (p *provider) DeleteOTP(ctx context.Context, otp *models.OTP) error {
-	removeOpt := gocb.RemoveOptions{
-		Context: ctx,
-	}
-	_, err := p.db.Collection(models.Collections.OTP).Remove(otp.ID, &removeOpt)
-	if err != nil {
-		return err
-	}
-	return nil
-}
--- a/server/db/providers/couchbase/provider.go
+++ b/server/db/providers/couchbase/provider.go
@@ -1,174 +0,0 @@
-package couchbase
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/couchbase/gocb/v2"
-
-	"github.com/authorizerdev/authorizer/server/db/models"
-	"github.com/authorizerdev/authorizer/server/memorystore"
-)
-
-const (
-	defaultBucketName = "authorizer"
-	defaultScope      = "_default"
-)
-
-type provider struct {
-	db        *gocb.Scope
-	scopeName string
-}
-
-// NewProvider returns a new Couchbase provider
-func NewProvider() (*provider, error) {
-	bucketName := memorystore.RequiredEnvStoreObj.GetRequiredEnv().CouchbaseBucket
-	scopeName := memorystore.RequiredEnvStoreObj.GetRequiredEnv().CouchbaseScope
-	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)
-		user := gocb.CollectionSpec{
-			Name:      collectionName.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
-		}
-	}
-
-	indices := GetIndex(scopeIdentifier)
-	for i := 0; i < v.NumField(); i++ {
-		field := v.Field(i)
-		for _, indexQuery := range indices[field.String()] {
-			scope.Query(indexQuery, nil)
-		}
-	}
-	return &provider{
-		db:        scope,
-		scopeName: scopeIdentifier,
-	}, nil
-}
-
-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),
-		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{
-			BucketSettings:         settings,
-			ConflictResolutionType: gocb.ConflictResolutionTypeSequenceNumber,
-		}, nil)
-		if err != nil {
-			return nil, err
-		}
-	}
-	bucket := cluster.Bucket(bucketName)
-	if scopeName != defaultScope {
-		err = bucket.Collections().CreateScope(scopeName, nil)
-		if err != nil && !errors.Is(err, gocb.ErrScopeExists) {
-			return bucket, err
-		}
-	}
-	return bucket, nil
-}
-
-func GetIndex(scopeName string) map[string][]string {
-	indices := make(map[string][]string)
-
-	// User Index
-	userIndex1 := fmt.Sprintf("CREATE INDEX userEmailIndex ON %s.%s(email)", scopeName, models.Collections.User)
-	userIndex2 := fmt.Sprintf("CREATE INDEX userPhoneIndex ON %s.%s(phone_number)", scopeName, models.Collections.User)
-	indices[models.Collections.User] = []string{userIndex1, userIndex2}
-
-	// VerificationRequest
-	verificationIndex1 := fmt.Sprintf("CREATE INDEX verificationRequestTokenIndex ON %s.%s(token)", scopeName, models.Collections.VerificationRequest)
-	verificationIndex2 := fmt.Sprintf("CREATE INDEX verificationRequestEmailAndIdentifierIndex ON %s.%s(email,identifier)", scopeName, models.Collections.VerificationRequest)
-	indices[models.Collections.VerificationRequest] = []string{verificationIndex1, verificationIndex2}
-
-	// Session index
-	sessionIndex1 := fmt.Sprintf("CREATE INDEX SessionUserIdIndex ON %s.%s(user_id)", scopeName, models.Collections.Session)
-	indices[models.Collections.Session] = []string{sessionIndex1}
-
-	// Webhook index
-	webhookIndex1 := fmt.Sprintf("CREATE INDEX webhookEventNameIndex ON %s.%s(event_name)", scopeName, models.Collections.Webhook)
-	indices[models.Collections.Webhook] = []string{webhookIndex1}
-
-	// WebhookLog index
-	webhookLogIndex1 := fmt.Sprintf("CREATE INDEX webhookLogIdIndex ON %s.%s(webhook_id)", scopeName, models.Collections.WebhookLog)
-	indices[models.Collections.Webhook] = []string{webhookLogIndex1}
-
-	// WebhookLog index
-	emailTempIndex1 := fmt.Sprintf("CREATE INDEX EmailTemplateEventNameIndex ON %s.%s(event_name)", scopeName, models.Collections.EmailTemplate)
-	indices[models.Collections.EmailTemplate] = []string{emailTempIndex1}
-
-	// OTP index
-	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
@@ -1,32 +0,0 @@
-package couchbase
-
-import (
-	"context"
-	"time"
-
-	"github.com/authorizerdev/authorizer/server/db/models"
-	"github.com/couchbase/gocb/v2"
-	"github.com/google/uuid"
-)
-
-// AddSession to save session information in database
-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{
-		Context: ctx,
-	}
-	_, err := p.db.Collection(models.Collections.Session).Insert(session.ID, session, &insertOpt)
-	if err != nil {
-		return err
-	}
-	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/couchbase/shared.go
+++ b/server/db/providers/couchbase/shared.go
@@ -1,57 +0,0 @@
-package couchbase
-
-import (
-	"context"
-	"fmt"
-	"reflect"
-	"strings"
-
-	"github.com/couchbase/gocb/v2"
-)
-
-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)
-			params[key] = value.(string)
-
-		} else {
-			updateFields += fmt.Sprintf("%s = $%s, ", key, key)
-			params[key] = value
-		}
-	}
-	updateFields = strings.Trim(updateFields, " ")
-	updateFields = strings.TrimSuffix(updateFields, ",")
-	return updateFields, params
-}
-
-func (p *provider) GetTotalDocs(ctx context.Context, collection string) (int64, error) {
-	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 totalDocs.Total, err
-	}
-	return totalDocs.Total, nil
-}
-
-type TotalDocs struct {
-	Total int64
-}
--- a/server/db/providers/couchbase/user.go
+++ b/server/db/providers/couchbase/user.go
@@ -1,192 +0,0 @@
-package couchbase
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"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/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) {
-	if user.ID == "" {
-		user.ID = uuid.New().String()
-	}
-
-	if user.Roles == "" {
-		defaultRoles, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyDefaultRoles)
-		if err != nil {
-			return user, err
-		}
-		user.Roles = defaultRoles
-	}
-
-	user.CreatedAt = time.Now().Unix()
-	user.UpdatedAt = time.Now().Unix()
-	insertOpt := gocb.InsertOptions{
-		Context: ctx,
-	}
-	_, err := p.db.Collection(models.Collections.User).Insert(user.ID, user, &insertOpt)
-	if err != nil {
-		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) {
-	user.UpdatedAt = time.Now().Unix()
-	unsertOpt := gocb.UpsertOptions{
-		Context: ctx,
-	}
-	_, err := p.db.Collection(models.Collections.User).Upsert(user.ID, user, &unsertOpt)
-	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 {
-	removeOpt := gocb.RemoveOptions{
-		Context: ctx,
-	}
-	_, err := p.db.Collection(models.Collections.User).Remove(user.ID, &removeOpt)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// ListUsers to get list of users from database
-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, 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},
-	})
-	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)
-		if err != nil {
-			log.Fatal(err)
-		}
-		users = append(users, user.AsAPIUser())
-	}
-	if err := queryResult.Err(); err != nil {
-		return nil, err
-	}
-	return &model.Users{
-		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, 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 user, err
-	}
-	err = q.One(&user)
-	if err != nil {
-		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, 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 user, err
-	}
-	err = q.One(&user)
-	if err != nil {
-		return user, err
-	}
-	return user, nil
-}
-
-// UpdateUsers to update multiple users, with parameters of user IDs slice
-// If ids set to nil / empty all the users will be updated
-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 {
-		for _, id := range ids {
-			params["id"] = id
-			userQuery := fmt.Sprintf("UPDATE %s.%s SET %s WHERE _id = $id", p.scopeName, models.Collections.User, updateFields)
-
-			_, err := p.db.Query(userQuery, &gocb.QueryOptions{
-				ScanConsistency: gocb.QueryScanConsistencyRequestPlus,
-				Context:         ctx,
-				NamedParameters: params,
-			})
-			if err != nil {
-				return err
-			}
-		}
-	} else {
-		userQuery := fmt.Sprintf("UPDATE %s.%s SET %s WHERE _id IS NOT NULL", p.scopeName, models.Collections.User, updateFields)
-		_, err := p.db.Query(userQuery, &gocb.QueryOptions{
-			ScanConsistency: gocb.QueryScanConsistencyRequestPlus,
-			Context:         ctx,
-			NamedParameters: params,
-		})
-		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
-	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 user, err
-	}
-	err = q.One(&user)
-	if err != nil {
-		return user, err
-	}
-	return user, nil
-}
--- a/server/db/providers/couchbase/verification_requests.go
+++ b/server/db/providers/couchbase/verification_requests.go
@@ -1,123 +0,0 @@
-package couchbase
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"time"
-
-	"github.com/authorizerdev/authorizer/server/db/models"
-	"github.com/authorizerdev/authorizer/server/graph/model"
-	"github.com/couchbase/gocb/v2"
-	"github.com/google/uuid"
-)
-
-// AddVerification to save verification request in database
-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()
-	insertOpt := gocb.InsertOptions{
-		Context: ctx,
-	}
-	_, err := p.db.Collection(models.Collections.VerificationRequest).Insert(verificationRequest.ID, verificationRequest, &insertOpt)
-	if err != nil {
-		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
-	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)
-
-	queryResult, err := p.db.Query(query, &gocb.QueryOptions{
-		Context:              ctx,
-		PositionalParameters: []interface{}{token},
-		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
-	})
-
-	if err != nil {
-		return verificationRequest, err
-	}
-	err = queryResult.One(&verificationRequest)
-
-	if err != nil {
-		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) {
-
-	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{
-		Context:              ctx,
-		PositionalParameters: []interface{}{email, identifier},
-		ScanConsistency:      gocb.QueryScanConsistencyRequestPlus,
-	})
-	if err != nil {
-		return nil, err
-	}
-	var verificationRequest *models.VerificationRequest
-	err = queryResult.One(&verificationRequest)
-	if err != nil {
-		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) {
-	var verificationRequests []*model.VerificationRequest
-	paginationClone := pagination
-	total, err := p.GetTotalDocs(ctx, models.Collections.VerificationRequest)
-	if err != nil {
-		return nil, err
-	}
-	paginationClone.Total = total
-	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
-	}
-	for queryResult.Next() {
-		var verificationRequest models.VerificationRequest
-		err := queryResult.Row(&verificationRequest)
-		if err != nil {
-			log.Fatal(err)
-		}
-		verificationRequests = append(verificationRequests, verificationRequest.AsAPIVerificationRequest())
-	}
-	if err := queryResult.Err(); err != nil {
-		return nil, err
-
-	}
-	return &model.VerificationRequests{
-		VerificationRequests: verificationRequests,
-		Pagination:           paginationClone,
-	}, nil
-}
-
-// DeleteVerificationRequest to delete verification request from database
-func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest *models.VerificationRequest) error {
-	removeOpt := gocb.RemoveOptions{
-		Context: ctx,
-	}
-	_, err := p.db.Collection(models.Collections.VerificationRequest).Remove(verificationRequest.ID, &removeOpt)
-	if err != nil {
-		return err
-	}
-	return nil
-}
--- a/server/db/providers/couchbase/webhook.go
+++ b/server/db/providers/couchbase/webhook.go
@@ -1,178 +0,0 @@
-package couchbase
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"log"
-	"strings"
-	"time"
-
-	"github.com/authorizerdev/authorizer/server/db/models"
-	"github.com/authorizerdev/authorizer/server/graph/model"
-	"github.com/couchbase/gocb/v2"
-	"github.com/google/uuid"
-)
-
-// AddWebhook to add webhook
-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 webhook.AsAPIWebhook(), err
-	}
-	return webhook.AsAPIWebhook(), nil
-}
-
-// 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())
-	}
-	bytes, err := json.Marshal(webhook)
-	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()
-	webhookMap := map[string]interface{}{}
-	err = decoder.Decode(&webhookMap)
-	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
-	}
-
-	return webhook.AsAPIWebhook(), nil
-}
-
-// ListWebhooks to list webhook
-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)
-	queryResult, err := p.db.Query(query, &gocb.QueryOptions{
-		Context:         ctx,
-		ScanConsistency: gocb.QueryScanConsistencyRequestPlus,
-		NamedParameters: params,
-	})
-	if err != nil {
-		return nil, err
-	}
-	for queryResult.Next() {
-		var webhook models.Webhook
-		err := queryResult.Row(&webhook)
-		if err != nil {
-			log.Fatal(err)
-		}
-		webhooks = append(webhooks, webhook.AsAPIWebhook())
-	}
-	if err := queryResult.Err(); err != nil {
-		return nil, err
-	}
-	return &model.Webhooks{
-		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
-	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)
-	q, err := p.db.Query(query, &gocb.QueryOptions{
-		Context:         ctx,
-		ScanConsistency: gocb.QueryScanConsistencyRequestPlus,
-		NamedParameters: params,
-	})
-	if err != nil {
-		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) {
-	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{
-		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)
-		if err != nil {
-			log.Fatal(err)
-		}
-		webhooks = append(webhooks, webhook.AsAPIWebhook())
-	}
-	if err := queryResult.Err(); err != nil {
-		return nil, err
-	}
-	return webhooks, 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,
-		ScanConsistency: gocb.QueryScanConsistencyRequestPlus,
-		NamedParameters: params,
-	})
-	if err != nil {
-		return err
-	}
-	return nil
-}
--- a/server/db/providers/couchbase/webhook_log.go
+++ b/server/db/providers/couchbase/webhook_log.go
@@ -1,77 +0,0 @@
-package couchbase
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"time"
-
-	"github.com/authorizerdev/authorizer/server/db/models"
-	"github.com/authorizerdev/authorizer/server/graph/model"
-	"github.com/couchbase/gocb/v2"
-	"github.com/google/uuid"
-)
-
-// AddWebhookLog to add webhook log
-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 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) {
-	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
-	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
-	}
-	for queryResult.Next() {
-		var webhookLog models.WebhookLog
-		err := queryResult.Row(&webhookLog)
-		if err != nil {
-			log.Fatal(err)
-		}
-		webhookLogs = append(webhookLogs, webhookLog.AsAPIWebhookLog())
-	}
-	if err := queryResult.Err(); err != nil {
-		return nil, err
-
-	}
-	return &model.WebhookLogs{
-		Pagination:  paginationClone,
-		WebhookLogs: webhookLogs,
-	}, nil
-}
--- a/server/db/providers/dynamodb/email_template.go
+++ b/server/db/providers/dynamodb/email_template.go
@@ -1,113 +0,0 @@
-package dynamodb
-
-import (
-	"context"
-	"errors"
-	"time"
-
-	"github.com/authorizerdev/authorizer/server/db/models"
-	"github.com/authorizerdev/authorizer/server/graph/model"
-	"github.com/google/uuid"
-	"github.com/guregu/dynamo"
-)
-
-// AddEmailTemplate to add EmailTemplate
-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()
-	}
-
-	emailTemplate.Key = emailTemplate.ID
-	emailTemplate.CreatedAt = time.Now().Unix()
-	emailTemplate.UpdatedAt = time.Now().Unix()
-	err := collection.Put(emailTemplate).RunWithContext(ctx)
-
-	if err != nil {
-		return emailTemplate.AsAPIEmailTemplate(), err
-	}
-
-	return emailTemplate.AsAPIEmailTemplate(), nil
-}
-
-// UpdateEmailTemplate to update EmailTemplate
-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)
-	if err != nil {
-		return emailTemplate.AsAPIEmailTemplate(), err
-	}
-	return emailTemplate.AsAPIEmailTemplate(), nil
-}
-
-// ListEmailTemplates to list 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) {
-			if paginationClone.Offset == iteration {
-				emailTemplates = append(emailTemplates, emailTemplate.AsAPIEmailTemplate())
-			}
-		}
-		lastEval = iter.LastEvaluatedKey()
-		iteration += paginationClone.Limit
-	}
-	paginationClone.Total = count
-	return &model.EmailTemplates{
-		Pagination:     paginationClone,
-		EmailTemplates: emailTemplates,
-	}, nil
-}
-
-// 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
-	err := collection.Get("id", emailTemplateID).OneWithContext(ctx, &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) {
-	collection := p.db.Table(models.Collections.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
-	}
-	if len(emailTemplates) > 0 {
-		emailTemplate = emailTemplates[0]
-		return emailTemplate.AsAPIEmailTemplate(), nil
-	} else {
-		return nil, errors.New("no record found")
-	}
-
-}
-
-// DeleteEmailTemplate to delete EmailTemplate
-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
-	}
-
-	return nil
-}
--- a/Show More
+++ b/Show More