fix: default role values

fix: version var in make file
Update CONTRIBUTING.md
2021-12-24 18:42:32 +05:30 · 2021-12-24 17:47:35 +05:30 · 2021-12-24 10:55:07 +05:30 · 2021-12-24 10:06:39 +05:30 · 2021-12-24 10:05:05 +05:30 · 2021-12-24 09:55:24 +05:30
95 changed files with 4171 additions and 2134 deletions
--- a/.env.sample
+++ b/.env.sample
@@ -2,8 +2,11 @@ ENV=production
 DATABASE_URL=data.db
 DATABASE_TYPE=sqlite
 ADMIN_SECRET=admin
-DISABLE_EMAIL_VERIFICATION=true
 JWT_SECRET=random_string
+SENDER_EMAIL=username
+SENDER_PASSWORD=password
+SMTP_HOST=smtp.mailtrap.io
+SMTP_PORT=2525
 JWT_TYPE=HS256
 ROLES=user
 DEFAULT_ROLES=user
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -49,3 +49,192 @@ Please ask as many questions as you need, either directly in the issue or on [Di
 5. Build the code `make clean && make`
   > Note: if you don't have [`make`](https://www.ibm.com/docs/en/aix/7.2?topic=concepts-make-command), you can `cd` into `server` dir and build using the `go build` command
 6. Run binary `./build/server`
+
+### Testing
+
+Make sure you test before creating PR.
+
+If you want to test for all the databases that authorizer supports you will have to run `mongodb` & `arangodb` instances locally.
+
+Setup mongodb & arangodb using Docker
+
+```
+docker run --name mongodb -d -p 27017:27017 mongo
+docker run --name arangodb -d -p 8529:8529 -e ARANGO_ROOT_PASSWORD=root arangodb/arangodb:3.8.4
+```
+> Note: If you are not making any changes in db schema / db operations, you can disable those db tests [here](https://github.com/authorizerdev/authorizer/blob/main/server/__test__/resolvers_test.go#L14)
+
+If you are adding new resolver, 
+1. create new resolver test file [here](https://github.com/authorizerdev/authorizer/tree/main/server/__test__)
+Naming convention filename: `resolver_name_test.go` function name: `resolverNameTest(s TestSetup, t *testing.T)`
+2. Add your tests [here](https://github.com/authorizerdev/authorizer/blob/main/server/__test__/resolvers_test.go#L38)
+
+__Command to run tests:__
+
+```sh
+make test
+```
+
+__Manual Testing:__
+
+For manually testing using graphql playground, you can paste following queries and mutations in your playground and test it
+
+```gql
+mutation Signup {
+  signup(params: {
+    email: "lakhan@yopmail.com",
+    password: "test",
+    confirm_password: "test",
+    given_name: "lakhan"
+  }) {
+    message
+    user {
+      id
+      family_name
+      given_name
+      email
+      email_verified
+    }
+  }
+}
+
+mutation ResendEamil {
+  resend_verify_email(params: {
+    email: "lakhan@yopmail.com"
+    identifier: "basic_auth_signup"
+  }) {
+    message
+  }
+}
+
+query GetVerifyRequests {
+  _verification_requests {
+    id
+    token
+    expires
+    identifier
+  }
+}
+
+mutation VerifyEmail {
+  verify_email(params: {
+    token: ""
+  }) {
+    access_token
+    expires_at
+    user {
+      id
+      email
+      given_name
+      email_verified
+    }
+  }
+}
+
+mutation Login {
+  login(params: {
+    email: "lakhan@yopmail.com",
+    password: "test"
+  }) {
+    access_token
+    expires_at
+    user {
+      id
+      family_name
+      given_name
+      email
+    }
+  }
+}
+
+query GetSession {
+  session {
+    access_token
+    expires_at
+    user {
+      id
+      given_name
+      family_name
+      email
+      email_verified
+      signup_methods
+      created_at
+      updated_at
+    }
+  }
+}
+
+mutation ForgotPassword {
+  forgot_password(params: {
+    email: "lakhan@yopmail.com"
+  }) {
+    message
+  }
+}
+
+mutation ResetPassword {
+  reset_password(params: {
+    token: ""
+    password: "test"
+    confirm_password: "test"
+  }) {
+    message
+  }
+}
+
+mutation UpdateProfile {
+  update_profile(params: {
+    family_name: "samani"
+  }) {
+    message
+  }
+}
+
+query GetUsers {
+  _users {
+    id
+    email
+    email_verified
+    given_name
+    family_name
+    picture
+    signup_methods
+    phone_number
+  }
+}
+
+mutation MagicLinkLogin {
+  magic_link_login(params: {
+    email: "test@yopmail.com"
+  }) {
+    message
+  }
+}
+
+mutation Logout {
+  logout {
+    message
+  }
+}
+
+mutation UpdateUser{
+  _update_user(params: {
+    id: "dafc9400-d603-4ade-997c-83fcd54bbd67",
+    roles: ["user", "admin"]
+  }) {
+    email
+    roles
+  }
+}
+
+mutation DeleteUser {
+  _delete_user(params: {
+    email: "signup.test134523@yopmail.com"
+  }) {
+    message
+  }
+}
+```
+
+
+
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM golang:1.16-alpine as builder
+FROM golang:1.17-alpine as builder
 WORKDIR /app
 COPY server server
 COPY Makefile .
--- a/4
+++ b/4
@@ -2,8 +2,8 @@ DEFAULT_VERSION=0.1.0-local
 VERSION := $(or $(VERSION),$(DEFAULT_VERSION))

 cmd:
-	cd server && go build -ldflags "-w -X main.Version=$(VERSION)" -o '../build/server'
+	cd server && go build -ldflags "-w -X main.VERSION=$(VERSION)" -o '../build/server'
 clean:
 	rm -rf build
 test:
-	cd server && go test ./...
+	cd server && go clean --testcache && go test -v ./__test__
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
  Authorizer
 </h1>

-**Authorizer** is an open-source authentication and authorization solution for your applications. Bring your database and have complete control over the user information. You can self-host authorizer instances and connect to any SQL database.
+**Authorizer** is an open-source authentication and authorization solution for your applications. Bring your database and have complete control over the user information. You can self-host authorizer instances and connect to any database (Currently supports [Postgres](https://www.postgresql.org/), [MySQL](https://www.mysql.com/), [SQLite](https://www.sqlite.org/index.html), [SQLServer](https://www.microsoft.com/en-us/sql-server/), [MongoDB](https://mongodb.com/),[ArangoDB](https://www.arangodb.com/)).

 ## Table of contents

@@ -149,6 +149,10 @@ Deploy production ready Authorizer instance using [railway.app](https://github.c
  > Note: One can always disable the email verification to allow open sign up, which is not recommended for production as anyone can use anyone's email address 😅
 - For persisting user sessions, you will need Redis URL (not in case of railway.app). If you do not configure a Redis server, sessions will be persisted until the instance is up or not restarted. For better response time on authorization requests/middleware, we recommend deploying Redis on the same infra/network as your authorizer server.

+## Testing
+
+- Check the testing instructions [here](https://github.com/authorizerdev/authorizer/blob/main/.github/CONTRIBUTING.md#testing)
+
 ## Integrating into your website

 This example demonstrates how you can use [`@authorizerdev/authorizer-js`](/authorizer-js/getting-started) CDN version and have login ready for your site in few seconds. You can also use the ES module version of [`@authorizerdev/authorizer-js`](/authorizer-js/getting-started) or framework-specific versions like [`@authorizerdev/authorizer-react`](/authorizer-react/getting-started)
--- a/TODO.md
+++ b/TODO.md
@@ -1,5 +1,15 @@
 # Task List

+## Open ID compatible claims and schema
+
+- [x] Rename `schema.graphqls` and re generate schema
+- [x] Rename to snake case [files + schema]
+- [x] Refactor db models
+- [x] Check extra data in oauth profile and save accordingly
+- [x] Update all the resolver to make them compatible with schema changes
+- [x] Update JWT claims
+- [x] Write integration tests for all resolvers
+
 ## Feature Multiple sessions

 - Multiple sessions for users to login use hMset from redis for this
--- a/app/build/bundle.js
+++ b/app/build/bundle.js
--- a/app/build/bundle.js.map
+++ b/app/build/bundle.js.map
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -5,19 +5,19 @@
 	"requires": true,
 	"dependencies": {
 		"@authorizerdev/authorizer-js": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-0.1.0.tgz",
-			"integrity": "sha512-wNtTrFYg4qjvI+Sm58d9E8x+XaiwCA0DCyG87e37YDXmMlvvOmRQf05dxRRxZoxNC1WUkA3UYMTAclCKkonZAg==",
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-0.2.0.tgz",
+			"integrity": "sha512-T2gurEYEP1T56j9IwDIWP1PsELoWcU7TBl5G0UsMqFQhKo7T6p2hM634Z7PS1yLegU3aihuvHGI0C0n4xSo0VQ==",
 			"requires": {
 				"node-fetch": "^2.6.1"
 			}
 		},
 		"@authorizerdev/authorizer-react": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-0.1.0.tgz",
-			"integrity": "sha512-+ro0CNKIvblEgRs5M0HevUYrXC6s433GinL7EubIL5XztN48GDBV2GI86lhl4WvjbYTZApZloXWczaZ51g8uig==",
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-0.3.0.tgz",
+			"integrity": "sha512-9f0cREXz2ND1wkgAxBV6YenjSSkhlzE79ExMdmcjZhRs0+htiF3YBNDTY4OGqL/lH+9SEsSxCjM/mttHak1nmQ==",
 			"requires": {
-				"@authorizerdev/authorizer-js": "^0.1.0",
+				"@authorizerdev/authorizer-js": "^0.2.0",
 				"final-form": "^4.20.2",
 				"react-final-form": "^6.5.3",
 				"styled-components": "^5.3.0"
@@ -32,9 +32,9 @@
 			}
 		},
 		"@babel/generator": {
-			"version": "7.16.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz",
-			"integrity": "sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==",
+			"version": "7.16.5",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz",
+			"integrity": "sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==",
 			"requires": {
 				"@babel/types": "^7.16.0",
 				"jsesc": "^2.5.1",
@@ -49,6 +49,14 @@
 				"@babel/types": "^7.16.0"
 			}
 		},
+		"@babel/helper-environment-visitor": {
+			"version": "7.16.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz",
+			"integrity": "sha512-ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg==",
+			"requires": {
+				"@babel/types": "^7.16.0"
+			}
+		},
 		"@babel/helper-function-name": {
 			"version": "7.16.0",
 			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz",
@@ -107,9 +115,9 @@
 			}
 		},
 		"@babel/parser": {
-			"version": "7.16.3",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.3.tgz",
-			"integrity": "sha512-dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw=="
+			"version": "7.16.6",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz",
+			"integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ=="
 		},
 		"@babel/runtime": {
 			"version": "7.14.8",
@@ -130,16 +138,17 @@
 			}
 		},
 		"@babel/traverse": {
-			"version": "7.16.3",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz",
-			"integrity": "sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==",
+			"version": "7.16.5",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.5.tgz",
+			"integrity": "sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ==",
 			"requires": {
 				"@babel/code-frame": "^7.16.0",
-				"@babel/generator": "^7.16.0",
+				"@babel/generator": "^7.16.5",
+				"@babel/helper-environment-visitor": "^7.16.5",
 				"@babel/helper-function-name": "^7.16.0",
 				"@babel/helper-hoist-variables": "^7.16.0",
 				"@babel/helper-split-export-declaration": "^7.16.0",
-				"@babel/parser": "^7.16.3",
+				"@babel/parser": "^7.16.5",
 				"@babel/types": "^7.16.0",
 				"debug": "^4.1.0",
 				"globals": "^11.1.0"
@@ -241,12 +250,12 @@
 			}
 		},
 		"babel-plugin-styled-components": {
-			"version": "1.13.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.3.tgz",
-			"integrity": "sha512-meGStRGv+VuKA/q0/jXxrPNWEm4LPfYIqxooDTdmh8kFsP/Ph7jJG5rUPwUPX3QHUvggwdbgdGpo88P/rRYsVw==",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.2.tgz",
+			"integrity": "sha512-7eG5NE8rChnNTDxa6LQfynwgHTVOYYaHJbUYSlOhk8QBXIQiMBKq4gyfHBBKPrxUcVBXVJL61ihduCpCQbuNbw==",
 			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.15.4",
-				"@babel/helper-module-imports": "^7.15.4",
+				"@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"
 			}
@@ -305,9 +314,9 @@
 			"integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="
 		},
 		"debug": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-			"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+			"version": "4.3.3",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+			"integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
 			"requires": {
 				"ms": "2.1.2"
 			}
@@ -323,9 +332,9 @@
 			"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==",
+			"version": "4.20.6",
+			"resolved": "https://registry.npmjs.org/final-form/-/final-form-4.20.6.tgz",
+			"integrity": "sha512-fCdwIj49KOaFfDRlXB57Eo+GghIMZQWrA9TakQI3C9uQxHwaFHXqZSNRlUdfnQmNNeySwGOaGPZCvjy58hyv4w==",
 			"requires": {
 				"@babel/runtime": "^7.10.0"
 			}
@@ -432,9 +441,9 @@
 			}
 		},
 		"postcss-value-parser": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-			"integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
 		"prop-types": {
 			"version": "15.7.2",
@@ -481,9 +490,9 @@
 			},
 			"dependencies": {
 				"@babel/runtime": {
-					"version": "7.16.3",
-					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
-					"integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
+					"version": "7.16.5",
+					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.5.tgz",
+					"integrity": "sha512-TXWihFIS3Pyv5hzR7j6ihmeLkZfrXGxAr5UfSl8CHf+6q/wpiYDkUau0czckpYG8QmnCIuPpdLtuA9VmuGGyMA==",
 					"requires": {
 						"regenerator-runtime": "^0.13.4"
 					}
--- a/app/package.json
+++ b/app/package.json
@@ -10,7 +10,7 @@
 	"author": "Lakhan Samani",
 	"license": "ISC",
 	"dependencies": {
-		"@authorizerdev/authorizer-react": "^0.1.0",
+		"@authorizerdev/authorizer-react": "^0.3.0",
 		"@types/react": "^17.0.15",
 		"@types/react-dom": "^17.0.9",
 		"esbuild": "^0.12.17",
--- a/server/test/cors_test.go
+++ b/server/test/cors_test.go
@@ -0,0 +1,27 @@
+package test
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCors(t *testing.T) {
+	allowedOrigin := "http://localhost:8080" // The allowed origin that you want to check
+	notAllowedOrigin := "http://myapp.com"
+
+	s := testSetup()
+	defer s.Server.Close()
+	client := &http.Client{}
+
+	req, _ := createContext(s)
+	req.Header.Add("Origin", allowedOrigin)
+	res, _ := client.Do(req)
+
+	// You should get your origin (or a * depending on your config) if the
+	// passed origin is allowed.
+	o := res.Header.Get("Access-Control-Allow-Origin")
+	assert.NotEqual(t, o, notAllowedOrigin, "Origins should not match")
+	assert.Equal(t, o, allowedOrigin, "Origins do match")
+}
--- a/server/test/delete_user_test.go
+++ b/server/test/delete_user_test.go
@@ -0,0 +1,34 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/constants"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func deleteUserTest(s TestSetup, t *testing.T) {
+	t.Run(`should delete users with admin secret only`, func(t *testing.T) {
+		req, ctx := createContext(s)
+		email := "delete_user." + s.TestInfo.Email
+		resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+
+		_, err := resolvers.DeleteUser(ctx, model.DeleteUserInput{
+			Email: email,
+		})
+		assert.NotNil(t, err, "unauthorized")
+
+		req.Header.Add("x-authorizer-admin-secret", constants.ADMIN_SECRET)
+		_, err = resolvers.DeleteUser(ctx, model.DeleteUserInput{
+			Email: email,
+		})
+		assert.Nil(t, err)
+		cleanData(email)
+	})
+}
--- a/server/test/env_test.go
+++ b/server/test/env_test.go
@@ -0,0 +1,25 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/constants"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestEnvs(t *testing.T) {
+	constants.ENV_PATH = "../../.env.sample"
+
+	assert.Equal(t, constants.ADMIN_SECRET, "admin")
+	assert.Equal(t, constants.ENV, "production")
+	assert.False(t, constants.DISABLE_EMAIL_VERIFICATION)
+	assert.False(t, constants.DISABLE_MAGIC_LINK_LOGIN)
+	assert.False(t, constants.DISABLE_BASIC_AUTHENTICATION)
+	assert.Equal(t, constants.JWT_TYPE, "HS256")
+	assert.Equal(t, constants.JWT_SECRET, "random_string")
+	assert.Equal(t, constants.JWT_ROLE_CLAIM, "role")
+	assert.EqualValues(t, constants.ROLES, []string{"user"})
+	assert.EqualValues(t, constants.DEFAULT_ROLES, []string{"user"})
+	assert.EqualValues(t, constants.PROTECTED_ROLES, []string{"admin"})
+	assert.EqualValues(t, constants.ALLOWED_ORIGINS, []string{"*"})
+}
--- a/server/test/forgot_password_test.go
+++ b/server/test/forgot_password_test.go
@@ -0,0 +1,35 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/enum"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func forgotPasswordTest(s TestSetup, t *testing.T) {
+	t.Run(`should run forgot password`, func(t *testing.T) {
+		_, ctx := createContext(s)
+		email := "forgot_password." + s.TestInfo.Email
+		_, err := resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+
+		_, err = resolvers.ForgotPassword(ctx, model.ForgotPasswordInput{
+			Email: email,
+		})
+		assert.Nil(t, err, "no errors for forgot password")
+
+		verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.ForgotPassword.String())
+		assert.Nil(t, err)
+
+		assert.Equal(t, verificationRequest.Identifier, enum.ForgotPassword.String())
+
+		cleanData(email)
+	})
+}
--- a/server/test/login_test.go
+++ b/server/test/login_test.go
@@ -0,0 +1,58 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/enum"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func loginTests(s TestSetup, t *testing.T) {
+	t.Run(`should login`, func(t *testing.T) {
+		_, ctx := createContext(s)
+		email := "login." + s.TestInfo.Email
+		_, err := resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+
+		_, err = resolvers.Login(ctx, model.LoginInput{
+			Email:    email,
+			Password: s.TestInfo.Password,
+		})
+
+		assert.NotNil(t, err, "should fail because email is not verified")
+
+		verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.BasicAuthSignup.String())
+		resolvers.VerifyEmail(ctx, model.VerifyEmailInput{
+			Token: verificationRequest.Token,
+		})
+
+		_, err = resolvers.Login(ctx, model.LoginInput{
+			Email:    email,
+			Password: s.TestInfo.Password,
+			Roles:    []string{"test"},
+		})
+		assert.NotNil(t, err, "invalid roles")
+
+		_, err = resolvers.Login(ctx, model.LoginInput{
+			Email:    email,
+			Password: s.TestInfo.Password + "s",
+		})
+		assert.NotNil(t, err, "invalid password")
+
+		loginRes, err := resolvers.Login(ctx, model.LoginInput{
+			Email:    email,
+			Password: s.TestInfo.Password,
+		})
+
+		assert.Nil(t, err, "login successful")
+		assert.NotNil(t, loginRes.AccessToken, "access token should not be empty")
+
+		cleanData(email)
+	})
+}
--- a/server/test/logout_test.go
+++ b/server/test/logout_test.go
@@ -0,0 +1,35 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/enum"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func logoutTests(s TestSetup, t *testing.T) {
+	t.Run(`should logout user`, func(t *testing.T) {
+		req, ctx := createContext(s)
+		email := "logout." + s.TestInfo.Email
+
+		_, err := resolvers.MagicLinkLogin(ctx, model.MagicLinkLoginInput{
+			Email: email,
+		})
+
+		verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.MagicLinkLogin.String())
+		verifyRes, err := resolvers.VerifyEmail(ctx, model.VerifyEmailInput{
+			Token: verificationRequest.Token,
+		})
+
+		token := *verifyRes.AccessToken
+		req.Header.Add("Authorization", "Bearer "+token)
+		_, err = resolvers.Logout(ctx)
+		assert.Nil(t, err)
+		_, err = resolvers.Profile(ctx)
+		assert.NotNil(t, err, "unauthorized")
+		cleanData(email)
+	})
+}
--- a/server/test/magic_link_login_test.go
+++ b/server/test/magic_link_login_test.go
@@ -0,0 +1,35 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/enum"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func magicLinkLoginTests(s TestSetup, t *testing.T) {
+	t.Run(`should login with magic link`, func(t *testing.T) {
+		req, ctx := createContext(s)
+		email := "magic_link_login." + s.TestInfo.Email
+
+		_, err := resolvers.MagicLinkLogin(ctx, model.MagicLinkLoginInput{
+			Email: email,
+		})
+		assert.Nil(t, err)
+
+		verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.MagicLinkLogin.String())
+		verifyRes, err := resolvers.VerifyEmail(ctx, model.VerifyEmailInput{
+			Token: verificationRequest.Token,
+		})
+
+		token := *verifyRes.AccessToken
+		req.Header.Add("Authorization", "Bearer "+token)
+		_, err = resolvers.Profile(ctx)
+		assert.Nil(t, err)
+
+		cleanData(email)
+	})
+}
--- a/server/test/meta_test.go
+++ b/server/test/meta_test.go
@@ -0,0 +1,23 @@
+package test
+
+import (
+	"context"
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func metaTests(s TestSetup, t *testing.T) {
+	t.Run(`should get meta information`, func(t *testing.T) {
+		ctx := context.Background()
+		meta, err := resolvers.Meta(ctx)
+		assert.Nil(t, err)
+		assert.False(t, meta.IsFacebookLoginEnabled)
+		assert.False(t, meta.IsGoogleLoginEnabled)
+		assert.False(t, meta.IsGithubLoginEnabled)
+		assert.True(t, meta.IsEmailVerificationEnabled)
+		assert.True(t, meta.IsBasicAuthenticationEnabled)
+		assert.True(t, meta.IsMagicLinkLoginEnabled)
+	})
+}
--- a/server/test/profile_test.go
+++ b/server/test/profile_test.go
@@ -0,0 +1,42 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/enum"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func profileTests(s TestSetup, t *testing.T) {
+	t.Run(`should get profile only with token`, func(t *testing.T) {
+		req, ctx := createContext(s)
+		email := "profile." + s.TestInfo.Email
+
+		resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+
+		_, err := resolvers.Profile(ctx)
+		assert.NotNil(t, err, "unauthorized")
+
+		verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.BasicAuthSignup.String())
+		verifyRes, err := resolvers.VerifyEmail(ctx, model.VerifyEmailInput{
+			Token: verificationRequest.Token,
+		})
+
+		token := *verifyRes.AccessToken
+		req.Header.Add("Authorization", "Bearer "+token)
+		profileRes, err := resolvers.Profile(ctx)
+		assert.Nil(t, err)
+
+		newEmail := *&profileRes.Email
+		assert.Equal(t, email, newEmail, "emails should be equal")
+
+		cleanData(email)
+	})
+}
--- a/server/test/resend_verify_email_test.go
+++ b/server/test/resend_verify_email_test.go
@@ -0,0 +1,31 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/enum"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func resendVerifyEmailTests(s TestSetup, t *testing.T) {
+	t.Run(`should resend verification email`, func(t *testing.T) {
+		_, ctx := createContext(s)
+		email := "resend_verify_email." + s.TestInfo.Email
+		_, err := resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+
+		_, err = resolvers.ResendVerifyEmail(ctx, model.ResendVerifyEmailInput{
+			Email:      email,
+			Identifier: enum.BasicAuthSignup.String(),
+		})
+
+		assert.Nil(t, err)
+
+		cleanData(email)
+	})
+}
--- a/server/test/reset_password_test.go
+++ b/server/test/reset_password_test.go
@@ -0,0 +1,49 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/enum"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func resetPasswordTest(s TestSetup, t *testing.T) {
+	t.Run(`should reset password`, func(t *testing.T) {
+		email := "reset_password." + s.TestInfo.Email
+		_, ctx := createContext(s)
+		_, err := resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+
+		_, err = resolvers.ForgotPassword(ctx, model.ForgotPasswordInput{
+			Email: email,
+		})
+		assert.Nil(t, err, "no errors for forgot password")
+
+		verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.ForgotPassword.String())
+		assert.Nil(t, err, "should get forgot password request")
+
+		_, err = resolvers.ResetPassword(ctx, model.ResetPasswordInput{
+			Token:           verificationRequest.Token,
+			Password:        "test1",
+			ConfirmPassword: "test",
+		})
+
+		assert.NotNil(t, err, "passowrds don't match")
+
+		_, err = resolvers.ResetPassword(ctx, model.ResetPasswordInput{
+			Token:           verificationRequest.Token,
+			Password:        "test1",
+			ConfirmPassword: "test1",
+		})
+
+		assert.Nil(t, err, "password changed successfully")
+
+		cleanData(email)
+	})
+}
--- a/server/test/resolvers_test.go
+++ b/server/test/resolvers_test.go
@@ -0,0 +1,47 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/constants"
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/enum"
+)
+
+func TestResolvers(t *testing.T) {
+	databases := map[string]string{
+		enum.Sqlite.String():   "../../data.db",
+		enum.Arangodb.String(): "http://root:root@localhost:8529",
+		enum.Mongodb.String():  "mongodb://localhost:27017",
+	}
+
+	for dbType, dbURL := range databases {
+		constants.DATABASE_URL = dbURL
+		constants.DATABASE_TYPE = dbType
+		db.InitDB()
+
+		s := testSetup()
+		defer s.Server.Close()
+
+		t.Run("should pass tests for "+dbType, func(t *testing.T) {
+			loginTests(s, t)
+			signupTests(s, t)
+			forgotPasswordTest(s, t)
+			resendVerifyEmailTests(s, t)
+			resetPasswordTest(s, t)
+			verifyEmailTest(s, t)
+			sessionTests(s, t)
+			profileTests(s, t)
+			updateProfileTests(s, t)
+			magicLinkLoginTests(s, t)
+			logoutTests(s, t)
+			metaTests(s, t)
+
+			// admin tests
+			verificationRequestsTest(s, t)
+			usersTest(s, t)
+			deleteUserTest(s, t)
+			updateUserTest(s, t)
+		})
+	}
+}
--- a/server/test/session_test.go
+++ b/server/test/session_test.go
@@ -0,0 +1,42 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/enum"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func sessionTests(s TestSetup, t *testing.T) {
+	t.Run(`should allow access to profile with session only`, func(t *testing.T) {
+		req, ctx := createContext(s)
+		email := "session." + s.TestInfo.Email
+
+		resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+
+		_, err := resolvers.Session(ctx, []string{})
+		assert.NotNil(t, err, "unauthorized")
+
+		verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.BasicAuthSignup.String())
+		verifyRes, err := resolvers.VerifyEmail(ctx, model.VerifyEmailInput{
+			Token: verificationRequest.Token,
+		})
+
+		token := *verifyRes.AccessToken
+		req.Header.Add("Authorization", "Bearer "+token)
+		sessionRes, err := resolvers.Session(ctx, []string{})
+		assert.Nil(t, err)
+
+		newToken := *sessionRes.AccessToken
+		assert.Equal(t, token, newToken, "tokens should be equal")
+
+		cleanData(email)
+	})
+}
--- a/server/test/signup_test.go
+++ b/server/test/signup_test.go
@@ -0,0 +1,47 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/enum"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func signupTests(s TestSetup, t *testing.T) {
+	t.Run(`should complete the signup and check duplicates`, func(t *testing.T) {
+		_, ctx := createContext(s)
+		email := "signup." + s.TestInfo.Email
+		res, err := resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password + "s",
+		})
+		assert.NotNil(t, err, "invalid password errors")
+
+		res, err = resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+
+		user := *res.User
+		assert.Equal(t, email, user.Email)
+		assert.Nil(t, res.AccessToken, "access token should be nil")
+
+		res, err = resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+
+		assert.NotNil(t, err, "should throw duplicate email error")
+
+		verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.BasicAuthSignup.String())
+		assert.Nil(t, err)
+		assert.Equal(t, email, verificationRequest.Email)
+		cleanData(email)
+	})
+}
--- a/server/test/test.go
+++ b/server/test/test.go
@@ -0,0 +1,93 @@
+package test
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptest"
+
+	"github.com/authorizerdev/authorizer/server/constants"
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/enum"
+	"github.com/authorizerdev/authorizer/server/env"
+	"github.com/authorizerdev/authorizer/server/handlers"
+	"github.com/authorizerdev/authorizer/server/middlewares"
+	"github.com/authorizerdev/authorizer/server/session"
+	"github.com/gin-contrib/location"
+	"github.com/gin-gonic/gin"
+)
+
+// common user data to share across tests
+type TestData struct {
+	Email    string
+	Password string
+}
+
+type TestSetup struct {
+	GinEngine  *gin.Engine
+	GinContext *gin.Context
+	Server     *httptest.Server
+	TestInfo   TestData
+}
+
+func cleanData(email string) {
+	verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.BasicAuthSignup.String())
+	if err == nil {
+		err = db.Mgr.DeleteVerificationRequest(verificationRequest)
+	}
+
+	verificationRequest, err = db.Mgr.GetVerificationByEmail(email, enum.ForgotPassword.String())
+	if err == nil {
+		err = db.Mgr.DeleteVerificationRequest(verificationRequest)
+	}
+
+	verificationRequest, err = db.Mgr.GetVerificationByEmail(email, enum.UpdateEmail.String())
+	if err == nil {
+		err = db.Mgr.DeleteVerificationRequest(verificationRequest)
+	}
+
+	dbUser, err := db.Mgr.GetUserByEmail(email)
+	if err == nil {
+		db.Mgr.DeleteUser(dbUser)
+		db.Mgr.DeleteUserSession(dbUser.ID)
+	}
+}
+
+func createContext(s TestSetup) (*http.Request, context.Context) {
+	req, _ := http.NewRequest(
+		"POST",
+		"http://"+s.Server.Listener.Addr().String()+"/graphql",
+		nil,
+	)
+
+	ctx := context.WithValue(req.Context(), "GinContextKey", s.GinContext)
+	s.GinContext.Request = req
+	return req, ctx
+}
+
+func testSetup() TestSetup {
+	testData := TestData{
+		Email:    "authorizer_tester@yopmail.com",
+		Password: "test",
+	}
+
+	constants.ENV_PATH = "../../.env.sample"
+	env.InitEnv()
+	session.InitSession()
+
+	w := httptest.NewRecorder()
+	c, r := gin.CreateTestContext(w)
+	r.Use(location.Default())
+	r.Use(middlewares.GinContextToContextMiddleware())
+	r.Use(middlewares.CORSMiddleware())
+
+	r.POST("/graphql", handlers.GraphqlHandler())
+
+	server := httptest.NewServer(r)
+
+	return TestSetup{
+		GinEngine:  r,
+		GinContext: c,
+		Server:     server,
+		TestInfo:   testData,
+	}
+}
--- a/server/test/update_profile_test.go
+++ b/server/test/update_profile_test.go
@@ -0,0 +1,53 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/enum"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func updateProfileTests(s TestSetup, t *testing.T) {
+	t.Run(`should update the profile with access token only`, func(t *testing.T) {
+		req, ctx := createContext(s)
+		email := "update_profile." + s.TestInfo.Email
+
+		resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+
+		fName := "samani"
+		_, err := resolvers.UpdateProfile(ctx, model.UpdateProfileInput{
+			FamilyName: &fName,
+		})
+		assert.NotNil(t, err, "unauthorized")
+
+		verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.BasicAuthSignup.String())
+		verifyRes, err := resolvers.VerifyEmail(ctx, model.VerifyEmailInput{
+			Token: verificationRequest.Token,
+		})
+
+		token := *verifyRes.AccessToken
+		req.Header.Add("Authorization", "Bearer "+token)
+		_, err = resolvers.UpdateProfile(ctx, model.UpdateProfileInput{
+			FamilyName: &fName,
+		})
+		assert.Nil(t, err)
+
+		newEmail := "new_" + email
+		_, err = resolvers.UpdateProfile(ctx, model.UpdateProfileInput{
+			Email: &newEmail,
+		})
+		assert.Nil(t, err)
+		_, err = resolvers.Profile(ctx)
+		assert.NotNil(t, err, "unauthorized")
+
+		cleanData(newEmail)
+		cleanData(email)
+	})
+}
--- a/server/test/update_user_test.go
+++ b/server/test/update_user_test.go
@@ -0,0 +1,40 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/constants"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func updateUserTest(s TestSetup, t *testing.T) {
+	t.Run(`should update the user with admin secret only`, func(t *testing.T) {
+		req, ctx := createContext(s)
+		email := "update_user." + s.TestInfo.Email
+		signupRes, _ := resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+
+		user := *signupRes.User
+		adminRole := "admin"
+		userRole := "user"
+		newRoles := []*string{&adminRole, &userRole}
+		_, err := resolvers.UpdateUser(ctx, model.UpdateUserInput{
+			ID:    user.ID,
+			Roles: newRoles,
+		})
+		assert.NotNil(t, err, "unauthorized")
+
+		req.Header.Add("x-authorizer-admin-secret", constants.ADMIN_SECRET)
+		_, err = resolvers.UpdateUser(ctx, model.UpdateUserInput{
+			ID:    user.ID,
+			Roles: newRoles,
+		})
+		assert.Nil(t, err)
+		cleanData(email)
+	})
+}
--- a/server/test/urls_test.go
+++ b/server/test/urls_test.go
@@ -0,0 +1,27 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/utils"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetHostName(t *testing.T) {
+	authorizer_url := "http://test.herokuapp.com:80"
+
+	host, port := utils.GetHostParts(authorizer_url)
+	expectedHost := "test.herokuapp.com"
+
+	assert.Equal(t, host, expectedHost, "hostname should be equal")
+	assert.Equal(t, port, "80", "port should be 80")
+}
+
+func TestGetDomainName(t *testing.T) {
+	authorizer_url := "http://test.herokuapp.com"
+
+	got := utils.GetDomainName(authorizer_url)
+	want := "herokuapp.com"
+
+	assert.Equal(t, got, want, "domain name should be equal")
+}
--- a/server/test/users_test.go
+++ b/server/test/users_test.go
@@ -0,0 +1,33 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/constants"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func usersTest(s TestSetup, t *testing.T) {
+	t.Run(`should get users list with admin secret only`, func(t *testing.T) {
+		req, ctx := createContext(s)
+		email := "users." + s.TestInfo.Email
+		resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+
+		users, err := resolvers.Users(ctx)
+		assert.NotNil(t, err, "unauthorized")
+
+		req.Header.Add("x-authorizer-admin-secret", constants.ADMIN_SECRET)
+		users, err = resolvers.Users(ctx)
+		assert.Nil(t, err)
+		rLen := len(users)
+		assert.GreaterOrEqual(t, rLen, 1)
+
+		cleanData(email)
+	})
+}
--- a/server/test/validator_test.go
+++ b/server/test/validator_test.go
@@ -0,0 +1,43 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/constants"
+	"github.com/authorizerdev/authorizer/server/enum"
+	"github.com/authorizerdev/authorizer/server/utils"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIsValidEmail(t *testing.T) {
+	validEmail := "lakhan@gmail.com"
+	invalidEmail1 := "lakhan"
+	invalidEmail2 := "lakhan.me"
+
+	assert.True(t, utils.IsValidEmail(validEmail), "it should be valid email")
+	assert.False(t, utils.IsValidEmail(invalidEmail1), "it should be invalid email")
+	assert.False(t, utils.IsValidEmail(invalidEmail2), "it should be invalid email")
+}
+
+func TestIsValidOrigin(t *testing.T) {
+	// don't use portocal(http/https) for ALLOWED_ORIGINS while testing,
+	// as we trim them off while running the main function
+	constants.ALLOWED_ORIGINS = []string{"localhost:8080", "*.google.com", "*.google.in", "*abc.*"}
+
+	assert.False(t, utils.IsValidOrigin("http://myapp.com"), "it should be invalid origin")
+	assert.False(t, utils.IsValidOrigin("http://appgoogle.com"), "it should be invalid origin")
+	assert.True(t, utils.IsValidOrigin("http://app.google.com"), "it should be valid origin")
+	assert.False(t, utils.IsValidOrigin("http://app.google.ind"), "it should be invalid origin")
+	assert.True(t, utils.IsValidOrigin("http://app.google.in"), "it should be valid origin")
+	assert.True(t, utils.IsValidOrigin("http://xyx.abc.com"), "it should be valid origin")
+	assert.True(t, utils.IsValidOrigin("http://xyx.abc.in"), "it should be valid origin")
+	assert.True(t, utils.IsValidOrigin("http://xyxabc.in"), "it should be valid origin")
+	assert.True(t, utils.IsValidOrigin("http://localhost:8080"), "it should be valid origin")
+}
+
+func TestIsValidIdentifier(t *testing.T) {
+	assert.False(t, utils.IsValidVerificationIdentifier("test"), "it should be invalid identifier")
+	assert.True(t, utils.IsValidVerificationIdentifier(enum.BasicAuthSignup.String()), "it should be valid identifier")
+	assert.True(t, utils.IsValidVerificationIdentifier(enum.UpdateEmail.String()), "it should be valid identifier")
+	assert.True(t, utils.IsValidVerificationIdentifier(enum.ForgotPassword.String()), "it should be valid identifier")
+}
--- a/server/test/verification_requests_test.go
+++ b/server/test/verification_requests_test.go
@@ -0,0 +1,35 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/constants"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func verificationRequestsTest(s TestSetup, t *testing.T) {
+	t.Run(`should get verification requests with admin secret only`, func(t *testing.T) {
+		req, ctx := createContext(s)
+
+		email := "verification_requests." + s.TestInfo.Email
+		resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+
+		requests, err := resolvers.VerificationRequests(ctx)
+		assert.NotNil(t, err, "unauthorizer")
+
+		req.Header.Add("x-authorizer-admin-secret", constants.ADMIN_SECRET)
+		requests, err = resolvers.VerificationRequests(ctx)
+
+		assert.Nil(t, err)
+		rLen := len(requests)
+		assert.GreaterOrEqual(t, rLen, 1)
+
+		cleanData(email)
+	})
+}
--- a/server/test/verify_email_test.go
+++ b/server/test/verify_email_test.go
@@ -0,0 +1,38 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/enum"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
+)
+
+func verifyEmailTest(s TestSetup, t *testing.T) {
+	t.Run(`should verify email`, func(t *testing.T) {
+		_, ctx := createContext(s)
+		email := "verify_email." + s.TestInfo.Email
+		res, err := resolvers.Signup(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+
+		user := *res.User
+		assert.Equal(t, email, user.Email)
+		assert.Nil(t, res.AccessToken, "access token should be nil")
+		verificationRequest, err := db.Mgr.GetVerificationByEmail(email, enum.BasicAuthSignup.String())
+		assert.Nil(t, err)
+		assert.Equal(t, email, verificationRequest.Email)
+
+		verifyRes, err := resolvers.VerifyEmail(ctx, model.VerifyEmailInput{
+			Token: verificationRequest.Token,
+		})
+		assert.Nil(t, err)
+		assert.NotEqual(t, verifyRes.AccessToken, "", "access token should not be empty")
+
+		cleanData(email)
+	})
+}
--- a/server/constants/constants.go
+++ b/server/constants/constants.go
@@ -1,11 +1,14 @@
 package constants

+// this constants are configured via env
 var (
 	ADMIN_SECRET                 = ""
 	ENV                          = ""
+	ENV_PATH                     = ""
 	VERSION                      = ""
 	DATABASE_TYPE                = ""
 	DATABASE_URL                 = ""
+	DATABASE_NAME                = ""
 	SMTP_HOST                    = ""
 	SMTP_PORT                    = ""
 	SENDER_EMAIL                 = ""
@@ -15,14 +18,14 @@ var (
 	ALLOWED_ORIGINS              = []string{}
 	AUTHORIZER_URL               = ""
 	APP_URL                      = ""
-	PORT                         = "8080"
+	PORT                         = ""
 	REDIS_URL                    = ""
 	IS_PROD                      = false
 	COOKIE_NAME                  = ""
 	RESET_PASSWORD_URL           = ""
-	DISABLE_EMAIL_VERIFICATION   = "false"
-	DISABLE_BASIC_AUTHENTICATION = "false"
-	DISABLE_MAGIC_LOGIN          = "false"
+	DISABLE_EMAIL_VERIFICATION   = false
+	DISABLE_BASIC_AUTHENTICATION = false
+	DISABLE_MAGIC_LINK_LOGIN     = false

 	// ROLES
 	ROLES           = []string{}
--- a/server/constants/oauth_info_urls.go
+++ b/server/constants/oauth_info_urls.go
@@ -2,6 +2,7 @@ package constants

 var (
 	// Ref: https://github.com/qor/auth/blob/master/providers/google/google.go
+	// deprecated and not used. instead we follow open id approach for google login
 	GoogleUserInfoURL = "https://www.googleapis.com/oauth2/v3/userinfo"
 	// Ref: https://github.com/qor/auth/blob/master/providers/facebook/facebook.go#L18
 	FacebookUserInfoURL = "https://graph.facebook.com/me?fields=id,first_name,last_name,name,email,picture&access_token="
--- a/server/db/arangodb.go
+++ b/server/db/arangodb.go
@@ -0,0 +1,104 @@
+package db
+
+import (
+	"context"
+	"log"
+
+	"github.com/arangodb/go-driver"
+	arangoDriver "github.com/arangodb/go-driver"
+	"github.com/arangodb/go-driver/http"
+	"github.com/authorizerdev/authorizer/server/constants"
+)
+
+// for this we need arangodb instance up and running
+// for local testing we can use dockerized version of it
+// docker run -p 8529:8529 -e ARANGO_ROOT_PASSWORD=root arangodb/arangodb:3.8.4
+
+func initArangodb() (arangoDriver.Database, error) {
+	ctx := context.Background()
+	conn, err := http.NewConnection(http.ConnectionConfig{
+		Endpoints: []string{constants.DATABASE_URL},
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	arangoClient, err := arangoDriver.NewClient(arangoDriver.ClientConfig{
+		Connection: conn,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	var arangodb driver.Database
+
+	arangodb_exists, err := arangoClient.DatabaseExists(nil, constants.DATABASE_NAME)
+
+	if arangodb_exists {
+		log.Println(constants.DATABASE_NAME + " db exists already")
+		arangodb, err = arangoClient.Database(nil, constants.DATABASE_NAME)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		arangodb, err = arangoClient.CreateDatabase(nil, constants.DATABASE_NAME, nil)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	userCollectionExists, err := arangodb.CollectionExists(ctx, Collections.User)
+	if userCollectionExists {
+		log.Println(Collections.User + " collection exists already")
+	} else {
+		_, err = arangodb.CreateCollection(ctx, Collections.User, nil)
+		if err != nil {
+			log.Println("error creating collection("+Collections.User+"):", err)
+		}
+	}
+	userCollection, _ := arangodb.Collection(nil, Collections.User)
+	userCollection.EnsureHashIndex(ctx, []string{"email"}, &arangoDriver.EnsureHashIndexOptions{
+		Unique: true,
+		Sparse: true,
+	})
+	userCollection.EnsureHashIndex(ctx, []string{"phone_number"}, &arangoDriver.EnsureHashIndexOptions{
+		Unique: true,
+		Sparse: true,
+	})
+
+	verificationRequestCollectionExists, err := arangodb.CollectionExists(ctx, Collections.VerificationRequest)
+	if verificationRequestCollectionExists {
+		log.Println(Collections.VerificationRequest + " collection exists already")
+	} else {
+		_, err = arangodb.CreateCollection(ctx, Collections.VerificationRequest, nil)
+		if err != nil {
+			log.Println("error creating collection("+Collections.VerificationRequest+"):", err)
+		}
+	}
+
+	verificationRequestCollection, _ := arangodb.Collection(nil, Collections.VerificationRequest)
+	verificationRequestCollection.EnsureHashIndex(ctx, []string{"email", "identifier"}, &arangoDriver.EnsureHashIndexOptions{
+		Unique: true,
+		Sparse: true,
+	})
+	verificationRequestCollection.EnsureHashIndex(ctx, []string{"token"}, &arangoDriver.EnsureHashIndexOptions{
+		Sparse: true,
+	})
+
+	sessionCollectionExists, err := arangodb.CollectionExists(ctx, Collections.Session)
+	if sessionCollectionExists {
+		log.Println(Collections.Session + " collection exists already")
+	} else {
+		_, err = arangodb.CreateCollection(ctx, Collections.Session, nil)
+		if err != nil {
+			log.Println("error creating collection("+Collections.Session+"):", err)
+		}
+	}
+
+	sessionCollection, _ := arangodb.Collection(nil, Collections.Session)
+	sessionCollection.EnsureHashIndex(ctx, []string{"user_id"}, &arangoDriver.EnsureHashIndexOptions{
+		Sparse: true,
+	})
+
+	return arangodb, err
+}
--- a/server/db/db.go
+++ b/server/db/db.go
@@ -3,62 +3,127 @@ package db
 import (
 	"log"

+	arangoDriver "github.com/arangodb/go-driver"
 	"github.com/authorizerdev/authorizer/server/constants"
 	"github.com/authorizerdev/authorizer/server/enum"
-	"github.com/google/uuid"
+	"go.mongodb.org/mongo-driver/mongo"
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
 	"gorm.io/driver/sqlite"
+	"gorm.io/driver/sqlserver"
 	"gorm.io/gorm"
 	"gorm.io/gorm/schema"
 )

 type Manager interface {
-	SaveUser(user User) (User, error)
+	AddUser(user User) (User, error)
 	UpdateUser(user User) (User, error)
+	DeleteUser(user User) error
 	GetUsers() ([]User, error)
 	GetUserByEmail(email string) (User, error)
 	GetUserByID(email string) (User, error)
-	UpdateVerificationTime(verifiedAt int64, id uuid.UUID) error
 	AddVerification(verification VerificationRequest) (VerificationRequest, error)
 	GetVerificationByToken(token string) (VerificationRequest, error)
-	DeleteToken(email string) error
+	DeleteVerificationRequest(verificationRequest VerificationRequest) error
 	GetVerificationRequests() ([]VerificationRequest, error)
-	GetVerificationByEmail(email string) (VerificationRequest, error)
-	DeleteUser(email string) error
-	SaveRoles(roles []Role) error
-	SaveSession(session Session) error
+	GetVerificationByEmail(email string, identifier string) (VerificationRequest, error)
+	AddSession(session Session) error
+	DeleteUserSession(userId string) error
 }

 type manager struct {
-	db *gorm.DB
+	sqlDB    *gorm.DB
+	arangodb arangoDriver.Database
+	mongodb  *mongo.Database
 }

-var Mgr Manager
+// mainly used by nosql dbs
+type CollectionList struct {
+	User                string
+	VerificationRequest string
+	Session             string
+}
+
+var (
+	IsORMSupported bool
+	IsArangoDB     bool
+	IsMongoDB      bool
+	Mgr            Manager
+	Prefix         = "authorizer_"
+	Collections    = CollectionList{
+		User:                Prefix + "users",
+		VerificationRequest: Prefix + "verification_requests",
+		Session:             Prefix + "sessions",
+	}
+)

 func InitDB() {
-	var db *gorm.DB
+	var sqlDB *gorm.DB
 	var err error
+
+	IsORMSupported = constants.DATABASE_TYPE != enum.Arangodb.String() && constants.DATABASE_TYPE != enum.Mongodb.String()
+	IsArangoDB = constants.DATABASE_TYPE == enum.Arangodb.String()
+	IsMongoDB = constants.DATABASE_TYPE == enum.Mongodb.String()
+
+	// sql db orm config
 	ormConfig := &gorm.Config{
 		NamingStrategy: schema.NamingStrategy{
-			TablePrefix: "authorizer_",
+			TablePrefix: Prefix,
 		},
 	}
-	if constants.DATABASE_TYPE == enum.Postgres.String() {
-		db, err = gorm.Open(postgres.Open(constants.DATABASE_URL), ormConfig)
-	}
-	if constants.DATABASE_TYPE == enum.Mysql.String() {
-		db, err = gorm.Open(mysql.Open(constants.DATABASE_URL), ormConfig)
-	}
-	if constants.DATABASE_TYPE == enum.Sqlite.String() {
-		db, err = gorm.Open(sqlite.Open(constants.DATABASE_URL), ormConfig)
+
+	log.Println("db type:", constants.DATABASE_TYPE)
+
+	switch constants.DATABASE_TYPE {
+	case enum.Postgres.String():
+		sqlDB, err = gorm.Open(postgres.Open(constants.DATABASE_URL), ormConfig)
+		break
+	case enum.Sqlite.String():
+		sqlDB, err = gorm.Open(sqlite.Open(constants.DATABASE_URL), ormConfig)
+		break
+	case enum.Mysql.String():
+		sqlDB, err = gorm.Open(mysql.Open(constants.DATABASE_URL), ormConfig)
+		break
+	case enum.SQLServer.String():
+		sqlDB, err = gorm.Open(sqlserver.Open(constants.DATABASE_URL), ormConfig)
+		break
+	case enum.Arangodb.String():
+		arangodb, err := initArangodb()
+		if err != nil {
+			log.Fatal("error initializing arangodb:", err)
+		}
+
+		Mgr = &manager{
+			sqlDB:    nil,
+			arangodb: arangodb,
+			mongodb:  nil,
+		}
+
+		break
+	case enum.Mongodb.String():
+		mongodb, err := initMongodb()
+		if err != nil {
+			log.Fatal("error initializing mongodb connection:", err)
+		}
+
+		Mgr = &manager{
+			sqlDB:    nil,
+			arangodb: nil,
+			mongodb:  mongodb,
+		}
 	}

-	if err != nil {
-		log.Fatal("Failed to init db:", err)
-	} else {
-		db.AutoMigrate(&User{}, &VerificationRequest{}, &Role{}, &Session{})
+	// common for all sql dbs that are configured via go-orm
+	if IsORMSupported {
+		if err != nil {
+			log.Fatal("Failed to init sqlDB:", err)
+		} else {
+			sqlDB.AutoMigrate(&User{}, &VerificationRequest{}, &Session{})
+		}
+		Mgr = &manager{
+			sqlDB:    sqlDB,
+			arangodb: nil,
+			mongodb:  nil,
+		}
 	}
-
-	Mgr = &manager{db: db}
 }
--- a/server/db/mongodb.go
+++ b/server/db/mongodb.go
@@ -0,0 +1,77 @@
+package db
+
+import (
+	"context"
+	"time"
+
+	"github.com/authorizerdev/authorizer/server/constants"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/mongo/readpref"
+)
+
+func initMongodb() (*mongo.Database, error) {
+	mongodbOptions := options.Client().ApplyURI(constants.DATABASE_URL)
+	maxWait := time.Duration(5 * time.Second)
+	mongodbOptions.ConnectTimeout = &maxWait
+	mongoClient, err := mongo.NewClient(mongodbOptions)
+	if err != nil {
+		return nil, err
+	}
+	ctx, _ := context.WithTimeout(context.Background(), 30*time.Second)
+	err = mongoClient.Connect(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	err = mongoClient.Ping(ctx, readpref.Primary())
+	if err != nil {
+		return nil, err
+	}
+
+	mongodb := mongoClient.Database(constants.DATABASE_NAME, options.Database())
+
+	mongodb.CreateCollection(ctx, Collections.User, options.CreateCollection())
+	userCollection := mongodb.Collection(Collections.User, options.Collection())
+	userCollection.Indexes().CreateMany(ctx, []mongo.IndexModel{
+		mongo.IndexModel{
+			Keys:    bson.M{"email": 1},
+			Options: options.Index().SetUnique(true).SetSparse(true),
+		},
+	}, options.CreateIndexes())
+	userCollection.Indexes().CreateMany(ctx, []mongo.IndexModel{
+		mongo.IndexModel{
+			Keys: bson.M{"phone_number": 1},
+			Options: options.Index().SetUnique(true).SetSparse(true).SetPartialFilterExpression(map[string]interface{}{
+				"phone_number": map[string]string{"$type": "string"},
+			}),
+		},
+	}, options.CreateIndexes())
+
+	mongodb.CreateCollection(ctx, Collections.VerificationRequest, options.CreateCollection())
+	verificationRequestCollection := mongodb.Collection(Collections.VerificationRequest, options.Collection())
+	verificationRequestCollection.Indexes().CreateMany(ctx, []mongo.IndexModel{
+		mongo.IndexModel{
+			Keys:    bson.M{"email": 1, "identifier": 1},
+			Options: options.Index().SetUnique(true).SetSparse(true),
+		},
+	}, options.CreateIndexes())
+	verificationRequestCollection.Indexes().CreateMany(ctx, []mongo.IndexModel{
+		mongo.IndexModel{
+			Keys:    bson.M{"token": 1},
+			Options: options.Index().SetSparse(true),
+		},
+	}, options.CreateIndexes())
+
+	mongodb.CreateCollection(ctx, Collections.Session, options.CreateCollection())
+	sessionCollection := mongodb.Collection(Collections.Session, options.Collection())
+	sessionCollection.Indexes().CreateMany(ctx, []mongo.IndexModel{
+		mongo.IndexModel{
+			Keys:    bson.M{"user_id": 1},
+			Options: options.Index().SetSparse(true),
+		},
+	}, options.CreateIndexes())
+
+	return mongodb, nil
+}
--- a/server/db/roles.go
+++ b/server/db/roles.go
@@ -1,34 +0,0 @@
-package db
-
-import (
-	"log"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
-)
-
-type Role struct {
-	ID   uuid.UUID `gorm:"primaryKey;type:char(36)"`
-	Role string    `gorm:"unique"`
-}
-
-func (r *Role) BeforeCreate(tx *gorm.DB) (err error) {
-	r.ID = uuid.New()
-
-	return
-}
-
-// SaveRoles function to save roles
-func (mgr *manager) SaveRoles(roles []Role) error {
-	res := mgr.db.Clauses(
-		clause.OnConflict{
-			DoNothing: true,
-		}).Create(&roles)
-	if res.Error != nil {
-		log.Println(`Error saving roles`)
-		return res.Error
-	}
-
-	return nil
-}
--- a/server/db/session.go
+++ b/server/db/session.go
@@ -1,38 +1,101 @@
 package db

 import (
+	"fmt"
 	"log"
+	"time"

 	"github.com/google/uuid"
-	"gorm.io/gorm"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo/options"
 	"gorm.io/gorm/clause"
 )

 type Session struct {
-	ID        uuid.UUID `gorm:"primaryKey;type:char(36)"`
-	UserID    uuid.UUID `gorm:"type:char(36)"`
-	User      User
-	UserAgent string
-	IP        string
-	CreatedAt int64 `gorm:"autoCreateTime"`
-	UpdatedAt int64 `gorm:"autoUpdateTime"`
+	Key       string `json:"_key,omitempty" bson:"_key,omitempty"` // for arangodb
+	ID        string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id"`
+	UserID    string `gorm:"type:char(36),index:" json:"user_id" bson:"user_id"`
+	User      User   `json:"-" bson:"-"`
+	UserAgent string `json:"user_agent" bson:"user_agent"`
+	IP        string `json:"ip" bson:"ip"`
+	CreatedAt int64  `gorm:"autoCreateTime" json:"created_at" bson:"created_at"`
+	UpdatedAt int64  `gorm:"autoUpdateTime" json:"updated_at" bson:"updated_at"`
 }

-func (r *Session) BeforeCreate(tx *gorm.DB) (err error) {
-	r.ID = uuid.New()
+// AddSession function to save user sessiosn
+func (mgr *manager) AddSession(session Session) error {
+	if session.ID == "" {
+		session.ID = uuid.New().String()
+	}

-	return
-}
+	if IsORMSupported {
+		session.Key = session.ID
+		res := mgr.sqlDB.Clauses(
+			clause.OnConflict{
+				DoNothing: true,
+			}).Create(&session)
+		if res.Error != nil {
+			log.Println(`error saving session`, res.Error)
+			return res.Error
+		}
+	}

-// SaveSession function to save user sessiosn
-func (mgr *manager) SaveSession(session Session) error {
-	res := mgr.db.Clauses(
-		clause.OnConflict{
-			DoNothing: true,
-		}).Create(&session)
-	if res.Error != nil {
-		log.Println(`Error saving session`, res.Error)
-		return res.Error
+	if IsArangoDB {
+		session.CreatedAt = time.Now().Unix()
+		session.UpdatedAt = time.Now().Unix()
+		sessionCollection, _ := mgr.arangodb.Collection(nil, Collections.Session)
+		_, err := sessionCollection.CreateDocument(nil, session)
+		if err != nil {
+			log.Println(`error saving session`, err)
+			return err
+		}
+	}
+
+	if IsMongoDB {
+		session.Key = session.ID
+		session.CreatedAt = time.Now().Unix()
+		session.UpdatedAt = time.Now().Unix()
+		sessionCollection := mgr.mongodb.Collection(Collections.Session, options.Collection())
+		_, err := sessionCollection.InsertOne(nil, session)
+		if err != nil {
+			log.Println(`error saving session`, err)
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (mgr *manager) DeleteUserSession(userId string) error {
+	if IsORMSupported {
+		result := mgr.sqlDB.Where("user_id = ?", userId).Delete(&Session{})
+
+		if result.Error != nil {
+			log.Println(`error deleting session:`, result.Error)
+			return result.Error
+		}
+	}
+
+	if IsArangoDB {
+		query := fmt.Sprintf(`FOR d IN %s FILTER d.user_id == @userId REMOVE { _key: d._key } IN %s`, Collections.Session, Collections.Session)
+		bindVars := map[string]interface{}{
+			"userId": userId,
+		}
+		cursor, err := mgr.arangodb.Query(nil, query, bindVars)
+		if err != nil {
+			log.Println("=> error deleting arangodb session:", err)
+			return err
+		}
+		defer cursor.Close()
+	}
+
+	if IsMongoDB {
+		sessionCollection := mgr.mongodb.Collection(Collections.Session, options.Collection())
+		_, err := sessionCollection.DeleteMany(nil, bson.M{"user_id": userId}, options.Delete())
+		if err != nil {
+			log.Println("error deleting session:", err)
+			return err
+		}
 	}

 	return nil
--- a/server/db/user.go
+++ b/server/db/user.go
@@ -1,82 +1,233 @@
 package db

 import (
+	"fmt"
 	"log"
 	"time"

+	"github.com/arangodb/go-driver"
+	arangoDriver "github.com/arangodb/go-driver"
+	"github.com/authorizerdev/authorizer/server/constants"
 	"github.com/google/uuid"
-	"gorm.io/gorm"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo/options"
 	"gorm.io/gorm/clause"
 )

 type User struct {
-	ID              uuid.UUID `gorm:"primaryKey;type:char(36)"`
-	FirstName       string
-	LastName        string
-	Email           string `gorm:"unique"`
-	Password        string `gorm:"type:text"`
-	SignupMethod    string
-	EmailVerifiedAt int64
-	CreatedAt       int64  `gorm:"autoCreateTime"`
-	UpdatedAt       int64  `gorm:"autoUpdateTime"`
-	Image           string `gorm:"type:text"`
-	Roles           string
+	Key string `json:"_key,omitempty" bson:"_key"` // for arangodb
+	ID  string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id"`
+
+	Email                 string  `gorm:"unique" json:"email" bson:"email"`
+	EmailVerifiedAt       *int64  `json:"email_verified_at" bson:"email_verified_at"`
+	Password              *string `gorm:"type:text" json:"password" bson:"password"`
+	SignupMethods         string  `json:"signup_methods" bson:"signup_methods"`
+	GivenName             *string `json:"given_name" bson:"given_name"`
+	FamilyName            *string `json:"family_name" bson:"family_name"`
+	MiddleName            *string `json:"middle_name" bson:"middle_name"`
+	Nickname              *string `json:"nickname" bson:"nickname"`
+	Gender                *string `json:"gender" bson:"gender"`
+	Birthdate             *string `json:"birthdate" bson:"birthdate"`
+	PhoneNumber           *string `gorm:"unique" json:"phone_number" bson:"phone_number"`
+	PhoneNumberVerifiedAt *int64  `json:"phone_number_verified_at" bson:"phone_number_verified_at"`
+	Picture               *string `gorm:"type:text" json:"picture" bson:"picture"`
+	Roles                 string  `json:"roles" bson:"roles"`
+	UpdatedAt             int64   `gorm:"autoUpdateTime" json:"updated_at" bson:"updated_at"`
+	CreatedAt             int64   `gorm:"autoCreateTime" json:"created_at" bson:"created_at"`
 }

-func (u *User) BeforeCreate(tx *gorm.DB) (err error) {
-	u.ID = uuid.New()
-
-	return
-}
-
-// SaveUser function to add user even with email conflict
-func (mgr *manager) SaveUser(user User) (User, error) {
-	result := mgr.db.Clauses(
-		clause.OnConflict{
-			UpdateAll: true,
-			Columns:   []clause.Column{{Name: "email"}},
-		}).Create(&user)
-
-	if result.Error != nil {
-		log.Println(result.Error)
-		return user, result.Error
+// AddUser function to add user even with email conflict
+func (mgr *manager) AddUser(user User) (User, error) {
+	if user.ID == "" {
+		user.ID = uuid.New().String()
 	}
+
+	if user.Roles == "" {
+		user.Roles = constants.DEFAULT_ROLES[0]
+	}
+
+	if IsORMSupported {
+		// copy id as value for fields required for mongodb & arangodb
+		user.Key = user.ID
+		result := mgr.sqlDB.Clauses(
+			clause.OnConflict{
+				UpdateAll: true,
+				Columns:   []clause.Column{{Name: "email"}},
+			}).Create(&user)
+
+		if result.Error != nil {
+			log.Println("error adding user:", result.Error)
+			return user, result.Error
+		}
+	}
+
+	if IsArangoDB {
+		user.CreatedAt = time.Now().Unix()
+		user.UpdatedAt = time.Now().Unix()
+		userCollection, _ := mgr.arangodb.Collection(nil, Collections.User)
+		meta, err := userCollection.CreateDocument(arangoDriver.WithOverwrite(nil), user)
+		if err != nil {
+			log.Println("error adding user:", err)
+			return user, err
+		}
+		user.Key = meta.Key
+		user.ID = meta.ID.String()
+	}
+
+	if IsMongoDB {
+		user.CreatedAt = time.Now().Unix()
+		user.UpdatedAt = time.Now().Unix()
+		user.Key = user.ID
+		userCollection := mgr.mongodb.Collection(Collections.User, options.Collection())
+		_, err := userCollection.InsertOne(nil, user)
+		if err != nil {
+			log.Println("error adding user:", err)
+			return user, err
+		}
+	}
+
 	return user, nil
 }

 // UpdateUser function to update user with ID conflict
 func (mgr *manager) UpdateUser(user User) (User, error) {
 	user.UpdatedAt = time.Now().Unix()
-	result := mgr.db.Clauses(
-		clause.OnConflict{
-			UpdateAll: true,
-			Columns:   []clause.Column{{Name: "email"}},
-		}).Create(&user)

-	if result.Error != nil {
-		log.Println(result.Error)
-		return user, result.Error
+	if IsORMSupported {
+		result := mgr.sqlDB.Save(&user)
+
+		if result.Error != nil {
+			log.Println("error updating user:", result.Error)
+			return user, result.Error
+		}
 	}
+
+	if IsArangoDB {
+		collection, _ := mgr.arangodb.Collection(nil, Collections.User)
+		meta, err := collection.UpdateDocument(nil, user.Key, user)
+		if err != nil {
+			log.Println("error updating user:", err)
+			return user, err
+		}
+
+		user.Key = meta.Key
+		user.ID = meta.ID.String()
+	}
+
+	if IsMongoDB {
+		userCollection := mgr.mongodb.Collection(Collections.User, options.Collection())
+		_, err := userCollection.UpdateOne(nil, bson.M{"_id": bson.M{"$eq": user.ID}}, bson.M{"$set": user}, options.MergeUpdateOptions())
+		if err != nil {
+			log.Println("error updating user:", err)
+			return user, err
+		}
+	}
+
 	return user, nil
 }

 // GetUsers function to get all users
 func (mgr *manager) GetUsers() ([]User, error) {
 	var users []User
-	result := mgr.db.Find(&users)
-	if result.Error != nil {
-		log.Println(result.Error)
-		return users, result.Error
+
+	if IsORMSupported {
+		result := mgr.sqlDB.Find(&users)
+		if result.Error != nil {
+			log.Println("error getting users:", result.Error)
+			return users, result.Error
+		}
 	}
+
+	if IsArangoDB {
+		query := fmt.Sprintf("FOR d in %s RETURN d", Collections.User)
+
+		cursor, err := mgr.arangodb.Query(nil, query, nil)
+		if err != nil {
+			return users, err
+		}
+		defer cursor.Close()
+
+		for {
+			var user User
+			meta, err := cursor.ReadDocument(nil, &user)
+
+			if driver.IsNoMoreDocuments(err) {
+				break
+			} else if err != nil {
+				return users, err
+			}
+
+			if meta.Key != "" {
+				users = append(users, user)
+			}
+		}
+	}
+
+	if IsMongoDB {
+		userCollection := mgr.mongodb.Collection(Collections.User, options.Collection())
+		cursor, err := userCollection.Find(nil, bson.M{}, options.Find())
+		if err != nil {
+			log.Println("error getting users:", err)
+			return users, err
+		}
+		defer cursor.Close(nil)
+
+		for cursor.Next(nil) {
+			var user User
+			err := cursor.Decode(&user)
+			if err != nil {
+				return users, err
+			}
+			users = append(users, user)
+		}
+	}
+
 	return users, nil
 }

 func (mgr *manager) GetUserByEmail(email string) (User, error) {
 	var user User
-	result := mgr.db.Where("email = ?", email).First(&user)

-	if result.Error != nil {
-		return user, result.Error
+	if IsORMSupported {
+		result := mgr.sqlDB.Where("email = ?", email).First(&user)
+
+		if result.Error != nil {
+			return user, result.Error
+		}
+	}
+
+	if IsArangoDB {
+		query := fmt.Sprintf("FOR d in %s FILTER d.email == @email RETURN d", Collections.User)
+		bindVars := map[string]interface{}{
+			"email": email,
+		}
+
+		cursor, err := mgr.arangodb.Query(nil, query, bindVars)
+		if err != nil {
+			return user, err
+		}
+		defer cursor.Close()
+
+		for {
+			if !cursor.HasMore() {
+				if user.Key == "" {
+					return user, fmt.Errorf("user not found")
+				}
+				break
+			}
+			_, err := cursor.ReadDocument(nil, &user)
+			if err != nil {
+				return user, err
+			}
+		}
+	}
+
+	if IsMongoDB {
+		userCollection := mgr.mongodb.Collection(Collections.User, options.Collection())
+		err := userCollection.FindOne(nil, bson.M{"email": email}).Decode(&user)
+		if err != nil {
+			return user, err
+		}
 	}

 	return user, nil
@@ -84,35 +235,78 @@ func (mgr *manager) GetUserByEmail(email string) (User, error) {

 func (mgr *manager) GetUserByID(id string) (User, error) {
 	var user User
-	result := mgr.db.Where("id = ?", id).First(&user)

-	if result.Error != nil {
-		return user, result.Error
+	if IsORMSupported {
+		result := mgr.sqlDB.Where("id = ?", id).First(&user)
+
+		if result.Error != nil {
+			return user, result.Error
+		}
+	}
+
+	if IsArangoDB {
+		query := fmt.Sprintf("FOR d in %s FILTER d._id == @id LIMIT 1 RETURN d", Collections.User)
+		bindVars := map[string]interface{}{
+			"id": id,
+		}
+
+		cursor, err := mgr.arangodb.Query(nil, query, bindVars)
+		if err != nil {
+			return user, err
+		}
+		defer cursor.Close()
+
+		for {
+			if !cursor.HasMore() {
+				if user.Key == "" {
+					return user, fmt.Errorf("user not found")
+				}
+				break
+			}
+			_, err := cursor.ReadDocument(nil, &user)
+			if err != nil {
+				return user, err
+			}
+		}
+	}
+
+	if IsMongoDB {
+		userCollection := mgr.mongodb.Collection(Collections.User, options.Collection())
+		err := userCollection.FindOne(nil, bson.M{"_id": id}).Decode(&user)
+		if err != nil {
+			return user, err
+		}
 	}

 	return user, nil
 }

-func (mgr *manager) UpdateVerificationTime(verifiedAt int64, id uuid.UUID) error {
-	user := &User{
-		ID: id,
-	}
-	result := mgr.db.Model(&user).Where("id = ?", id).Update("email_verified_at", verifiedAt)
+func (mgr *manager) DeleteUser(user User) error {
+	if IsORMSupported {
+		result := mgr.sqlDB.Delete(&user)

-	if result.Error != nil {
-		return result.Error
-	}
-
-	return nil
-}
-
-func (mgr *manager) DeleteUser(email string) error {
-	var user User
-	result := mgr.db.Where("email = ?", email).Delete(&user)
-
-	if result.Error != nil {
-		log.Println(`Error deleting user:`, result.Error)
-		return result.Error
+		if result.Error != nil {
+			log.Println(`error deleting user:`, result.Error)
+			return result.Error
+		}
+	}
+
+	if IsArangoDB {
+		collection, _ := mgr.arangodb.Collection(nil, Collections.User)
+		_, err := collection.RemoveDocument(nil, user.Key)
+		if err != nil {
+			log.Println(`error deleting user:`, err)
+			return err
+		}
+	}
+
+	if IsMongoDB {
+		userCollection := mgr.mongodb.Collection(Collections.User, options.Collection())
+		_, err := userCollection.DeleteOne(nil, bson.M{"_id": user.ID}, options.Delete())
+		if err != nil {
+			log.Println("error deleting user:", err)
+			return err
+		}
 	}

 	return nil
--- a/server/db/verificationRequests.go
+++ b/server/db/verificationRequests.go
@@ -1,86 +0,0 @@
-package db
-
-import (
-	"log"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
-)
-
-type VerificationRequest struct {
-	ID         uuid.UUID `gorm:"primaryKey;type:char(36)"`
-	Token      string    `gorm:"type:text"`
-	Identifier string
-	ExpiresAt  int64
-	CreatedAt  int64  `gorm:"autoCreateTime"`
-	UpdatedAt  int64  `gorm:"autoUpdateTime"`
-	Email      string `gorm:"unique"`
-}
-
-func (v *VerificationRequest) BeforeCreate(tx *gorm.DB) (err error) {
-	v.ID = uuid.New()
-
-	return
-}
-
-// AddVerification function to add verification record
-func (mgr *manager) AddVerification(verification VerificationRequest) (VerificationRequest, error) {
-	result := mgr.db.Clauses(clause.OnConflict{
-		Columns:   []clause.Column{{Name: "email"}},
-		DoUpdates: clause.AssignmentColumns([]string{"token", "identifier", "expires_at"}),
-	}).Create(&verification)
-
-	if result.Error != nil {
-		log.Println(`Error saving verification record`, result.Error)
-		return verification, result.Error
-	}
-	return verification, nil
-}
-
-func (mgr *manager) GetVerificationByToken(token string) (VerificationRequest, error) {
-	var verification VerificationRequest
-	result := mgr.db.Where("token = ?", token).First(&verification)
-
-	if result.Error != nil {
-		log.Println(`Error getting verification token:`, result.Error)
-		return verification, result.Error
-	}
-
-	return verification, nil
-}
-
-func (mgr *manager) GetVerificationByEmail(email string) (VerificationRequest, error) {
-	var verification VerificationRequest
-	result := mgr.db.Where("email = ?", email).First(&verification)
-
-	if result.Error != nil {
-		log.Println(`Error getting verification token:`, result.Error)
-		return verification, result.Error
-	}
-
-	return verification, nil
-}
-
-func (mgr *manager) DeleteToken(email string) error {
-	var verification VerificationRequest
-	result := mgr.db.Where("email = ?", email).Delete(&verification)
-
-	if result.Error != nil {
-		log.Println(`Error deleting token:`, result.Error)
-		return result.Error
-	}
-
-	return nil
-}
-
-// GetUsers function to get all users
-func (mgr *manager) GetVerificationRequests() ([]VerificationRequest, error) {
-	var verificationRequests []VerificationRequest
-	result := mgr.db.Find(&verificationRequests)
-	if result.Error != nil {
-		log.Println(result.Error)
-		return verificationRequests, result.Error
-	}
-	return verificationRequests, nil
-}
--- a/server/db/verification_requests.go
+++ b/server/db/verification_requests.go
@@ -0,0 +1,260 @@
+package db
+
+import (
+	"fmt"
+	"log"
+	"time"
+
+	"github.com/arangodb/go-driver"
+	"github.com/google/uuid"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo/options"
+	"gorm.io/gorm/clause"
+)
+
+type VerificationRequest struct {
+	Key        string `json:"_key,omitempty" bson:"_key"` // for arangodb
+	ID         string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id"`
+	Token      string `gorm:"type:text" json:"token" bson:"token"`
+	Identifier string `gorm:"uniqueIndex:idx_email_identifier" json:"identifier" bson:"identifier"`
+	ExpiresAt  int64  `json:"expires_at" bson:"expires_at"`
+	CreatedAt  int64  `gorm:"autoCreateTime" json:"created_at" bson:"created_at"`
+	UpdatedAt  int64  `gorm:"autoUpdateTime" json:"updated_at" bson:"updated_at"`
+	Email      string `gorm:"uniqueIndex:idx_email_identifier" json:"email" bson:"email"`
+}
+
+// AddVerification function to add verification record
+func (mgr *manager) AddVerification(verification VerificationRequest) (VerificationRequest, error) {
+	if verification.ID == "" {
+		verification.ID = uuid.New().String()
+	}
+	if IsORMSupported {
+		// copy id as value for fields required for mongodb & arangodb
+		verification.Key = verification.ID
+		result := mgr.sqlDB.Clauses(clause.OnConflict{
+			Columns:   []clause.Column{{Name: "email"}, {Name: "identifier"}},
+			DoUpdates: clause.AssignmentColumns([]string{"token", "expires_at"}),
+		}).Create(&verification)
+
+		if result.Error != nil {
+			log.Println(`error saving verification record`, result.Error)
+			return verification, result.Error
+		}
+	}
+
+	if IsArangoDB {
+		verification.CreatedAt = time.Now().Unix()
+		verification.UpdatedAt = time.Now().Unix()
+		verificationRequestCollection, _ := mgr.arangodb.Collection(nil, Collections.VerificationRequest)
+		meta, err := verificationRequestCollection.CreateDocument(nil, verification)
+		if err != nil {
+			log.Println("error saving verification record:", err)
+			return verification, err
+		}
+		verification.Key = meta.Key
+		verification.ID = meta.ID.String()
+	}
+
+	if IsMongoDB {
+		verification.CreatedAt = time.Now().Unix()
+		verification.UpdatedAt = time.Now().Unix()
+		verification.Key = verification.ID
+		verificationRequestCollection := mgr.mongodb.Collection(Collections.VerificationRequest, options.Collection())
+		_, err := verificationRequestCollection.InsertOne(nil, verification)
+		if err != nil {
+			log.Println("error saving verification record:", err)
+			return verification, err
+		}
+	}
+
+	return verification, nil
+}
+
+// GetVerificationRequests function to get all verification requests
+func (mgr *manager) GetVerificationRequests() ([]VerificationRequest, error) {
+	var verificationRequests []VerificationRequest
+
+	if IsORMSupported {
+		result := mgr.sqlDB.Find(&verificationRequests)
+		if result.Error != nil {
+			log.Println("error getting verification requests:", result.Error)
+			return verificationRequests, result.Error
+		}
+	}
+
+	if IsArangoDB {
+		query := fmt.Sprintf("FOR d in %s RETURN d", Collections.VerificationRequest)
+
+		cursor, err := mgr.arangodb.Query(nil, query, nil)
+		if err != nil {
+			return verificationRequests, err
+		}
+		defer cursor.Close()
+
+		for {
+			var verificationRequest VerificationRequest
+			meta, err := cursor.ReadDocument(nil, &verificationRequest)
+
+			if driver.IsNoMoreDocuments(err) {
+				break
+			} else if err != nil {
+				return verificationRequests, err
+			}
+
+			if meta.Key != "" {
+				verificationRequests = append(verificationRequests, verificationRequest)
+			}
+
+		}
+	}
+
+	if IsMongoDB {
+		verificationRequestCollection := mgr.mongodb.Collection(Collections.VerificationRequest, options.Collection())
+		cursor, err := verificationRequestCollection.Find(nil, bson.M{}, options.Find())
+		if err != nil {
+			log.Println("error getting verification requests:", err)
+			return verificationRequests, err
+		}
+		defer cursor.Close(nil)
+
+		for cursor.Next(nil) {
+			var verificationRequest VerificationRequest
+			err := cursor.Decode(&verificationRequest)
+			if err != nil {
+				return verificationRequests, err
+			}
+			verificationRequests = append(verificationRequests, verificationRequest)
+		}
+	}
+
+	return verificationRequests, nil
+}
+
+func (mgr *manager) GetVerificationByToken(token string) (VerificationRequest, error) {
+	var verification VerificationRequest
+
+	if IsORMSupported {
+		result := mgr.sqlDB.Where("token = ?", token).First(&verification)
+
+		if result.Error != nil {
+			log.Println(`error getting verification request:`, result.Error)
+			return verification, result.Error
+		}
+	}
+
+	if IsArangoDB {
+		query := fmt.Sprintf("FOR d in %s FILTER d.token == @token LIMIT 1 RETURN d", Collections.VerificationRequest)
+		bindVars := map[string]interface{}{
+			"token": token,
+		}
+
+		cursor, err := mgr.arangodb.Query(nil, query, bindVars)
+		if err != nil {
+			return verification, err
+		}
+		defer cursor.Close()
+
+		for {
+			if !cursor.HasMore() {
+				if verification.Key == "" {
+					return verification, fmt.Errorf("verification request not found")
+				}
+				break
+			}
+			_, err := cursor.ReadDocument(nil, &verification)
+			if err != nil {
+				return verification, err
+			}
+		}
+	}
+
+	if IsMongoDB {
+		verificationRequestCollection := mgr.mongodb.Collection(Collections.VerificationRequest, options.Collection())
+		err := verificationRequestCollection.FindOne(nil, bson.M{"token": token}).Decode(&verification)
+		if err != nil {
+			return verification, err
+		}
+	}
+
+	return verification, nil
+}
+
+func (mgr *manager) GetVerificationByEmail(email string, identifier string) (VerificationRequest, error) {
+	var verification VerificationRequest
+	if IsORMSupported {
+		result := mgr.sqlDB.Where("email = ? AND identifier = ?", email, identifier).First(&verification)
+
+		if result.Error != nil {
+			log.Println(`error getting verification token:`, result.Error)
+			return verification, result.Error
+		}
+	}
+
+	if IsArangoDB {
+		query := fmt.Sprintf("FOR d in %s FILTER d.email == @email FILTER d.identifier == @identifier LIMIT 1 RETURN d", Collections.VerificationRequest)
+		bindVars := map[string]interface{}{
+			"email":      email,
+			"identifier": identifier,
+		}
+
+		cursor, err := mgr.arangodb.Query(nil, query, bindVars)
+		if err != nil {
+			return verification, err
+		}
+		defer cursor.Close()
+
+		for {
+			if !cursor.HasMore() {
+				if verification.Key == "" {
+					return verification, fmt.Errorf("verification request not found")
+				}
+				break
+			}
+			_, err := cursor.ReadDocument(nil, &verification)
+			if err != nil {
+				return verification, err
+			}
+		}
+	}
+
+	if IsMongoDB {
+		verificationRequestCollection := mgr.mongodb.Collection(Collections.VerificationRequest, options.Collection())
+		err := verificationRequestCollection.FindOne(nil, bson.M{"email": email, "identifier": identifier}).Decode(&verification)
+		if err != nil {
+			return verification, err
+		}
+	}
+
+	return verification, nil
+}
+
+func (mgr *manager) DeleteVerificationRequest(verificationRequest VerificationRequest) error {
+	if IsORMSupported {
+		result := mgr.sqlDB.Delete(&verificationRequest)
+
+		if result.Error != nil {
+			log.Println(`error deleting verification request:`, result.Error)
+			return result.Error
+		}
+	}
+
+	if IsArangoDB {
+		collection, _ := mgr.arangodb.Collection(nil, Collections.VerificationRequest)
+		_, err := collection.RemoveDocument(nil, verificationRequest.Key)
+		if err != nil {
+			log.Println(`error deleting verification request:`, err)
+			return err
+		}
+	}
+
+	if IsMongoDB {
+		verificationRequestCollection := mgr.mongodb.Collection(Collections.VerificationRequest, options.Collection())
+		_, err := verificationRequestCollection.DeleteOne(nil, bson.M{"_id": verificationRequest.ID}, options.Delete())
+		if err != nil {
+			log.Println("error deleting verification request::", err)
+			return err
+		}
+	}
+
+	return nil
+}
--- a/server/enum/db_types.go
+++ b/server/enum/db_types.go
@@ -6,6 +6,9 @@ const (
 	Postgres DbType = iota
 	Sqlite
 	Mysql
+	SQLServer
+	Arangodb
+	Mongodb
 )

 func (d DbType) String() string {
@@ -13,5 +16,8 @@ func (d DbType) String() string {
 		"postgres",
 		"sqlite",
 		"mysql",
+		"sqlserver",
+		"arangodb",
+		"mongodb",
 	}[d]
 }
--- a/server/enum/oauth_providers.go
+++ b/server/enum/oauth_providers.go
--- a/server/enum/signup_methods.go
+++ b/server/enum/signup_methods.go
@@ -4,7 +4,7 @@ type SignupMethod int

 const (
 	BasicAuth SignupMethod = iota
-	MagicLink
+	MagicLinkLogin
 	Google
 	Github
 	Facebook
@@ -13,7 +13,7 @@ const (
 func (d SignupMethod) String() string {
 	return [...]string{
 		"basic_auth",
-		"magic_link",
+		"magic_link_login",
 		"google",
 		"github",
 		"facebook",
--- a/server/enum/token_types.go
+++ b/server/enum/token_types.go
--- a/server/enum/verification_types.go
+++ b/server/enum/verification_types.go
--- a/server/env.go
+++ b/server/env.go
@@ -1,195 +0,0 @@
-package main
-
-import (
-	"flag"
-	"log"
-	"os"
-	"strings"
-
-	"github.com/authorizerdev/authorizer/server/constants"
-	"github.com/authorizerdev/authorizer/server/utils"
-	"github.com/joho/godotenv"
-)
-
-// build variables
-var (
-	Version            string
-	ARG_DB_URL         *string
-	ARG_DB_TYPE        *string
-	ARG_AUTHORIZER_URL *string
-	ARG_ENV_FILE       *string
-)
-
-// InitEnv -> to initialize env and through error if required env are not present
-func InitEnv() {
-	envPath := `.env`
-	ARG_DB_URL = flag.String("database_url", "", "Database connection string")
-	ARG_DB_TYPE = flag.String("database_type", "", "Database type, possible values are postgres,mysql,sqlite")
-	ARG_AUTHORIZER_URL = flag.String("authorizer_url", "", "URL for authorizer instance, eg: https://xyz.herokuapp.com")
-	ARG_ENV_FILE = flag.String("env_file", "", "Env file path")
-
-	flag.Parse()
-	if *ARG_ENV_FILE != "" {
-		envPath = *ARG_ENV_FILE
-	}
-
-	err := godotenv.Load(envPath)
-	if err != nil {
-		log.Println("Error loading .env file")
-	}
-
-	constants.VERSION = Version
-	constants.ADMIN_SECRET = os.Getenv("ADMIN_SECRET")
-	constants.ENV = os.Getenv("ENV")
-	constants.DATABASE_TYPE = os.Getenv("DATABASE_TYPE")
-	constants.DATABASE_URL = os.Getenv("DATABASE_URL")
-	constants.SMTP_HOST = os.Getenv("SMTP_HOST")
-	constants.SMTP_PORT = os.Getenv("SMTP_PORT")
-	constants.SENDER_EMAIL = os.Getenv("SENDER_EMAIL")
-	constants.SENDER_PASSWORD = os.Getenv("SENDER_PASSWORD")
-	constants.JWT_SECRET = os.Getenv("JWT_SECRET")
-	constants.JWT_TYPE = os.Getenv("JWT_TYPE")
-	constants.AUTHORIZER_URL = strings.TrimSuffix(os.Getenv("AUTHORIZER_URL"), "/")
-	constants.PORT = os.Getenv("PORT")
-	constants.REDIS_URL = os.Getenv("REDIS_URL")
-	constants.COOKIE_NAME = os.Getenv("COOKIE_NAME")
-	constants.GOOGLE_CLIENT_ID = os.Getenv("GOOGLE_CLIENT_ID")
-	constants.GOOGLE_CLIENT_SECRET = os.Getenv("GOOGLE_CLIENT_SECRET")
-	constants.GITHUB_CLIENT_ID = os.Getenv("GITHUB_CLIENT_ID")
-	constants.GITHUB_CLIENT_SECRET = os.Getenv("GITHUB_CLIENT_SECRET")
-	constants.FACEBOOK_CLIENT_ID = os.Getenv("FACEBOOK_CLIENT_ID")
-	constants.FACEBOOK_CLIENT_SECRET = os.Getenv("FACEBOOK_CLIENT_SECRET")
-	constants.TWITTER_CLIENT_ID = os.Getenv("TWITTER_CLIENT_ID")
-	constants.TWITTER_CLIENT_SECRET = os.Getenv("TWITTER_CLIENT_SECRET")
-	constants.RESET_PASSWORD_URL = strings.TrimPrefix(os.Getenv("RESET_PASSWORD_URL"), "/")
-	constants.DISABLE_BASIC_AUTHENTICATION = os.Getenv("DISABLE_BASIC_AUTHENTICATION")
-	constants.DISABLE_EMAIL_VERIFICATION = os.Getenv("DISABLE_EMAIL_VERIFICATION")
-	constants.DISABLE_MAGIC_LOGIN = os.Getenv("DISABLE_MAGIC_LOGIN")
-	constants.JWT_ROLE_CLAIM = os.Getenv("JWT_ROLE_CLAIM")
-
-	if constants.ADMIN_SECRET == "" {
-		panic("root admin secret is required")
-	}
-
-	if constants.ENV == "" {
-		constants.ENV = "production"
-	}
-
-	if constants.ENV == "production" {
-		constants.IS_PROD = true
-		os.Setenv("GIN_MODE", "release")
-	} else {
-		constants.IS_PROD = false
-	}
-
-	allowedOriginsSplit := strings.Split(os.Getenv("ALLOWED_ORIGINS"), ",")
-	allowedOrigins := []string{}
-	for _, val := range allowedOriginsSplit {
-		trimVal := strings.TrimSpace(val)
-		if trimVal != "" {
-			allowedOrigins = append(allowedOrigins, trimVal)
-		}
-	}
-	if len(allowedOrigins) == 0 {
-		allowedOrigins = []string{"*"}
-	}
-	constants.ALLOWED_ORIGINS = allowedOrigins
-
-	if *ARG_AUTHORIZER_URL != "" {
-		constants.AUTHORIZER_URL = *ARG_AUTHORIZER_URL
-	}
-
-	if *ARG_DB_URL != "" {
-		constants.DATABASE_URL = *ARG_DB_URL
-	}
-
-	if *ARG_DB_TYPE != "" {
-		constants.DATABASE_TYPE = *ARG_DB_TYPE
-	}
-
-	if constants.DATABASE_URL == "" {
-		panic("Database url is required")
-	}
-
-	if constants.DATABASE_TYPE == "" {
-		panic("Database type is required")
-	}
-
-	if constants.JWT_TYPE == "" {
-		constants.JWT_TYPE = "HS256"
-	}
-
-	if constants.COOKIE_NAME == "" {
-		constants.COOKIE_NAME = "authorizer"
-	}
-
-	if constants.DISABLE_BASIC_AUTHENTICATION == "" {
-		constants.DISABLE_BASIC_AUTHENTICATION = "false"
-	}
-
-	if constants.DISABLE_MAGIC_LOGIN == "" {
-		constants.DISABLE_MAGIC_LOGIN = "false"
-	}
-
-	if constants.SMTP_HOST == "" || constants.SENDER_EMAIL == "" || constants.SENDER_PASSWORD == "" {
-		constants.DISABLE_EMAIL_VERIFICATION = "true"
-	} else if constants.DISABLE_EMAIL_VERIFICATION == "" {
-		constants.DISABLE_EMAIL_VERIFICATION = "false"
-	}
-
-	log.Println("=> disable email verification:", constants.DISABLE_EMAIL_VERIFICATION)
-
-	rolesSplit := strings.Split(os.Getenv("ROLES"), ",")
-	roles := []string{}
-	if len(rolesSplit) == 0 {
-		roles = []string{"user"}
-	}
-
-	defaultRoleSplit := strings.Split(os.Getenv("DEFAULT_ROLES"), ",")
-	defaultRoles := []string{}
-
-	if len(defaultRoleSplit) == 0 {
-		defaultRoles = []string{"user"}
-	}
-
-	protectedRolesSplit := strings.Split(os.Getenv("PROTECTED_ROLES"), ",")
-	protectedRoles := []string{}
-
-	if len(protectedRolesSplit) > 0 {
-		for _, val := range protectedRolesSplit {
-			trimVal := strings.TrimSpace(val)
-			protectedRoles = append(protectedRoles, trimVal)
-		}
-	}
-
-	for _, val := range rolesSplit {
-		trimVal := strings.TrimSpace(val)
-		if trimVal != "" {
-			roles = append(roles, trimVal)
-		}
-
-		if utils.StringSliceContains(defaultRoleSplit, trimVal) {
-			defaultRoles = append(defaultRoles, trimVal)
-		}
-	}
-
-	if len(roles) > 0 && len(defaultRoles) == 0 && len(defaultRoleSplit) > 0 {
-		panic(`Invalid DEFAULT_ROLE environment variable. It can be one from give ROLES environment variable value`)
-	}
-
-	constants.ROLES = roles
-	constants.DEFAULT_ROLES = defaultRoles
-	constants.PROTECTED_ROLES = protectedRoles
-
-	if constants.JWT_ROLE_CLAIM == "" {
-		constants.JWT_ROLE_CLAIM = "role"
-	}
-
-	if os.Getenv("ORGANIZATION_NAME") != "" {
-		constants.ORGANIZATION_NAME = os.Getenv("ORGANIZATION_NAME")
-	}
-
-	if os.Getenv("ORGANIZATION_LOGO") != "" {
-		constants.ORGANIZATION_LOGO = os.Getenv("ORGANIZATION_LOGO")
-	}
-}
--- a/server/env/env.go
+++ b/server/env/env.go
@@ -0,0 +1,273 @@
+package env
+
+import (
+	"log"
+	"os"
+	"strings"
+
+	"github.com/authorizerdev/authorizer/server/constants"
+	"github.com/authorizerdev/authorizer/server/utils"
+	"github.com/joho/godotenv"
+)
+
+// build variables
+var (
+	ARG_DB_URL         *string
+	ARG_DB_TYPE        *string
+	ARG_AUTHORIZER_URL *string
+	ARG_ENV_FILE       *string
+)
+
+// InitEnv -> to initialize env and through error if required env are not present
+func InitEnv() {
+	if constants.ENV_PATH == "" {
+		constants.ENV_PATH = `.env`
+	}
+
+	if ARG_ENV_FILE != nil && *ARG_ENV_FILE != "" {
+		constants.ENV_PATH = *ARG_ENV_FILE
+	}
+
+	err := godotenv.Load(constants.ENV_PATH)
+	if err != nil {
+		log.Printf("error loading %s file", constants.ENV_PATH)
+	}
+
+	if constants.ADMIN_SECRET == "" {
+		constants.ADMIN_SECRET = os.Getenv("ADMIN_SECRET")
+		if constants.ADMIN_SECRET == "" {
+			panic("root admin secret is required")
+		}
+	}
+
+	if constants.ENV == "" {
+		constants.ENV = os.Getenv("ENV")
+		if constants.ENV == "" {
+			constants.ENV = "production"
+		}
+
+		if constants.ENV == "production" {
+			constants.IS_PROD = true
+			os.Setenv("GIN_MODE", "release")
+		} else {
+			constants.IS_PROD = false
+		}
+	}
+
+	if constants.DATABASE_TYPE == "" {
+		constants.DATABASE_TYPE = os.Getenv("DATABASE_TYPE")
+		log.Println(constants.DATABASE_TYPE)
+
+		if ARG_DB_TYPE != nil && *ARG_DB_TYPE != "" {
+			constants.DATABASE_TYPE = *ARG_DB_TYPE
+		}
+
+		if constants.DATABASE_TYPE == "" {
+			panic("DATABASE_TYPE is required")
+		}
+	}
+
+	if constants.DATABASE_URL == "" {
+		constants.DATABASE_URL = os.Getenv("DATABASE_URL")
+
+		if ARG_DB_URL != nil && *ARG_DB_URL != "" {
+			constants.DATABASE_URL = *ARG_DB_URL
+		}
+
+		if constants.DATABASE_URL == "" {
+			panic("DATABASE_URL is required")
+		}
+	}
+
+	if constants.DATABASE_NAME == "" {
+		constants.DATABASE_NAME = os.Getenv("DATABASE_NAME")
+		if constants.DATABASE_NAME == "" {
+			constants.DATABASE_NAME = "authorizer"
+		}
+	}
+
+	if constants.SMTP_HOST == "" {
+		constants.SMTP_HOST = os.Getenv("SMTP_HOST")
+	}
+
+	if constants.SMTP_PORT == "" {
+		constants.SMTP_PORT = os.Getenv("SMTP_PORT")
+	}
+
+	if constants.SENDER_EMAIL == "" {
+		constants.SENDER_EMAIL = os.Getenv("SENDER_EMAIL")
+	}
+
+	if constants.SENDER_PASSWORD == "" {
+		constants.SENDER_PASSWORD = os.Getenv("SENDER_PASSWORD")
+	}
+
+	if constants.JWT_SECRET == "" {
+		constants.JWT_SECRET = os.Getenv("JWT_SECRET")
+	}
+
+	if constants.JWT_TYPE == "" {
+		constants.JWT_TYPE = os.Getenv("JWT_TYPE")
+	}
+
+	if constants.JWT_ROLE_CLAIM == "" {
+		constants.JWT_ROLE_CLAIM = os.Getenv("JWT_ROLE_CLAIM")
+
+		if constants.JWT_ROLE_CLAIM == "" {
+			constants.JWT_ROLE_CLAIM = "role"
+		}
+	}
+
+	if constants.AUTHORIZER_URL == "" {
+		constants.AUTHORIZER_URL = strings.TrimSuffix(os.Getenv("AUTHORIZER_URL"), "/")
+
+		if ARG_AUTHORIZER_URL != nil && *ARG_AUTHORIZER_URL != "" {
+			constants.AUTHORIZER_URL = *ARG_AUTHORIZER_URL
+		}
+	}
+
+	if constants.PORT == "" {
+		constants.PORT = os.Getenv("PORT")
+		if constants.PORT == "" {
+			constants.PORT = "8080"
+		}
+	}
+
+	if constants.REDIS_URL == "" {
+		constants.REDIS_URL = os.Getenv("REDIS_URL")
+	}
+
+	if constants.COOKIE_NAME == "" {
+		constants.COOKIE_NAME = os.Getenv("COOKIE_NAME")
+	}
+
+	if constants.GOOGLE_CLIENT_ID == "" {
+		constants.GOOGLE_CLIENT_ID = os.Getenv("GOOGLE_CLIENT_ID")
+	}
+
+	if constants.GOOGLE_CLIENT_SECRET == "" {
+		constants.GOOGLE_CLIENT_SECRET = os.Getenv("GOOGLE_CLIENT_SECRET")
+	}
+
+	if constants.GITHUB_CLIENT_ID == "" {
+		constants.GITHUB_CLIENT_ID = os.Getenv("GITHUB_CLIENT_ID")
+	}
+
+	if constants.GITHUB_CLIENT_SECRET == "" {
+		constants.GITHUB_CLIENT_SECRET = os.Getenv("GITHUB_CLIENT_SECRET")
+	}
+
+	if constants.FACEBOOK_CLIENT_ID == "" {
+		constants.FACEBOOK_CLIENT_ID = os.Getenv("FACEBOOK_CLIENT_ID")
+	}
+
+	if constants.FACEBOOK_CLIENT_SECRET == "" {
+		constants.FACEBOOK_CLIENT_SECRET = os.Getenv("FACEBOOK_CLIENT_SECRET")
+	}
+
+	if constants.RESET_PASSWORD_URL == "" {
+		constants.RESET_PASSWORD_URL = strings.TrimPrefix(os.Getenv("RESET_PASSWORD_URL"), "/")
+	}
+
+	constants.DISABLE_BASIC_AUTHENTICATION = os.Getenv("DISABLE_BASIC_AUTHENTICATION") == "true"
+	constants.DISABLE_EMAIL_VERIFICATION = os.Getenv("DISABLE_EMAIL_VERIFICATION") == "true"
+	constants.DISABLE_MAGIC_LINK_LOGIN = os.Getenv("DISABLE_MAGIC_LINK_LOGIN") == "true"
+
+	if constants.SMTP_HOST == "" || constants.SENDER_EMAIL == "" || constants.SENDER_PASSWORD == "" {
+		constants.DISABLE_EMAIL_VERIFICATION = true
+		constants.DISABLE_MAGIC_LINK_LOGIN = true
+	}
+
+	allowedOriginsSplit := strings.Split(os.Getenv("ALLOWED_ORIGINS"), ",")
+	allowedOrigins := []string{}
+	hasWildCard := false
+
+	for _, val := range allowedOriginsSplit {
+		trimVal := strings.TrimSpace(val)
+		if trimVal != "" {
+			if trimVal != "*" {
+				host, port := utils.GetHostParts(trimVal)
+				allowedOrigins = append(allowedOrigins, host+":"+port)
+			} else {
+				hasWildCard = true
+				allowedOrigins = append(allowedOrigins, trimVal)
+				break
+			}
+		}
+	}
+
+	if len(allowedOrigins) > 1 && hasWildCard {
+		allowedOrigins = []string{"*"}
+	}
+
+	if len(allowedOrigins) == 0 {
+		allowedOrigins = []string{"*"}
+	}
+
+	constants.ALLOWED_ORIGINS = allowedOrigins
+
+	if constants.JWT_TYPE == "" {
+		constants.JWT_TYPE = "HS256"
+	}
+
+	if constants.COOKIE_NAME == "" {
+		constants.COOKIE_NAME = "authorizer"
+	}
+
+	if constants.DISABLE_EMAIL_VERIFICATION {
+		constants.DISABLE_MAGIC_LINK_LOGIN = true
+	}
+
+	rolesEnv := strings.TrimSpace(os.Getenv("ROLES"))
+	rolesSplit := strings.Split(rolesEnv, ",")
+	roles := []string{}
+	if len(rolesEnv) == 0 {
+		roles = []string{"user"}
+	}
+
+	defaultRolesEnv := strings.TrimSpace(os.Getenv("DEFAULT_ROLES"))
+	defaultRoleSplit := strings.Split(defaultRolesEnv, ",")
+	defaultRoles := []string{}
+
+	if len(defaultRolesEnv) == 0 {
+		defaultRoles = []string{"user"}
+	}
+
+	protectedRolesEnv := strings.TrimSpace(os.Getenv("PROTECTED_ROLES"))
+	protectedRolesSplit := strings.Split(protectedRolesEnv, ",")
+	protectedRoles := []string{}
+
+	if len(protectedRolesEnv) > 0 {
+		for _, val := range protectedRolesSplit {
+			trimVal := strings.TrimSpace(val)
+			protectedRoles = append(protectedRoles, trimVal)
+		}
+	}
+
+	for _, val := range rolesSplit {
+		trimVal := strings.TrimSpace(val)
+		if trimVal != "" {
+			roles = append(roles, trimVal)
+		}
+
+		if utils.StringSliceContains(defaultRoleSplit, trimVal) {
+			defaultRoles = append(defaultRoles, trimVal)
+		}
+	}
+
+	if len(roles) > 0 && len(defaultRoles) == 0 && len(defaultRoleSplit) > 0 {
+		panic(`Invalid DEFAULT_ROLE environment variable. It can be one from give ROLES environment variable value`)
+	}
+
+	constants.ROLES = roles
+	constants.DEFAULT_ROLES = defaultRoles
+	constants.PROTECTED_ROLES = protectedRoles
+
+	if os.Getenv("ORGANIZATION_NAME") != "" {
+		constants.ORGANIZATION_NAME = os.Getenv("ORGANIZATION_NAME")
+	}
+
+	if os.Getenv("ORGANIZATION_LOGO") != "" {
+		constants.ORGANIZATION_LOGO = os.Getenv("ORGANIZATION_LOGO")
+	}
+}
--- a/server/go.mod
+++ b/server/go.mod
@@ -3,31 +3,36 @@ module github.com/authorizerdev/authorizer/server
 go 1.16

 require (
-	github.com/99designs/gqlgen v0.13.0
-	github.com/coreos/go-oidc/v3 v3.1.0 // indirect
-	github.com/gin-contrib/location v0.0.2 // indirect
+	github.com/99designs/gqlgen v0.14.0
+	github.com/arangodb/go-driver v1.2.1
+	github.com/coreos/go-oidc/v3 v3.1.0
+	github.com/gin-contrib/location v0.0.2
 	github.com/gin-gonic/gin v1.7.2
 	github.com/go-playground/validator/v10 v10.8.0 // indirect
 	github.com/go-redis/redis/v8 v8.11.0
-	github.com/golang-jwt/jwt v3.2.1+incompatible
+	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/uuid v1.3.0
-	github.com/jackc/pgproto3/v2 v2.1.0 // indirect
 	github.com/joho/godotenv v1.3.0
 	github.com/json-iterator/go v1.1.11 // indirect
 	github.com/mattn/go-isatty v0.0.13 // indirect
-	github.com/mattn/go-sqlite3 v1.14.7 // indirect
-	github.com/robertkrimen/otto v0.0.0-20211024170158-b87d35c0b86f // indirect
+	github.com/mitchellh/mapstructure v1.1.2 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/robertkrimen/otto v0.0.0-20211024170158-b87d35c0b86f
+	github.com/stretchr/testify v1.7.0
 	github.com/ugorji/go v1.2.6 // indirect
-	github.com/vektah/gqlparser/v2 v2.1.0
-	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
+	github.com/vektah/gqlparser/v2 v2.2.0
+	go.mongodb.org/mongo-driver v1.8.1
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
 	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
 	golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gorm.io/driver/mysql v1.1.1
-	gorm.io/driver/postgres v1.1.0
-	gorm.io/driver/sqlite v1.1.4
-	gorm.io/gorm v1.21.11
+	gorm.io/driver/mysql v1.2.1
+	gorm.io/driver/postgres v1.2.3
+	gorm.io/driver/sqlite v1.2.6
+	gorm.io/driver/sqlserver v1.2.1
+	gorm.io/gorm v1.22.4
 )
--- 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
@@ -2,20 +2,11 @@

 package model

-type AdminUpdateUserInput struct {
-	ID        string    `json:"id"`
-	Email     *string   `json:"email"`
-	FirstName *string   `json:"firstName"`
-	LastName  *string   `json:"lastName"`
-	Image     *string   `json:"image"`
-	Roles     []*string `json:"roles"`
-}
-
 type AuthResponse struct {
-	Message              string  `json:"message"`
-	AccessToken          *string `json:"accessToken"`
-	AccessTokenExpiresAt *int64  `json:"accessTokenExpiresAt"`
-	User                 *User   `json:"user"`
+	Message     string  `json:"message"`
+	AccessToken *string `json:"access_token"`
+	ExpiresAt   *int64  `json:"expires_at"`
+	User        *User   `json:"user"`
 }

 type DeleteUserInput struct {
@@ -37,30 +28,30 @@ type LoginInput struct {
 	Roles    []string `json:"roles"`
 }

-type MagicLoginInput struct {
+type MagicLinkLoginInput struct {
 	Email string   `json:"email"`
 	Roles []string `json:"roles"`
 }

 type Meta struct {
 	Version                      string `json:"version"`
-	IsGoogleLoginEnabled         bool   `json:"isGoogleLoginEnabled"`
-	IsFacebookLoginEnabled       bool   `json:"isFacebookLoginEnabled"`
-	IsTwitterLoginEnabled        bool   `json:"isTwitterLoginEnabled"`
-	IsGithubLoginEnabled         bool   `json:"isGithubLoginEnabled"`
-	IsEmailVerificationEnabled   bool   `json:"isEmailVerificationEnabled"`
-	IsBasicAuthenticationEnabled bool   `json:"isBasicAuthenticationEnabled"`
-	IsMagicLoginEnabled          bool   `json:"isMagicLoginEnabled"`
+	IsGoogleLoginEnabled         bool   `json:"is_google_login_enabled"`
+	IsFacebookLoginEnabled       bool   `json:"is_facebook_login_enabled"`
+	IsGithubLoginEnabled         bool   `json:"is_github_login_enabled"`
+	IsEmailVerificationEnabled   bool   `json:"is_email_verification_enabled"`
+	IsBasicAuthenticationEnabled bool   `json:"is_basic_authentication_enabled"`
+	IsMagicLinkLoginEnabled      bool   `json:"is_magic_link_login_enabled"`
 }

 type ResendVerifyEmailInput struct {
-	Email string `json:"email"`
+	Email      string `json:"email"`
+	Identifier string `json:"identifier"`
 }

 type ResetPasswordInput struct {
 	Token           string `json:"token"`
 	Password        string `json:"password"`
-	ConfirmPassword string `json:"confirmPassword"`
+	ConfirmPassword string `json:"confirm_password"`
 }

 type Response struct {
@@ -68,36 +59,67 @@ type Response struct {
 }

 type SignUpInput struct {
-	FirstName       *string  `json:"firstName"`
-	LastName        *string  `json:"lastName"`
 	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:"confirmPassword"`
-	Image           *string  `json:"image"`
+	ConfirmPassword string   `json:"confirm_password"`
 	Roles           []string `json:"roles"`
 }

 type UpdateProfileInput struct {
-	OldPassword        *string `json:"oldPassword"`
-	NewPassword        *string `json:"newPassword"`
-	ConfirmNewPassword *string `json:"confirmNewPassword"`
-	FirstName          *string `json:"firstName"`
-	LastName           *string `json:"lastName"`
-	Image              *string `json:"image"`
+	OldPassword        *string `json:"old_password"`
+	NewPassword        *string `json:"new_password"`
+	ConfirmNewPassword *string `json:"confirm_new_password"`
 	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"`
+}
+
+type UpdateUserInput struct {
+	ID          string    `json:"id"`
+	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"`
+	Roles       []*string `json:"roles"`
 }

 type User struct {
-	ID              string   `json:"id"`
-	Email           string   `json:"email"`
-	SignupMethod    string   `json:"signupMethod"`
-	FirstName       *string  `json:"firstName"`
-	LastName        *string  `json:"lastName"`
-	EmailVerifiedAt *int64   `json:"emailVerifiedAt"`
-	Image           *string  `json:"image"`
-	CreatedAt       *int64   `json:"createdAt"`
-	UpdatedAt       *int64   `json:"updatedAt"`
-	Roles           []string `json:"roles"`
+	ID                  string   `json:"id"`
+	Email               string   `json:"email"`
+	EmailVerified       bool     `json:"email_verified"`
+	SignupMethods       string   `json:"signup_methods"`
+	GivenName           *string  `json:"given_name"`
+	FamilyName          *string  `json:"family_name"`
+	MiddleName          *string  `json:"middle_name"`
+	Nickname            *string  `json:"nickname"`
+	PreferredUsername   *string  `json:"preferred_username"`
+	Gender              *string  `json:"gender"`
+	Birthdate           *string  `json:"birthdate"`
+	PhoneNumber         *string  `json:"phone_number"`
+	PhoneNumberVerified *bool    `json:"phone_number_verified"`
+	Picture             *string  `json:"picture"`
+	Roles               []string `json:"roles"`
+	CreatedAt           *int64   `json:"created_at"`
+	UpdatedAt           *int64   `json:"updated_at"`
 }

 type VerificationRequest struct {
@@ -106,8 +128,8 @@ type VerificationRequest struct {
 	Token      *string `json:"token"`
 	Email      *string `json:"email"`
 	Expires    *int64  `json:"expires"`
-	CreatedAt  *int64  `json:"createdAt"`
-	UpdatedAt  *int64  `json:"updatedAt"`
+	CreatedAt  *int64  `json:"created_at"`
+	UpdatedAt  *int64  `json:"updated_at"`
 }

 type VerifyEmailInput struct {
--- a/server/graph/schema.graphqls
+++ b/server/graph/schema.graphqls
@@ -7,26 +7,33 @@ scalar Any

 type Meta {
 	version: String!
-	isGoogleLoginEnabled: Boolean!
-	isFacebookLoginEnabled: Boolean!
-	isTwitterLoginEnabled: Boolean!
-	isGithubLoginEnabled: Boolean!
-	isEmailVerificationEnabled: Boolean!
-	isBasicAuthenticationEnabled: Boolean!
-	isMagicLoginEnabled: Boolean!
+	is_google_login_enabled: Boolean!
+	is_facebook_login_enabled: Boolean!
+	is_github_login_enabled: Boolean!
+	is_email_verification_enabled: Boolean!
+	is_basic_authentication_enabled: Boolean!
+	is_magic_link_login_enabled: Boolean!
 }

 type User {
 	id: ID!
 	email: String!
-	signupMethod: String!
-	firstName: String
-	lastName: String
-	emailVerifiedAt: Int64
-	image: String
-	createdAt: Int64
-	updatedAt: Int64
+	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
 }

 type VerificationRequest {
@@ -35,8 +42,8 @@ type VerificationRequest {
 	token: String
 	email: String
 	expires: Int64
-	createdAt: Int64
-	updatedAt: Int64
+	created_at: Int64
+	updated_at: Int64
 }

 type Error {
@@ -46,8 +53,8 @@ type Error {

 type AuthResponse {
 	message: String!
-	accessToken: String
-	accessTokenExpiresAt: Int64
+	access_token: String
+	expires_at: Int64
 	user: User
 }

@@ -56,12 +63,17 @@ type Response {
 }

 input SignUpInput {
-	firstName: String
-	lastName: 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!
-	confirmPassword: String!
-	image: String
+	confirm_password: String!
 	roles: [String!]
 }

@@ -77,25 +89,35 @@ input VerifyEmailInput {

 input ResendVerifyEmailInput {
 	email: String!
+	identifier: String!
 }

 input UpdateProfileInput {
-	oldPassword: String
-	newPassword: String
-	confirmNewPassword: String
-	firstName: String
-	lastName: String
-	image: String
+	old_password: String
+	new_password: String
+	confirm_new_password: String
 	email: String
-	# roles: [String]
+	given_name: String
+	family_name: String
+	middle_name: String
+	nickname: String
+	gender: String
+	birthdate: String
+	phone_number: String
+	picture: String
 }

-input AdminUpdateUserInput {
+input UpdateUserInput {
 	id: ID!
 	email: String
-	firstName: String
-	lastName: String
-	image: String
+	given_name: String
+	family_name: String
+	middle_name: String
+	nickname: String
+	gender: String
+	birthdate: String
+	phone_number: String
+	picture: String
 	roles: [String]
 }

@@ -106,14 +128,14 @@ input ForgotPasswordInput {
 input ResetPasswordInput {
 	token: String!
 	password: String!
-	confirmPassword: String!
+	confirm_password: String!
 }

 input DeleteUserInput {
 	email: String!
 }

-input MagicLoginInput {
+input MagicLinkLoginInput {
 	email: String!
 	roles: [String!]
 }
@@ -121,21 +143,23 @@ input MagicLoginInput {
 type Mutation {
 	signup(params: SignUpInput!): AuthResponse!
 	login(params: LoginInput!): AuthResponse!
-	magicLogin(params: MagicLoginInput!): Response!
+	magic_link_login(params: MagicLinkLoginInput!): Response!
 	logout: Response!
-	updateProfile(params: UpdateProfileInput!): Response!
-	adminUpdateUser(params: AdminUpdateUserInput!): User!
-	verifyEmail(params: VerifyEmailInput!): AuthResponse!
-	resendVerifyEmail(params: ResendVerifyEmailInput!): Response!
-	forgotPassword(params: ForgotPasswordInput!): Response!
-	resetPassword(params: ResetPasswordInput!): Response!
-	deleteUser(params: DeleteUserInput!): 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!
+	# admin only apis
+	_delete_user(params: DeleteUserInput!): Response!
+	_update_user(params: UpdateUserInput!): User!
 }

 type Query {
 	meta: Meta!
-	users: [User!]!
-	token(roles: [String!]): AuthResponse
+	session(roles: [String!]): AuthResponse
 	profile: User!
-	verificationRequests: [VerificationRequest!]!
+	# admin only apis
+	_users: [User!]!
+	_verification_requests: [VerificationRequest!]!
 }
--- a/server/graph/schema.resolvers.go
+++ b/server/graph/schema.resolvers.go
@@ -19,8 +19,8 @@ func (r *mutationResolver) Login(ctx context.Context, params model.LoginInput) (
 	return resolvers.Login(ctx, params)
 }

-func (r *mutationResolver) MagicLogin(ctx context.Context, params model.MagicLoginInput) (*model.Response, error) {
-	return resolvers.MagicLogin(ctx, params)
+func (r *mutationResolver) MagicLinkLogin(ctx context.Context, params model.MagicLinkLoginInput) (*model.Response, error) {
+	return resolvers.MagicLinkLogin(ctx, params)
 }

 func (r *mutationResolver) Logout(ctx context.Context) (*model.Response, error) {
@@ -31,10 +31,6 @@ func (r *mutationResolver) UpdateProfile(ctx context.Context, params model.Updat
 	return resolvers.UpdateProfile(ctx, params)
 }

-func (r *mutationResolver) AdminUpdateUser(ctx context.Context, params model.AdminUpdateUserInput) (*model.User, error) {
-	return resolvers.AdminUpdateUser(ctx, params)
-}
-
 func (r *mutationResolver) VerifyEmail(ctx context.Context, params model.VerifyEmailInput) (*model.AuthResponse, error) {
 	return resolvers.VerifyEmail(ctx, params)
 }
@@ -55,22 +51,26 @@ func (r *mutationResolver) DeleteUser(ctx context.Context, params model.DeleteUs
 	return resolvers.DeleteUser(ctx, params)
 }

+func (r *mutationResolver) UpdateUser(ctx context.Context, params model.UpdateUserInput) (*model.User, error) {
+	return resolvers.UpdateUser(ctx, params)
+}
+
 func (r *queryResolver) Meta(ctx context.Context) (*model.Meta, error) {
 	return resolvers.Meta(ctx)
 }

-func (r *queryResolver) Users(ctx context.Context) ([]*model.User, error) {
-	return resolvers.Users(ctx)
-}
-
-func (r *queryResolver) Token(ctx context.Context, roles []string) (*model.AuthResponse, error) {
-	return resolvers.Token(ctx, roles)
+func (r *queryResolver) Session(ctx context.Context, roles []string) (*model.AuthResponse, error) {
+	return resolvers.Session(ctx, roles)
 }

 func (r *queryResolver) Profile(ctx context.Context) (*model.User, error) {
 	return resolvers.Profile(ctx)
 }

+func (r *queryResolver) Users(ctx context.Context) ([]*model.User, error) {
+	return resolvers.Users(ctx)
+}
+
 func (r *queryResolver) VerificationRequests(ctx context.Context) ([]*model.VerificationRequest, error) {
 	return resolvers.VerificationRequests(ctx)
 }
@@ -81,5 +81,7 @@ func (r *Resolver) Mutation() generated.MutationResolver { return &mutationResol
 // Query returns generated.QueryResolver implementation.
 func (r *Resolver) Query() generated.QueryResolver { return &queryResolver{r} }

-type mutationResolver struct{ *Resolver }
-type queryResolver struct{ *Resolver }
+type (
+	mutationResolver struct{ *Resolver }
+	queryResolver    struct{ *Resolver }
+)
--- a/server/handlers/app.go
+++ b/server/handlers/app.go
@@ -49,7 +49,7 @@ func AppHandler() gin.HandlerFunc {
 			stateObj.RedirectURL = strings.TrimSuffix(stateObj.RedirectURL, "/")

 			// validate redirect url with allowed origins
-			if !utils.IsValidRedirectURL(stateObj.RedirectURL) {
+			if !utils.IsValidOrigin(stateObj.RedirectURL) {
 				c.JSON(400, gin.H{"error": "invalid redirect url"})
 				return
 			}
--- a/server/handlers/oauth_callback.go
+++ b/server/handlers/oauth_callback.go
@@ -43,26 +43,10 @@ func processGoogleUserInfo(code string) (db.User, error) {
 		return user, fmt.Errorf("unable to verify id_token: %s", err.Error())
 	}

-	// Extract custom claims
-	var claims struct {
-		Email      string `json:"email"`
-		Picture    string `json:"picture"`
-		GivenName  string `json:"given_name"`
-		FamilyName string `json:"family_name"`
-		Verified   bool   `json:"email_verified"`
-	}
-	if err := idToken.Claims(&claims); err != nil {
+	if err := idToken.Claims(&user); err != nil {
 		return user, fmt.Errorf("unable to extract claims")
 	}

-	user = db.User{
-		FirstName:       claims.GivenName,
-		LastName:        claims.FamilyName,
-		Image:           claims.Picture,
-		Email:           claims.Email,
-		EmailVerifiedAt: time.Now().Unix(),
-	}
-
 	return user, nil
 }

@@ -104,12 +88,14 @@ func processGithubUserInfo(code string) (db.User, error) {
 	if len(name) > 1 && strings.TrimSpace(name[1]) != "" {
 		lastName = name[0]
 	}
+
+	picture := userRawData["avatar_url"]
+
 	user = db.User{
-		FirstName:       firstName,
-		LastName:        lastName,
-		Image:           userRawData["avatar_url"],
-		Email:           userRawData["email"],
-		EmailVerifiedAt: time.Now().Unix(),
+		GivenName:  &firstName,
+		FamilyName: &lastName,
+		Picture:    &picture,
+		Email:      userRawData["email"],
 	}

 	return user, nil
@@ -129,7 +115,7 @@ func processFacebookUserInfo(code string) (db.User, error) {

 	response, err := client.Do(req)
 	if err != nil {
-		log.Println("err:", err)
+		log.Println("error processing facebook user info:", err)
 		return user, err
 	}

@@ -146,12 +132,15 @@ func processFacebookUserInfo(code string) (db.User, error) {

 	picObject := userRawData["picture"].(map[string]interface{})["data"]
 	picDataObject := picObject.(map[string]interface{})
+	firstName := fmt.Sprintf("%v", userRawData["first_name"])
+	lastName := fmt.Sprintf("%v", userRawData["last_name"])
+	picture := fmt.Sprintf("%v", picDataObject["url"])
+
 	user = db.User{
-		FirstName:       fmt.Sprintf("%v", userRawData["first_name"]),
-		LastName:        fmt.Sprintf("%v", userRawData["last_name"]),
-		Image:           fmt.Sprintf("%v", picDataObject["url"]),
-		Email:           email,
-		EmailVerifiedAt: time.Now().Unix(),
+		GivenName:  &firstName,
+		FamilyName: &lastName,
+		Picture:    &picture,
+		Email:      email,
 	}

 	return user, nil
@@ -202,7 +191,7 @@ func OAuthCallbackHandler() gin.HandlerFunc {

 		if err != nil {
 			// user not registered, register user and generate session token
-			user.SignupMethod = provider
+			user.SignupMethods = provider
 			// make sure inputRoles don't include protected roles
 			hasProtectedRole := false
 			for _, ir := range inputRoles {
@@ -217,15 +206,18 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 			}

 			user.Roles = strings.Join(inputRoles, ",")
+			now := time.Now().Unix()
+			user.EmailVerifiedAt = &now
+			user, _ = db.Mgr.AddUser(user)
 		} else {
 			// user exists in db, check if method was google
 			// if not append google to existing signup method and save it

-			signupMethod := existingUser.SignupMethod
+			signupMethod := existingUser.SignupMethods
 			if !strings.Contains(signupMethod, provider) {
 				signupMethod = signupMethod + "," + provider
 			}
-			user.SignupMethod = signupMethod
+			user.SignupMethods = signupMethod
 			user.Password = existingUser.Password

 			// There multiple scenarios with roles here in social login
@@ -260,9 +252,11 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 			} else {
 				user.Roles = existingUser.Roles
 			}
+			user.Key = existingUser.Key
+			user.ID = existingUser.ID
+			user, err = db.Mgr.UpdateUser(user)
 		}

-		user, _ = db.Mgr.SaveUser(user)
 		user, _ = db.Mgr.GetUserByEmail(user.Email)
 		userIdStr := fmt.Sprintf("%v", user.ID)
 		refreshToken, _, _ := utils.CreateAuthToken(user, enum.RefreshToken, inputRoles)
@@ -270,15 +264,7 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 		accessToken, _, _ := utils.CreateAuthToken(user, enum.AccessToken, inputRoles)
 		utils.SetCookie(c, accessToken)
 		session.SetToken(userIdStr, accessToken, refreshToken)
-		go func() {
-			sessionData := db.Session{
-				UserID:    user.ID,
-				UserAgent: utils.GetUserAgent(c.Request),
-				IP:        utils.GetIP(c.Request),
-			}
-
-			db.Mgr.SaveSession(sessionData)
-		}()
+		utils.CreateSession(user.ID, c)

 		c.Redirect(http.StatusTemporaryRedirect, redirectURL)
 	}
--- a/server/handlers/oauth_login.go
+++ b/server/handlers/oauth_login.go
--- a/server/handlers/verify_email.go
+++ b/server/handlers/verify_email.go
@@ -1,7 +1,6 @@
 package handlers

 import (
-	"fmt"
 	"net/http"
 	"strings"
 	"time"
@@ -24,7 +23,7 @@ func VerifyEmailHandler() gin.HandlerFunc {
 			return
 		}

-		_, err := db.Mgr.GetVerificationByToken(token)
+		verificationRequest, err := db.Mgr.GetVerificationByToken(token)
 		if err != nil {
 			c.JSON(400, errorRes)
 			return
@@ -46,28 +45,21 @@ func VerifyEmailHandler() gin.HandlerFunc {
 		}

 		// update email_verified_at in users table
-		if user.EmailVerifiedAt <= 0 {
-			db.Mgr.UpdateVerificationTime(time.Now().Unix(), user.ID)
+		if user.EmailVerifiedAt == nil {
+			now := time.Now().Unix()
+			user.EmailVerifiedAt = &now
+			db.Mgr.UpdateUser(user)
 		}
 		// delete from verification table
-		db.Mgr.DeleteToken(claim.Email)
+		db.Mgr.DeleteVerificationRequest(verificationRequest)

-		userIdStr := fmt.Sprintf("%v", user.ID)
 		roles := strings.Split(user.Roles, ",")
 		refreshToken, _, _ := utils.CreateAuthToken(user, enum.RefreshToken, roles)

 		accessToken, _, _ := utils.CreateAuthToken(user, enum.AccessToken, roles)

-		session.SetToken(userIdStr, accessToken, refreshToken)
-		go func() {
-			sessionData := db.Session{
-				UserID:    user.ID,
-				UserAgent: utils.GetUserAgent(c.Request),
-				IP:        utils.GetIP(c.Request),
-			}
-
-			db.Mgr.SaveSession(sessionData)
-		}()
+		session.SetToken(user.ID, accessToken, refreshToken)
+		utils.CreateSession(user.ID, c)
 		utils.SetCookie(c, accessToken)
 		c.Redirect(http.StatusTemporaryRedirect, claim.RedirectURL)
 	}
--- a/server/main.go
+++ b/server/main.go
@@ -1,80 +1,45 @@
 package main

 import (
-	"context"
-	"log"
+	"flag"

 	"github.com/authorizerdev/authorizer/server/constants"
 	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/env"
 	"github.com/authorizerdev/authorizer/server/handlers"
 	"github.com/authorizerdev/authorizer/server/oauth"
+	"github.com/authorizerdev/authorizer/server/router"
 	"github.com/authorizerdev/authorizer/server/session"
 	"github.com/authorizerdev/authorizer/server/utils"
-	"github.com/gin-contrib/location"
-	"github.com/gin-gonic/gin"
 )

-func GinContextToContextMiddleware() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		if constants.AUTHORIZER_URL == "" {
-			url := location.Get(c)
-			constants.AUTHORIZER_URL = url.Scheme + "://" + c.Request.Host
-			log.Println("=> setting url:", constants.AUTHORIZER_URL)
-		}
-		ctx := context.WithValue(c.Request.Context(), "GinContextKey", c)
-		c.Request = c.Request.WithContext(ctx)
-		c.Next()
-	}
-}
-
-// TODO use allowed origins for cors origin
-// TODO throw error if url is not allowed
-func CORSMiddleware() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		origin := c.Request.Header.Get("Origin")
-		constants.APP_URL = origin
-		log.Println("=> APP_URL:", constants.APP_URL)
-		c.Writer.Header().Set("Access-Control-Allow-Origin", origin)
-		c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
-		c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With")
-		c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT")
-
-		if c.Request.Method == "OPTIONS" {
-			c.AbortWithStatus(204)
-			return
-		}
-
-		c.Next()
-	}
-}
+var VERSION string

 func main() {
-	InitEnv()
+	env.ARG_DB_URL = flag.String("database_url", "", "Database connection string")
+	env.ARG_DB_TYPE = flag.String("database_type", "", "Database type, possible values are postgres,mysql,sqlite")
+	env.ARG_AUTHORIZER_URL = flag.String("authorizer_url", "", "URL for authorizer instance, eg: https://xyz.herokuapp.com")
+	env.ARG_ENV_FILE = flag.String("env_file", "", "Env file path")
+	flag.Parse()
+
+	constants.VERSION = VERSION
+
+	env.InitEnv()
 	db.InitDB()
 	session.InitSession()
 	oauth.InitOAuth()
 	utils.InitServer()

-	r := gin.Default()
-	r.Use(location.Default())
-	r.Use(GinContextToContextMiddleware())
-	r.Use(CORSMiddleware())
+	router := router.InitRouter()

-	r.GET("/", handlers.PlaygroundHandler())
-	r.POST("/graphql", handlers.GraphqlHandler())
-	r.GET("/verify_email", handlers.VerifyEmailHandler())
-	r.GET("/oauth_login/:oauth_provider", handlers.OAuthLoginHandler())
-	r.GET("/oauth_callback/:oauth_provider", handlers.OAuthCallbackHandler())
-
-	// login wall app related routes
-
-	r.LoadHTMLGlob("templates/*")
-	app := r.Group("/app")
+	// login wall app related routes.
+	// if we put them in router file then tests would fail as templates or build path will be different
+	router.LoadHTMLGlob("templates/*")
+	app := router.Group("/app")
 	{
 		app.Static("/build", "app/build")
 		app.GET("/", handlers.AppHandler())
 		app.GET("/reset-password", handlers.AppHandler())
 	}
-
-	r.Run()
+	router.Run(":" + constants.PORT)
 }
--- a/server/middlewares/context.go
+++ b/server/middlewares/context.go
@@ -0,0 +1,23 @@
+package middlewares
+
+import (
+	"context"
+	"log"
+
+	"github.com/authorizerdev/authorizer/server/constants"
+	"github.com/gin-contrib/location"
+	"github.com/gin-gonic/gin"
+)
+
+func GinContextToContextMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		if constants.AUTHORIZER_URL == "" {
+			url := location.Get(c)
+			constants.AUTHORIZER_URL = url.Scheme + "://" + c.Request.Host
+			log.Println("authorizer url:", constants.AUTHORIZER_URL)
+		}
+		ctx := context.WithValue(c.Request.Context(), "GinContextKey", c)
+		c.Request = c.Request.WithContext(ctx)
+		c.Next()
+	}
+}
--- a/server/middlewares/cors.go
+++ b/server/middlewares/cors.go
@@ -0,0 +1,29 @@
+package middlewares
+
+import (
+	"github.com/authorizerdev/authorizer/server/constants"
+	"github.com/authorizerdev/authorizer/server/utils"
+	"github.com/gin-gonic/gin"
+)
+
+func CORSMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		origin := c.Request.Header.Get("Origin")
+		constants.APP_URL = origin
+
+		if utils.IsValidOrigin(origin) {
+			c.Writer.Header().Set("Access-Control-Allow-Origin", origin)
+		}
+
+		c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
+		c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With")
+		c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT")
+
+		if c.Request.Method == "OPTIONS" {
+			c.AbortWithStatus(204)
+			return
+		}
+
+		c.Next()
+	}
+}
--- a/server/resolvers/delete_user.go
+++ b/server/resolvers/delete_user.go
@@ -29,9 +29,9 @@ func DeleteUser(ctx context.Context, params model.DeleteUserInput) (*model.Respo

 	session.DeleteUserSession(fmt.Sprintf("%x", user.ID))

-	err = db.Mgr.DeleteUser(params.Email)
+	err = db.Mgr.DeleteUser(user)
 	if err != nil {
-		log.Println("Err:", err)
+		log.Println("error deleting user:", err)
 		return res, err
 	}

--- a/server/resolvers/forgot_password.go
+++ b/server/resolvers/forgot_password.go
@@ -20,7 +20,7 @@ func ForgotPassword(ctx context.Context, params model.ForgotPasswordInput) (*mod
 	if err != nil {
 		return res, err
 	}
-	if constants.DISABLE_BASIC_AUTHENTICATION == "true" {
+	if constants.DISABLE_BASIC_AUTHENTICATION {
 		return res, fmt.Errorf(`basic authentication is disabled for this instance`)
 	}
 	host := gc.Request.Host
@@ -37,7 +37,7 @@ func ForgotPassword(ctx context.Context, params model.ForgotPasswordInput) (*mod

 	token, err := utils.CreateVerificationToken(params.Email, enum.ForgotPassword.String())
 	if err != nil {
-		log.Println(`Error generating token`, err)
+		log.Println(`error generating token`, err)
 	}
 	db.Mgr.AddVerification(db.VerificationRequest{
 		Token:      token,
--- a/server/resolvers/login.go
+++ b/server/resolvers/login.go
@@ -22,7 +22,7 @@ func Login(ctx context.Context, params model.LoginInput) (*model.AuthResponse, e
 		return res, err
 	}

-	if constants.DISABLE_BASIC_AUTHENTICATION == "true" {
+	if constants.DISABLE_BASIC_AUTHENTICATION {
 		return res, fmt.Errorf(`basic authentication is disabled for this instance`)
 	}

@@ -32,18 +32,18 @@ func Login(ctx context.Context, params model.LoginInput) (*model.AuthResponse, e
 		return res, fmt.Errorf(`user with this email not found`)
 	}

-	if !strings.Contains(user.SignupMethod, enum.BasicAuth.String()) {
+	if !strings.Contains(user.SignupMethods, enum.BasicAuth.String()) {
 		return res, fmt.Errorf(`user has not signed up email & password`)
 	}

-	if user.EmailVerifiedAt <= 0 {
+	if user.EmailVerifiedAt == nil {
 		return res, fmt.Errorf(`email not verified`)
 	}

-	err = bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(params.Password))
+	err = bcrypt.CompareHashAndPassword([]byte(*user.Password), []byte(params.Password))

 	if err != nil {
-		log.Println("Compare password error:", err)
+		log.Println("compare password error:", err)
 		return res, fmt.Errorf(`invalid password`)
 	}
 	roles := constants.DEFAULT_ROLES
@@ -55,38 +55,18 @@ func Login(ctx context.Context, params model.LoginInput) (*model.AuthResponse, e

 		roles = params.Roles
 	}
-	userIdStr := fmt.Sprintf("%v", user.ID)
 	refreshToken, _, _ := utils.CreateAuthToken(user, enum.RefreshToken, roles)

 	accessToken, expiresAt, _ := utils.CreateAuthToken(user, enum.AccessToken, roles)

-	session.SetToken(userIdStr, accessToken, refreshToken)
-	go func() {
-		sessionData := db.Session{
-			UserID:    user.ID,
-			UserAgent: utils.GetUserAgent(gc.Request),
-			IP:        utils.GetIP(gc.Request),
-		}
-
-		db.Mgr.SaveSession(sessionData)
-	}()
+	session.SetToken(user.ID, accessToken, refreshToken)
+	utils.CreateSession(user.ID, gc)

 	res = &model.AuthResponse{
-		Message:              `Logged in successfully`,
-		AccessToken:          &accessToken,
-		AccessTokenExpiresAt: &expiresAt,
-		User: &model.User{
-			ID:              userIdStr,
-			Email:           user.Email,
-			Image:           &user.Image,
-			FirstName:       &user.FirstName,
-			LastName:        &user.LastName,
-			SignupMethod:    user.SignupMethod,
-			EmailVerifiedAt: &user.EmailVerifiedAt,
-			Roles:           strings.Split(user.Roles, ","),
-			CreatedAt:       &user.CreatedAt,
-			UpdatedAt:       &user.UpdatedAt,
-		},
+		Message:     `Logged in successfully`,
+		AccessToken: &accessToken,
+		ExpiresAt:   &expiresAt,
+		User:        utils.GetResponseUserData(user),
 	}

 	utils.SetCookie(gc, accessToken)
--- a/server/resolvers/logout.go
+++ b/server/resolvers/logout.go
@@ -27,7 +27,7 @@ func Logout(ctx context.Context) (*model.Response, error) {
 	}

 	userId := fmt.Sprintf("%v", claim["id"])
-	session.DeleteToken(userId, token)
+	session.DeleteVerificationRequest(userId, token)
 	res = &model.Response{
 		Message: "Logged out successfully",
 	}
--- a/server/resolvers/magic_link_login.go
+++ b/server/resolvers/magic_link_login.go
@@ -14,10 +14,10 @@ import (
 	"github.com/authorizerdev/authorizer/server/utils"
 )

-func MagicLogin(ctx context.Context, params model.MagicLoginInput) (*model.Response, error) {
+func MagicLinkLogin(ctx context.Context, params model.MagicLinkLoginInput) (*model.Response, error) {
 	var res *model.Response

-	if constants.DISABLE_MAGIC_LOGIN == "true" {
+	if constants.DISABLE_MAGIC_LINK_LOGIN {
 		return res, fmt.Errorf(`magic link login is disabled for this instance`)
 	}

@@ -35,8 +35,9 @@ func MagicLogin(ctx context.Context, params model.MagicLoginInput) (*model.Respo

 	// find user with email
 	existingUser, err := db.Mgr.GetUserByEmail(params.Email)
+
 	if err != nil {
-		user.SignupMethod = enum.MagicLink.String()
+		user.SignupMethods = enum.MagicLinkLogin.String()
 		// define roles for new user
 		if len(params.Roles) > 0 {
 			// check if roles exists
@@ -50,6 +51,7 @@ func MagicLogin(ctx context.Context, params model.MagicLoginInput) (*model.Respo
 		}

 		user.Roles = strings.Join(inputRoles, ",")
+		user, _ = db.Mgr.AddUser(user)
 	} else {
 		user = existingUser
 		// There multiple scenarios with roles here in magic link login
@@ -84,22 +86,24 @@ func MagicLogin(ctx context.Context, params model.MagicLoginInput) (*model.Respo
 			user.Roles = existingUser.Roles
 		}

-		signupMethod := existingUser.SignupMethod
-		if !strings.Contains(signupMethod, enum.MagicLink.String()) {
-			signupMethod = signupMethod + "," + enum.MagicLink.String()
+		signupMethod := existingUser.SignupMethods
+		if !strings.Contains(signupMethod, enum.MagicLinkLogin.String()) {
+			signupMethod = signupMethod + "," + enum.MagicLinkLogin.String()
 		}

-		user.SignupMethod = signupMethod
+		user.SignupMethods = signupMethod
+		user, _ = db.Mgr.UpdateUser(user)
+		if err != nil {
+			log.Println("error updating user:", err)
+		}
 	}

-	user, _ = db.Mgr.SaveUser(user)
-
-	if constants.DISABLE_EMAIL_VERIFICATION != "true" {
+	if !constants.DISABLE_EMAIL_VERIFICATION {
 		// insert verification request
-		verificationType := enum.MagicLink.String()
+		verificationType := enum.MagicLinkLogin.String()
 		token, err := utils.CreateVerificationToken(params.Email, verificationType)
 		if err != nil {
-			log.Println(`Error generating token`, err)
+			log.Println(`error generating token`, err)
 		}
 		db.Mgr.AddVerification(db.VerificationRequest{
 			Token:      token,
--- a/server/resolvers/profile.go
+++ b/server/resolvers/profile.go
@@ -3,7 +3,6 @@ package resolvers
 import (
 	"context"
 	"fmt"
-	"strings"

 	"github.com/authorizerdev/authorizer/server/db"
 	"github.com/authorizerdev/authorizer/server/graph/model"
@@ -41,20 +40,7 @@ func Profile(ctx context.Context) (*model.User, error) {
 		return res, err
 	}

-	userIdStr := fmt.Sprintf("%v", user.ID)
-
-	res = &model.User{
-		ID:              userIdStr,
-		Email:           user.Email,
-		Image:           &user.Image,
-		FirstName:       &user.FirstName,
-		LastName:        &user.LastName,
-		SignupMethod:    user.SignupMethod,
-		EmailVerifiedAt: &user.EmailVerifiedAt,
-		Roles:           strings.Split(user.Roles, ","),
-		CreatedAt:       &user.CreatedAt,
-		UpdatedAt:       &user.UpdatedAt,
-	}
+	res = utils.GetResponseUserData(user)

 	return res, nil
 }
--- a/server/resolvers/resend_verify_email.go
+++ b/server/resolvers/resend_verify_email.go
@@ -20,18 +20,28 @@ func ResendVerifyEmail(ctx context.Context, params model.ResendVerifyEmailInput)
 		return res, fmt.Errorf("invalid email")
 	}

-	verificationRequest, err := db.Mgr.GetVerificationByEmail(params.Email)
+	if !utils.IsValidVerificationIdentifier(params.Identifier) {
+		return res, fmt.Errorf("invalid identifier")
+	}
+
+	verificationRequest, err := db.Mgr.GetVerificationByEmail(params.Email, params.Identifier)
 	if err != nil {
 		return res, fmt.Errorf(`verification request not found`)
 	}

-	token, err := utils.CreateVerificationToken(params.Email, verificationRequest.Identifier)
+	// delete current verification and create new one
+	err = db.Mgr.DeleteVerificationRequest(verificationRequest)
 	if err != nil {
-		log.Println(`Error generating token`, err)
+		log.Println("error deleting verification request:", err)
+	}
+
+	token, err := utils.CreateVerificationToken(params.Email, params.Identifier)
+	if err != nil {
+		log.Println(`error generating token`, err)
 	}
 	db.Mgr.AddVerification(db.VerificationRequest{
 		Token:      token,
-		Identifier: verificationRequest.Identifier,
+		Identifier: params.Identifier,
 		ExpiresAt:  time.Now().Add(time.Minute * 30).Unix(),
 		Email:      params.Email,
 	})
--- a/server/resolvers/reset_password.go
+++ b/server/resolvers/reset_password.go
@@ -14,11 +14,11 @@ import (

 func ResetPassword(ctx context.Context, params model.ResetPasswordInput) (*model.Response, error) {
 	var res *model.Response
-	if constants.DISABLE_BASIC_AUTHENTICATION == "true" {
+	if constants.DISABLE_BASIC_AUTHENTICATION {
 		return res, fmt.Errorf(`basic authentication is disabled for this instance`)
 	}

-	_, err := db.Mgr.GetVerificationByToken(params.Token)
+	verificationRequest, err := db.Mgr.GetVerificationByToken(params.Token)
 	if err != nil {
 		return res, fmt.Errorf(`invalid token`)
 	}
@@ -39,16 +39,16 @@ func ResetPassword(ctx context.Context, params model.ResetPasswordInput) (*model
 	}

 	password, _ := utils.HashPassword(params.Password)
-	user.Password = password
+	user.Password = &password

-	signupMethod := user.SignupMethod
+	signupMethod := user.SignupMethods
 	if !strings.Contains(signupMethod, enum.BasicAuth.String()) {
 		signupMethod = signupMethod + "," + enum.BasicAuth.String()
 	}
-	user.SignupMethod = signupMethod
+	user.SignupMethods = signupMethod

 	// delete from verification table
-	db.Mgr.DeleteToken(claim.Email)
+	db.Mgr.DeleteVerificationRequest(verificationRequest)
 	db.Mgr.UpdateUser(user)

 	res = &model.Response{
--- a/server/resolvers/session.go
+++ b/server/resolvers/session.go
@@ -3,7 +3,6 @@ package resolvers
 import (
 	"context"
 	"fmt"
-	"strings"
 	"time"

 	"github.com/authorizerdev/authorizer/server/constants"
@@ -14,7 +13,7 @@ import (
 	"github.com/authorizerdev/authorizer/server/utils"
 )

-func Token(ctx context.Context, roles []string) (*model.AuthResponse, error) {
+func Session(ctx context.Context, roles []string) (*model.AuthResponse, error) {
 	var res *model.AuthResponse

 	gc, err := utils.GinContextFromContext(ctx)
@@ -64,37 +63,18 @@ func Token(ctx context.Context, roles []string) (*model.AuthResponse, error) {
 		// if access token has expired and refresh/session token is valid
 		// generate new accessToken
 		currentRefreshToken := session.GetToken(userIdStr, token)
-		session.DeleteToken(userIdStr, token)
+		session.DeleteVerificationRequest(userIdStr, token)
 		token, expiresAt, _ = utils.CreateAuthToken(user, enum.AccessToken, claimRoles)
 		session.SetToken(userIdStr, token, currentRefreshToken)
-		go func() {
-			sessionData := db.Session{
-				UserID:    user.ID,
-				UserAgent: utils.GetUserAgent(gc.Request),
-				IP:        utils.GetIP(gc.Request),
-			}
-
-			db.Mgr.SaveSession(sessionData)
-		}()
+		utils.CreateSession(user.ID, gc)
 	}

 	utils.SetCookie(gc, token)
 	res = &model.AuthResponse{
-		Message:              `Token verified`,
-		AccessToken:          &token,
-		AccessTokenExpiresAt: &expiresAt,
-		User: &model.User{
-			ID:              userIdStr,
-			Email:           user.Email,
-			Image:           &user.Image,
-			FirstName:       &user.FirstName,
-			LastName:        &user.LastName,
-			Roles:           strings.Split(user.Roles, ","),
-			CreatedAt:       &user.CreatedAt,
-			UpdatedAt:       &user.UpdatedAt,
-			SignupMethod:    user.SignupMethod,
-			EmailVerifiedAt: &user.EmailVerifiedAt,
-		},
+		Message:     `Token verified`,
+		AccessToken: &token,
+		ExpiresAt:   &expiresAt,
+		User:        utils.GetResponseUserData(user),
 	}
 	return res, nil
 }
--- a/server/resolvers/signup.go
+++ b/server/resolvers/signup.go
@@ -22,11 +22,11 @@ func Signup(ctx context.Context, params model.SignUpInput) (*model.AuthResponse,
 		return res, err
 	}

-	if constants.DISABLE_BASIC_AUTHENTICATION == "true" {
+	if constants.DISABLE_BASIC_AUTHENTICATION {
 		return res, fmt.Errorf(`basic authentication is disabled for this instance`)
 	}
 	if params.ConfirmPassword != params.Password {
-		return res, fmt.Errorf(`passowrd and confirm password does not match`)
+		return res, fmt.Errorf(`password and confirm password does not match`)
 	}

 	params.Email = strings.ToLower(params.Email)
@@ -35,6 +35,19 @@ func Signup(ctx context.Context, params model.SignUpInput) (*model.AuthResponse,
 		return res, fmt.Errorf(`invalid email address`)
 	}

+	// find user with email
+	existingUser, err := db.Mgr.GetUserByEmail(params.Email)
+	if err != nil {
+		log.Println("user with email " + params.Email + " not found")
+	}
+
+	if existingUser.EmailVerifiedAt != nil {
+		// email is verified
+		return res, fmt.Errorf(`%s has already signed up`, params.Email)
+	} else if existingUser.ID != "" && existingUser.EmailVerifiedAt == nil {
+		return res, fmt.Errorf("%s has already signed up. please complete the email verification process or reset the password", params.Email)
+	}
+
 	inputRoles := []string{}

 	if len(params.Roles) > 0 {
@@ -48,16 +61,6 @@ func Signup(ctx context.Context, params model.SignUpInput) (*model.AuthResponse,
 		inputRoles = constants.DEFAULT_ROLES
 	}

-	// find user with email
-	existingUser, err := db.Mgr.GetUserByEmail(params.Email)
-	if err != nil {
-		log.Println("User with email " + params.Email + " not found")
-	}
-
-	if existingUser.EmailVerifiedAt > 0 {
-		// email is verified
-		return res, fmt.Errorf(`you have already signed up. Please login`)
-	}
 	user := db.User{
 		Email: params.Email,
 	}
@@ -65,45 +68,59 @@ func Signup(ctx context.Context, params model.SignUpInput) (*model.AuthResponse,
 	user.Roles = strings.Join(inputRoles, ",")

 	password, _ := utils.HashPassword(params.Password)
-	user.Password = password
+	user.Password = &password

-	if params.FirstName != nil {
-		user.FirstName = *params.FirstName
+	if params.GivenName != nil {
+		user.GivenName = params.GivenName
 	}

-	if params.LastName != nil {
-		user.LastName = *params.LastName
+	if params.FamilyName != nil {
+		user.FamilyName = params.FamilyName
 	}

-	user.SignupMethod = enum.BasicAuth.String()
-	if constants.DISABLE_EMAIL_VERIFICATION == "true" {
-		user.EmailVerifiedAt = time.Now().Unix()
+	if params.MiddleName != nil {
+		user.MiddleName = params.MiddleName
 	}
-	user, err = db.Mgr.SaveUser(user)
+
+	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.PhoneNumber != nil {
+		user.PhoneNumber = params.PhoneNumber
+	}
+
+	if params.Picture != nil {
+		user.Picture = params.Picture
+	}
+
+	user.SignupMethods = enum.BasicAuth.String()
+	if constants.DISABLE_EMAIL_VERIFICATION {
+		now := time.Now().Unix()
+		user.EmailVerifiedAt = &now
+	}
+	user, err = db.Mgr.AddUser(user)
 	if err != nil {
 		return res, err
 	}
 	userIdStr := fmt.Sprintf("%v", user.ID)
 	roles := strings.Split(user.Roles, ",")
-	userToReturn := &model.User{
-		ID:              userIdStr,
-		Email:           user.Email,
-		Image:           &user.Image,
-		FirstName:       &user.FirstName,
-		LastName:        &user.LastName,
-		SignupMethod:    user.SignupMethod,
-		EmailVerifiedAt: &user.EmailVerifiedAt,
-		Roles:           strings.Split(user.Roles, ","),
-		CreatedAt:       &user.CreatedAt,
-		UpdatedAt:       &user.UpdatedAt,
-	}
+	userToReturn := utils.GetResponseUserData(user)

-	if constants.DISABLE_EMAIL_VERIFICATION != "true" {
+	if !constants.DISABLE_EMAIL_VERIFICATION {
 		// insert verification request
 		verificationType := enum.BasicAuthSignup.String()
 		token, err := utils.CreateVerificationToken(params.Email, verificationType)
 		if err != nil {
-			log.Println(`Error generating token`, err)
+			log.Println(`error generating token`, err)
 		}
 		db.Mgr.AddVerification(db.VerificationRequest{
 			Token:      token,
@@ -128,20 +145,12 @@ func Signup(ctx context.Context, params model.SignUpInput) (*model.AuthResponse,
 		accessToken, expiresAt, _ := utils.CreateAuthToken(user, enum.AccessToken, roles)

 		session.SetToken(userIdStr, accessToken, refreshToken)
-		go func() {
-			sessionData := db.Session{
-				UserID:    user.ID,
-				UserAgent: utils.GetUserAgent(gc.Request),
-				IP:        utils.GetIP(gc.Request),
-			}
-
-			db.Mgr.SaveSession(sessionData)
-		}()
+		utils.CreateSession(user.ID, gc)
 		res = &model.AuthResponse{
-			Message:              `Signed up successfully.`,
-			AccessToken:          &accessToken,
-			AccessTokenExpiresAt: &expiresAt,
-			User:                 userToReturn,
+			Message:     `Signed up successfully.`,
+			AccessToken: &accessToken,
+			ExpiresAt:   &expiresAt,
+			User:        userToReturn,
 		}

 		utils.SetCookie(gc, accessToken)
--- a/server/resolvers/update_profile.go
+++ b/server/resolvers/update_profile.go
@@ -40,7 +40,7 @@ func UpdateProfile(ctx context.Context, params model.UpdateProfileInput) (*model
 	}

 	// validate if all params are not empty
-	if params.FirstName == nil && params.LastName == nil && params.Image == nil && params.OldPassword == nil && params.Email == nil {
+	if params.GivenName == nil && params.FamilyName == nil && params.Picture == nil && params.MiddleName == nil && params.Nickname == nil && params.OldPassword == nil && params.Email == nil && params.Birthdate == nil && params.Gender == nil && params.PhoneNumber == nil {
 		return res, fmt.Errorf("please enter atleast one param to update")
 	}

@@ -50,20 +50,40 @@ func UpdateProfile(ctx context.Context, params model.UpdateProfileInput) (*model
 		return res, err
 	}

-	if params.FirstName != nil && user.FirstName != *params.FirstName {
-		user.FirstName = *params.FirstName
+	if params.GivenName != nil && user.GivenName != params.GivenName {
+		user.GivenName = params.GivenName
 	}

-	if params.LastName != nil && user.LastName != *params.LastName {
-		user.LastName = *params.LastName
+	if params.FamilyName != nil && user.FamilyName != params.FamilyName {
+		user.FamilyName = params.FamilyName
 	}

-	if params.Image != nil && user.Image != *params.Image {
-		user.Image = *params.Image
+	if params.MiddleName != nil && user.MiddleName != params.MiddleName {
+		user.MiddleName = params.MiddleName
+	}
+
+	if params.Nickname != nil && user.Nickname != params.Nickname {
+		user.Nickname = params.Nickname
+	}
+
+	if params.Birthdate != nil && user.Birthdate != params.Birthdate {
+		user.Birthdate = params.Birthdate
+	}
+
+	if params.Gender != nil && user.Gender != params.Gender {
+		user.Gender = params.Gender
+	}
+
+	if params.PhoneNumber != nil && user.PhoneNumber != params.PhoneNumber {
+		user.PhoneNumber = params.PhoneNumber
+	}
+
+	if params.Picture != nil && user.Picture != params.Picture {
+		user.Picture = params.Picture
 	}

 	if params.OldPassword != nil {
-		if err = bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(*params.OldPassword)); err != nil {
+		if err = bcrypt.CompareHashAndPassword([]byte(*user.Password), []byte(*params.OldPassword)); err != nil {
 			return res, fmt.Errorf("incorrect old password")
 		}

@@ -81,7 +101,7 @@ func UpdateProfile(ctx context.Context, params model.UpdateProfileInput) (*model

 		password, _ := utils.HashPassword(*params.NewPassword)

-		user.Password = password
+		user.Password = &password
 	}

 	hasEmailChanged := false
@@ -93,7 +113,8 @@ func UpdateProfile(ctx context.Context, params model.UpdateProfileInput) (*model
 		}
 		newEmail := strings.ToLower(*params.Email)
 		// check if user with new email exists
-		_, err = db.Mgr.GetUserByEmail(newEmail)
+		_, err := db.Mgr.GetUserByEmail(newEmail)
+
 		// err = nil means user exists
 		if err == nil {
 			return res, fmt.Errorf("user with this email address already exists")
@@ -103,13 +124,13 @@ func UpdateProfile(ctx context.Context, params model.UpdateProfileInput) (*model
 		utils.DeleteCookie(gc)

 		user.Email = newEmail
-		user.EmailVerifiedAt = 0
+		user.EmailVerifiedAt = nil
 		hasEmailChanged = true
 		// insert verification request
 		verificationType := enum.UpdateEmail.String()
 		token, err := utils.CreateVerificationToken(newEmail, verificationType)
 		if err != nil {
-			log.Println(`Error generating token`, err)
+			log.Println(`error generating token`, err)
 		}
 		db.Mgr.AddVerification(db.VerificationRequest{
 			Token:      token,
@@ -126,7 +147,7 @@ func UpdateProfile(ctx context.Context, params model.UpdateProfileInput) (*model

 	_, err = db.Mgr.UpdateUser(user)
 	if err != nil {
-		log.Println("Error updating user:", err)
+		log.Println("error updating user:", err)
 		return res, err
 	}
 	message := `Profile details updated successfully.`
--- a/server/resolvers/adminUpdateUser.go
+++ b/server/resolvers/adminUpdateUser.go
@@ -15,7 +15,7 @@ import (
 	"github.com/authorizerdev/authorizer/server/utils"
 )

-func AdminUpdateUser(ctx context.Context, params model.AdminUpdateUserInput) (*model.User, error) {
+func UpdateUser(ctx context.Context, params model.UpdateUserInput) (*model.User, error) {
 	gc, err := utils.GinContextFromContext(ctx)
 	var res *model.User
 	if err != nil {
@@ -26,7 +26,7 @@ func AdminUpdateUser(ctx context.Context, params model.AdminUpdateUserInput) (*m
 		return res, fmt.Errorf("unauthorized")
 	}

-	if params.FirstName == nil && params.LastName == nil && params.Image == nil && params.Email == nil && params.Roles == nil {
+	if params.GivenName == nil && params.FamilyName == nil && params.Picture == nil && params.MiddleName == nil && params.Nickname == nil && params.Email == nil && params.Birthdate == nil && params.Gender == nil && params.PhoneNumber == nil && params.Roles == nil {
 		return res, fmt.Errorf("please enter atleast one param to update")
 	}

@@ -35,16 +35,36 @@ func AdminUpdateUser(ctx context.Context, params model.AdminUpdateUserInput) (*m
 		return res, fmt.Errorf(`User not found`)
 	}

-	if params.FirstName != nil && user.FirstName != *params.FirstName {
-		user.FirstName = *params.FirstName
+	if params.GivenName != nil && user.GivenName != params.GivenName {
+		user.GivenName = params.GivenName
 	}

-	if params.LastName != nil && user.LastName != *params.LastName {
-		user.LastName = *params.LastName
+	if params.FamilyName != nil && user.FamilyName != params.FamilyName {
+		user.FamilyName = params.FamilyName
 	}

-	if params.Image != nil && user.Image != *params.Image {
-		user.Image = *params.Image
+	if params.MiddleName != nil && user.MiddleName != params.MiddleName {
+		user.MiddleName = params.MiddleName
+	}
+
+	if params.Nickname != nil && user.Nickname != params.Nickname {
+		user.Nickname = params.Nickname
+	}
+
+	if params.Birthdate != nil && user.Birthdate != params.Birthdate {
+		user.Birthdate = params.Birthdate
+	}
+
+	if params.Gender != nil && user.Gender != params.Gender {
+		user.Gender = params.Gender
+	}
+
+	if params.PhoneNumber != nil && user.PhoneNumber != params.PhoneNumber {
+		user.PhoneNumber = params.PhoneNumber
+	}
+
+	if params.Picture != nil && user.Picture != params.Picture {
+		user.Picture = params.Picture
 	}

 	if params.Email != nil && user.Email != *params.Email {
@@ -64,12 +84,12 @@ func AdminUpdateUser(ctx context.Context, params model.AdminUpdateUserInput) (*m
 		utils.DeleteCookie(gc)

 		user.Email = newEmail
-		user.EmailVerifiedAt = 0
+		user.EmailVerifiedAt = nil
 		// insert verification request
 		verificationType := enum.UpdateEmail.String()
 		token, err := utils.CreateVerificationToken(newEmail, verificationType)
 		if err != nil {
-			log.Println(`Error generating token`, err)
+			log.Println(`error generating token`, err)
 		}
 		db.Mgr.AddVerification(db.VerificationRequest{
 			Token:      token,
@@ -110,19 +130,19 @@ func AdminUpdateUser(ctx context.Context, params model.AdminUpdateUserInput) (*m

 	user, err = db.Mgr.UpdateUser(user)
 	if err != nil {
-		log.Println("Error updating user:", err)
+		log.Println("error updating user:", err)
 		return res, err
 	}

 	res = &model.User{
-		ID:        params.ID,
-		Email:     user.Email,
-		Image:     &user.Image,
-		FirstName: &user.FirstName,
-		LastName:  &user.LastName,
-		Roles:     strings.Split(user.Roles, ","),
-		CreatedAt: &user.CreatedAt,
-		UpdatedAt: &user.UpdatedAt,
+		ID:         params.ID,
+		Email:      user.Email,
+		Picture:    user.Picture,
+		GivenName:  user.GivenName,
+		FamilyName: user.FamilyName,
+		Roles:      strings.Split(user.Roles, ","),
+		CreatedAt:  &user.CreatedAt,
+		UpdatedAt:  &user.UpdatedAt,
 	}
 	return res, nil
 }
--- a/server/resolvers/users.go
+++ b/server/resolvers/users.go
@@ -3,7 +3,6 @@ package resolvers
 import (
 	"context"
 	"fmt"
-	"strings"

 	"github.com/authorizerdev/authorizer/server/db"
 	"github.com/authorizerdev/authorizer/server/graph/model"
@@ -27,17 +26,7 @@ func Users(ctx context.Context) ([]*model.User, error) {
 	}

 	for i := 0; i < len(users); i++ {
-		res = append(res, &model.User{
-			ID:              fmt.Sprintf("%v", users[i].ID),
-			Email:           users[i].Email,
-			SignupMethod:    users[i].SignupMethod,
-			FirstName:       &users[i].FirstName,
-			LastName:        &users[i].LastName,
-			EmailVerifiedAt: &users[i].EmailVerifiedAt,
-			Roles:           strings.Split(users[i].Roles, ","),
-			CreatedAt:       &users[i].CreatedAt,
-			UpdatedAt:       &users[i].UpdatedAt,
-		})
+		res = append(res, utils.GetResponseUserData(users[i]))
 	}

 	return res, nil
--- a/server/resolvers/verification_requests.go
+++ b/server/resolvers/verification_requests.go
--- a/server/resolvers/verify_email.go
+++ b/server/resolvers/verify_email.go
@@ -20,7 +20,7 @@ func VerifyEmail(ctx context.Context, params model.VerifyEmailInput) (*model.Aut
 		return res, err
 	}

-	_, err = db.Mgr.GetVerificationByToken(params.Token)
+	verificationRequest, err := db.Mgr.GetVerificationByToken(params.Token)
 	if err != nil {
 		return res, fmt.Errorf(`invalid token`)
 	}
@@ -37,43 +37,25 @@ func VerifyEmail(ctx context.Context, params model.VerifyEmailInput) (*model.Aut
 	}

 	// update email_verified_at in users table
-	db.Mgr.UpdateVerificationTime(time.Now().Unix(), user.ID)
+	now := time.Now().Unix()
+	user.EmailVerifiedAt = &now
+	db.Mgr.UpdateUser(user)
 	// delete from verification table
-	db.Mgr.DeleteToken(claim.Email)
+	db.Mgr.DeleteVerificationRequest(verificationRequest)

-	userIdStr := fmt.Sprintf("%v", user.ID)
 	roles := strings.Split(user.Roles, ",")
 	refreshToken, _, _ := utils.CreateAuthToken(user, enum.RefreshToken, roles)

 	accessToken, expiresAt, _ := utils.CreateAuthToken(user, enum.AccessToken, roles)

-	session.SetToken(userIdStr, accessToken, refreshToken)
-	go func() {
-		sessionData := db.Session{
-			UserID:    user.ID,
-			UserAgent: utils.GetUserAgent(gc.Request),
-			IP:        utils.GetIP(gc.Request),
-		}
-
-		db.Mgr.SaveSession(sessionData)
-	}()
+	session.SetToken(user.ID, accessToken, refreshToken)
+	utils.CreateSession(user.ID, gc)

 	res = &model.AuthResponse{
-		Message:              `Email verified successfully.`,
-		AccessToken:          &accessToken,
-		AccessTokenExpiresAt: &expiresAt,
-		User: &model.User{
-			ID:              userIdStr,
-			Email:           user.Email,
-			Image:           &user.Image,
-			FirstName:       &user.FirstName,
-			LastName:        &user.LastName,
-			SignupMethod:    user.SignupMethod,
-			EmailVerifiedAt: &user.EmailVerifiedAt,
-			Roles:           strings.Split(user.Roles, ","),
-			CreatedAt:       &user.CreatedAt,
-			UpdatedAt:       &user.UpdatedAt,
-		},
+		Message:     `Email verified successfully.`,
+		AccessToken: &accessToken,
+		ExpiresAt:   &expiresAt,
+		User:        utils.GetResponseUserData(user),
 	}

 	utils.SetCookie(gc, accessToken)
--- a/server/router/router.go
+++ b/server/router/router.go
@@ -0,0 +1,23 @@
+package router
+
+import (
+	"github.com/authorizerdev/authorizer/server/handlers"
+	"github.com/authorizerdev/authorizer/server/middlewares"
+	"github.com/gin-contrib/location"
+	"github.com/gin-gonic/gin"
+)
+
+func InitRouter() *gin.Engine {
+	router := gin.Default()
+	router.Use(location.Default())
+	router.Use(middlewares.GinContextToContextMiddleware())
+	router.Use(middlewares.CORSMiddleware())
+
+	router.GET("/", handlers.PlaygroundHandler())
+	router.POST("/graphql", handlers.GraphqlHandler())
+	router.GET("/verify_email", handlers.VerifyEmailHandler())
+	router.GET("/oauth_login/:oauth_provider", handlers.OAuthLoginHandler())
+	router.GET("/oauth_callback/:oauth_provider", handlers.OAuthCallbackHandler())
+
+	return router
+}
--- a/server/session/in_memory_session.go
+++ b/server/session/in_memory_session.go
@@ -1,7 +1,6 @@
 package session

 import (
-	"log"
 	"sync"
 )

@@ -30,8 +29,6 @@ func (c *InMemoryStore) AddToken(userId, accessToken, refreshToken string) {
 		c.store[userId] = tempMap
 	}

-	log.Println(c.store)
-
 	c.mu.Unlock()
 }

@@ -41,7 +38,7 @@ func (c *InMemoryStore) DeleteUserSession(userId string) {
 	c.mu.Unlock()
 }

-func (c *InMemoryStore) DeleteToken(userId, accessToken string) {
+func (c *InMemoryStore) DeleteVerificationRequest(userId, accessToken string) {
 	c.mu.Lock()
 	delete(c.store[userId], accessToken)
 	c.mu.Unlock()
--- a/server/session/redis_store.go
+++ b/server/session/redis_store.go
@@ -29,7 +29,7 @@ func (c *RedisStore) DeleteUserSession(userId string) {
 	}
 }

-func (c *RedisStore) DeleteToken(userId, accessToken string) {
+func (c *RedisStore) DeleteVerificationRequest(userId, accessToken string) {
 	err := c.store.HDel(c.ctx, "authorizer_"+userId, accessToken).Err()
 	if err != nil {
 		log.Fatalln("Error deleting redis token:", err)
@@ -47,7 +47,7 @@ func (c *RedisStore) GetToken(userId, accessToken string) string {
 	token := ""
 	res, err := c.store.HMGet(c.ctx, "authorizer_"+userId, accessToken).Result()
 	if err != nil {
-		log.Println("Error getting token from redis store:", err)
+		log.Println("error getting token from redis store:", err)
 	}
 	if len(res) > 0 && res[0] != nil {
 		token = fmt.Sprintf("%v", res[0])
@@ -66,7 +66,7 @@ func (c *RedisStore) GetSocialLoginState(key string) string {
 	state := ""
 	state, err := c.store.Get(c.ctx, key).Result()
 	if err != nil {
-		log.Println("Error getting token from redis store:", err)
+		log.Println("error getting token from redis store:", err)
 	}

 	return state
--- a/server/session/session.go
+++ b/server/session/session.go
@@ -27,12 +27,12 @@ func SetToken(userId, accessToken, refreshToken string) {
 	}
 }

-func DeleteToken(userId, accessToken string) {
+func DeleteVerificationRequest(userId, accessToken string) {
 	if SessionStoreObj.RedisMemoryStoreObj != nil {
-		SessionStoreObj.RedisMemoryStoreObj.DeleteToken(userId, accessToken)
+		SessionStoreObj.RedisMemoryStoreObj.DeleteVerificationRequest(userId, accessToken)
 	}
 	if SessionStoreObj.InMemoryStoreObj != nil {
-		SessionStoreObj.InMemoryStoreObj.DeleteToken(userId, accessToken)
+		SessionStoreObj.InMemoryStoreObj.DeleteVerificationRequest(userId, accessToken)
 	}
 }

@@ -96,7 +96,7 @@ func RemoveSocialLoginState(key string) {

 func InitSession() {
 	if constants.REDIS_URL != "" {
-		log.Println("Using redis store to save sessions")
+		log.Println("using redis store to save sessions")
 		opt, err := redis.ParseURL(constants.REDIS_URL)
 		if err != nil {
 			log.Fatalln("Error parsing redis url:", err)
@@ -114,7 +114,7 @@ func InitSession() {
 		}

 	} else {
-		log.Println("Using in memory store to save sessions")
+		log.Println("using in memory store to save sessions")
 		SessionStoreObj.InMemoryStoreObj = &InMemoryStore{
 			store:            map[string]map[string]string{},
 			socialLoginState: map[string]string{},
--- a/server/utils/auth_token.go
+++ b/server/utils/auth_token.go
@@ -26,34 +26,31 @@ func CreateAuthToken(user db.User, tokenType enum.TokenType, roles []string) (st

 	expiresAt := time.Now().Add(expiryBound).Unix()

+	resUser := GetResponseUserData(user)
+	userBytes, _ := json.Marshal(&resUser)
+	var userMap map[string]interface{}
+	json.Unmarshal(userBytes, &userMap)
+
 	customClaims := jwt.MapClaims{
 		"exp":                    expiresAt,
 		"iat":                    time.Now().Unix(),
 		"token_type":             tokenType.String(),
-		"email":                  user.Email,
-		"id":                     user.ID,
 		"allowed_roles":          strings.Split(user.Roles, ","),
 		constants.JWT_ROLE_CLAIM: roles,
 	}

-	// check for the extra access token script
+	for k, v := range userMap {
+		if k != "roles" {
+			customClaims[k] = v
+		}
+	}

+	// check for the extra access token script
 	accessTokenScript := os.Getenv("CUSTOM_ACCESS_TOKEN_SCRIPT")
 	if accessTokenScript != "" {
-		userInfo := map[string]interface{}{
-			"id":            user.ID,
-			"email":         user.Email,
-			"firstName":     user.FirstName,
-			"lastName":      user.LastName,
-			"image":         user.Image,
-			"roles":         strings.Split(user.Roles, ","),
-			"signUpMethods": strings.Split(user.SignupMethod, ","),
-		}
-
 		vm := otto.New()
-		userBytes, _ := json.Marshal(userInfo)
-		claimBytes, _ := json.Marshal(customClaims)

+		claimBytes, _ := json.Marshal(customClaims)
 		vm.Run(fmt.Sprintf(`
 			var user = %s;
 			var tokenPayload = %s;
@@ -64,12 +61,12 @@ func CreateAuthToken(user db.User, tokenType enum.TokenType, roles []string) (st
 		val, err := vm.Get("functionRes")

 		if err != nil {
-			log.Println("=> err custom access token script:", err)
+			log.Println("error getting custom access token script:", err)
 		} else {
 			extraPayload := make(map[string]interface{})
 			err = json.Unmarshal([]byte(fmt.Sprintf("%s", val)), &extraPayload)
 			if err != nil {
-				log.Println("Error converting accessTokenScript response to map:", err)
+				log.Println("error converting accessTokenScript response to map:", err)
 			} else {
 				for k, v := range extraPayload {
 					customClaims[k] = v
--- a/server/utils/cookie.go
+++ b/server/utils/cookie.go
@@ -10,7 +10,7 @@ import (
 func SetCookie(gc *gin.Context, token string) {
 	secure := true
 	httpOnly := true
-	host := GetHostName(constants.AUTHORIZER_URL)
+	host, _ := GetHostParts(constants.AUTHORIZER_URL)
 	domain := GetDomainName(constants.AUTHORIZER_URL)
 	if domain != "localhost" {
 		domain = "." + domain
@@ -37,7 +37,7 @@ func DeleteCookie(gc *gin.Context) {
 	secure := true
 	httpOnly := true

-	host := GetDomainName(constants.AUTHORIZER_URL)
+	host, _ := GetHostParts(constants.AUTHORIZER_URL)
 	domain := GetDomainName(constants.AUTHORIZER_URL)
 	if domain != "localhost" {
 		domain = "." + domain
--- a/server/utils/create_session.go
+++ b/server/utils/create_session.go
@@ -0,0 +1,16 @@
+package utils
+
+import (
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/gin-gonic/gin"
+)
+
+func CreateSession(userId string, c *gin.Context) {
+	sessionData := db.Session{
+		UserID:    userId,
+		UserAgent: GetUserAgent(c.Request),
+		IP:        GetIP(c.Request),
+	}
+
+	db.Mgr.AddSession(sessionData)
+}
--- a/server/utils/get_response_user_data.go
+++ b/server/utils/get_response_user_data.go
@@ -0,0 +1,32 @@
+package utils
+
+import (
+	"strings"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+)
+
+func GetResponseUserData(user db.User) *model.User {
+	isEmailVerified := user.EmailVerifiedAt != nil
+	isPhoneVerified := user.PhoneNumberVerifiedAt != nil
+	return &model.User{
+		ID:                  user.ID,
+		Email:               user.Email,
+		EmailVerified:       isEmailVerified,
+		SignupMethods:       user.SignupMethods,
+		GivenName:           user.GivenName,
+		FamilyName:          user.FamilyName,
+		MiddleName:          user.MiddleName,
+		Nickname:            user.Nickname,
+		PreferredUsername:   &user.Email,
+		Gender:              user.Gender,
+		Birthdate:           user.Birthdate,
+		PhoneNumber:         user.PhoneNumber,
+		PhoneNumberVerified: &isPhoneVerified,
+		Picture:             user.Picture,
+		Roles:               strings.Split(user.Roles, ","),
+		CreatedAt:           &user.CreatedAt,
+		UpdatedAt:           &user.UpdatedAt,
+	}
+}
--- a/server/utils/gin_context.go
+++ b/server/utils/gin_context.go
--- a/server/utils/hash_password.go
+++ b/server/utils/hash_password.go
--- a/server/utils/initServer.go
+++ b/server/utils/initServer.go
@@ -1,30 +0,0 @@
-package utils
-
-import (
-	"log"
-
-	"github.com/authorizerdev/authorizer/server/constants"
-	"github.com/authorizerdev/authorizer/server/db"
-)
-
-// any jobs that we want to run at start of server can be executed here
-
-// 1. create roles table and add the roles list from env to table
-
-func InitServer() {
-	roles := []db.Role{}
-	for _, val := range constants.ROLES {
-		roles = append(roles, db.Role{
-			Role: val,
-		})
-	}
-	for _, val := range constants.PROTECTED_ROLES {
-		roles = append(roles, db.Role{
-			Role: val,
-		})
-	}
-	err := db.Mgr.SaveRoles(roles)
-	if err != nil {
-		log.Println(`Error saving roles`, err)
-	}
-}
--- a/server/utils/init_server.go
+++ b/server/utils/init_server.go
@@ -0,0 +1,6 @@
+package utils
+
+// any jobs that we want to run at start of server can be executed here
+
+func InitServer() {
+}
--- a/server/utils/meta.go
+++ b/server/utils/meta.go
@@ -13,9 +13,8 @@ func GetMetaInfo() model.Meta {
 		IsGoogleLoginEnabled:         constants.GOOGLE_CLIENT_ID != "" && constants.GOOGLE_CLIENT_SECRET != "",
 		IsGithubLoginEnabled:         constants.GITHUB_CLIENT_ID != "" && constants.GOOGLE_CLIENT_SECRET != "",
 		IsFacebookLoginEnabled:       constants.FACEBOOK_CLIENT_ID != "" && constants.FACEBOOK_CLIENT_SECRET != "",
-		IsTwitterLoginEnabled:        constants.TWITTER_CLIENT_ID != "" && constants.TWITTER_CLIENT_SECRET != "",
-		IsBasicAuthenticationEnabled: constants.DISABLE_BASIC_AUTHENTICATION != "true",
-		IsEmailVerificationEnabled:   constants.DISABLE_EMAIL_VERIFICATION != "true",
-		IsMagicLoginEnabled:          constants.DISABLE_MAGIC_LOGIN != "true" && constants.DISABLE_EMAIL_VERIFICATION != "true",
+		IsBasicAuthenticationEnabled: !constants.DISABLE_BASIC_AUTHENTICATION,
+		IsEmailVerificationEnabled:   !constants.DISABLE_EMAIL_VERIFICATION,
+		IsMagicLinkLoginEnabled:      !constants.DISABLE_MAGIC_LINK_LOGIN,
 	}
 }
--- a/server/utils/request_info.go
+++ b/server/utils/request_info.go
--- a/server/utils/urls.go
+++ b/server/utils/urls.go
@@ -5,21 +5,32 @@ import (
 	"strings"
 )

-// GetHostName function to get hostname
-func GetHostName(auth_url string) string {
-	u, err := url.Parse(auth_url)
+// GetHostName function returns hostname and port
+func GetHostParts(uri string) (string, string) {
+	tempURI := uri
+	if !strings.HasPrefix(tempURI, "http") && strings.HasPrefix(tempURI, "https") {
+		tempURI = "https://" + tempURI
+	}
+
+	u, err := url.Parse(tempURI)
 	if err != nil {
-		return `localhost`
+		return "localhost", "8080"
 	}

 	host := u.Hostname()
+	port := u.Port()

-	return host
+	return host, port
 }

 // GetDomainName function to get domain name
-func GetDomainName(auth_url string) string {
-	u, err := url.Parse(auth_url)
+func GetDomainName(uri string) string {
+	tempURI := uri
+	if !strings.HasPrefix(tempURI, "http") && strings.HasPrefix(tempURI, "https") {
+		tempURI = "https://" + tempURI
+	}
+
+	u, err := url.Parse(tempURI)
 	if err != nil {
 		return `localhost`
 	}
--- a/server/utils/urls_test.go
+++ b/server/utils/urls_test.go
@@ -1,25 +0,0 @@
-package utils
-
-import "testing"
-
-func TestGetHostName(t *testing.T) {
-	authorizer_url := "http://test.herokuapp.com"
-
-	got := GetHostName(authorizer_url)
-	want := "test.herokuapp.com"
-
-	if got != want {
-		t.Errorf("GetHostName Test failed got %s, wanted %s", got, want)
-	}
-}
-
-func TestGetDomainName(t *testing.T) {
-	authorizer_url := "http://test.herokuapp.com"
-
-	got := GetDomainName(authorizer_url)
-	want := "herokuapp.com"
-
-	if got != want {
-		t.Errorf("GetHostName Test failed got %q, wanted %q", got, want)
-	}
-}
--- a/server/utils/validator.go
+++ b/server/utils/validator.go
@@ -2,9 +2,11 @@ package utils

 import (
 	"net/mail"
+	"regexp"
 	"strings"

 	"github.com/authorizerdev/authorizer/server/constants"
+	"github.com/authorizerdev/authorizer/server/enum"
 	"github.com/gin-gonic/gin"
 )

@@ -13,16 +15,32 @@ func IsValidEmail(email string) bool {
 	return err == nil
 }

-func IsValidRedirectURL(url string) bool {
+func IsValidOrigin(url string) bool {
 	if len(constants.ALLOWED_ORIGINS) == 1 && constants.ALLOWED_ORIGINS[0] == "*" {
 		return true
 	}

 	hasValidURL := false
-	urlDomain := GetDomainName(url)
+	hostName, port := GetHostParts(url)
+	currentOrigin := hostName + ":" + port

-	for _, val := range constants.ALLOWED_ORIGINS {
-		if strings.Contains(val, urlDomain) {
+	for _, origin := range constants.ALLOWED_ORIGINS {
+		replacedString := origin
+		// if has regex whitelisted domains
+		if strings.Contains(origin, "*") {
+			replacedString = strings.Replace(origin, ".", "\\.", -1)
+			replacedString = strings.Replace(replacedString, "*", ".*", -1)
+
+			if strings.HasPrefix(replacedString, ".*") {
+				replacedString += "\\b"
+			}
+
+			if strings.HasSuffix(replacedString, ".*") {
+				replacedString = "\\b" + replacedString
+			}
+		}
+
+		if matched, _ := regexp.MatchString(replacedString, currentOrigin); matched {
 			hasValidURL = true
 			break
 		}
@@ -52,6 +70,13 @@ func IsValidRoles(userRoles []string, roles []string) bool {
 	return valid
 }

+func IsValidVerificationIdentifier(identifier string) bool {
+	if identifier != enum.BasicAuthSignup.String() && identifier != enum.ForgotPassword.String() && identifier != enum.UpdateEmail.String() {
+		return false
+	}
+	return true
+}
+
 func IsStringArrayEqual(a, b []string) bool {
 	if len(a) != len(b) {
 		return false
--- a/server/utils/verification_token.go
+++ b/server/utils/verification_token.go
@@ -19,13 +19,11 @@ type CustomClaim struct {
 	UserInfo
 }

-// TODO convert tokenType to enum
 func CreateVerificationToken(email string, tokenType string) (string, error) {
 	t := jwt.New(jwt.GetSigningMethod(constants.JWT_TYPE))

 	t.Claims = &CustomClaim{
 		&jwt.StandardClaims{
-
 			ExpiresAt: time.Now().Add(time.Minute * 30).Unix(),
 		},
 		tokenType,
Author	SHA1	Message	Date
Lakhan Samani	b4b8593879	fix: default role values	2021-12-24 18:42:32 +05:30
Lakhan Samani	46a91fde20	fix: version var in make file	2021-12-24 17:47:35 +05:30
Lakhan Samani	8f826e6c2f	Update CONTRIBUTING.md	2021-12-24 10:55:07 +05:30
Lakhan Samani	ebfea707c5	Update README.md	2021-12-24 10:06:39 +05:30
Lakhan Samani	8fc0175166	Update CONTRIBUTING.md	2021-12-24 10:05:05 +05:30
Lakhan Samani	dc43f56db1	fix: update authorizer-react version	2021-12-24 09:55:24 +05:30
Lakhan Samani	e5761f1e42	Merge pull request #87 from authorizerdev/feat/use-opend-id-standard-claims feat/use opend id standard claims	2021-12-24 08:49:01 +05:30
Lakhan Samani	8dd8252a46	fix: move test to __test__ folder	2021-12-24 07:40:04 +05:30
Lakhan Samani	7ee4715af2	fix: rename magic_link_login enum	2021-12-24 07:20:22 +05:30
Lakhan Samani	1b3f931074	fix: rename getresuser util	2021-12-24 06:35:02 +05:30
Lakhan Samani	30cde3e521	feat: add tests for all resolvers	2021-12-24 06:27:39 +05:30
Lakhan Samani	6e9370458b	fix: create common resolver test suite	2021-12-23 14:17:44 +05:30
Lakhan Samani	beae4502d4	feat: add integration tests for signup, login, reset_password, forgot_password, verify_email	2021-12-23 10:31:52 +05:30
Lakhan Samani	969395ccdb	fix: make email verification col nullable	2021-12-22 15:38:51 +05:30
Lakhan Samani	3ee79c3937	fix: unique constraint data	2021-12-22 15:31:45 +05:30
Lakhan Samani	508c714932	fix: refactor schema for open id claim standards	2021-12-22 10:51:12 +05:30
Lakhan Samani	8f7582e1ec	fix: add valid origin check for cors (#83 ) Resolves #72	2021-12-21 18:46:54 +05:30
Lakhan Samani	bdbbe4adee	Update README.md	2021-12-21 09:32:05 +05:30
Lakhan Samani	65478296cb	feat: add mongodb support (#82 ) * feat: add mongodb enum * fix: isMongodb var condition * feat: add init mongodb connection * feat: add mongodb operations for various db methods * fix: error message	2021-12-20 23:21:27 +05:30
Lakhan Samani	2342f7c5c6	build: new app	2021-12-20 18:42:02 +05:30
Lakhan Samani	8266c1cff5	chore: update authorizer-react 0.2.0	2021-12-20 18:41:48 +05:30
Lakhan Samani	c662c625a0	Update README.md	2021-12-20 18:38:17 +05:30
Lakhan Samani	c989648327	Merge branch 'main' of https://github.com/authorizerdev/authorizer	2021-12-20 18:32:46 +05:30
Lakhan Samani	a933ac1118	fix: remove count check on cursor	2021-12-20 18:32:36 +05:30
Lakhan Samani	b8afe7abcc	Update README.md	2021-12-20 18:28:55 +05:30
Lakhan Samani	3ab02cc4ff	Update README.md	2021-12-20 18:22:56 +05:30
Lakhan Samani	bedc3d0b50	fix: arangodb get one queries	2021-12-20 17:33:11 +05:30
Lakhan Samani	1398762e1d	fix: remove completed todo	2021-12-19 05:46:14 +05:30
Lakhan Samani	e0a77da773	test: add email validtor test	2021-12-19 05:45:06 +05:30
Lakhan Samani	c3f4cd3bf9	feat: add support for sqlserver (#81 ) * feat: add support for sqlserver * fix: update gorm dependencies * fix: update constraint	2021-12-17 21:50:57 +05:30
Lakhan Samani	f110255310	feat/add arangodb support (#80 ) feat: add arangodb init fix: dao for sql + arangodb * fix: update error logs * fix: use db name dynamically	2021-12-17 21:25:07 +05:30