fix: tests + version

- Update code as per go 1.19.3 - Fix tests for unused vars
feat: implement base for surreal db
2022-11-27 20:40:45 +05:30 · 2022-11-24 19:08:17 +05:30
121 changed files with 1906 additions and 6683 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM golang:1.19.5-alpine as go-builder
+FROM golang:1.19.1-alpine as go-builder
 WORKDIR /authorizer
 COPY server server
 COPY Makefile .
--- a/14
+++ b/14
@@ -26,31 +26,23 @@ 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
 	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
+	docker run -d --name authorizer_arangodb -p 8529:8529 -e ARANGO_NO_AUTH=1 arangodb/arangodb:3.8.4
+	docker run -d --name dynamodb-local-test  -p 8000:8000 amazon/dynamodb-local:latest 
 	cd server && go clean --testcache && TEST_DBS="sqlite,mongodb,arangodb,scylladb,dynamodb" 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:
 	cd server && go run github.com/99designs/gqlgen generate && go mod tidy
--- 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.8",
+				"@authorizerdev/authorizer-react": "^1.1.3-beta.1",
 				"@types/react": "^17.0.15",
 				"@types/react-dom": "^17.0.9",
 				"esbuild": "^0.12.17",
@@ -27,9 +27,9 @@
 			}
 		},
 		"node_modules/@authorizerdev/authorizer-js": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.1.4.tgz",
-			"integrity": "sha512-oLp3XMYU9xHlg5urpAOaw6NrKQ07SaI8oAi1BAMHZWivv5qi2V+6roey0y9MdvCUmsMULBBcZg87kuoMTXRJOw==",
+			"version": "1.1.2-beta.1",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.1.2-beta.1.tgz",
+			"integrity": "sha512-u+O2iB3tqF1HtdJ6LfBXL9iMycqlCCL3othBQkqitGP1ldhASWLJ2pcXZAcHgyoeczKdj2XKZKdIcWB3GYR0IQ==",
 			"dependencies": {
 				"cross-fetch": "^3.1.5"
 			},
@@ -38,11 +38,14 @@
 			}
 		},
 		"node_modules/@authorizerdev/authorizer-react": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.8.tgz",
-			"integrity": "sha512-5v9Zc7ZxiEQEHT1Fwj1jvEemdckcrn7mZPkdmJ/z0YOWNbF20ZpM4WsfrtJB+d293m7Rb1QKwzdFPkYINMh5tw==",
+			"version": "1.1.3-beta.1",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.3-beta.1.tgz",
+			"integrity": "sha512-+ZsOBp6XjZVnDyeJCXgaqZ8xzFO7ygpHB6v2cblCKIA3wX5pg/Dsg1oumHGrSHIEK8No/GOtCjSx4Rv6/CweBQ==",
 			"dependencies": {
-				"@authorizerdev/authorizer-js": "^1.1.4"
+				"@authorizerdev/authorizer-js": "^1.1.2-beta.1",
+				"final-form": "^4.20.2",
+				"react-final-form": "^6.5.3",
+				"styled-components": "^5.3.0"
 			},
 			"engines": {
 				"node": ">=10"
@@ -466,6 +469,18 @@
 				"node": ">=0.8.0"
 			}
 		},
+		"node_modules/final-form": {
+			"version": "4.20.4",
+			"resolved": "https://registry.npmjs.org/final-form/-/final-form-4.20.4.tgz",
+			"integrity": "sha512-hyoOVVilPLpkTvgi+FSJkFZrh0Yhy4BhE6lk/NiBwrF4aRV8/ykKEyXYvQH/pfUbRkOosvpESYouFb+FscsLrw==",
+			"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",
@@ -658,6 +673,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",
@@ -834,19 +876,22 @@
 	},
 	"dependencies": {
 		"@authorizerdev/authorizer-js": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.1.4.tgz",
-			"integrity": "sha512-oLp3XMYU9xHlg5urpAOaw6NrKQ07SaI8oAi1BAMHZWivv5qi2V+6roey0y9MdvCUmsMULBBcZg87kuoMTXRJOw==",
+			"version": "1.1.2-beta.1",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.1.2-beta.1.tgz",
+			"integrity": "sha512-u+O2iB3tqF1HtdJ6LfBXL9iMycqlCCL3othBQkqitGP1ldhASWLJ2pcXZAcHgyoeczKdj2XKZKdIcWB3GYR0IQ==",
 			"requires": {
 				"cross-fetch": "^3.1.5"
 			}
 		},
 		"@authorizerdev/authorizer-react": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.8.tgz",
-			"integrity": "sha512-5v9Zc7ZxiEQEHT1Fwj1jvEemdckcrn7mZPkdmJ/z0YOWNbF20ZpM4WsfrtJB+d293m7Rb1QKwzdFPkYINMh5tw==",
+			"version": "1.1.3-beta.1",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.3-beta.1.tgz",
+			"integrity": "sha512-+ZsOBp6XjZVnDyeJCXgaqZ8xzFO7ygpHB6v2cblCKIA3wX5pg/Dsg1oumHGrSHIEK8No/GOtCjSx4Rv6/CweBQ==",
 			"requires": {
-				"@authorizerdev/authorizer-js": "^1.1.4"
+				"@authorizerdev/authorizer-js": "^1.1.2-beta.1",
+				"final-form": "^4.20.2",
+				"react-final-form": "^6.5.3",
+				"styled-components": "^5.3.0"
 			}
 		},
 		"@babel/code-frame": {
@@ -1186,6 +1231,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.4",
+			"resolved": "https://registry.npmjs.org/final-form/-/final-form-4.20.4.tgz",
+			"integrity": "sha512-hyoOVVilPLpkTvgi+FSJkFZrh0Yhy4BhE6lk/NiBwrF4aRV8/ykKEyXYvQH/pfUbRkOosvpESYouFb+FscsLrw==",
+			"requires": {
+				"@babel/runtime": "^7.10.0"
+			}
+		},
 		"globals": {
 			"version": "11.12.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -1334,6 +1387,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
@@ -12,7 +12,7 @@
 	"author": "Lakhan Samani",
 	"license": "ISC",
 	"dependencies": {
-		"@authorizerdev/authorizer-react": "^1.1.8",
+		"@authorizerdev/authorizer-react": "^1.1.3",
 		"@types/react": "^17.0.15",
 		"@types/react-dom": "^17.0.9",
 		"esbuild": "^0.12.17",
--- 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.1.4":
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-1.1.4.tgz"
-  integrity sha512-oLp3XMYU9xHlg5urpAOaw6NrKQ07SaI8oAi1BAMHZWivv5qi2V+6roey0y9MdvCUmsMULBBcZg87kuoMTXRJOw==
-  dependencies:
-    cross-fetch "^3.1.5"
-
-"@authorizerdev/authorizer-react@^1.1.8":
-  version "1.1.8"
-  resolved "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-1.1.8.tgz"
-  integrity sha512-5v9Zc7ZxiEQEHT1Fwj1jvEemdckcrn7mZPkdmJ/z0YOWNbF20ZpM4WsfrtJB+d293m7Rb1QKwzdFPkYINMh5tw==
-  dependencies:
-    "@authorizerdev/authorizer-js" "^1.1.4"
-
-"@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.5"
-  resolved "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz"
-  integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
-  dependencies:
-    node-fetch "2.6.7"
-
-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.7:
-  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"
-
-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/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
@@ -104,14 +104,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();
--- a/dashboard/src/components/EnvComponents/JWTConfiguration.tsx
+++ b/dashboard/src/components/EnvComponents/JWTConfiguration.tsx
@@ -43,7 +43,7 @@ const JSTConfigurations = ({
 				title: `JWT config copied successfully`,
 				isClosable: true,
 				status: 'success',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 		} catch (err) {
 			console.error({
@@ -54,7 +54,7 @@ const JSTConfigurations = ({
 				title: `Failed to copy JWT config`,
 				isClosable: true,
 				status: 'error',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 		}
 	};
--- a/dashboard/src/components/EnvComponents/OAuthConfig.tsx
+++ b/dashboard/src/components/EnvComponents/OAuthConfig.tsx
@@ -16,7 +16,6 @@ import {
 	FaLinkedin,
 	FaApple,
 	FaTwitter,
-	FaMicrosoft,
 } from 'react-icons/fa';
 import { TextInputType, HiddenInputType } from '../../constants';

@@ -304,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/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();
 	};
--- 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);
 		}
--- a/dashboard/src/components/UpdateEmailTemplateModal.tsx
+++ b/dashboard/src/components/UpdateEmailTemplateModal.tsx
@@ -173,7 +173,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 ||
@@ -186,7 +186,7 @@ const UpdateEmailTemplate = ({
 				),
 				isClosable: true,
 				status: 'success',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 			setTemplateData({
 				...initTemplateData,
--- a/dashboard/src/components/UpdateWebhookModal.tsx
+++ b/dashboard/src/components/UpdateWebhookModal.tsx
@@ -290,7 +290,7 @@ 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({
@@ -299,7 +299,7 @@ const UpdateWebhookModal = ({
 				),
 				isClosable: true,
 				status: 'success',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 			setWebhook({
 				...initWebhookData,
--- a/dashboard/src/constants.ts
+++ b/dashboard/src/constants.ts
@@ -10,8 +10,6 @@ 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',
@@ -40,7 +38,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',
@@ -123,9 +120,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] | [];
--- 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
--- 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/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: [],
@@ -206,7 +203,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
@@ -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();
@@ -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();
@@ -268,7 +268,7 @@ export default function Users() {
 				} for user`,
 				isClosable: true,
 				status: 'success',
-				position: 'top-right',
+				position: 'bottom-right',
 			});
 			updateUserList();
 			return;
@@ -277,7 +277,7 @@ export default function Users() {
 			title: 'Multi factor authentication update failed for user',
 			isClosable: true,
 			status: 'error',
-			position: 'top-right',
+			position: 'bottom-right',
 		});
 	};

--- 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,8 +3,6 @@ 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"
 	// AuthRecipeMethodGoogle is the google auth method
@@ -19,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/db_types.go
+++ b/server/constants/db_types.go
@@ -27,6 +27,6 @@ const (
 	DbTypePlanetScaleDB = "planetscale"
 	// DbTypeDynamoDB is the Dynamo database type
 	DbTypeDynamoDB = "dynamodb"
-	// DbTypeCouchbaseDB is the Couchbase database type
-	DbTypeCouchbaseDB = "couchbase"
+	// DbTypeSurrealDB is the SurrealDB database type
+	DbTypeSurrealDB = "surrealdb"
 )
--- a/server/constants/env.go
+++ b/server/constants/env.go
@@ -43,13 +43,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
@@ -108,12 +101,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
@@ -138,8 +125,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
--- 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/db/db.go
+++ b/server/db/db.go
@@ -7,10 +7,10 @@ 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/db/providers/surrealdb"
 	"github.com/authorizerdev/authorizer/server/memorystore"
 )

@@ -22,12 +22,12 @@ 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 && envs.DatabaseType != constants.DbTypeDynamoDB && envs.DatabaseType != constants.DbTypeSurrealDB
 	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
+	isSurrealDB := envs.DatabaseType == constants.DbTypeSurrealDB

 	if isSQL {
 		log.Info("Initializing SQL Driver for: ", envs.DatabaseType)
@@ -74,11 +74,11 @@ func InitDB() error {
 		}
 	}

-	if isCouchbaseDB {
-		log.Info("Initializing CouchbaseDB Driver for: ", envs.DatabaseType)
-		Provider, err = couchbase.NewProvider()
+	if isSurrealDB {
+		log.Info("Initializing Surreal Driver")
+		Provider, err = surrealdb.NewProvider()
 		if err != nil {
-			log.Fatal("Failed to initialize Couchbase driver: ", err)
+			log.Fatal("Failed to initialize Surreal driver: ", err)
 			return err
 		}
 	}
--- a/server/db/models/email_templates.go
+++ b/server/db/models/email_templates.go
@@ -1,6 +1,7 @@
 package models

 import (
+	"encoding/json"
 	"strings"

 	"github.com/authorizerdev/authorizer/server/graph/model"
@@ -35,3 +36,10 @@ func (e *EmailTemplate) AsAPIEmailTemplate() *model.EmailTemplate {
 		UpdatedAt: refs.NewInt64Ref(e.UpdatedAt),
 	}
 }
+
+func (e *EmailTemplate) ToMap() map[string]interface{} {
+	res := map[string]interface{}{}
+	data, _ := json.Marshal(e) // Convert to a json string
+	json.Unmarshal(data, &res) // Convert to a map
+	return res
+}
--- a/server/db/models/env.go
+++ b/server/db/models/env.go
@@ -1,14 +1,22 @@
 package models

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

 // 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" 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"`
+	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"`
+}
+
+func (env *Env) ToMap() map[string]interface{} {
+	res := map[string]interface{}{}
+	data, _ := json.Marshal(env) // Convert to a json string
+	json.Unmarshal(data, &res)   // Convert to a map
+	return res
 }
--- a/server/db/models/model.go
+++ b/server/db/models/model.go
@@ -13,6 +13,10 @@ type CollectionList struct {
 }

 var (
+	// DB/Namespace
+	DBNamespace = "authorizer"
+	// Identifier field used for surreal db
+	SurrealDbIdentifier = "identifier"
 	// Prefix for table name / collection names
 	Prefix = "authorizer_"
 	// Collections / Tables available for authorizer in the database (used for dbs other than gorm)
--- a/server/db/models/otp.go
+++ b/server/db/models/otp.go
@@ -1,5 +1,7 @@
 package models

+import "encoding/json"
+
 // OTP model for database
 type OTP struct {
 	Key       string `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty" dynamo:"key,omitempty"` // for arangodb
@@ -14,3 +16,10 @@ type OTP struct {
 type Paging struct {
 	ID string `json:"id,omitempty" dynamo:"id,hash"`
 }
+
+func (o *OTP) ToMap() map[string]interface{} {
+	res := map[string]interface{}{}
+	data, _ := json.Marshal(o) // Convert to a json string
+	json.Unmarshal(data, &res) // Convert to a map
+	return res
+}
--- a/server/db/models/session.go
+++ b/server/db/models/session.go
@@ -1,5 +1,7 @@
 package models

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

 // Session model for db
@@ -12,3 +14,10 @@ type Session struct {
 	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"`
 }
+
+func (s *Session) ToMap() map[string]interface{} {
+	res := map[string]interface{}{}
+	data, _ := json.Marshal(s) // Convert to a json string
+	json.Unmarshal(data, &res) // Convert to a map
+	return res
+}
--- a/server/db/models/verification_requests.go
+++ b/server/db/models/verification_requests.go
@@ -1,6 +1,7 @@
 package models

 import (
+	"encoding/json"
 	"strings"

 	"github.com/authorizerdev/authorizer/server/graph/model"
@@ -41,3 +42,10 @@ func (v *VerificationRequest) AsAPIVerificationRequest() *model.VerificationRequ
 		UpdatedAt:   refs.NewInt64Ref(v.UpdatedAt),
 	}
 }
+
+func (v *VerificationRequest) ToMap() map[string]interface{} {
+	res := map[string]interface{}{}
+	data, _ := json.Marshal(v) // Convert to a json string
+	json.Unmarshal(data, &res) // Convert to a map
+	return res
+}
--- a/server/db/models/webhook.go
+++ b/server/db/models/webhook.go
@@ -42,3 +42,10 @@ func (w *Webhook) AsAPIWebhook() *model.Webhook {
 		UpdatedAt: refs.NewInt64Ref(w.UpdatedAt),
 	}
 }
+
+func (w *Webhook) ToMap() map[string]interface{} {
+	res := map[string]interface{}{}
+	data, _ := json.Marshal(w) // Convert to a json string
+	json.Unmarshal(data, &res) // Convert to a map
+	return res
+}
--- a/server/db/models/webhook_log.go
+++ b/server/db/models/webhook_log.go
@@ -1,6 +1,7 @@
 package models

 import (
+	"encoding/json"
 	"strings"

 	"github.com/authorizerdev/authorizer/server/graph/model"
@@ -37,3 +38,10 @@ func (w *WebhookLog) AsAPIWebhookLog() *model.WebhookLog {
 		UpdatedAt:  refs.NewInt64Ref(w.UpdatedAt),
 	}
 }
+
+func (w *WebhookLog) ToMap() map[string]interface{} {
+	res := map[string]interface{}{}
+	data, _ := json.Marshal(w) // Convert to a json string
+	json.Unmarshal(data, &res) // Convert to a map
+	return res
+}
--- 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"
@@ -51,7 +52,7 @@ func (p *provider) ListEmailTemplate(ctx context.Context, pagination model.Pagin

 	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
--- 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,75 +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{
-		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
-	dbName := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseName
-	arangodb_exists, err := arangoClient.DatabaseExists(ctx, dbName)
+	arangoClient, err := arangoDriver.NewClient(arangoDriver.ClientConfig{
+		Connection: conn,
+	})
 	if err != nil {
 		return nil, err
 	}
+
+	var arangodb driver.Database
+	dbName := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseName
+	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,
@@ -104,9 +70,6 @@ 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 {
@@ -114,10 +77,7 @@ func NewProvider() (*provider, error) {
 		}
 	}

-	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,
@@ -127,9 +87,6 @@ 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 {
@@ -137,19 +94,13 @@ func NewProvider() (*provider, error) {
 		}
 	}

-	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
@@ -157,9 +108,6 @@ func NewProvider() (*provider, error) {
 	}

 	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 {
@@ -167,19 +115,13 @@ func NewProvider() (*provider, error) {
 		}
 	}

-	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 {
@@ -187,18 +129,12 @@ func NewProvider() (*provider, error) {
 		}
 	}

-	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 {
@@ -206,19 +142,13 @@ func NewProvider() (*provider, error) {
 		}
 	}

-	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 {
@@ -226,10 +156,7 @@ func NewProvider() (*provider, error) {
 		}
 	}

-	otpCollection, err := arangodb.Collection(ctx, models.Collections.OTP)
-	if err != nil {
-		return nil, err
-	}
+	otpCollection, _ := arangodb.Collection(nil, models.Collections.OTP)
 	otpCollection.EnsureHashIndex(ctx, []string{"email"}, &arangoDriver.EnsureHashIndexOptions{
 		Unique: true,
 		Sparse: true,
--- 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,7 +15,6 @@ 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
@@ -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)
@@ -54,7 +48,6 @@ 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) {
 	user.UpdatedAt = time.Now().Unix()
-
 	collection, _ := p.db.Collection(ctx, models.Collections.User)
 	meta, err := collection.UpdateDocument(ctx, user.Key, user)
 	if err != nil {
@@ -90,7 +83,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) {
 	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)

@@ -198,7 +191,7 @@ func (p *provider) UpdateUsers(ctx context.Context, data map[string]interface{},
 	}

 	query := ""
-	if len(ids) > 0 {
+	if ids != nil && len(ids) > 0 {
 		keysArray := ""
 		for _, id := range ids {
 			keysArray += fmt.Sprintf("'%s', ", id)
@@ -211,40 +204,10 @@ func (p *provider) UpdateUsers(ctx context.Context, data map[string]interface{},
 	}

 	_, 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.Key == "" {
-				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,7 +5,7 @@ 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"
@@ -96,7 +96,7 @@ func (p *provider) GetVerificationRequestByEmail(ctx context.Context, email stri
 // 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
-	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)
@@ -112,7 +112,7 @@ func (p *provider) ListVerificationRequests(ctx context.Context, pagination mode
 		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
@@ -132,8 +132,8 @@ func (p *provider) ListVerificationRequests(ctx context.Context, pagination mode

 // 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)
+	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
@@ -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"
@@ -49,7 +50,7 @@ func (p *provider) ListWebhook(ctx context.Context, pagination model.Pagination)

 	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
--- 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"
@@ -43,7 +44,7 @@ func (p *provider) ListWebhookLogs(ctx context.Context, pagination model.Paginat
 		}
 	}

-	sctx := arangoDriver.WithQueryFullCount(ctx)
+	sctx := driver.WithQueryFullCount(ctx)
 	cursor, err := p.db.Query(sctx, query, bindVariables)
 	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()
--- a/server/db/providers/cassandradb/user.go
+++ b/server/db/providers/cassandradb/user.go
@@ -12,7 +12,6 @@ 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"
 )
@@ -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()

@@ -306,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/couchbase/email_template.go
+++ b/server/db/providers/couchbase/email_template.go
@@ -1,166 +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() {
-		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) {
-	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) {
-	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/otp.go
+++ b/server/db/providers/couchbase/otp.go
@@ -1,84 +0,0 @@
-package couchbase
-
-import (
-	"context"
-	"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) {
-	otp, _ := p.GetOTPByEmail(ctx, otpParam.Email)
-
-	shouldCreate := false
-	if otp == nil {
-		shouldCreate = true
-		otp = &models.OTP{
-			ID:        uuid.NewString(),
-			Otp:       otpParam.Otp,
-			Email:     otpParam.Email,
-			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, 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
-}
-
-// 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,170 +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}
-
-	return indices
-}
--- a/server/db/providers/couchbase/shared.go
+++ b/server/db/providers/couchbase/shared.go
@@ -1,65 +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,199 +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) {
-	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) {
-	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,128 +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) {
-	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,
-	})
-	verificationRequest := models.VerificationRequest{}
-
-	if err != nil {
-		return verificationRequest, err
-	}
-
-	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,185 +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()
-
-	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()
-
-	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, env, 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_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) {
-	var webhook models.Webhook
-	params := make(map[string]interface{}, 1)
-	params["event_name"] = eventName
-
-	query := fmt.Sprintf(`SELECT _id, event_name, endpoint, headers, enabled, created_at, updated_at FROM %s.%s WHERE event_name=$event_name LIMIT 1`, p.scopeName, models.Collections.Webhook)
-	q, err := p.db.Query(query, &gocb.QueryOptions{
-		Context:         ctx,
-		ScanConsistency: gocb.QueryScanConsistencyRequestPlus,
-		NamedParameters: params,
-	})
-
-	if err != nil {
-		return nil, err
-	}
-	err = q.One(&webhook)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return webhook.AsAPIWebhook(), nil
-}
-
-// DeleteWebhook to delete webhook
-func (p *provider) DeleteWebhook(ctx context.Context, webhook *model.Webhook) error {
-
-	params := make(map[string]interface{}, 1)
-	params["webhook_id"] = webhook.ID
-	removeOpt := gocb.RemoveOptions{
-		Context: ctx,
-	}
-	_, err := p.db.Collection(models.Collections.Webhook).Remove(webhook.ID, &removeOpt)
-
-	if err != nil {
-		return err
-	}
-
-	query := fmt.Sprintf(`DELETE FROM %s.%s WHERE webhook_id=$webhook_id`, p.scopeName, models.Collections.WebhookLog)
-	_, err = p.db.Query(query, &gocb.QueryOptions{
-		Context:         ctx,
-		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,85 +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/env.go
+++ b/server/db/providers/dynamodb/env.go
@@ -34,6 +34,7 @@ func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, erro

 // UpdateEnv to update environment information in database
 func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, error) {
+
 	collection := p.db.Table(models.Collections.Env)
 	env.UpdatedAt = time.Now().Unix()

--- a/server/db/providers/dynamodb/user.go
+++ b/server/db/providers/dynamodb/user.go
@@ -3,15 +3,12 @@ package dynamodb
 import (
 	"context"
 	"errors"
-	"fmt"
-	"strings"
 	"time"

 	"github.com/authorizerdev/authorizer/server/constants"
 	"github.com/authorizerdev/authorizer/server/db/models"
 	"github.com/authorizerdev/authorizer/server/graph/model"
 	"github.com/authorizerdev/authorizer/server/memorystore"
-	"github.com/authorizerdev/authorizer/server/refs"
 	"github.com/google/uuid"
 	"github.com/guregu/dynamo"
 	log "github.com/sirupsen/logrus"
@@ -33,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 {
-			return user, fmt.Errorf("user with given phone number already exists")
-		}
-	}
-
 	user.CreatedAt = time.Now().Unix()
 	user.UpdatedAt = time.Now().Unix()

@@ -202,23 +193,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 users []models.User
-	var user models.User
-
-	collection := p.db.Table(models.Collections.User)
-	err := collection.Scan().Filter("'phone_number' = ?", phoneNumber).AllWithContext(ctx, &users)
-
-	if err != nil {
-		return nil, err
-	}
-
-	if len(users) > 0 {
-		user = users[0]
-		return &user, nil
-	} else {
-		return nil, errors.New("no record found")
-	}
-}
--- a/server/db/providers/mongodb/user.go
+++ b/server/db/providers/mongodb/user.go
@@ -155,16 +155,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
-
-	userCollection := p.db.Collection(models.Collections.User, options.Collection())
-	err := userCollection.FindOne(ctx, bson.M{"phone_number": phoneNumber}).Decode(&user)
-	if err != nil {
-		return nil, err
-	}
-
-	return &user, nil
-}
--- a/server/db/providers/provider_template/user.go
+++ b/server/db/providers/provider_template/user.go
@@ -69,10 +69,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
-
-	return user, nil
-}
--- a/server/db/providers/providers.go
+++ b/server/db/providers/providers.go
@@ -18,8 +18,6 @@ type Provider interface {
 	ListUsers(ctx context.Context, pagination model.Pagination) (*model.Users, error)
 	// GetUserByEmail to get user information from database using email address
 	GetUserByEmail(ctx context.Context, email string) (models.User, error)
-	// GetUserByPhoneNumber to get user information from database using phone number
-	GetUserByPhoneNumber(ctx context.Context, phoneNumber string) (*models.User, error)
 	// GetUserByID to get user information from database using user ID
 	GetUserByID(ctx context.Context, id string) (models.User, error)
 	// UpdateUsers to update multiple users, with parameters of user IDs slice
--- a/server/db/providers/sql/user.go
+++ b/server/db/providers/sql/user.go
@@ -31,7 +31,7 @@ func (p *provider) AddUser(ctx context.Context, user models.User) (models.User,
 	}

 	if user.PhoneNumber != nil && strings.TrimSpace(refs.StringValue(user.PhoneNumber)) != "" {
-		if u, _ := p.GetUserByPhoneNumber(ctx, refs.StringValue(user.PhoneNumber)); u != nil {
+		if u, _ := p.GetUserByPhone(ctx, refs.StringValue(user.PhoneNumber)); u != nil {
 			return user, fmt.Errorf("user with given phone number already exists")
 		}
 	}
@@ -56,6 +56,12 @@ func (p *provider) AddUser(ctx context.Context, user models.User) (models.User,
 func (p *provider) UpdateUser(ctx context.Context, user models.User) (models.User, error) {
 	user.UpdatedAt = time.Now().Unix()

+	if user.PhoneNumber != nil && strings.TrimSpace(refs.StringValue(user.PhoneNumber)) != "" {
+		if u, _ := p.GetUserByPhone(ctx, refs.StringValue(user.PhoneNumber)); u != nil && u.ID != user.ID {
+			return user, fmt.Errorf("user with given phone number already exists")
+		}
+	}
+
 	result := p.db.Save(&user)

 	if result.Error != nil {
@@ -67,12 +73,13 @@ func (p *provider) UpdateUser(ctx context.Context, user models.User) (models.Use

 // DeleteUser to delete user information from database
 func (p *provider) DeleteUser(ctx context.Context, user models.User) error {
-	result := p.db.Where("user_id = ?", user.ID).Delete(&models.Session{})
+	result := p.db.Delete(&user)
+
 	if result.Error != nil {
 		return result.Error
 	}

-	result = p.db.Delete(&user)
+	result = p.db.Where("user_id = ?", user.ID).Delete(&models.Session{})
 	if result.Error != nil {
 		return result.Error
 	}
@@ -150,13 +157,12 @@ 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) {
+func (p *provider) GetUserByPhone(ctx context.Context, phoneNumber string) (*models.User, error) {
 	var user *models.User
 	result := p.db.Where("phone_number = ?", phoneNumber).First(&user)

 	if result.Error != nil {
-		return nil, result.Error
+		return user, result.Error
 	}

 	return user, nil
--- a/server/db/providers/surrealdb/email_template.go
+++ b/server/db/providers/surrealdb/email_template.go
@@ -0,0 +1,48 @@
+package surrealdb
+
+import (
+	"context"
+	"time"
+
+	"github.com/authorizerdev/authorizer/server/db/models"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"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()
+	return emailTemplate.AsAPIEmailTemplate(), nil
+}
+
+// UpdateEmailTemplate to update EmailTemplate
+func (p *provider) UpdateEmailTemplate(ctx context.Context, emailTemplate models.EmailTemplate) (*model.EmailTemplate, error) {
+	emailTemplate.UpdatedAt = time.Now().Unix()
+	return emailTemplate.AsAPIEmailTemplate(), nil
+}
+
+// ListEmailTemplates to list EmailTemplate
+func (p *provider) ListEmailTemplate(ctx context.Context, pagination model.Pagination) (*model.EmailTemplates, error) {
+	return nil, nil
+}
+
+// GetEmailTemplateByID to get EmailTemplate by id
+func (p *provider) GetEmailTemplateByID(ctx context.Context, emailTemplateID string) (*model.EmailTemplate, error) {
+	return nil, nil
+}
+
+// GetEmailTemplateByEventName to get EmailTemplate by event_name
+func (p *provider) GetEmailTemplateByEventName(ctx context.Context, eventName string) (*model.EmailTemplate, error) {
+	return nil, nil
+}
+
+// DeleteEmailTemplate to delete EmailTemplate
+func (p *provider) DeleteEmailTemplate(ctx context.Context, emailTemplate *model.EmailTemplate) error {
+	return nil
+}
--- a/server/db/providers/surrealdb/env.go
+++ b/server/db/providers/surrealdb/env.go
@@ -1,4 +1,4 @@
-package couchbase
+package surrealdb

 import (
 	"context"
@@ -6,8 +6,8 @@ import (
 	"time"

 	"github.com/authorizerdev/authorizer/server/db/models"
-	"github.com/couchbase/gocb/v2"
 	"github.com/google/uuid"
+	"github.com/surrealdb/surrealdb.go"
 )

 // AddEnv to save environment information in database
@@ -15,15 +15,14 @@ func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, erro
 	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)
+	mapData := env.ToMap()
+	mapData[models.SurrealDbIdentifier] = env.ID
+
+	_, err := p.db.Create(models.Collections.Env, mapData)
 	if err != nil {
 		return env, err
 	}
@@ -33,18 +32,14 @@ func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, erro
 // 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},
-	})
+	mapData := env.ToMap()
+	mapData[models.SurrealDbIdentifier] = env.ID

+	_, err := p.db.Update(models.Collections.Env, mapData)
 	if err != nil {
 		return env, err
 	}
-
 	return env, nil
 }

@@ -52,19 +47,22 @@ func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, e
 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,
-	})
+	mapData, err := p.db.Select(models.Collections.Env)
 	if err != nil {
 		return env, err
 	}
-	err = q.One(&env)

+	envs := []models.Env{}
+	err = surrealdb.Unmarshal(mapData, &envs)
 	if err != nil {
 		return env, err
 	}
-	env.Hash = env.EncryptionKey
+
+	if len(envs) > 0 {
+		env = envs[0]
+	} else {
+		return env, fmt.Errorf("env record not found")
+	}
+
 	return env, nil
 }
--- a/server/db/providers/surrealdb/otp.go
+++ b/server/db/providers/surrealdb/otp.go
@@ -0,0 +1,22 @@
+package surrealdb
+
+import (
+	"context"
+
+	"github.com/authorizerdev/authorizer/server/db/models"
+)
+
+// UpsertOTP to add or update otp
+func (p *provider) UpsertOTP(ctx context.Context, otp *models.OTP) (*models.OTP, error) {
+	return nil, nil
+}
+
+// GetOTPByEmail to get otp for a given email address
+func (p *provider) GetOTPByEmail(ctx context.Context, emailAddress string) (*models.OTP, error) {
+	return nil, nil
+}
+
+// DeleteOTP to delete otp
+func (p *provider) DeleteOTP(ctx context.Context, otp *models.OTP) error {
+	return nil
+}
--- a/server/db/providers/surrealdb/provider.go
+++ b/server/db/providers/surrealdb/provider.go
@@ -0,0 +1,42 @@
+package surrealdb
+
+import (
+	"github.com/authorizerdev/authorizer/server/db/models"
+	"github.com/authorizerdev/authorizer/server/memorystore"
+	"github.com/surrealdb/surrealdb.go"
+)
+
+// TODO change following provider to new db provider
+type provider struct {
+	db *surrealdb.DB
+}
+
+// NewProvider returns a new SQL provider
+// TODO change following provider to new db provider
+func NewProvider() (*provider, error) {
+	dbURL := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseURL
+	db, err := surrealdb.New(dbURL)
+	if err != nil {
+		return nil, err
+	}
+
+	dbUsername := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseUsername
+	dbPassword := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabasePassword
+
+	_, err = db.Signin(map[string]interface{}{
+		"user": dbUsername,
+		"pass": dbPassword,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = db.Use(models.DBNamespace, models.DBNamespace)
+	if err != nil {
+		return nil, err
+	}
+
+	return &provider{
+		db: db,
+	}, nil
+}
--- a/server/db/providers/surrealdb/session.go
+++ b/server/db/providers/surrealdb/session.go
@@ -1,11 +1,10 @@
-package couchbase
+package surrealdb

 import (
 	"context"
 	"time"

 	"github.com/authorizerdev/authorizer/server/db/models"
-	"github.com/couchbase/gocb/v2"
 	"github.com/google/uuid"
 )

@@ -17,14 +16,6 @@ func (p *provider) AddSession(ctx context.Context, session models.Session) error

 	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
 }

--- a/server/db/providers/surrealdb/user.go
+++ b/server/db/providers/surrealdb/user.go
@@ -0,0 +1,71 @@
+package surrealdb
+
+import (
+	"context"
+	"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/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()
+
+	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()
+	return user, nil
+}
+
+// DeleteUser to delete user information from database
+func (p *provider) DeleteUser(ctx context.Context, user models.User) error {
+	return nil
+}
+
+// ListUsers to get list of users from database
+func (p *provider) ListUsers(ctx context.Context, pagination model.Pagination) (*model.Users, error) {
+	return nil, 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
+
+	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
+
+	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()
+
+	return nil
+}
--- a/server/db/providers/surrealdb/verification_requests.go
+++ b/server/db/providers/surrealdb/verification_requests.go
@@ -0,0 +1,46 @@
+package surrealdb
+
+import (
+	"context"
+	"time"
+
+	"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) {
+	if verificationRequest.ID == "" {
+		verificationRequest.ID = uuid.New().String()
+	}
+
+	verificationRequest.CreatedAt = time.Now().Unix()
+	verificationRequest.UpdatedAt = time.Now().Unix()
+
+	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
+
+	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
+
+	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) {
+	return nil, nil
+}
+
+// DeleteVerificationRequest to delete verification request from database
+func (p *provider) DeleteVerificationRequest(ctx context.Context, verificationRequest models.VerificationRequest) error {
+	return nil
+}
--- a/server/db/providers/surrealdb/webhook.go
+++ b/server/db/providers/surrealdb/webhook.go
@@ -0,0 +1,49 @@
+package surrealdb
+
+import (
+	"context"
+	"time"
+
+	"github.com/authorizerdev/authorizer/server/db/models"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"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()
+	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()
+	return webhook.AsAPIWebhook(), nil
+}
+
+// ListWebhooks to list webhook
+func (p *provider) ListWebhook(ctx context.Context, pagination model.Pagination) (*model.Webhooks, error) {
+	return nil, nil
+}
+
+// GetWebhookByID to get webhook by id
+func (p *provider) GetWebhookByID(ctx context.Context, webhookID string) (*model.Webhook, error) {
+	return nil, nil
+}
+
+// GetWebhookByEventName to get webhook by event_name
+func (p *provider) GetWebhookByEventName(ctx context.Context, eventName string) (*model.Webhook, error) {
+	return nil, nil
+}
+
+// DeleteWebhook to delete webhook
+func (p *provider) DeleteWebhook(ctx context.Context, webhook *model.Webhook) error {
+	// Also delete webhook logs for given webhook id
+	return nil
+}
--- a/server/db/providers/surrealdb/webhook_log.go
+++ b/server/db/providers/surrealdb/webhook_log.go
@@ -0,0 +1,27 @@
+package surrealdb
+
+import (
+	"context"
+	"time"
+
+	"github.com/authorizerdev/authorizer/server/db/models"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"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()
+	return webhookLog.AsAPIWebhookLog(), nil
+}
+
+// ListWebhookLogs to list webhook logs
+func (p *provider) ListWebhookLogs(ctx context.Context, pagination model.Pagination, webhookID string) (*model.WebhookLogs, error) {
+	return nil, nil
+}
--- a/server/env/env.go
+++ b/server/env/env.go
@@ -75,24 +75,17 @@ func InitAllEnv() error {
 	osAppleClientSecret := os.Getenv(constants.EnvKeyAppleClientSecret)
 	osTwitterClientID := os.Getenv(constants.EnvKeyTwitterClientID)
 	osTwitterClientSecret := os.Getenv(constants.EnvKeyTwitterClientSecret)
-	osMicrosoftClientID := os.Getenv(constants.EnvKeyMicrosoftClientID)
-	osMicrosoftClientSecret := os.Getenv(constants.EnvKeyMicrosoftClientSecret)
-	osMicrosoftActiveDirectoryTenantID := os.Getenv(constants.EnvKeyMicrosoftActiveDirectoryTenantID)
 	osResetPasswordURL := os.Getenv(constants.EnvKeyResetPasswordURL)
 	osOrganizationName := os.Getenv(constants.EnvKeyOrganizationName)
 	osOrganizationLogo := os.Getenv(constants.EnvKeyOrganizationLogo)
 	osAwsRegion := os.Getenv(constants.EnvAwsRegion)
 	osAwsAccessKey := os.Getenv(constants.EnvAwsAccessKeyID)
 	osAwsSecretKey := os.Getenv(constants.EnvAwsSecretAccessKey)
-	osCouchbaseBucket := os.Getenv(constants.EnvCouchbaseBucket)
-	osCouchbaseScope := os.Getenv(constants.EnvCouchbaseScope)
-	osCouchbaseBucketRAMQuotaMB := os.Getenv(constants.EnvCouchbaseBucketRAMQuotaMB)

 	// os bool vars
 	osAppCookieSecure := os.Getenv(constants.EnvKeyAppCookieSecure)
 	osAdminCookieSecure := os.Getenv(constants.EnvKeyAdminCookieSecure)
 	osDisableBasicAuthentication := os.Getenv(constants.EnvKeyDisableBasicAuthentication)
-	osDisableMobileBasicAuthentication := os.Getenv(constants.AuthRecipeMethodMobileBasicAuth)
 	osDisableEmailVerification := os.Getenv(constants.EnvKeyDisableEmailVerification)
 	osDisableMagicLinkLogin := os.Getenv(constants.EnvKeyDisableMagicLinkLogin)
 	osDisableLoginPage := os.Getenv(constants.EnvKeyDisableLoginPage)
@@ -140,38 +133,17 @@ func InitAllEnv() error {
 	if val, ok := envData[constants.EnvAwsAccessKeyID]; !ok || val == "" {
 		envData[constants.EnvAwsAccessKeyID] = osAwsAccessKey
 	}
-	if osAwsAccessKey != "" && envData[constants.EnvAwsAccessKeyID] != osAwsAccessKey {
+	if osAwsAccessKey != "" && envData[constants.EnvAwsAccessKeyID] != osAwsRegion {
 		envData[constants.EnvAwsAccessKeyID] = osAwsAccessKey
 	}

 	if val, ok := envData[constants.EnvAwsSecretAccessKey]; !ok || val == "" {
 		envData[constants.EnvAwsSecretAccessKey] = osAwsSecretKey
 	}
-	if osAwsSecretKey != "" && envData[constants.EnvAwsSecretAccessKey] != osAwsSecretKey {
+	if osAwsSecretKey != "" && envData[constants.EnvAwsSecretAccessKey] != osAwsRegion {
 		envData[constants.EnvAwsSecretAccessKey] = osAwsSecretKey
 	}

-	if val, ok := envData[constants.EnvCouchbaseBucket]; !ok || val == "" {
-		envData[constants.EnvCouchbaseBucket] = osCouchbaseBucket
-	}
-	if osCouchbaseBucket != "" && envData[constants.EnvCouchbaseBucket] != osCouchbaseBucket {
-		envData[constants.EnvCouchbaseBucket] = osCouchbaseBucket
-	}
-
-	if val, ok := envData[constants.EnvCouchbaseBucketRAMQuotaMB]; !ok || val == "" {
-		envData[constants.EnvCouchbaseBucketRAMQuotaMB] = osCouchbaseBucketRAMQuotaMB
-	}
-	if osCouchbaseBucketRAMQuotaMB != "" && envData[constants.EnvCouchbaseBucketRAMQuotaMB] != osCouchbaseBucketRAMQuotaMB {
-		envData[constants.EnvCouchbaseBucketRAMQuotaMB] = osCouchbaseBucketRAMQuotaMB
-	}
-
-	if val, ok := envData[constants.EnvCouchbaseScope]; !ok || val == "" {
-		envData[constants.EnvCouchbaseScope] = osCouchbaseScope
-	}
-	if osCouchbaseScope != "" && envData[constants.EnvCouchbaseScope] != osCouchbaseScope {
-		envData[constants.EnvCouchbaseScope] = osCouchbaseScope
-	}
-
 	if val, ok := envData[constants.EnvKeyAppURL]; !ok || val == "" {
 		envData[constants.EnvKeyAppURL] = osAppURL
 	}
@@ -458,27 +430,6 @@ func InitAllEnv() error {
 		envData[constants.EnvKeyTwitterClientSecret] = osTwitterClientSecret
 	}

-	if val, ok := envData[constants.EnvKeyMicrosoftClientID]; !ok || val == "" {
-		envData[constants.EnvKeyMicrosoftClientID] = osMicrosoftClientID
-	}
-	if osMicrosoftClientID != "" && envData[constants.EnvKeyMicrosoftClientID] != osMicrosoftClientID {
-		envData[constants.EnvKeyMicrosoftClientID] = osMicrosoftClientID
-	}
-
-	if val, ok := envData[constants.EnvKeyMicrosoftClientSecret]; !ok || val == "" {
-		envData[constants.EnvKeyMicrosoftClientSecret] = osMicrosoftClientSecret
-	}
-	if osMicrosoftClientSecret != "" && envData[constants.EnvKeyMicrosoftClientSecret] != osMicrosoftClientSecret {
-		envData[constants.EnvKeyMicrosoftClientSecret] = osMicrosoftClientSecret
-	}
-
-	if val, ok := envData[constants.EnvKeyMicrosoftActiveDirectoryTenantID]; !ok || val == "" {
-		envData[constants.EnvKeyMicrosoftActiveDirectoryTenantID] = osMicrosoftActiveDirectoryTenantID
-	}
-	if osMicrosoftActiveDirectoryTenantID != "" && envData[constants.EnvKeyMicrosoftActiveDirectoryTenantID] != osMicrosoftActiveDirectoryTenantID {
-		envData[constants.EnvKeyMicrosoftActiveDirectoryTenantID] = osMicrosoftActiveDirectoryTenantID
-	}
-
 	if val, ok := envData[constants.EnvKeyResetPasswordURL]; !ok || val == "" {
 		envData[constants.EnvKeyResetPasswordURL] = strings.TrimPrefix(osResetPasswordURL, "/")
 	}
@@ -547,19 +498,6 @@ func InitAllEnv() error {
 		}
 	}

-	if _, ok := envData[constants.EnvKeyDisableMobileBasicAuthentication]; !ok {
-		envData[constants.EnvKeyDisableMobileBasicAuthentication] = osDisableBasicAuthentication == "true"
-	}
-	if osDisableMobileBasicAuthentication != "" {
-		boolValue, err := strconv.ParseBool(osDisableMobileBasicAuthentication)
-		if err != nil {
-			return err
-		}
-		if boolValue != envData[constants.EnvKeyDisableMobileBasicAuthentication].(bool) {
-			envData[constants.EnvKeyDisableMobileBasicAuthentication] = boolValue
-		}
-	}
-
 	if _, ok := envData[constants.EnvKeyDisableEmailVerification]; !ok {
 		envData[constants.EnvKeyDisableEmailVerification] = osDisableEmailVerification == "true"
 	}
--- a/server/env/persist_env.go
+++ b/server/env/persist_env.go
@@ -75,6 +75,7 @@ func GetEnvData() (map[string]interface{}, error) {
 	}

 	memorystore.Provider.UpdateEnvVariable(constants.EnvKeyEncryptionKey, decryptedEncryptionKey)
+
 	b64DecryptedConfig, err := crypto.DecryptB64(env.EnvData)
 	if err != nil {
 		log.Debug("Error while decrypting env data from B64: ", err)
@@ -200,7 +201,7 @@ func PersistEnv() error {
 				envValue := strings.TrimSpace(os.Getenv(key))
 				if envValue != "" {
 					switch key {
-					case constants.EnvKeyIsProd, constants.EnvKeyDisableBasicAuthentication, constants.EnvKeyDisableMobileBasicAuthentication, constants.EnvKeyDisableEmailVerification, constants.EnvKeyDisableLoginPage, constants.EnvKeyDisableMagicLinkLogin, constants.EnvKeyDisableSignUp, constants.EnvKeyDisableRedisForEnv, constants.EnvKeyDisableStrongPassword, constants.EnvKeyIsEmailServiceEnabled, constants.EnvKeyEnforceMultiFactorAuthentication, constants.EnvKeyDisableMultiFactorAuthentication, constants.EnvKeyAdminCookieSecure, constants.EnvKeyAppCookieSecure:
+					case constants.EnvKeyIsProd, constants.EnvKeyDisableBasicAuthentication, constants.EnvKeyDisableEmailVerification, constants.EnvKeyDisableLoginPage, constants.EnvKeyDisableMagicLinkLogin, constants.EnvKeyDisableSignUp, constants.EnvKeyDisableRedisForEnv, constants.EnvKeyDisableStrongPassword, constants.EnvKeyIsEmailServiceEnabled, constants.EnvKeyEnforceMultiFactorAuthentication, constants.EnvKeyDisableMultiFactorAuthentication, constants.EnvKeyAdminCookieSecure, constants.EnvKeyAppCookieSecure:
 						if envValueBool, err := strconv.ParseBool(envValue); err == nil {
 							if value.(bool) != envValueBool {
 								storeData[key] = envValueBool
--- a/server/go.mod
+++ b/server/go.mod
@@ -4,37 +4,45 @@ go 1.16

 require (
 	github.com/99designs/gqlgen v0.17.20
-	github.com/arangodb/go-driver v1.2.1
-	github.com/aws/aws-sdk-go v1.44.109
-	github.com/coreos/go-oidc/v3 v3.1.0
-	github.com/couchbase/gocb/v2 v2.6.0
+	github.com/arangodb/go-driver v1.4.0
+	github.com/aws/aws-sdk-go v1.44.145
+	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
+	github.com/coreos/go-oidc/v3 v3.4.0
 	github.com/gin-gonic/gin v1.8.1
+	github.com/glebarez/go-sqlite v1.19.5 // indirect
 	github.com/glebarez/sqlite v1.5.0
 	github.com/go-playground/validator/v10 v10.11.1 // indirect
-	github.com/go-redis/redis/v8 v8.11.0
+	github.com/go-redis/redis/v8 v8.11.5
 	github.com/goccy/go-json v0.9.11 // indirect
-	github.com/gocql/gocql v1.2.0
+	github.com/gocql/gocql v1.2.1
+	github.com/gofrs/uuid v4.3.1+incompatible // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.3.0
-	github.com/guregu/dynamo v1.16.0
-	github.com/joho/godotenv v1.3.0
+	github.com/guregu/dynamo v1.17.0
+	github.com/joho/godotenv v1.4.0
+	github.com/klauspost/compress v1.15.12 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
-	github.com/robertkrimen/otto v0.0.0-20211024170158-b87d35c0b86f
-	github.com/sirupsen/logrus v1.8.1
-	github.com/stretchr/testify v1.8.0
+	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa // indirect
+	github.com/robertkrimen/otto v0.0.0-20221126133309-a3b51c68f2a4
+	github.com/sirupsen/logrus v1.9.0
+	github.com/stretchr/testify v1.8.1
+	github.com/surrealdb/surrealdb.go v0.1.2-0.20221019092700-845266102715
+	github.com/urfave/cli/v2 v2.23.5 // indirect
 	github.com/vektah/gqlparser/v2 v2.5.1
-	go.mongodb.org/mongo-driver v1.8.1
-	golang.org/x/crypto v0.4.0
-	golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
-	google.golang.org/appengine v1.6.7 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
+	go.mongodb.org/mongo-driver v1.11.0
+	golang.org/x/crypto v0.3.0
+	golang.org/x/oauth2 v0.2.0
+	golang.org/x/tools v0.3.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/mail.v2 v2.3.1
 	gopkg.in/square/go-jose.v2 v2.6.0
-	gorm.io/driver/mysql v1.4.3
-	gorm.io/driver/postgres v1.4.7
+	gorm.io/driver/mysql v1.4.4
+	gorm.io/driver/postgres v1.4.5
 	gorm.io/driver/sqlserver v1.4.1
 	gorm.io/gorm v1.24.2
 )
--- a/server/go.sum
+++ b/server/go.sum
--- a/server/graph/generated/generated.go
+++ b/server/graph/generated/generated.go
--- a/server/graph/model/models_gen.go
+++ b/server/graph/model/models_gen.go
@@ -109,9 +109,6 @@ type Env struct {
 	AppleClientSecret                *string  `json:"APPLE_CLIENT_SECRET"`
 	TwitterClientID                  *string  `json:"TWITTER_CLIENT_ID"`
 	TwitterClientSecret              *string  `json:"TWITTER_CLIENT_SECRET"`
-	MicrosoftClientID                *string  `json:"MICROSOFT_CLIENT_ID"`
-	MicrosoftClientSecret            *string  `json:"MICROSOFT_CLIENT_SECRET"`
-	MicrosoftActiveDirectoryTenantID *string  `json:"MICROSOFT_ACTIVE_DIRECTORY_TENANT_ID"`
 	OrganizationName                 *string  `json:"ORGANIZATION_NAME"`
 	OrganizationLogo                 *string  `json:"ORGANIZATION_LOGO"`
 	AppCookieSecure                  bool     `json:"APP_COOKIE_SECURE"`
@@ -139,10 +136,6 @@ type GenerateJWTKeysResponse struct {
 	PrivateKey *string `json:"private_key"`
 }

-type GetUserRequest struct {
-	ID string `json:"id"`
-}
-
 type InviteMemberInput struct {
 	Emails      []string `json:"emails"`
 	RedirectURI *string  `json:"redirect_uri"`
@@ -178,7 +171,6 @@ type Meta struct {
 	IsLinkedinLoginEnabled       bool   `json:"is_linkedin_login_enabled"`
 	IsAppleLoginEnabled          bool   `json:"is_apple_login_enabled"`
 	IsTwitterLoginEnabled        bool   `json:"is_twitter_login_enabled"`
-	IsMicrosoftLoginEnabled      bool   `json:"is_microsoft_login_enabled"`
 	IsEmailVerificationEnabled   bool   `json:"is_email_verification_enabled"`
 	IsBasicAuthenticationEnabled bool   `json:"is_basic_authentication_enabled"`
 	IsMagicLinkLoginEnabled      bool   `json:"is_magic_link_login_enabled"`
@@ -187,33 +179,6 @@ type Meta struct {
 	IsMultiFactorAuthEnabled     bool   `json:"is_multi_factor_auth_enabled"`
 }

-type MobileLoginInput struct {
-	PhoneNumber string   `json:"phone_number"`
-	Password    string   `json:"password"`
-	Roles       []string `json:"roles"`
-	Scope       []string `json:"scope"`
-	State       *string  `json:"state"`
-}
-
-type MobileSignUpInput struct {
-	Email                    *string  `json:"email"`
-	GivenName                *string  `json:"given_name"`
-	FamilyName               *string  `json:"family_name"`
-	MiddleName               *string  `json:"middle_name"`
-	Nickname                 *string  `json:"nickname"`
-	Gender                   *string  `json:"gender"`
-	Birthdate                *string  `json:"birthdate"`
-	PhoneNumber              string   `json:"phone_number"`
-	Picture                  *string  `json:"picture"`
-	Password                 string   `json:"password"`
-	ConfirmPassword          string   `json:"confirm_password"`
-	Roles                    []string `json:"roles"`
-	Scope                    []string `json:"scope"`
-	RedirectURI              *string  `json:"redirect_uri"`
-	IsMultiFactorAuthEnabled *bool    `json:"is_multi_factor_auth_enabled"`
-	State                    *string  `json:"state"`
-}
-
 type OAuthRevokeInput struct {
 	RefreshToken string `json:"refresh_token"`
 }
@@ -347,9 +312,6 @@ type UpdateEnvInput struct {
 	AppleClientSecret                *string  `json:"APPLE_CLIENT_SECRET"`
 	TwitterClientID                  *string  `json:"TWITTER_CLIENT_ID"`
 	TwitterClientSecret              *string  `json:"TWITTER_CLIENT_SECRET"`
-	MicrosoftClientID                *string  `json:"MICROSOFT_CLIENT_ID"`
-	MicrosoftClientSecret            *string  `json:"MICROSOFT_CLIENT_SECRET"`
-	MicrosoftActiveDirectoryTenantID *string  `json:"MICROSOFT_ACTIVE_DIRECTORY_TENANT_ID"`
 	OrganizationName                 *string  `json:"ORGANIZATION_NAME"`
 	OrganizationLogo                 *string  `json:"ORGANIZATION_LOGO"`
 }
--- a/server/graph/schema.graphqls
+++ b/server/graph/schema.graphqls
@@ -6,574 +6,527 @@ scalar Map
 scalar Any

 type Pagination {
-  limit: Int64!
-  page: Int64!
-  offset: Int64!
-  total: Int64!
+	limit: Int64!
+	page: Int64!
+	offset: Int64!
+	total: Int64!
 }

 type Meta {
-  version: String!
-  client_id: String!
-  is_google_login_enabled: Boolean!
-  is_facebook_login_enabled: Boolean!
-  is_github_login_enabled: Boolean!
-  is_linkedin_login_enabled: Boolean!
-  is_apple_login_enabled: Boolean!
-  is_twitter_login_enabled: Boolean!
-  is_microsoft_login_enabled: Boolean!
-  is_email_verification_enabled: Boolean!
-  is_basic_authentication_enabled: Boolean!
-  is_magic_link_login_enabled: Boolean!
-  is_sign_up_enabled: Boolean!
-  is_strong_password_enabled: Boolean!
-  is_multi_factor_auth_enabled: Boolean!
+	version: String!
+	client_id: String!
+	is_google_login_enabled: Boolean!
+	is_facebook_login_enabled: Boolean!
+	is_github_login_enabled: Boolean!
+	is_linkedin_login_enabled: Boolean!
+	is_apple_login_enabled: Boolean!
+	is_twitter_login_enabled: Boolean!
+	is_email_verification_enabled: Boolean!
+	is_basic_authentication_enabled: Boolean!
+	is_magic_link_login_enabled: Boolean!
+	is_sign_up_enabled: Boolean!
+	is_strong_password_enabled: Boolean!
+	is_multi_factor_auth_enabled: Boolean!
 }

 type User {
-  id: ID!
-  email: String!
-  email_verified: Boolean!
-  signup_methods: String!
-  given_name: String
-  family_name: String
-  middle_name: String
-  nickname: String
-  # defaults to email
-  preferred_username: String
-  gender: String
-  birthdate: String
-  phone_number: String
-  phone_number_verified: Boolean
-  picture: String
-  roles: [String!]!
-  created_at: Int64
-  updated_at: Int64
-  revoked_timestamp: Int64
-  is_multi_factor_auth_enabled: Boolean
+	id: ID!
+	email: String!
+	email_verified: Boolean!
+	signup_methods: String!
+	given_name: String
+	family_name: String
+	middle_name: String
+	nickname: String
+	# defaults to email
+	preferred_username: String
+	gender: String
+	birthdate: String
+	phone_number: String
+	phone_number_verified: Boolean
+	picture: String
+	roles: [String!]!
+	created_at: Int64
+	updated_at: Int64
+	revoked_timestamp: Int64
+	is_multi_factor_auth_enabled: Boolean
 }

 type Users {
-  pagination: Pagination!
-  users: [User!]!
+	pagination: Pagination!
+	users: [User!]!
 }

 type VerificationRequest {
-  id: ID!
-  identifier: String
-  token: String
-  email: String
-  expires: Int64
-  created_at: Int64
-  updated_at: Int64
-  nonce: String
-  redirect_uri: String
+	id: ID!
+	identifier: String
+	token: String
+	email: String
+	expires: Int64
+	created_at: Int64
+	updated_at: Int64
+	nonce: String
+	redirect_uri: String
 }

 type VerificationRequests {
-  pagination: Pagination!
-  verification_requests: [VerificationRequest!]!
+	pagination: Pagination!
+	verification_requests: [VerificationRequest!]!
 }

 type Error {
-  message: String!
-  reason: String!
+	message: String!
+	reason: String!
 }

 type AuthResponse {
-  message: String!
-  should_show_otp_screen: Boolean
-  access_token: String
-  id_token: String
-  refresh_token: String
-  expires_in: Int64
-  user: User
+	message: String!
+	should_show_otp_screen: Boolean
+	access_token: String
+	id_token: String
+	refresh_token: String
+	expires_in: Int64
+	user: User
 }

 type Response {
-  message: String!
+	message: String!
 }

 type Env {
-  ACCESS_TOKEN_EXPIRY_TIME: String
-  ADMIN_SECRET: String
-  DATABASE_NAME: String
-  DATABASE_URL: String
-  DATABASE_TYPE: String
-  DATABASE_USERNAME: String
-  DATABASE_PASSWORD: String
-  DATABASE_HOST: String
-  DATABASE_PORT: String
-  CLIENT_ID: String!
-  CLIENT_SECRET: String!
-  CUSTOM_ACCESS_TOKEN_SCRIPT: String
-  SMTP_HOST: String
-  SMTP_PORT: String
-  SMTP_USERNAME: String
-  SMTP_PASSWORD: String
-  SMTP_LOCAL_NAME: String
-  SENDER_EMAIL: String
-  JWT_TYPE: String
-  JWT_SECRET: String
-  JWT_PRIVATE_KEY: String
-  JWT_PUBLIC_KEY: String
-  ALLOWED_ORIGINS: [String!]
-  APP_URL: String
-  REDIS_URL: String
-  RESET_PASSWORD_URL: String
-  DISABLE_EMAIL_VERIFICATION: Boolean!
-  DISABLE_BASIC_AUTHENTICATION: Boolean!
-  DISABLE_MAGIC_LINK_LOGIN: Boolean!
-  DISABLE_LOGIN_PAGE: Boolean!
-  DISABLE_SIGN_UP: Boolean!
-  DISABLE_REDIS_FOR_ENV: Boolean!
-  DISABLE_STRONG_PASSWORD: Boolean!
-  DISABLE_MULTI_FACTOR_AUTHENTICATION: Boolean!
-  ENFORCE_MULTI_FACTOR_AUTHENTICATION: Boolean!
-  ROLES: [String!]
-  PROTECTED_ROLES: [String!]
-  DEFAULT_ROLES: [String!]
-  JWT_ROLE_CLAIM: String
-  GOOGLE_CLIENT_ID: String
-  GOOGLE_CLIENT_SECRET: String
-  GITHUB_CLIENT_ID: String
-  GITHUB_CLIENT_SECRET: String
-  FACEBOOK_CLIENT_ID: String
-  FACEBOOK_CLIENT_SECRET: String
-  LINKEDIN_CLIENT_ID: String
-  LINKEDIN_CLIENT_SECRET: String
-  APPLE_CLIENT_ID: String
-  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
-  ORGANIZATION_NAME: String
-  ORGANIZATION_LOGO: String
-  APP_COOKIE_SECURE: Boolean!
-  ADMIN_COOKIE_SECURE: Boolean!
+	ACCESS_TOKEN_EXPIRY_TIME: String
+	ADMIN_SECRET: String
+	DATABASE_NAME: String
+	DATABASE_URL: String
+	DATABASE_TYPE: String
+	DATABASE_USERNAME: String
+	DATABASE_PASSWORD: String
+	DATABASE_HOST: String
+	DATABASE_PORT: String
+	CLIENT_ID: String!
+	CLIENT_SECRET: String!
+	CUSTOM_ACCESS_TOKEN_SCRIPT: String
+	SMTP_HOST: String
+	SMTP_PORT: String
+	SMTP_USERNAME: String
+	SMTP_PASSWORD: String
+	SMTP_LOCAL_NAME: String
+	SENDER_EMAIL: String
+	JWT_TYPE: String
+	JWT_SECRET: String
+	JWT_PRIVATE_KEY: String
+	JWT_PUBLIC_KEY: String
+	ALLOWED_ORIGINS: [String!]
+	APP_URL: String
+	REDIS_URL: String
+	RESET_PASSWORD_URL: String
+	DISABLE_EMAIL_VERIFICATION: Boolean!
+	DISABLE_BASIC_AUTHENTICATION: Boolean!
+	DISABLE_MAGIC_LINK_LOGIN: Boolean!
+	DISABLE_LOGIN_PAGE: Boolean!
+	DISABLE_SIGN_UP: Boolean!
+	DISABLE_REDIS_FOR_ENV: Boolean!
+	DISABLE_STRONG_PASSWORD: Boolean!
+	DISABLE_MULTI_FACTOR_AUTHENTICATION: Boolean!
+	ENFORCE_MULTI_FACTOR_AUTHENTICATION: Boolean!
+	ROLES: [String!]
+	PROTECTED_ROLES: [String!]
+	DEFAULT_ROLES: [String!]
+	JWT_ROLE_CLAIM: String
+	GOOGLE_CLIENT_ID: String
+	GOOGLE_CLIENT_SECRET: String
+	GITHUB_CLIENT_ID: String
+	GITHUB_CLIENT_SECRET: String
+	FACEBOOK_CLIENT_ID: String
+	FACEBOOK_CLIENT_SECRET: String
+	LINKEDIN_CLIENT_ID: String
+	LINKEDIN_CLIENT_SECRET: String
+	APPLE_CLIENT_ID: String
+	APPLE_CLIENT_SECRET: String
+	TWITTER_CLIENT_ID: String
+	TWITTER_CLIENT_SECRET: String
+	ORGANIZATION_NAME: String
+	ORGANIZATION_LOGO: String
+	APP_COOKIE_SECURE: Boolean!
+	ADMIN_COOKIE_SECURE: Boolean!
 }

 type ValidateJWTTokenResponse {
-  is_valid: Boolean!
-  claims: Map
+	is_valid: Boolean!
+	claims: Map
 }

 type GenerateJWTKeysResponse {
-  secret: String
-  public_key: String
-  private_key: String
+	secret: String
+	public_key: String
+	private_key: String
 }

 type Webhook {
-  id: ID!
-  event_name: String
-  endpoint: String
-  enabled: Boolean
-  headers: Map
-  created_at: Int64
-  updated_at: Int64
+	id: ID!
+	event_name: String
+	endpoint: String
+	enabled: Boolean
+	headers: Map
+	created_at: Int64
+	updated_at: Int64
 }

 type Webhooks {
-  pagination: Pagination!
-  webhooks: [Webhook!]!
+	pagination: Pagination!
+	webhooks: [Webhook!]!
 }

 type WebhookLog {
-  id: ID!
-  http_status: Int64
-  response: String
-  request: String
-  webhook_id: ID
-  created_at: Int64
-  updated_at: Int64
+	id: ID!
+	http_status: Int64
+	response: String
+	request: String
+	webhook_id: ID
+	created_at: Int64
+	updated_at: Int64
 }

 type TestEndpointResponse {
-  http_status: Int64
-  response: String
+	http_status: Int64
+	response: String
 }

 type WebhookLogs {
-  pagination: Pagination!
-  webhook_logs: [WebhookLog!]!
+	pagination: Pagination!
+	webhook_logs: [WebhookLog!]!
 }

 type EmailTemplate {
-  id: ID!
-  event_name: String!
-  template: String!
-  design: String!
-  subject: String!
-  created_at: Int64
-  updated_at: Int64
+	id: ID!
+	event_name: String!
+	template: String!
+	design: String!
+	subject: String!
+	created_at: Int64
+	updated_at: Int64
 }

 type EmailTemplates {
-  pagination: Pagination!
-  email_templates: [EmailTemplate!]!
+	pagination: Pagination!
+	email_templates: [EmailTemplate!]!
 }

 input UpdateEnvInput {
-  ACCESS_TOKEN_EXPIRY_TIME: String
-  ADMIN_SECRET: String
-  CUSTOM_ACCESS_TOKEN_SCRIPT: String
-  OLD_ADMIN_SECRET: String
-  SMTP_HOST: String
-  SMTP_PORT: String
-  SMTP_USERNAME: String
-  SMTP_PASSWORD: String
-  SMTP_LOCAL_NAME: String
-  SENDER_EMAIL: String
-  JWT_TYPE: String
-  JWT_SECRET: String
-  JWT_PRIVATE_KEY: String
-  JWT_PUBLIC_KEY: String
-  ALLOWED_ORIGINS: [String!]
-  APP_URL: String
-  RESET_PASSWORD_URL: String
-  APP_COOKIE_SECURE: Boolean
-  ADMIN_COOKIE_SECURE: Boolean
-  DISABLE_EMAIL_VERIFICATION: Boolean
-  DISABLE_BASIC_AUTHENTICATION: Boolean
-  DISABLE_MAGIC_LINK_LOGIN: Boolean
-  DISABLE_LOGIN_PAGE: Boolean
-  DISABLE_SIGN_UP: Boolean
-  DISABLE_REDIS_FOR_ENV: Boolean
-  DISABLE_STRONG_PASSWORD: Boolean
-  DISABLE_MULTI_FACTOR_AUTHENTICATION: Boolean
-  ENFORCE_MULTI_FACTOR_AUTHENTICATION: Boolean
-  ROLES: [String!]
-  PROTECTED_ROLES: [String!]
-  DEFAULT_ROLES: [String!]
-  JWT_ROLE_CLAIM: String
-  GOOGLE_CLIENT_ID: String
-  GOOGLE_CLIENT_SECRET: String
-  GITHUB_CLIENT_ID: String
-  GITHUB_CLIENT_SECRET: String
-  FACEBOOK_CLIENT_ID: String
-  FACEBOOK_CLIENT_SECRET: String
-  LINKEDIN_CLIENT_ID: String
-  LINKEDIN_CLIENT_SECRET: String
-  APPLE_CLIENT_ID: String
-  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
-  ORGANIZATION_NAME: String
-  ORGANIZATION_LOGO: String
+	ACCESS_TOKEN_EXPIRY_TIME: String
+	ADMIN_SECRET: String
+	CUSTOM_ACCESS_TOKEN_SCRIPT: String
+	OLD_ADMIN_SECRET: String
+	SMTP_HOST: String
+	SMTP_PORT: String
+	SMTP_USERNAME: String
+	SMTP_PASSWORD: String
+	SMTP_LOCAL_NAME: String
+	SENDER_EMAIL: String
+	JWT_TYPE: String
+	JWT_SECRET: String
+	JWT_PRIVATE_KEY: String
+	JWT_PUBLIC_KEY: String
+	ALLOWED_ORIGINS: [String!]
+	APP_URL: String
+	RESET_PASSWORD_URL: String
+	APP_COOKIE_SECURE: Boolean
+	ADMIN_COOKIE_SECURE: Boolean
+	DISABLE_EMAIL_VERIFICATION: Boolean
+	DISABLE_BASIC_AUTHENTICATION: Boolean
+	DISABLE_MAGIC_LINK_LOGIN: Boolean
+	DISABLE_LOGIN_PAGE: Boolean
+	DISABLE_SIGN_UP: Boolean
+	DISABLE_REDIS_FOR_ENV: Boolean
+	DISABLE_STRONG_PASSWORD: Boolean
+	DISABLE_MULTI_FACTOR_AUTHENTICATION: Boolean
+	ENFORCE_MULTI_FACTOR_AUTHENTICATION: Boolean
+	ROLES: [String!]
+	PROTECTED_ROLES: [String!]
+	DEFAULT_ROLES: [String!]
+	JWT_ROLE_CLAIM: String
+	GOOGLE_CLIENT_ID: String
+	GOOGLE_CLIENT_SECRET: String
+	GITHUB_CLIENT_ID: String
+	GITHUB_CLIENT_SECRET: String
+	FACEBOOK_CLIENT_ID: String
+	FACEBOOK_CLIENT_SECRET: String
+	LINKEDIN_CLIENT_ID: String
+	LINKEDIN_CLIENT_SECRET: String
+	APPLE_CLIENT_ID: String
+	APPLE_CLIENT_SECRET: String
+	TWITTER_CLIENT_ID: String
+	TWITTER_CLIENT_SECRET: String
+	ORGANIZATION_NAME: String
+	ORGANIZATION_LOGO: String
 }

 input AdminLoginInput {
-  admin_secret: String!
+	admin_secret: String!
 }

 input AdminSignupInput {
-  admin_secret: String!
-}
-
-input MobileSignUpInput {
-  email: String
-  given_name: String
-  family_name: String
-  middle_name: String
-  nickname: String
-  gender: String
-  birthdate: String
-  phone_number: String!
-  picture: String
-  password: String!
-  confirm_password: String!
-  roles: [String!]
-  scope: [String!]
-  redirect_uri: String
-  is_multi_factor_auth_enabled: Boolean
-  # state is used for authorization code grant flow
-  # it is used to get code for an on-going auth process during login
-  # and use that code for setting `c_hash` in id_token
-  state: String
+	admin_secret: String!
 }

 input SignUpInput {
-  email: String!
-  given_name: String
-  family_name: String
-  middle_name: String
-  nickname: String
-  gender: String
-  birthdate: String
-  phone_number: String
-  picture: String
-  password: String!
-  confirm_password: String!
-  roles: [String!]
-  scope: [String!]
-  redirect_uri: String
-  is_multi_factor_auth_enabled: Boolean
-  # state is used for authorization code grant flow
-  # it is used to get code for an on-going auth process during login
-  # and use that code for setting `c_hash` in id_token
-  state: String
+	email: String!
+	given_name: String
+	family_name: String
+	middle_name: String
+	nickname: String
+	gender: String
+	birthdate: String
+	phone_number: String
+	picture: String
+	password: String!
+	confirm_password: String!
+	roles: [String!]
+	scope: [String!]
+	redirect_uri: String
+	is_multi_factor_auth_enabled: Boolean
+	# state is used for authorization code grant flow
+	# it is used to get code for an on-going auth process during login
+	# and use that code for setting `c_hash` in id_token
+	state: String
 }

 input LoginInput {
-  email: String!
-  password: String!
-  roles: [String!]
-  scope: [String!]
-  # state is used for authorization code grant flow
-  # it is used to get code for an on-going auth process during login
-  # and use that code for setting `c_hash` in id_token
-  state: String
-}
-
-input MobileLoginInput {
-  phone_number: String!
-  password: String!
-  roles: [String!]
-  scope: [String!]
-  # state is used for authorization code grant flow
-  # it is used to get code for an on-going auth process during login
-  # and use that code for setting `c_hash` in id_token
-  state: String
+	email: String!
+	password: String!
+	roles: [String!]
+	scope: [String!]
+	# state is used for authorization code grant flow
+	# it is used to get code for an on-going auth process during login
+	# and use that code for setting `c_hash` in id_token
+	state: String
 }

 input VerifyEmailInput {
-  token: String!
-  # state is used for authorization code grant flow
-  # it is used to get code for an on-going auth process during login
-  # and use that code for setting `c_hash` in id_token
-  state: String
+	token: String!
+	# state is used for authorization code grant flow
+	# it is used to get code for an on-going auth process during login
+	# and use that code for setting `c_hash` in id_token
+	state: String
 }

 input ResendVerifyEmailInput {
-  email: String!
-  identifier: String!
-  # state is used for authorization code grant flow
-  # it is used to get code for an on-going auth process during login
-  # and use that code for setting `c_hash` in id_token
-  state: String
+	email: String!
+	identifier: String!
+	# state is used for authorization code grant flow
+	# it is used to get code for an on-going auth process during login
+	# and use that code for setting `c_hash` in id_token
+	state: String
 }

 input UpdateProfileInput {
-  old_password: String
-  new_password: String
-  confirm_new_password: String
-  email: String
-  given_name: String
-  family_name: String
-  middle_name: String
-  nickname: String
-  gender: String
-  birthdate: String
-  phone_number: String
-  picture: String
-  is_multi_factor_auth_enabled: Boolean
+	old_password: String
+	new_password: String
+	confirm_new_password: String
+	email: String
+	given_name: String
+	family_name: String
+	middle_name: String
+	nickname: String
+	gender: String
+	birthdate: String
+	phone_number: String
+	picture: String
+	is_multi_factor_auth_enabled: Boolean
 }

 input UpdateUserInput {
-  id: ID!
-  email: String
-  email_verified: Boolean
-  given_name: String
-  family_name: String
-  middle_name: String
-  nickname: String
-  gender: String
-  birthdate: String
-  phone_number: String
-  picture: String
-  roles: [String]
-  is_multi_factor_auth_enabled: Boolean
+	id: ID!
+	email: String
+	email_verified: Boolean
+	given_name: String
+	family_name: String
+	middle_name: String
+	nickname: String
+	gender: String
+	birthdate: String
+	phone_number: String
+	picture: String
+	roles: [String]
+	is_multi_factor_auth_enabled: Boolean
 }

 input ForgotPasswordInput {
-  email: String!
-  state: String
-  redirect_uri: String
+	email: String!
+	state: String
+	redirect_uri: String
 }

 input ResetPasswordInput {
-  token: String!
-  password: String!
-  confirm_password: String!
+	token: String!
+	password: String!
+	confirm_password: String!
 }

 input DeleteUserInput {
-  email: String!
+	email: String!
 }

 input MagicLinkLoginInput {
-  email: String!
-  roles: [String!]
-  scope: [String!]
-  state: String
-  redirect_uri: String
+	email: String!
+	roles: [String!]
+	scope: [String!]
+	state: String
+	redirect_uri: String
 }

 input SessionQueryInput {
-  roles: [String!]
-  scope: [String!]
+	roles: [String!]
+	scope: [String!]
 }

 input PaginationInput {
-  limit: Int64
-  page: Int64
+	limit: Int64
+	page: Int64
 }

 input PaginatedInput {
-  pagination: PaginationInput
+	pagination: PaginationInput
 }

 input OAuthRevokeInput {
-  refresh_token: String!
+	refresh_token: String!
 }

 input InviteMemberInput {
-  emails: [String!]!
-  redirect_uri: String
+	emails: [String!]!
+	redirect_uri: String
 }

 input UpdateAccessInput {
-  user_id: String!
+	user_id: String!
 }

 input ValidateJWTTokenInput {
-  token_type: String!
-  token: String!
-  roles: [String!]
+	token_type: String!
+	token: String!
+	roles: [String!]
 }

 input GenerateJWTKeysInput {
-  type: String!
+	type: String!
 }

 input ListWebhookLogRequest {
-  pagination: PaginationInput
-  webhook_id: String
+	pagination: PaginationInput
+	webhook_id: String
 }

 input AddWebhookRequest {
-  event_name: String!
-  endpoint: String!
-  enabled: Boolean!
-  headers: Map
+	event_name: String!
+	endpoint: String!
+	enabled: Boolean!
+	headers: Map
 }

 input UpdateWebhookRequest {
-  id: ID!
-  event_name: String
-  endpoint: String
-  enabled: Boolean
-  headers: Map
+	id: ID!
+	event_name: String
+	endpoint: String
+	enabled: Boolean
+	headers: Map
 }

 input WebhookRequest {
-  id: ID!
+	id: ID!
 }

 input TestEndpointRequest {
-  endpoint: String!
-  event_name: String!
-  headers: Map
+	endpoint: String!
+	event_name: String!
+	headers: Map
 }

 input AddEmailTemplateRequest {
-  event_name: String!
-  subject: String!
-  template: String!
-  # Design value is set when editor is used
-  # If raw HTML is used design value is set to null
-  design: String
+	event_name: String!
+	subject: String!
+	template: String!
+	# Design value is set when editor is used
+	# If raw HTML is used design value is set to null
+	design: String
 }

 input UpdateEmailTemplateRequest {
-  id: ID!
-  event_name: String
-  template: String
-  subject: String
-  # Design value is set when editor is used
-  # If raw HTML is used design value is set to null
-  design: String
+	id: ID!
+	event_name: String
+	template: String
+	subject: String
+	# Design value is set when editor is used
+	# If raw HTML is used design value is set to null
+	design: String
 }

 input DeleteEmailTemplateRequest {
-  id: ID!
+	id: ID!
 }

 input VerifyOTPRequest {
-  email: String!
-  otp: String!
-  # state is used for authorization code grant flow
-  # it is used to get code for an on-going auth process during login
-  # and use that code for setting `c_hash` in id_token
-  state: String
+	email: String!
+	otp: String!
+	# state is used for authorization code grant flow
+	# it is used to get code for an on-going auth process during login
+	# and use that code for setting `c_hash` in id_token
+	state: String
 }

 input ResendOTPRequest {
-  email: String!
-  # state is used for authorization code grant flow
-  # it is used to get code for an on-going auth process during login
-  # and use that code for setting `c_hash` in id_token
-  state: String
-}
-
-input GetUserRequest {
-  id: String!
+	email: String!
+	# state is used for authorization code grant flow
+	# it is used to get code for an on-going auth process during login
+	# and use that code for setting `c_hash` in id_token
+	state: String
 }

 type Mutation {
-  signup(params: SignUpInput!): AuthResponse!
-  mobile_signup(params: MobileSignUpInput): AuthResponse!
-  login(params: LoginInput!): AuthResponse!
-  mobile_login(params: MobileLoginInput!): AuthResponse!
-  magic_link_login(params: MagicLinkLoginInput!): Response!
-  logout: Response!
-  update_profile(params: UpdateProfileInput!): Response!
-  verify_email(params: VerifyEmailInput!): AuthResponse!
-  resend_verify_email(params: ResendVerifyEmailInput!): Response!
-  forgot_password(params: ForgotPasswordInput!): Response!
-  reset_password(params: ResetPasswordInput!): Response!
-  revoke(params: OAuthRevokeInput!): Response!
-  verify_otp(params: VerifyOTPRequest!): AuthResponse!
-  resend_otp(params: ResendOTPRequest!): Response!
-  # admin only apis
-  _delete_user(params: DeleteUserInput!): Response!
-  _update_user(params: UpdateUserInput!): User!
-  _admin_signup(params: AdminSignupInput!): Response!
-  _admin_login(params: AdminLoginInput!): Response!
-  _admin_logout: Response!
-  _update_env(params: UpdateEnvInput!): Response!
-  _invite_members(params: InviteMemberInput!): Response!
-  _revoke_access(param: UpdateAccessInput!): Response!
-  _enable_access(param: UpdateAccessInput!): Response!
-  _generate_jwt_keys(params: GenerateJWTKeysInput!): GenerateJWTKeysResponse!
-  _add_webhook(params: AddWebhookRequest!): Response!
-  _update_webhook(params: UpdateWebhookRequest!): Response!
-  _delete_webhook(params: WebhookRequest!): Response!
-  _test_endpoint(params: TestEndpointRequest!): TestEndpointResponse!
-  _add_email_template(params: AddEmailTemplateRequest!): Response!
-  _update_email_template(params: UpdateEmailTemplateRequest!): Response!
-  _delete_email_template(params: DeleteEmailTemplateRequest!): Response!
+	signup(params: SignUpInput!): AuthResponse!
+	login(params: LoginInput!): AuthResponse!
+	magic_link_login(params: MagicLinkLoginInput!): Response!
+	logout: Response!
+	update_profile(params: UpdateProfileInput!): Response!
+	verify_email(params: VerifyEmailInput!): AuthResponse!
+	resend_verify_email(params: ResendVerifyEmailInput!): Response!
+	forgot_password(params: ForgotPasswordInput!): Response!
+	reset_password(params: ResetPasswordInput!): Response!
+	revoke(params: OAuthRevokeInput!): Response!
+	verify_otp(params: VerifyOTPRequest!): AuthResponse!
+	resend_otp(params: ResendOTPRequest!): Response!
+	# admin only apis
+	_delete_user(params: DeleteUserInput!): Response!
+	_update_user(params: UpdateUserInput!): User!
+	_admin_signup(params: AdminSignupInput!): Response!
+	_admin_login(params: AdminLoginInput!): Response!
+	_admin_logout: Response!
+	_update_env(params: UpdateEnvInput!): Response!
+	_invite_members(params: InviteMemberInput!): Response!
+	_revoke_access(param: UpdateAccessInput!): Response!
+	_enable_access(param: UpdateAccessInput!): Response!
+	_generate_jwt_keys(params: GenerateJWTKeysInput!): GenerateJWTKeysResponse!
+	_add_webhook(params: AddWebhookRequest!): Response!
+	_update_webhook(params: UpdateWebhookRequest!): Response!
+	_delete_webhook(params: WebhookRequest!): Response!
+	_test_endpoint(params: TestEndpointRequest!): TestEndpointResponse!
+	_add_email_template(params: AddEmailTemplateRequest!): Response!
+	_update_email_template(params: UpdateEmailTemplateRequest!): Response!
+	_delete_email_template(params: DeleteEmailTemplateRequest!): Response!
 }

 type Query {
-  meta: Meta!
-  session(params: SessionQueryInput): AuthResponse!
-  profile: User!
-  validate_jwt_token(params: ValidateJWTTokenInput!): ValidateJWTTokenResponse!
-  # admin only apis
-  _users(params: PaginatedInput): Users!
-  _user(params: GetUserRequest!): User!
-  _verification_requests(params: PaginatedInput): VerificationRequests!
-  _admin_session: Response!
-  _env: Env!
-  _webhook(params: WebhookRequest!): Webhook!
-  _webhooks(params: PaginatedInput): Webhooks!
-  _webhook_logs(params: ListWebhookLogRequest): WebhookLogs!
-  _email_templates(params: PaginatedInput): EmailTemplates!
+	meta: Meta!
+	session(params: SessionQueryInput): AuthResponse!
+	profile: User!
+	validate_jwt_token(params: ValidateJWTTokenInput!): ValidateJWTTokenResponse!
+	# admin only apis
+	_users(params: PaginatedInput): Users!
+	_verification_requests(params: PaginatedInput): VerificationRequests!
+	_admin_session: Response!
+	_env: Env!
+	_webhook(params: WebhookRequest!): Webhook!
+	_webhooks(params: PaginatedInput): Webhooks!
+	_webhook_logs(params: ListWebhookLogRequest): WebhookLogs!
+	_email_templates(params: PaginatedInput): EmailTemplates!
 }
--- a/server/graph/schema.resolvers.go
+++ b/server/graph/schema.resolvers.go
@@ -16,21 +16,11 @@ func (r *mutationResolver) Signup(ctx context.Context, params model.SignUpInput)
 	return resolvers.SignupResolver(ctx, params)
 }

-// MobileSignup is the resolver for the mobile_signup field.
-func (r *mutationResolver) MobileSignup(ctx context.Context, params *model.MobileSignUpInput) (*model.AuthResponse, error) {
-	return resolvers.MobileSignupResolver(ctx, params)
-}
-
 // Login is the resolver for the login field.
 func (r *mutationResolver) Login(ctx context.Context, params model.LoginInput) (*model.AuthResponse, error) {
 	return resolvers.LoginResolver(ctx, params)
 }

-// MobileLogin is the resolver for the mobile_login field.
-func (r *mutationResolver) MobileLogin(ctx context.Context, params model.MobileLoginInput) (*model.AuthResponse, error) {
-	return resolvers.MobileLoginResolver(ctx, params)
-}
-
 // MagicLinkLogin is the resolver for the magic_link_login field.
 func (r *mutationResolver) MagicLinkLogin(ctx context.Context, params model.MagicLinkLoginInput) (*model.Response, error) {
 	return resolvers.MagicLinkLoginResolver(ctx, params)
@@ -191,11 +181,6 @@ func (r *queryResolver) Users(ctx context.Context, params *model.PaginatedInput)
 	return resolvers.UsersResolver(ctx, params)
 }

-// User is the resolver for the _user field.
-func (r *queryResolver) User(ctx context.Context, params model.GetUserRequest) (*model.User, error) {
-	return resolvers.UserResolver(ctx, params)
-}
-
 // VerificationRequests is the resolver for the _verification_requests field.
 func (r *queryResolver) VerificationRequests(ctx context.Context, params *model.PaginatedInput) (*model.VerificationRequests, error) {
 	return resolvers.VerificationRequestsResolver(ctx, params)
--- a/server/handlers/app.go
+++ b/server/handlers/app.go
@@ -76,7 +76,7 @@ func AppHandler() gin.HandlerFunc {
 			"data": map[string]interface{}{
 				"authorizerURL":    hostname,
 				"redirectURL":      redirectURI,
-				"scope":            strings.Join(scope, " "),
+				"scope":            scope,
 				"state":            state,
 				"organizationName": orgName,
 				"organizationLogo": orgLogo,
--- a/server/handlers/authorize.go
+++ b/server/handlers/authorize.go
@@ -139,7 +139,6 @@ func AuthorizeHandler() gin.HandlerFunc {
 					"error_description": "code challenge is required",
 				},
 			}, http.StatusOK)
-			return
 		}

 		loginError := map[string]interface{}{
@@ -269,7 +268,7 @@ func AuthorizeHandler() gin.HandlerFunc {
 				return
 			}

-			if err := memorystore.Provider.SetUserSession(sessionKey, constants.TokenTypeAccessToken+"_"+nonce, authToken.AccessToken.Token); err != nil {
+			if err := memorystore.Provider.SetUserSession(sessionKey, constants.TokenTypeAccessToken+"_"+nonce, authToken.FingerPrintHash); err != nil {
 				log.Debug("SetUserSession failed: ", err)
 				handleResponse(gc, responseMode, loginURL, redirectURI, loginError, http.StatusOK)
 				return
@@ -284,7 +283,7 @@ func AuthorizeHandler() gin.HandlerFunc {
 				"access_token": authToken.AccessToken.Token,
 				"id_token":     authToken.IDToken.Token,
 				"state":        state,
-				"scope":        strings.Join(scope, " "),
+				"scope":        scope,
 				"token_type":   "Bearer",
 				"expires_in":   authToken.AccessToken.ExpiresAt,
 			}
@@ -327,7 +326,7 @@ func AuthorizeHandler() gin.HandlerFunc {

 func validateAuthorizeRequest(responseType, responseMode, clientID, state, codeChallenge string) error {
 	if strings.TrimSpace(state) == "" {
-		return fmt.Errorf("invalid state. state is required to prevent csrf attack")
+		return fmt.Errorf("invalid state. state is required to prevent csrf attack", responseMode)
 	}
 	if responseType != constants.ResponseTypeCode && responseType != constants.ResponseTypeToken && responseType != constants.ResponseTypeIDToken {
 		return fmt.Errorf("invalid response type %s. 'code' & 'token' are valid response_type", responseMode)
@@ -350,13 +349,14 @@ func handleResponse(gc *gin.Context, responseMode, loginURI, redirectURI string,
 		isAuthenticationRequired = true
 	}

-	if isAuthenticationRequired && responseMode != constants.ResponseModeWebMessage {
+	if isAuthenticationRequired {
 		gc.Redirect(http.StatusFound, loginURI)
 		return
 	}

 	switch responseMode {
 	case constants.ResponseModeQuery, constants.ResponseModeFragment:
+
 		gc.Redirect(http.StatusFound, redirectURI)
 		return
 	case constants.ResponseModeWebMessage:
--- a/server/handlers/oauth_callback.go
+++ b/server/handlers/oauth_callback.go
@@ -5,7 +5,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"net/http"
 	"strconv"
 	"strings"
@@ -70,8 +70,6 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 			user, err = processAppleUserInfo(oauthCode)
 		case constants.AuthRecipeMethodTwitter:
 			user, err = processTwitterUserInfo(oauthCode, sessionState)
-		case constants.AuthRecipeMethodMicrosoft:
-			user, err = processMicrosoftUserInfo(oauthCode)
 		default:
 			log.Info("Invalid oauth provider")
 			err = fmt.Errorf(`invalid oauth provider`)
@@ -314,7 +312,7 @@ func processGoogleUserInfo(code string) (models.User, error) {

 func processGithubUserInfo(code string) (models.User, error) {
 	user := models.User{}
-	oauth2Token, err := oauth.OAuthProviders.GithubConfig.Exchange(context.TODO(), code)
+	oauth2Token, err := oauth.OAuthProviders.GithubConfig.Exchange(oauth2.NoContext, code)
 	if err != nil {
 		log.Debug("Failed to exchange code for token: ", err)
 		return user, fmt.Errorf("invalid github exchange code: %s", err.Error())
@@ -336,7 +334,7 @@ func processGithubUserInfo(code string) (models.User, error) {
 	}

 	defer response.Body.Close()
-	body, err := io.ReadAll(response.Body)
+	body, err := ioutil.ReadAll(response.Body)
 	if err != nil {
 		log.Debug("Failed to read github user info response body: ", err)
 		return user, fmt.Errorf("failed to read github response body: %s", err.Error())
@@ -385,7 +383,7 @@ func processGithubUserInfo(code string) (models.User, error) {
 		}

 		defer response.Body.Close()
-		body, err := io.ReadAll(response.Body)
+		body, err := ioutil.ReadAll(response.Body)
 		if err != nil {
 			log.Debug("Failed to read github user email response body: ", err)
 			return user, fmt.Errorf("failed to read github response body: %s", err.Error())
@@ -421,7 +419,7 @@ func processGithubUserInfo(code string) (models.User, error) {

 func processFacebookUserInfo(code string) (models.User, error) {
 	user := models.User{}
-	oauth2Token, err := oauth.OAuthProviders.FacebookConfig.Exchange(context.TODO(), code)
+	oauth2Token, err := oauth.OAuthProviders.FacebookConfig.Exchange(oauth2.NoContext, code)
 	if err != nil {
 		log.Debug("Invalid facebook exchange code: ", err)
 		return user, fmt.Errorf("invalid facebook exchange code: %s", err.Error())
@@ -440,7 +438,7 @@ func processFacebookUserInfo(code string) (models.User, error) {
 	}

 	defer response.Body.Close()
-	body, err := io.ReadAll(response.Body)
+	body, err := ioutil.ReadAll(response.Body)
 	if err != nil {
 		log.Debug("Failed to read facebook response: ", err)
 		return user, fmt.Errorf("failed to read facebook response body: %s", err.Error())
@@ -472,7 +470,7 @@ func processFacebookUserInfo(code string) (models.User, error) {

 func processLinkedInUserInfo(code string) (models.User, error) {
 	user := models.User{}
-	oauth2Token, err := oauth.OAuthProviders.LinkedInConfig.Exchange(context.TODO(), code)
+	oauth2Token, err := oauth.OAuthProviders.LinkedInConfig.Exchange(oauth2.NoContext, code)
 	if err != nil {
 		log.Debug("Failed to exchange code for token: ", err)
 		return user, fmt.Errorf("invalid linkedin exchange code: %s", err.Error())
@@ -495,7 +493,7 @@ func processLinkedInUserInfo(code string) (models.User, error) {
 	}

 	defer response.Body.Close()
-	body, err := io.ReadAll(response.Body)
+	body, err := ioutil.ReadAll(response.Body)
 	if err != nil {
 		log.Debug("Failed to read linkedin user info response body: ", err)
 		return user, fmt.Errorf("failed to read linkedin response body: %s", err.Error())
@@ -525,7 +523,7 @@ func processLinkedInUserInfo(code string) (models.User, error) {
 	}

 	defer response.Body.Close()
-	body, err = io.ReadAll(response.Body)
+	body, err = ioutil.ReadAll(response.Body)
 	if err != nil {
 		log.Debug("Failed to read linkedin email info response body: ", err)
 		return user, fmt.Errorf("failed to read linkedin email response body: %s", err.Error())
@@ -554,7 +552,7 @@ func processLinkedInUserInfo(code string) (models.User, error) {

 func processAppleUserInfo(code string) (models.User, error) {
 	user := models.User{}
-	oauth2Token, err := oauth.OAuthProviders.AppleConfig.Exchange(context.TODO(), code)
+	oauth2Token, err := oauth.OAuthProviders.AppleConfig.Exchange(oauth2.NoContext, code)
 	if err != nil {
 		log.Debug("Failed to exchange code for token: ", err)
 		return user, fmt.Errorf("invalid apple exchange code: %s", err.Error())
@@ -607,7 +605,7 @@ func processAppleUserInfo(code string) (models.User, error) {

 func processTwitterUserInfo(code, verifier string) (models.User, error) {
 	user := models.User{}
-	oauth2Token, err := oauth.OAuthProviders.TwitterConfig.Exchange(context.TODO(), code, oauth2.SetAuthURLParam("code_verifier", verifier))
+	oauth2Token, err := oauth.OAuthProviders.TwitterConfig.Exchange(oauth2.NoContext, code, oauth2.SetAuthURLParam("code_verifier", verifier))
 	if err != nil {
 		log.Debug("Failed to exchange code for token: ", err)
 		return user, fmt.Errorf("invalid twitter exchange code: %s", err.Error())
@@ -630,7 +628,7 @@ func processTwitterUserInfo(code, verifier string) (models.User, error) {
 	}

 	defer response.Body.Close()
-	body, err := io.ReadAll(response.Body)
+	body, err := ioutil.ReadAll(response.Body)
 	if err != nil {
 		log.Debug("Failed to read Twitter user info response body: ", err)
 		return user, fmt.Errorf("failed to read Twitter response body: %s", err.Error())
@@ -671,37 +669,3 @@ func processTwitterUserInfo(code, verifier string) (models.User, error) {

 	return user, nil
 }
-
-// process microsoft user information
-func processMicrosoftUserInfo(code string) (models.User, error) {
-	user := models.User{}
-	ctx := context.Background()
-	oauth2Token, err := oauth.OAuthProviders.MicrosoftConfig.Exchange(ctx, code)
-	if err != nil {
-		log.Debug("Failed to exchange code for token: ", err)
-		return user, fmt.Errorf("invalid google exchange code: %s", err.Error())
-	}
-
-	verifier := oauth.OIDCProviders.MicrosoftOIDC.Verifier(&oidc.Config{ClientID: oauth.OAuthProviders.MicrosoftConfig.ClientID})
-
-	// Extract the ID Token from OAuth2 token.
-	rawIDToken, ok := oauth2Token.Extra("id_token").(string)
-	if !ok {
-		log.Debug("Failed to extract ID Token from OAuth2 token")
-		return user, fmt.Errorf("unable to extract id_token")
-	}
-
-	// Parse and verify ID Token payload.
-	idToken, err := verifier.Verify(ctx, rawIDToken)
-	if err != nil {
-		log.Debug("Failed to verify ID Token: ", err)
-		return user, fmt.Errorf("unable to verify id_token: %s", err.Error())
-	}
-
-	if err := idToken.Claims(&user); err != nil {
-		log.Debug("Failed to parse ID Token claims: ", err)
-		return user, fmt.Errorf("unable to extract claims")
-	}
-
-	return user, nil
-}
--- a/server/handlers/oauth_login.go
+++ b/server/handlers/oauth_login.go
@@ -209,24 +209,6 @@ func OAuthLoginHandler() gin.HandlerFunc {
 			// check: https://github.com/golang/oauth2/issues/449
 			url := oauth.OAuthProviders.AppleConfig.AuthCodeURL(oauthStateString, oauth2.SetAuthURLParam("response_mode", "form_post")) + "&scope=name email"
 			c.Redirect(http.StatusTemporaryRedirect, url)
-		case constants.AuthRecipeMethodMicrosoft:
-			if oauth.OAuthProviders.MicrosoftConfig == nil {
-				log.Debug("Microsoft OAuth provider is not configured")
-				isProviderConfigured = false
-				break
-			}
-			err := memorystore.Provider.SetState(oauthStateString, constants.AuthRecipeMethodMicrosoft)
-			if err != nil {
-				log.Debug("Error setting state: ", err)
-				c.JSON(500, gin.H{
-					"error": "internal server error",
-				})
-				return
-			}
-			// during the init of OAuthProvider authorizer url might be empty
-			oauth.OAuthProviders.MicrosoftConfig.RedirectURL = hostname + "/oauth_callback/" + constants.AuthRecipeMethodMicrosoft
-			url := oauth.OAuthProviders.MicrosoftConfig.AuthCodeURL(oauthStateString)
-			c.Redirect(http.StatusTemporaryRedirect, url)
 		default:
 			log.Debug("Invalid oauth provider: ", provider)
 			c.JSON(422, gin.H{
--- a/server/handlers/token.go
+++ b/server/handlers/token.go
@@ -259,7 +259,7 @@ func TokenHandler() gin.HandlerFunc {
 		res := map[string]interface{}{
 			"access_token": authToken.AccessToken.Token,
 			"id_token":     authToken.IDToken.Token,
-			"scope":        strings.Join(scope, " "),
+			"scope":        scope,
 			"roles":        roles,
 			"expires_in":   expiresIn,
 		}
--- a/server/handlers/userinfo.go
+++ b/server/handlers/userinfo.go
@@ -1,8 +1,6 @@
 package handlers

 import (
-	"encoding/json"
-	"fmt"
 	"net/http"

 	"github.com/gin-gonic/gin"
@@ -41,28 +39,7 @@ func UserInfoHandler() gin.HandlerFunc {
 			})
 			return
 		}
-		apiUser := user.AsAPIUser()
-		userBytes, err := json.Marshal(apiUser)
-		if err != nil {
-			log.Debug("Error marshalling user: ", err)
-			gc.JSON(http.StatusUnauthorized, gin.H{
-				"error": err.Error(),
-			})
-			return
-		}
-		fmt.Println("=> str:", string(userBytes))
-		res := map[string]interface{}{}
-		err = json.Unmarshal(userBytes, &res)
-		if err != nil {
-			log.Debug("Error un-marshalling user: ", err)
-			gc.JSON(http.StatusUnauthorized, gin.H{
-				"error": err.Error(),
-			})
-			return
-		}
-		// add sub field to user as per openid standards
-		// https://github.com/authorizerdev/authorizer/issues/327
-		res["sub"] = userID
-		gc.JSON(http.StatusOK, res)
+
+		gc.JSON(http.StatusOK, user.AsAPIUser())
 	}
 }
--- a/server/memorystore/memory_store.go
+++ b/server/memorystore/memory_store.go
@@ -26,7 +26,6 @@ func InitMemStore() error {

 		// boolean envs
 		constants.EnvKeyDisableBasicAuthentication:       false,
-		constants.EnvKeyDisableMobileBasicAuthentication: false,
 		constants.EnvKeyDisableMagicLinkLogin:            false,
 		constants.EnvKeyDisableEmailVerification:         false,
 		constants.EnvKeyDisableLoginPage:                 false,
--- a/server/memorystore/providers/inmemory/store.go
+++ b/server/memorystore/providers/inmemory/store.go
@@ -35,7 +35,6 @@ func (c *provider) DeleteAllUserSessions(userId string) error {
 		constants.AuthRecipeMethodGoogle,
 		constants.AuthRecipeMethodLinkedIn,
 		constants.AuthRecipeMethodTwitter,
-		constants.AuthRecipeMethodMicrosoft,
 	}

 	for _, namespace := range namespaces {
--- a/server/memorystore/providers/redis/store.go
+++ b/server/memorystore/providers/redis/store.go
@@ -72,7 +72,6 @@ func (c *provider) DeleteAllUserSessions(userID string) error {
 		constants.AuthRecipeMethodGoogle,
 		constants.AuthRecipeMethodLinkedIn,
 		constants.AuthRecipeMethodTwitter,
-		constants.AuthRecipeMethodMicrosoft,
 	}
 	for _, namespace := range namespaces {
 		err := c.store.Del(c.ctx, namespace+":"+userID).Err()
@@ -162,7 +161,7 @@ func (c *provider) GetEnvStore() (map[string]interface{}, error) {
 		return nil, err
 	}
 	for key, value := range data {
-		if key == constants.EnvKeyDisableBasicAuthentication || key == constants.EnvKeyDisableMobileBasicAuthentication || key == constants.EnvKeyDisableEmailVerification || key == constants.EnvKeyDisableLoginPage || key == constants.EnvKeyDisableMagicLinkLogin || key == constants.EnvKeyDisableRedisForEnv || key == constants.EnvKeyDisableSignUp || key == constants.EnvKeyDisableStrongPassword || key == constants.EnvKeyIsEmailServiceEnabled || key == constants.EnvKeyEnforceMultiFactorAuthentication || key == constants.EnvKeyDisableMultiFactorAuthentication || key == constants.EnvKeyAppCookieSecure || key == constants.EnvKeyAdminCookieSecure {
+		if key == constants.EnvKeyDisableBasicAuthentication || key == constants.EnvKeyDisableEmailVerification || key == constants.EnvKeyDisableLoginPage || key == constants.EnvKeyDisableMagicLinkLogin || key == constants.EnvKeyDisableRedisForEnv || key == constants.EnvKeyDisableSignUp || key == constants.EnvKeyDisableStrongPassword || key == constants.EnvKeyIsEmailServiceEnabled || key == constants.EnvKeyEnforceMultiFactorAuthentication || key == constants.EnvKeyDisableMultiFactorAuthentication || key == constants.EnvKeyAppCookieSecure || key == constants.EnvKeyAdminCookieSecure {
 			boolValue, err := strconv.ParseBool(value)
 			if err != nil {
 				return res, err
--- a/server/memorystore/required_env_store.go
+++ b/server/memorystore/required_env_store.go
@@ -32,10 +32,6 @@ type RequiredEnv struct {
 	AwsRegion          string `json:"AWS_REGION"`
 	AwsAccessKeyID     string `json:"AWS_ACCESS_KEY_ID"`
 	AwsSecretAccessKey string `json:"AWS_SECRET_ACCESS_KEY"`
-	// Couchbase related envs
-	CouchbaseBucket           string `json:"COUCHBASE_BUCKET"`
-	CouchbaseScope            string `json:"COUCHBASE_SCOPE"`
-	CouchbaseBucketRAMQuotaMB string `json:"COUCHBASE_BUCKET_RAM_QUOTA"`
 }

 // RequiredEnvObj is a simple in-memory store for sessions.
@@ -97,9 +93,6 @@ func InitRequiredEnv() error {
 	awsRegion := os.Getenv(constants.EnvAwsRegion)
 	awsAccessKeyID := os.Getenv(constants.EnvAwsAccessKeyID)
 	awsSecretAccessKey := os.Getenv(constants.EnvAwsSecretAccessKey)
-	couchbaseBucket := os.Getenv(constants.EnvCouchbaseBucket)
-	couchbaseScope := os.Getenv(constants.EnvCouchbaseScope)
-	couchbaseBucketRAMQuotaMB := os.Getenv(constants.EnvCouchbaseBucketRAMQuotaMB)

 	if strings.TrimSpace(redisURL) == "" {
 		if cli.ARG_REDIS_URL != nil && *cli.ARG_REDIS_URL != "" {
@@ -142,25 +135,22 @@ func InitRequiredEnv() error {
 	}

 	requiredEnv := RequiredEnv{
-		EnvPath:                   envPath,
-		DatabaseURL:               dbURL,
-		DatabaseType:              dbType,
-		DatabaseName:              dbName,
-		DatabaseHost:              dbHost,
-		DatabasePort:              dbPort,
-		DatabaseUsername:          dbUsername,
-		DatabasePassword:          dbPassword,
-		DatabaseCert:              dbCert,
-		DatabaseCertKey:           dbCertKey,
-		DatabaseCACert:            dbCACert,
-		RedisURL:                  redisURL,
-		DisableRedisForEnv:        disableRedisForEnv,
-		AwsRegion:                 awsRegion,
-		AwsAccessKeyID:            awsAccessKeyID,
-		AwsSecretAccessKey:        awsSecretAccessKey,
-		CouchbaseBucket:           couchbaseBucket,
-		CouchbaseScope:            couchbaseScope,
-		CouchbaseBucketRAMQuotaMB: couchbaseBucketRAMQuotaMB,
+		EnvPath:            envPath,
+		DatabaseURL:        dbURL,
+		DatabaseType:       dbType,
+		DatabaseName:       dbName,
+		DatabaseHost:       dbHost,
+		DatabasePort:       dbPort,
+		DatabaseUsername:   dbUsername,
+		DatabasePassword:   dbPassword,
+		DatabaseCert:       dbCert,
+		DatabaseCertKey:    dbCertKey,
+		DatabaseCACert:     dbCACert,
+		RedisURL:           redisURL,
+		DisableRedisForEnv: disableRedisForEnv,
+		AwsRegion:          awsRegion,
+		AwsAccessKeyID:     awsAccessKeyID,
+		AwsSecretAccessKey: awsSecretAccessKey,
 	}

 	RequiredEnvStoreObj = &RequiredEnvStore{
--- a/server/middlewares/cors.go
+++ b/server/middlewares/cors.go
@@ -9,6 +9,7 @@ import (
 func CORSMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		origin := c.Request.Header.Get("Origin")
+
 		if validators.IsValidOrigin(origin) {
 			c.Writer.Header().Set("Access-Control-Allow-Origin", origin)
 		}
--- a/server/oauth/oauth.go
+++ b/server/oauth/oauth.go
@@ -2,14 +2,12 @@ package oauth

 import (
 	"context"
-	"fmt"

 	"github.com/coreos/go-oidc/v3/oidc"
 	"golang.org/x/oauth2"
 	facebookOAuth2 "golang.org/x/oauth2/facebook"
 	githubOAuth2 "golang.org/x/oauth2/github"
 	linkedInOAuth2 "golang.org/x/oauth2/linkedin"
-	microsoftOAuth2 "golang.org/x/oauth2/microsoft"

 	"github.com/authorizerdev/authorizer/server/constants"
 	"github.com/authorizerdev/authorizer/server/memorystore"
@@ -17,19 +15,17 @@ import (

 // OAuthProviders is a struct that contains reference all the OAuth providers
 type OAuthProvider struct {
-	GoogleConfig    *oauth2.Config
-	GithubConfig    *oauth2.Config
-	FacebookConfig  *oauth2.Config
-	LinkedInConfig  *oauth2.Config
-	AppleConfig     *oauth2.Config
-	TwitterConfig   *oauth2.Config
-	MicrosoftConfig *oauth2.Config
+	GoogleConfig   *oauth2.Config
+	GithubConfig   *oauth2.Config
+	FacebookConfig *oauth2.Config
+	LinkedInConfig *oauth2.Config
+	AppleConfig    *oauth2.Config
+	TwitterConfig  *oauth2.Config
 }

 // OIDCProviders is a struct that contains reference all the OpenID providers
 type OIDCProvider struct {
-	GoogleOIDC    *oidc.Provider
-	MicrosoftOIDC *oidc.Provider
+	GoogleOIDC *oidc.Provider
 }

 var (
@@ -162,32 +158,5 @@ func InitOAuth() error {
 		}
 	}

-	microsoftClientID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyMicrosoftClientID)
-	if err != nil {
-		microsoftClientID = ""
-	}
-	microsoftClientSecret, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyMicrosoftClientSecret)
-	if err != nil {
-		microsoftClientSecret = ""
-	}
-	microsoftActiveDirTenantID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyMicrosoftActiveDirectoryTenantID)
-	if err != nil {
-		microsoftActiveDirTenantID = ""
-	}
-	if microsoftClientID != "" && microsoftClientSecret != "" && microsoftActiveDirTenantID != "" {
-		p, err := oidc.NewProvider(ctx, fmt.Sprintf("https://login.microsoftonline.com/%s/v2.0", microsoftActiveDirTenantID))
-		if err != nil {
-			return err
-		}
-		OIDCProviders.MicrosoftOIDC = p
-		OAuthProviders.MicrosoftConfig = &oauth2.Config{
-			ClientID:     microsoftClientID,
-			ClientSecret: microsoftClientSecret,
-			RedirectURL:  "/oauth_callback/microsoft",
-			Endpoint:     microsoftOAuth2.AzureADEndpoint(microsoftActiveDirTenantID),
-			Scopes:       []string{oidc.ScopeOpenID, "profile", "email"},
-		}
-	}
-
 	return nil
 }
--- a/server/parsers/url.go
+++ b/server/parsers/url.go
@@ -20,12 +20,12 @@ func GetHost(c *gin.Context) string {
 		authorizerURL = ""
 	}
 	if authorizerURL != "" {
-		return strings.TrimSuffix(authorizerURL, "/")
+		return authorizerURL
 	}

 	authorizerURL = c.Request.Header.Get("X-Authorizer-URL")
 	if authorizerURL != "" {
-		return strings.TrimSuffix(authorizerURL, "/")
+		return authorizerURL
 	}

 	scheme := c.Request.Header.Get("X-Forwarded-Proto")
@@ -33,7 +33,7 @@ func GetHost(c *gin.Context) string {
 		scheme = "http"
 	}
 	host := c.Request.Host
-	return strings.TrimSuffix(scheme+"://"+host, "/")
+	return scheme + "://" + host
 }

 // GetHostName function returns hostname and port
--- a/server/resolvers/env.go
+++ b/server/resolvers/env.go
@@ -152,15 +152,6 @@ func EnvResolver(ctx context.Context) (*model.Env, error) {
 	if val, ok := store[constants.EnvKeyTwitterClientSecret]; ok {
 		res.TwitterClientSecret = refs.NewStringRef(val.(string))
 	}
-	if val, ok := store[constants.EnvKeyMicrosoftClientID]; ok {
-		res.MicrosoftClientID = refs.NewStringRef(val.(string))
-	}
-	if val, ok := store[constants.EnvKeyMicrosoftClientSecret]; ok {
-		res.MicrosoftClientSecret = refs.NewStringRef(val.(string))
-	}
-	if val, ok := store[constants.EnvKeyMicrosoftActiveDirectoryTenantID]; ok {
-		res.MicrosoftActiveDirectoryTenantID = refs.NewStringRef(val.(string))
-	}

 	if val, ok := store[constants.EnvKeyOrganizationName]; ok {
 		res.OrganizationName = refs.NewStringRef(val.(string))
--- a/server/resolvers/invite_members.go
+++ b/server/resolvers/invite_members.go
@@ -48,15 +48,7 @@ func InviteMembersResolver(ctx context.Context, params model.InviteMemberInput)
 	}

 	isBasicAuthDisabled, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyDisableBasicAuthentication)
-	if err != nil {
-		log.Debug("Failed to get is basic auth disabled")
-		return nil, err
-	}
 	isMagicLinkLoginDisabled, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyDisableMagicLinkLogin)
-	if err != nil {
-		log.Debug("Failed to get is magic link login disabled")
-		return nil, err
-	}
 	if isBasicAuthDisabled && isMagicLinkLoginDisabled {
 		log.Debug("Basic authentication and Magic link login is disabled.")
 		return nil, errors.New("either basic authentication or magic link login is required")
--- a/server/resolvers/meta.go
+++ b/server/resolvers/meta.go
@@ -89,24 +89,6 @@ func MetaResolver(ctx context.Context) (*model.Meta, error) {
 		twitterClientSecret = ""
 	}

-	microsoftClientID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyMicrosoftClientID)
-	if err != nil {
-		log.Debug("Failed to get Microsoft Client ID from environment variable", err)
-		microsoftClientID = ""
-	}
-
-	microsoftClientSecret, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyMicrosoftClientSecret)
-	if err != nil {
-		log.Debug("Failed to get Microsoft Client Secret from environment variable", err)
-		microsoftClientSecret = ""
-	}
-
-	microsoftActiveDirTenantID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyMicrosoftActiveDirectoryTenantID)
-	if err != nil {
-		log.Debug("Failed to get Microsoft Active Directory Tenant ID from environment variable", err)
-		microsoftActiveDirTenantID = ""
-	}
-
 	isBasicAuthDisabled, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyDisableBasicAuthentication)
 	if err != nil {
 		log.Debug("Failed to get Disable Basic Authentication from environment variable", err)
@@ -152,7 +134,6 @@ func MetaResolver(ctx context.Context) (*model.Meta, error) {
 		IsLinkedinLoginEnabled:       linkedClientID != "" && linkedInClientSecret != "",
 		IsAppleLoginEnabled:          appleClientID != "" && appleClientSecret != "",
 		IsTwitterLoginEnabled:        twitterClientID != "" && twitterClientSecret != "",
-		IsMicrosoftLoginEnabled:      microsoftClientID != "" && microsoftClientSecret != "" && microsoftActiveDirTenantID != "",
 		IsBasicAuthenticationEnabled: !isBasicAuthDisabled,
 		IsEmailVerificationEnabled:   !isEmailVerificationDisabled,
 		IsMagicLinkLoginEnabled:      !isMagicLinkLoginDisabled,
--- a/server/resolvers/mobile_login.go
+++ b/server/resolvers/mobile_login.go
@@ -1,216 +0,0 @@
-package resolvers
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/google/uuid"
-	log "github.com/sirupsen/logrus"
-	"golang.org/x/crypto/bcrypt"
-
-	"github.com/authorizerdev/authorizer/server/constants"
-	"github.com/authorizerdev/authorizer/server/cookie"
-	"github.com/authorizerdev/authorizer/server/db"
-	"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/authorizerdev/authorizer/server/token"
-	"github.com/authorizerdev/authorizer/server/utils"
-	"github.com/authorizerdev/authorizer/server/validators"
-)
-
-// MobileLoginResolver is a resolver for mobile login mutation
-func MobileLoginResolver(ctx context.Context, params model.MobileLoginInput) (*model.AuthResponse, error) {
-	var res *model.AuthResponse
-
-	gc, err := utils.GinContextFromContext(ctx)
-	if err != nil {
-		log.Debug("Failed to get GinContext: ", err)
-		return res, err
-	}
-
-	isBasiAuthDisabled, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyDisableMobileBasicAuthentication)
-	if err != nil {
-		log.Debug("Error getting mobile basic auth disabled: ", err)
-		isBasiAuthDisabled = true
-	}
-
-	if isBasiAuthDisabled {
-		log.Debug("Basic authentication is disabled.")
-		return res, fmt.Errorf(`phone number based basic authentication is disabled for this instance`)
-	}
-
-	log := log.WithFields(log.Fields{
-		"phone_number": params.PhoneNumber,
-	})
-
-	user, err := db.Provider.GetUserByPhoneNumber(ctx, params.PhoneNumber)
-	if err != nil {
-		log.Debug("Failed to get user by phone number: ", err)
-		return res, fmt.Errorf(`bad user credentials`)
-	}
-
-	if user.RevokedTimestamp != nil {
-		log.Debug("User access is revoked")
-		return res, fmt.Errorf(`user access has been revoked`)
-	}
-
-	if !strings.Contains(user.SignupMethods, constants.AuthRecipeMethodMobileBasicAuth) {
-		log.Debug("User signup method is not mobile basic auth")
-		return res, fmt.Errorf(`user has not signed up with phone number & password`)
-	}
-
-	if user.PhoneNumberVerifiedAt == nil {
-		log.Debug("User phone number is not verified")
-		return res, fmt.Errorf(`phone number is not verified`)
-	}
-
-	err = bcrypt.CompareHashAndPassword([]byte(*user.Password), []byte(params.Password))
-
-	if err != nil {
-		log.Debug("Failed to compare password: ", err)
-		return res, fmt.Errorf(`bad user credentials`)
-	}
-
-	defaultRolesString, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyDefaultRoles)
-	roles := []string{}
-	if err != nil {
-		log.Debug("Error getting default roles: ", err)
-		defaultRolesString = ""
-	} else {
-		roles = strings.Split(defaultRolesString, ",")
-	}
-
-	currentRoles := strings.Split(user.Roles, ",")
-	if len(params.Roles) > 0 {
-		if !validators.IsValidRoles(params.Roles, currentRoles) {
-			log.Debug("Invalid roles: ", params.Roles)
-			return res, fmt.Errorf(`invalid roles`)
-		}
-
-		roles = params.Roles
-	}
-
-	scope := []string{"openid", "email", "profile"}
-	if params.Scope != nil && len(scope) > 0 {
-		scope = params.Scope
-	}
-
-	/*
-		// TODO use sms authentication for MFA
-		isEmailServiceEnabled, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyIsEmailServiceEnabled)
-		if err != nil || !isEmailServiceEnabled {
-			log.Debug("Email service not enabled: ", err)
-		}
-
-		isMFADisabled, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyDisableMultiFactorAuthentication)
-		if err != nil || !isEmailServiceEnabled {
-			log.Debug("MFA service not enabled: ", err)
-		}
-
-		// If email service is not enabled continue the process in any way
-		if refs.BoolValue(user.IsMultiFactorAuthEnabled) && isEmailServiceEnabled && !isMFADisabled {
-			otp := utils.GenerateOTP()
-			otpData, err := db.Provider.UpsertOTP(ctx, &models.OTP{
-				Email:     user.Email,
-				Otp:       otp,
-				ExpiresAt: time.Now().Add(1 * time.Minute).Unix(),
-			})
-			if err != nil {
-				log.Debug("Failed to add otp: ", err)
-				return nil, err
-			}
-
-			go func() {
-				// exec it as go routine so that we can reduce the api latency
-				go email.SendEmail([]string{params.PhoneNumber}, constants.VerificationTypeOTP, map[string]interface{}{
-					"user":         user.ToMap(),
-					"organization": utils.GetOrganization(),
-					"otp":          otpData.Otp,
-				})
-				if err != nil {
-					log.Debug("Failed to send otp email: ", err)
-				}
-			}()
-
-			return &model.AuthResponse{
-				Message:             "Please check the OTP in your inbox",
-				ShouldShowOtpScreen: refs.NewBoolRef(true),
-			}, nil
-		}
-	*/
-
-	code := ""
-	codeChallenge := ""
-	nonce := ""
-	if params.State != nil {
-		// Get state from store
-		authorizeState, _ := memorystore.Provider.GetState(refs.StringValue(params.State))
-		if authorizeState != "" {
-			authorizeStateSplit := strings.Split(authorizeState, "@@")
-			if len(authorizeStateSplit) > 1 {
-				code = authorizeStateSplit[0]
-				codeChallenge = authorizeStateSplit[1]
-			} else {
-				nonce = authorizeState
-			}
-			go memorystore.Provider.RemoveState(refs.StringValue(params.State))
-		}
-	}
-
-	if nonce == "" {
-		nonce = uuid.New().String()
-	}
-
-	authToken, err := token.CreateAuthToken(gc, *user, roles, scope, constants.AuthRecipeMethodMobileBasicAuth, nonce, code)
-	if err != nil {
-		log.Debug("Failed to create auth token", err)
-		return res, err
-	}
-
-	// TODO add to other login options as well
-	// Code challenge could be optional if PKCE flow is not used
-	if code != "" {
-		if err := memorystore.Provider.SetState(code, codeChallenge+"@@"+authToken.FingerPrintHash); err != nil {
-			log.Debug("SetState failed: ", err)
-			return res, err
-		}
-	}
-
-	expiresIn := authToken.AccessToken.ExpiresAt - time.Now().Unix()
-	if expiresIn <= 0 {
-		expiresIn = 1
-	}
-
-	res = &model.AuthResponse{
-		Message:     `Logged in successfully`,
-		AccessToken: &authToken.AccessToken.Token,
-		IDToken:     &authToken.IDToken.Token,
-		ExpiresIn:   &expiresIn,
-		User:        user.AsAPIUser(),
-	}
-
-	cookie.SetSession(gc, authToken.FingerPrintHash)
-	sessionStoreKey := constants.AuthRecipeMethodMobileBasicAuth + ":" + user.ID
-	memorystore.Provider.SetUserSession(sessionStoreKey, constants.TokenTypeSessionToken+"_"+authToken.FingerPrint, authToken.FingerPrintHash)
-	memorystore.Provider.SetUserSession(sessionStoreKey, constants.TokenTypeAccessToken+"_"+authToken.FingerPrint, authToken.AccessToken.Token)
-
-	if authToken.RefreshToken != nil {
-		res.RefreshToken = &authToken.RefreshToken.Token
-		memorystore.Provider.SetUserSession(sessionStoreKey, constants.TokenTypeRefreshToken+"_"+authToken.FingerPrint, authToken.RefreshToken.Token)
-	}
-
-	go func() {
-		utils.RegisterEvent(ctx, constants.UserLoginWebhookEvent, constants.AuthRecipeMethodMobileBasicAuth, *user)
-		db.Provider.AddSession(ctx, models.Session{
-			UserID:    user.ID,
-			UserAgent: utils.GetUserAgent(gc.Request),
-			IP:        utils.GetIP(gc.Request),
-		})
-	}()
-
-	return res, nil
-}
--- a/server/resolvers/mobile_signup.go
+++ b/server/resolvers/mobile_signup.go
@@ -1,270 +0,0 @@
-package resolvers
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/google/uuid"
-	log "github.com/sirupsen/logrus"
-
-	"github.com/authorizerdev/authorizer/server/constants"
-	"github.com/authorizerdev/authorizer/server/cookie"
-	"github.com/authorizerdev/authorizer/server/crypto"
-	"github.com/authorizerdev/authorizer/server/db"
-	"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/authorizerdev/authorizer/server/token"
-	"github.com/authorizerdev/authorizer/server/utils"
-	"github.com/authorizerdev/authorizer/server/validators"
-)
-
-// MobileSignupResolver is a resolver for mobile_basic_auth_signup mutation
-func MobileSignupResolver(ctx context.Context, params *model.MobileSignUpInput) (*model.AuthResponse, error) {
-	var res *model.AuthResponse
-
-	gc, err := utils.GinContextFromContext(ctx)
-	if err != nil {
-		log.Debug("Failed to get GinContext: ", err)
-		return res, err
-	}
-
-	isSignupDisabled, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyDisableSignUp)
-	if err != nil {
-		log.Debug("Error getting signup disabled: ", err)
-		isSignupDisabled = true
-	}
-	if isSignupDisabled {
-		log.Debug("Signup is disabled")
-		return res, fmt.Errorf(`signup is disabled for this instance`)
-	}
-
-	isBasicAuthDisabled, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyDisableMobileBasicAuthentication)
-	if err != nil {
-		log.Debug("Error getting basic auth disabled: ", err)
-		isBasicAuthDisabled = true
-	}
-
-	if isBasicAuthDisabled {
-		log.Debug("Mobile based Basic authentication is disabled")
-		return res, fmt.Errorf(`phone number based basic authentication is disabled for this instance`)
-	}
-
-	if params.ConfirmPassword != params.Password {
-		log.Debug("Passwords do not match")
-		return res, fmt.Errorf(`password and confirm password does not match`)
-	}
-
-	if err := validators.IsValidPassword(params.Password); err != nil {
-		log.Debug("Invalid password")
-		return res, err
-	}
-
-	mobile := strings.TrimSpace(params.PhoneNumber)
-	if mobile == "" || len(mobile) < 10 {
-		log.Debug("Invalid phone number")
-		return res, fmt.Errorf("invalid phone number")
-	}
-
-	emailInput := strings.ToLower(strings.TrimSpace(refs.StringValue(params.Email)))
-
-	// if email is null set random dummy email for db constraint
-
-	if emailInput != "" && !validators.IsValidEmail(emailInput) {
-		log.Debug("Invalid email: ", emailInput)
-		return res, fmt.Errorf(`invalid email address`)
-	}
-
-	if emailInput == "" {
-		emailInput = mobile + "@authorizer.dev"
-	}
-
-	log := log.WithFields(log.Fields{
-		"email":        emailInput,
-		"phone_number": mobile,
-	})
-	// find user with email
-	existingUser, err := db.Provider.GetUserByPhoneNumber(ctx, mobile)
-	if err != nil {
-		log.Debug("Failed to get user by email: ", err)
-	}
-
-	if existingUser != nil {
-		if existingUser.PhoneNumberVerifiedAt != nil {
-			// email is verified
-			log.Debug("Phone number is already verified and signed up.")
-			return res, fmt.Errorf(`%s has already signed up`, mobile)
-		} else if existingUser.ID != "" && existingUser.PhoneNumberVerifiedAt == nil {
-			log.Debug("Phone number is already signed up. Verification pending...")
-			return res, fmt.Errorf("%s has already signed up. please complete the phone number verification process or reset the password", mobile)
-		}
-	}
-
-	inputRoles := []string{}
-
-	if len(params.Roles) > 0 {
-		// check if roles exists
-		rolesString, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyRoles)
-		roles := []string{}
-		if err != nil {
-			log.Debug("Error getting roles: ", err)
-			return res, err
-		} else {
-			roles = strings.Split(rolesString, ",")
-		}
-		if !validators.IsValidRoles(params.Roles, roles) {
-			log.Debug("Invalid roles: ", params.Roles)
-			return res, fmt.Errorf(`invalid roles`)
-		} else {
-			inputRoles = params.Roles
-		}
-	} else {
-		inputRolesString, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyDefaultRoles)
-		if err != nil {
-			log.Debug("Error getting default roles: ", err)
-			return res, err
-		} else {
-			inputRoles = strings.Split(inputRolesString, ",")
-		}
-	}
-
-	now := time.Now().Unix()
-	user := models.User{
-		Email:                 emailInput,
-		PhoneNumber:           &mobile,
-		PhoneNumberVerifiedAt: &now,
-	}
-
-	user.Roles = strings.Join(inputRoles, ",")
-
-	password, _ := crypto.EncryptPassword(params.Password)
-	user.Password = &password
-
-	if params.GivenName != nil {
-		user.GivenName = params.GivenName
-	}
-
-	if params.FamilyName != nil {
-		user.FamilyName = params.FamilyName
-	}
-
-	if params.MiddleName != nil {
-		user.MiddleName = params.MiddleName
-	}
-
-	if params.Nickname != nil {
-		user.Nickname = params.Nickname
-	}
-
-	if params.Gender != nil {
-		user.Gender = params.Gender
-	}
-
-	if params.Birthdate != nil {
-		user.Birthdate = params.Birthdate
-	}
-
-	if params.Picture != nil {
-		user.Picture = params.Picture
-	}
-
-	if params.IsMultiFactorAuthEnabled != nil {
-		user.IsMultiFactorAuthEnabled = params.IsMultiFactorAuthEnabled
-	}
-
-	isMFAEnforced, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyEnforceMultiFactorAuthentication)
-	if err != nil {
-		log.Debug("MFA service not enabled: ", err)
-		isMFAEnforced = false
-	}
-
-	if isMFAEnforced {
-		user.IsMultiFactorAuthEnabled = refs.NewBoolRef(true)
-	}
-
-	user.SignupMethods = constants.AuthRecipeMethodMobileBasicAuth
-	user, err = db.Provider.AddUser(ctx, user)
-	if err != nil {
-		log.Debug("Failed to add user: ", err)
-		return res, err
-	}
-	roles := strings.Split(user.Roles, ",")
-	userToReturn := user.AsAPIUser()
-
-	scope := []string{"openid", "email", "profile"}
-	if params.Scope != nil && len(scope) > 0 {
-		scope = params.Scope
-	}
-
-	code := ""
-	codeChallenge := ""
-	nonce := ""
-	if params.State != nil {
-		// Get state from store
-		authorizeState, _ := memorystore.Provider.GetState(refs.StringValue(params.State))
-		if authorizeState != "" {
-			authorizeStateSplit := strings.Split(authorizeState, "@@")
-			if len(authorizeStateSplit) > 1 {
-				code = authorizeStateSplit[0]
-				codeChallenge = authorizeStateSplit[1]
-			} else {
-				nonce = authorizeState
-			}
-			go memorystore.Provider.RemoveState(refs.StringValue(params.State))
-		}
-	}
-
-	if nonce == "" {
-		nonce = uuid.New().String()
-	}
-
-	authToken, err := token.CreateAuthToken(gc, user, roles, scope, constants.AuthRecipeMethodMobileBasicAuth, nonce, code)
-	if err != nil {
-		log.Debug("Failed to create auth token: ", err)
-		return res, err
-	}
-
-	// Code challenge could be optional if PKCE flow is not used
-	if code != "" {
-		if err := memorystore.Provider.SetState(code, codeChallenge+"@@"+authToken.FingerPrintHash); err != nil {
-			log.Debug("SetState failed: ", err)
-			return res, err
-		}
-	}
-
-	expiresIn := authToken.AccessToken.ExpiresAt - time.Now().Unix()
-	if expiresIn <= 0 {
-		expiresIn = 1
-	}
-
-	res = &model.AuthResponse{
-		Message:     `Signed up successfully.`,
-		AccessToken: &authToken.AccessToken.Token,
-		ExpiresIn:   &expiresIn,
-		User:        userToReturn,
-	}
-
-	sessionKey := constants.AuthRecipeMethodMobileBasicAuth + ":" + user.ID
-	cookie.SetSession(gc, authToken.FingerPrintHash)
-	memorystore.Provider.SetUserSession(sessionKey, constants.TokenTypeSessionToken+"_"+authToken.FingerPrint, authToken.FingerPrintHash)
-	memorystore.Provider.SetUserSession(sessionKey, constants.TokenTypeAccessToken+"_"+authToken.FingerPrint, authToken.AccessToken.Token)
-
-	if authToken.RefreshToken != nil {
-		res.RefreshToken = &authToken.RefreshToken.Token
-		memorystore.Provider.SetUserSession(sessionKey, constants.TokenTypeRefreshToken+"_"+authToken.FingerPrint, authToken.RefreshToken.Token)
-	}
-
-	go func() {
-		utils.RegisterEvent(ctx, constants.UserSignUpWebhookEvent, constants.AuthRecipeMethodMobileBasicAuth, user)
-		db.Provider.AddSession(ctx, models.Session{
-			UserID:    user.ID,
-			UserAgent: utils.GetUserAgent(gc.Request),
-			IP:        utils.GetIP(gc.Request),
-		})
-	}()
-
-	return res, nil
-}
--- a/server/resolvers/update_env.go
+++ b/server/resolvers/update_env.go
@@ -25,7 +25,6 @@ import (
 // remove the session tokens for those methods
 func clearSessionIfRequired(currentData, updatedData map[string]interface{}) {
 	isCurrentBasicAuthEnabled := !currentData[constants.EnvKeyDisableBasicAuthentication].(bool)
-	isCurrentMobileBasicAuthEnabled := !currentData[constants.EnvKeyDisableMobileBasicAuthentication].(bool)
 	isCurrentMagicLinkLoginEnabled := !currentData[constants.EnvKeyDisableMagicLinkLogin].(bool)
 	isCurrentAppleLoginEnabled := currentData[constants.EnvKeyAppleClientID] != nil && currentData[constants.EnvKeyAppleClientSecret] != nil && currentData[constants.EnvKeyAppleClientID].(string) != "" && currentData[constants.EnvKeyAppleClientSecret].(string) != ""
 	isCurrentFacebookLoginEnabled := currentData[constants.EnvKeyFacebookClientID] != nil && currentData[constants.EnvKeyFacebookClientSecret] != nil && currentData[constants.EnvKeyFacebookClientID].(string) != "" && currentData[constants.EnvKeyFacebookClientSecret].(string) != ""
@@ -33,10 +32,8 @@ func clearSessionIfRequired(currentData, updatedData map[string]interface{}) {
 	isCurrentGithubLoginEnabled := currentData[constants.EnvKeyGithubClientID] != nil && currentData[constants.EnvKeyGithubClientSecret] != nil && currentData[constants.EnvKeyGithubClientID].(string) != "" && currentData[constants.EnvKeyGithubClientSecret].(string) != ""
 	isCurrentLinkedInLoginEnabled := currentData[constants.EnvKeyLinkedInClientID] != nil && currentData[constants.EnvKeyLinkedInClientSecret] != nil && currentData[constants.EnvKeyLinkedInClientID].(string) != "" && currentData[constants.EnvKeyLinkedInClientSecret].(string) != ""
 	isCurrentTwitterLoginEnabled := currentData[constants.EnvKeyTwitterClientID] != nil && currentData[constants.EnvKeyTwitterClientSecret] != nil && currentData[constants.EnvKeyTwitterClientID].(string) != "" && currentData[constants.EnvKeyTwitterClientSecret].(string) != ""
-	isCurrentMicrosoftLoginEnabled := currentData[constants.EnvKeyMicrosoftClientID] != nil && currentData[constants.EnvKeyMicrosoftClientSecret] != nil && currentData[constants.EnvKeyMicrosoftActiveDirectoryTenantID] != nil && currentData[constants.EnvKeyMicrosoftClientID].(string) != "" && currentData[constants.EnvKeyMicrosoftClientSecret].(string) != "" && currentData[constants.EnvKeyMicrosoftActiveDirectoryTenantID].(string) != ""

 	isUpdatedBasicAuthEnabled := !updatedData[constants.EnvKeyDisableBasicAuthentication].(bool)
-	isUpdatedMobileBasicAuthEnabled := !updatedData[constants.EnvKeyDisableMobileBasicAuthentication].(bool)
 	isUpdatedMagicLinkLoginEnabled := !updatedData[constants.EnvKeyDisableMagicLinkLogin].(bool)
 	isUpdatedAppleLoginEnabled := updatedData[constants.EnvKeyAppleClientID] != nil && updatedData[constants.EnvKeyAppleClientSecret] != nil && updatedData[constants.EnvKeyAppleClientID].(string) != "" && updatedData[constants.EnvKeyAppleClientSecret].(string) != ""
 	isUpdatedFacebookLoginEnabled := updatedData[constants.EnvKeyFacebookClientID] != nil && updatedData[constants.EnvKeyFacebookClientSecret] != nil && updatedData[constants.EnvKeyFacebookClientID].(string) != "" && updatedData[constants.EnvKeyFacebookClientSecret].(string) != ""
@@ -44,16 +41,11 @@ func clearSessionIfRequired(currentData, updatedData map[string]interface{}) {
 	isUpdatedGithubLoginEnabled := updatedData[constants.EnvKeyGithubClientID] != nil && updatedData[constants.EnvKeyGithubClientSecret] != nil && updatedData[constants.EnvKeyGithubClientID].(string) != "" && updatedData[constants.EnvKeyGithubClientSecret].(string) != ""
 	isUpdatedLinkedInLoginEnabled := updatedData[constants.EnvKeyLinkedInClientID] != nil && updatedData[constants.EnvKeyLinkedInClientSecret] != nil && updatedData[constants.EnvKeyLinkedInClientID].(string) != "" && updatedData[constants.EnvKeyLinkedInClientSecret].(string) != ""
 	isUpdatedTwitterLoginEnabled := updatedData[constants.EnvKeyTwitterClientID] != nil && updatedData[constants.EnvKeyTwitterClientSecret] != nil && updatedData[constants.EnvKeyTwitterClientID].(string) != "" && updatedData[constants.EnvKeyTwitterClientSecret].(string) != ""
-	isUpdatedMicrosoftLoginEnabled := updatedData[constants.EnvKeyMicrosoftClientID] != nil && updatedData[constants.EnvKeyMicrosoftClientSecret] != nil && updatedData[constants.EnvKeyMicrosoftActiveDirectoryTenantID] != nil && updatedData[constants.EnvKeyMicrosoftClientID].(string) != "" && updatedData[constants.EnvKeyMicrosoftClientSecret].(string) != "" && updatedData[constants.EnvKeyMicrosoftActiveDirectoryTenantID].(string) != ""

 	if isCurrentBasicAuthEnabled && !isUpdatedBasicAuthEnabled {
 		memorystore.Provider.DeleteSessionForNamespace(constants.AuthRecipeMethodBasicAuth)
 	}

-	if isCurrentMobileBasicAuthEnabled && !isUpdatedMobileBasicAuthEnabled {
-		memorystore.Provider.DeleteSessionForNamespace(constants.AuthRecipeMethodMobileBasicAuth)
-	}
-
 	if isCurrentMagicLinkLoginEnabled && !isUpdatedMagicLinkLoginEnabled {
 		memorystore.Provider.DeleteSessionForNamespace(constants.AuthRecipeMethodMagicLinkLogin)
 	}
@@ -81,10 +73,6 @@ func clearSessionIfRequired(currentData, updatedData map[string]interface{}) {
 	if isCurrentTwitterLoginEnabled && !isUpdatedTwitterLoginEnabled {
 		memorystore.Provider.DeleteSessionForNamespace(constants.AuthRecipeMethodTwitter)
 	}
-
-	if isCurrentMicrosoftLoginEnabled && !isUpdatedMicrosoftLoginEnabled {
-		memorystore.Provider.DeleteSessionForNamespace(constants.AuthRecipeMethodMicrosoft)
-	}
 }

 // UpdateEnvResolver is a resolver for update config mutation
--- a/server/resolvers/update_profile.go
+++ b/server/resolvers/update_profile.go
@@ -88,11 +88,6 @@ func UpdateProfileResolver(ctx context.Context, params model.UpdateProfileInput)
 	}

 	if params.PhoneNumber != nil && refs.StringValue(user.PhoneNumber) != refs.StringValue(params.PhoneNumber) {
-		// verify if phone number is unique
-		if _, err := db.Provider.GetUserByPhoneNumber(ctx, strings.TrimSpace(refs.StringValue(params.PhoneNumber))); err == nil {
-			log.Debug("user with given phone number already exists")
-			return nil, errors.New("user with given phone number already exists")
-		}
 		user.PhoneNumber = params.PhoneNumber
 	}

@@ -159,14 +154,8 @@ func UpdateProfileResolver(ctx context.Context, params model.UpdateProfileInput)
 		isBasicAuthDisabled = true
 	}

-	isMobileBasicAuthDisabled, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyDisableMobileBasicAuthentication)
-	if err != nil {
-		log.Debug("Error getting mobile basic auth disabled: ", err)
-		isBasicAuthDisabled = true
-	}
-
 	if params.NewPassword != nil && params.ConfirmNewPassword != nil {
-		if isBasicAuthDisabled || isMobileBasicAuthDisabled {
+		if isBasicAuthDisabled {
 			log.Debug("Cannot update password as basic authentication is disabled")
 			return res, fmt.Errorf(`basic authentication is disabled for this instance`)
 		}
--- a/server/resolvers/update_user.go
+++ b/server/resolvers/update_user.go
@@ -83,11 +83,6 @@ func UpdateUserResolver(ctx context.Context, params model.UpdateUserInput) (*mod
 	}

 	if params.PhoneNumber != nil && refs.StringValue(user.PhoneNumber) != refs.StringValue(params.PhoneNumber) {
-		// verify if phone number is unique
-		if _, err := db.Provider.GetUserByPhoneNumber(ctx, strings.TrimSpace(refs.StringValue(params.PhoneNumber))); err == nil {
-			log.Debug("user with given phone number already exists")
-			return nil, errors.New("user with given phone number already exists")
-		}
 		user.PhoneNumber = params.PhoneNumber
 	}

--- a/server/resolvers/user.go
+++ b/server/resolvers/user.go
@@ -1,36 +0,0 @@
-package resolvers
-
-import (
-	"context"
-	"fmt"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/authorizerdev/authorizer/server/db"
-	"github.com/authorizerdev/authorizer/server/graph/model"
-	"github.com/authorizerdev/authorizer/server/token"
-	"github.com/authorizerdev/authorizer/server/utils"
-)
-
-// UserResolver is a resolver for user query
-// This is admin only query
-func UserResolver(ctx context.Context, params model.GetUserRequest) (*model.User, error) {
-	gc, err := utils.GinContextFromContext(ctx)
-	if err != nil {
-		log.Debug("Failed to get GinContext: ", err)
-		return nil, err
-	}
-
-	if !token.IsSuperAdmin(gc) {
-		log.Debug("Not logged in as super admin.")
-		return nil, fmt.Errorf("unauthorized")
-	}
-
-	res, err := db.Provider.GetUserByID(ctx, params.ID)
-	if err != nil {
-		log.Debug("Failed to get users: ", err)
-		return nil, err
-	}
-
-	return res.AsAPIUser(), nil
-}
--- a/server/test/admin_signup_test.go
+++ b/server/test/admin_signup_test.go
@@ -25,6 +25,7 @@ func adminSignupTests(t *testing.T, s TestSetup) {
 		_, err = resolvers.AdminSignupResolver(ctx, model.AdminSignupInput{
 			AdminSecret: "admin123",
 		})
+
 		assert.Nil(t, err)
 	})
 }
--- a/server/test/enable_access_test.go
+++ b/server/test/enable_access_test.go
@@ -23,6 +23,7 @@ func enableAccessTest(t *testing.T, s TestSetup) {
 		})
 		assert.NoError(t, err)
 		verificationRequest, err := db.Provider.GetVerificationRequestByEmail(ctx, email, constants.VerificationTypeMagicLinkLogin)
+		assert.NoError(t, err)
 		verifyRes, err := resolvers.VerifyEmailResolver(ctx, model.VerifyEmailInput{
 			Token: verificationRequest.Token,
 		})
--- a/server/test/forgot_password_test.go
+++ b/server/test/forgot_password_test.go
@@ -20,6 +20,7 @@ func forgotPasswordTest(t *testing.T, s TestSetup) {
 			Password:        s.TestInfo.Password,
 			ConfirmPassword: s.TestInfo.Password,
 		})
+		assert.NoError(t, err)

 		_, err = resolvers.ForgotPasswordResolver(ctx, model.ForgotPasswordInput{
 			Email: email,
--- a/server/test/invite_member_test.go
+++ b/server/test/invite_member_test.go
@@ -41,6 +41,8 @@ func inviteUserTest(t *testing.T, s TestSetup) {
 		res, err = resolvers.InviteMembersResolver(ctx, model.InviteMemberInput{
 			Emails: invalidEmailsTest,
 		})
+		assert.Error(t, err)
+		assert.Nil(t, res)

 		// valid test
 		res, err = resolvers.InviteMembersResolver(ctx, model.InviteMemberInput{
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lakhan Samani	91d17a9b1f	fix: tests + version - Update code as per go 1.19.3 - Fix tests for unused vars	2022-11-27 20:40:45 +05:30
Lakhan Samani	a366b2811d	feat: implement base for surreal db	2022-11-24 19:08:17 +05:30