fix: refactor schema for open id claim standards

TODO.md

@@ -1,5 +1,19 @@
 # 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
+- [] Write integration tests for all resolvers
+- [] Update doc
+  - [] Rename all schemas + vars
+- [] Update JS lib
+- [] Update react lib
+
 ## Feature Multiple sessions
 
 - Multiple sessions for users to login use hMset from redis for this

server/constants/constants.go

@@ -1,5 +1,6 @@
 package constants
 
+// this constants are configured via env
 var (
 	ADMIN_SECRET                 = ""
 	ENV                          = ""
@@ -17,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_MAGIC_LINK_LOGIN     = false
 
 	// ROLES
 	ROLES           = []string{}

server/db/arangodb.go

@@ -61,11 +61,11 @@ func initArangodb() (arangoDriver.Database, error) {
 		}
 	}
 	userCollection, _ := arangodb.Collection(nil, Collections.User)
-	userCollection.EnsureHashIndex(ctx, []string{"id"}, &arangoDriver.EnsureHashIndexOptions{
+	userCollection.EnsureHashIndex(ctx, []string{"email"}, &arangoDriver.EnsureHashIndexOptions{
 		Unique: true,
 		Sparse: true,
 	})
-	userCollection.EnsureHashIndex(ctx, []string{"email"}, &arangoDriver.EnsureHashIndexOptions{
+	userCollection.EnsureHashIndex(ctx, []string{"phone_number"}, &arangoDriver.EnsureHashIndexOptions{
 		Unique: true,
 		Sparse: true,
 	})
@@ -79,11 +79,8 @@ func initArangodb() (arangoDriver.Database, error) {
 			log.Println("error creating collection("+Collections.VerificationRequest+"):", err)
 		}
 	}
+
 	verificationRequestCollection, _ := arangodb.Collection(nil, Collections.VerificationRequest)
-	verificationRequestCollection.EnsureHashIndex(ctx, []string{"id"}, &arangoDriver.EnsureHashIndexOptions{
-		Unique: true,
-		Sparse: true,
-	})
 	verificationRequestCollection.EnsureHashIndex(ctx, []string{"email", "identifier"}, &arangoDriver.EnsureHashIndexOptions{
 		Unique: true,
 		Sparse: true,
@@ -102,11 +99,5 @@ func initArangodb() (arangoDriver.Database, error) {
 		}
 	}
 
-	sessionCollection, _ := arangodb.Collection(nil, Collections.Session)
-	sessionCollection.EnsureHashIndex(ctx, []string{"id"}, &arangoDriver.EnsureHashIndexOptions{
-		Unique: true,
-		Sparse: true,
-	})
-
 	return arangodb, err
 }

server/db/mongodb.go

@@ -46,6 +46,12 @@ func initMongodb() (*mongo.Database, error) {
 			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),
+		},
+	}, options.CreateIndexes())
 
 	mongodb.CreateCollection(ctx, Collections.VerificationRequest, options.CreateCollection())
 	verificationRequestCollection := mongodb.Collection(Collections.VerificationRequest, options.Collection())

server/db/session.go

@@ -10,9 +10,9 @@ import (
 )
 
 type Session struct {
-	Key       string `json:"_key,omitempty" bson:"_key,omitempty"` // for arangodb
+	Key string `json:"_key,omitempty" bson:"_key,omitempty"` // for arangodb
-	ObjectID  string `json:"_id,omitempty" bson:"_id"`             // for arangodb & mongodb
+	// ObjectID  string `json:"_id,omitempty" bson:"_id"`             // for arangodb & mongodb
-	ID        string `gorm:"primaryKey;type:char(36)" json:"id" bson:"id"`
+	ID        string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id"`
 	UserID    string `gorm:"type:char(36)" json:"user_id" bson:"user_id"`
 	User      User   `json:"-" bson:"-"`
 	UserAgent string `json:"user_agent" bson:"user_agent"`
@@ -29,7 +29,7 @@ func (mgr *manager) AddSession(session Session) error {
 
 	if IsORMSupported {
 		session.Key = session.ID
-		session.ObjectID = session.ID
+		// session.ObjectID = session.ID
 		res := mgr.sqlDB.Clauses(
 			clause.OnConflict{
 				DoNothing: true,
@@ -53,7 +53,7 @@ func (mgr *manager) AddSession(session Session) error {
 
 	if IsMongoDB {
 		session.Key = session.ID
-		session.ObjectID = session.ID
+		// session.ObjectID = session.ID
 		session.CreatedAt = time.Now().Unix()
 		session.UpdatedAt = time.Now().Unix()
 		sessionCollection := mgr.mongodb.Collection(Collections.Session, options.Collection())

server/db/user.go

@@ -14,19 +14,25 @@ import (
 )
 
 type User struct {
-	Key             string `json:"_key,omitempty" bson:"_key"` // for arangodb
+	Key string `json:"_key,omitempty" bson:"_key"` // for arangodb
-	ObjectID        string `json:"_id,omitempty" bson:"_id"`   // for arangodb & mongodb
+	ID  string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id"`
-	ID              string `gorm:"primaryKey;type:char(36)" json:"id" bson:"id"`
+
-	FirstName       string `json:"first_name" bson:"first_name"`
+	Email                 string `gorm:"unique" json:"email" bson:"email"`
-	LastName        string `json:"last_name" bson:"last_name"`
+	EmailVerifiedAt       int64  `json:"email_verified_at" bson:"email_verified_at"`
-	Email           string `gorm:"unique" json:"email" bson:"email"`
+	Password              string `gorm:"type:text" json:"password" bson:"password"`
-	Password        string `gorm:"type:text" json:"password" bson:"password"`
+	SignupMethods         string `json:"signup_methods" bson:"signup_methods"`
-	SignupMethod    string `json:"signup_method" bson:"signup_method"`
+	GivenName             string `json:"given_name" bson:"given_name"`
-	EmailVerifiedAt int64  `json:"email_verified_at" bson:"email_verified_at"`
+	FamilyName            string `json:"family_name" bson:"family_name"`
-	CreatedAt       int64  `gorm:"autoCreateTime" json:"created_at" bson:"created_at"`
+	MiddleName            string `json:"middle_name" bson:"middle_name"`
-	UpdatedAt       int64  `gorm:"autoUpdateTime" json:"updated_at" bson:"updated_at"`
+	Nickname              string `json:"nickname" bson:"nickname"`
-	Image           string `gorm:"type:text" json:"image" bson:"image"`
+	Gender                string `json:"gender" bson:"gender"`
-	Roles           string `json:"roles" bson:"roles"`
+	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"`
 }
 
 // AddUser function to add user even with email conflict
@@ -38,7 +44,7 @@ func (mgr *manager) AddUser(user User) (User, error) {
 	if IsORMSupported {
 		// copy id as value for fields required for mongodb & arangodb
 		user.Key = user.ID
-		user.ObjectID = user.ID
+		// user.ObjectID = user.ID
 		result := mgr.sqlDB.Clauses(
 			clause.OnConflict{
 				UpdateAll: true,
@@ -61,14 +67,14 @@ func (mgr *manager) AddUser(user User) (User, error) {
 			return user, err
 		}
 		user.Key = meta.Key
-		user.ObjectID = meta.ID.String()
+		// user.ObjectID = meta.ID.String()
 	}
 
 	if IsMongoDB {
 		user.CreatedAt = time.Now().Unix()
 		user.UpdatedAt = time.Now().Unix()
 		user.Key = user.ID
-		user.ObjectID = user.ID
+		// user.ObjectID = user.ID
 		userCollection := mgr.mongodb.Collection(Collections.User, options.Collection())
 		_, err := userCollection.InsertOne(nil, user)
 		if err != nil {
@@ -102,7 +108,7 @@ func (mgr *manager) UpdateUser(user User) (User, error) {
 		}
 
 		user.Key = meta.Key
-		user.ObjectID = meta.ID.String()
+		// user.ObjectID = meta.ID.String()
 	}
 
 	if IsMongoDB {

server/db/verification_requests.go

@@ -13,9 +13,9 @@ import (
 )
 
 type VerificationRequest struct {
-	Key        string `json:"_key,omitempty" bson:"_key"` // for arangodb
+	Key string `json:"_key,omitempty" bson:"_key"` // for arangodb
-	ObjectID   string `json:"_id,omitempty" bson:"_id"`   // for arangodb & mongodb
+	// ObjectID   string `json:"_id,omitempty" bson:"_id"`   // for arangodb & mongodb
-	ID         string `gorm:"primaryKey;type:char(36)" json:"id" bson:"id"`
+	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"`
@@ -32,7 +32,7 @@ func (mgr *manager) AddVerification(verification VerificationRequest) (Verificat
 	if IsORMSupported {
 		// copy id as value for fields required for mongodb & arangodb
 		verification.Key = verification.ID
-		verification.ObjectID = verification.ID
+		// verification.ObjectID = verification.ID
 		result := mgr.sqlDB.Clauses(clause.OnConflict{
 			Columns:   []clause.Column{{Name: "email"}, {Name: "identifier"}},
 			DoUpdates: clause.AssignmentColumns([]string{"token", "expires_at"}),
@@ -54,14 +54,14 @@ func (mgr *manager) AddVerification(verification VerificationRequest) (Verificat
 			return verification, err
 		}
 		verification.Key = meta.Key
-		verification.ObjectID = meta.ID.String()
+		// verification.ObjectID = meta.ID.String()
 	}
 
 	if IsMongoDB {
 		verification.CreatedAt = time.Now().Unix()
 		verification.UpdatedAt = time.Now().Unix()
 		verification.Key = verification.ID
-		verification.ObjectID = verification.ID
+		// verification.ObjectID = verification.ID
 		verificationRequestCollection := mgr.mongodb.Collection(Collections.VerificationRequest, options.Collection())
 		_, err := verificationRequestCollection.InsertOne(nil, verification)
 		if err != nil {

server/env/env.go

@@ -41,48 +41,149 @@ func InitEnv() {
 	}
 
 	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.DATABASE_NAME = os.Getenv("DATABASE_NAME")
-	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") == "true"
-	constants.DISABLE_EMAIL_VERIFICATION = os.Getenv("DISABLE_EMAIL_VERIFICATION") == "true"
-	constants.DISABLE_MAGIC_LOGIN = os.Getenv("DISABLE_MAGIC_LOGIN") == "true"
-	constants.JWT_ROLE_CLAIM = os.Getenv("JWT_ROLE_CLAIM")
 
 	if constants.ADMIN_SECRET == "" {
-		panic("root admin secret is required")
+		constants.ADMIN_SECRET = os.Getenv("ADMIN_SECRET")
+		if constants.ADMIN_SECRET == "" {
+			panic("root admin secret is required")
+		}
 	}
 
 	if constants.ENV == "" {
-		constants.ENV = "production"
+		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.ENV == "production" {
+	if constants.DATABASE_TYPE == "" {
-		constants.IS_PROD = true
+		constants.DATABASE_TYPE = os.Getenv("DATABASE_TYPE")
-		os.Setenv("GIN_MODE", "release")
+
-	} else {
+		if *ARG_DB_TYPE != "" {
-		constants.IS_PROD = false
+			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 != "" {
+			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 != "" {
+			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"), ",")
@@ -113,30 +214,6 @@ func InitEnv() {
 
 	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.DATABASE_NAME == "" {
-		constants.DATABASE_NAME = "authorizer"
-	}
-
 	if constants.JWT_TYPE == "" {
 		constants.JWT_TYPE = "HS256"
 	}
@@ -145,13 +222,8 @@ func InitEnv() {
 		constants.COOKIE_NAME = "authorizer"
 	}
 
-	if constants.SMTP_HOST == "" || constants.SENDER_EMAIL == "" || constants.SENDER_PASSWORD == "" {
-		constants.DISABLE_EMAIL_VERIFICATION = true
-		constants.DISABLE_MAGIC_LOGIN = true
-	}
-
 	if constants.DISABLE_EMAIL_VERIFICATION {
-		constants.DISABLE_MAGIC_LOGIN = true
+		constants.DISABLE_MAGIC_LINK_LOGIN = true
 	}
 
 	rolesSplit := strings.Split(os.Getenv("ROLES"), ",")
@@ -196,10 +268,6 @@ func InitEnv() {
 	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")
 	}

server/env/env_test.go

@@ -10,6 +10,8 @@ import (
 
 func TestEnvs(t *testing.T) {
 	constants.ENV_PATH = "../../.env.sample"
+	constants.DATABASE_TYPE = "sqlite"
+	constants.DATABASE_URL = "data.db"
 	InitEnv()
 
 	assert.Equal(t, constants.ADMIN_SECRET, "admin")
@@ -17,7 +19,7 @@ func TestEnvs(t *testing.T) {
 	assert.Equal(t, constants.DATABASE_URL, "data.db")
 	assert.Equal(t, constants.DATABASE_TYPE, enum.Sqlite.String())
 	assert.True(t, constants.DISABLE_EMAIL_VERIFICATION)
-	assert.True(t, constants.DISABLE_MAGIC_LOGIN)
+	assert.True(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")

server/go.mod

@@ -3,7 +3,7 @@ module github.com/authorizerdev/authorizer/server
 go 1.16
 
 require (
-	github.com/99designs/gqlgen v0.13.0
+	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
@@ -20,10 +20,10 @@ require (
 	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 // indirect
+	github.com/stretchr/testify v1.7.0
 	github.com/ugorji/go v1.2.6 // indirect
-	github.com/vektah/gqlparser/v2 v2.1.0
+	github.com/vektah/gqlparser/v2 v2.2.0
-	go.mongodb.org/mongo-driver v1.8.1 // indirect
+	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

server/go.sum

@@ -31,15 +31,15 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/99designs/gqlgen v0.13.0 h1:haLTcUp3Vwp80xMVEg5KRNwzfUrgFdRmtBY8fuB8scA=
+github.com/99designs/gqlgen v0.14.0 h1:Wg8aNYQUjMR/4v+W3xD+7SizOy6lSvVeQ06AobNQAXI=
-github.com/99designs/gqlgen v0.13.0/go.mod h1:NV130r6f4tpRWuAI+zsrSdooO/eWUv+Gyyoi3rEfXIk=
+github.com/99designs/gqlgen v0.14.0/go.mod h1:S7z4boV+Nx4VvzMUpVrY/YuHjFX4n7rDyuTqvAkuoRE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
-github.com/agnivade/levenshtein v1.0.3 h1:M5ZnqLOoZR8ygVq0FfkXsNOKzMCk0xRiow0R5+5VkQ0=
+github.com/agnivade/levenshtein v1.1.0 h1:n6qGwyHG61v3ABce1rPVZklEYRT8NFpCMrpZdBUbYGM=
-github.com/agnivade/levenshtein v1.0.3/go.mod h1:4SFRZbbXWLF4MU1T9Qg0pGgH3Pjs+t6ie5efyrwRJXs=
+github.com/agnivade/levenshtein v1.1.0/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/arangodb/go-driver v1.2.1 h1:HREDHhDmzdIWxHmfkfTESbYUnRjESjPh4WUuXq7FZa8=
@@ -73,8 +73,8 @@ github.com/denisenkom/go-mssqldb v0.11.0 h1:9rHa233rhdOyrz2GcP9NM+gi2psgJZ4GWDpL
 github.com/denisenkom/go-mssqldb v0.11.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
-github.com/dgryski/trifles v0.0.0-20190318185328-a8d75aae118c h1:TUuUh0Xgj97tLMNtWtNvI9mIV6isjEb9lBMNv+77IGM=
+github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48 h1:fRzb/w+pyskVMQ+UbP35JkH8yB7MYb4q/qhBarqZE6g=
-github.com/dgryski/trifles v0.0.0-20190318185328-a8d75aae118c/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
+github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -89,7 +89,6 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.7.2 h1:Tg03T9yM2xa8j6I3Z3oqLaQRSmKvxPd6g/2HJ6zICFA=
 github.com/gin-gonic/gin v1.7.2/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
-github.com/go-chi/chi v3.3.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -113,7 +112,7 @@ github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
@@ -246,6 +245,7 @@ github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMW
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
@@ -328,7 +328,6 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -338,6 +337,7 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go v1.2.6 h1:tGiWC9HENWE2tqYycIqFTNorMmFRVhNwCpDOpWqnk8E=
@@ -347,8 +347,8 @@ github.com/ugorji/go/codec v1.2.6 h1:7kbGefxLoDBuYXOms4yD7223OpNMMPNPZxXk5TvFcyQ
 github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw=
 github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
 github.com/vektah/dataloaden v0.2.1-0.20190515034641-a19b9a6e7c9e/go.mod h1:/HUdMve7rvxZma+2ZELQeNh88+003LL7Pf/CZ089j8U=
-github.com/vektah/gqlparser/v2 v2.1.0 h1:uiKJ+T5HMGGQM2kRKQ8Pxw8+Zq9qhhZhz/lieYvCMns=
+github.com/vektah/gqlparser/v2 v2.2.0 h1:bAc3slekAAJW6sZTi07aGq0OrfaCjj4jxARAaC7g2EM=
-github.com/vektah/gqlparser/v2 v2.1.0/go.mod h1:SyUiHgLATUR8BiYURfTirrTcGpcE+4XkV2se04Px1Ms=
+github.com/vektah/gqlparser/v2 v2.2.0/go.mod h1:i3mQIGIrbK2PD1RrCeMTlVbkF2FJ6WkU1KJlJlC+3F4=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w=
@@ -565,7 +565,6 @@ golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200114235610-7ae403b6b589/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
@@ -581,10 +580,12 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -715,5 +716,5 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sourcegraph.com/sourcegraph/appdash v0.0.0-20180110180208-2cc67fd64755/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
+sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
 sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67/go.mod h1:L5q+DGLGOQFpo1snNEkLOJT2d1YTW66rWNzatr3He1k=

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"`
+	Message     string  `json:"message"`
-	AccessToken          *string `json:"accessToken"`
+	AccessToken *string `json:"access_token"`
-	AccessTokenExpiresAt *int64  `json:"accessTokenExpiresAt"`
+	ExpiresAt   *int64  `json:"expires_at"`
-	User                 *User   `json:"user"`
+	User        *User   `json:"user"`
 }
 
 type DeleteUserInput struct {
@@ -37,20 +28,19 @@ 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"`
+	IsGoogleLoginEnabled         bool   `json:"is_google_login_enabled"`
-	IsFacebookLoginEnabled       bool   `json:"isFacebookLoginEnabled"`
+	IsFacebookLoginEnabled       bool   `json:"is_facebook_login_enabled"`
-	IsTwitterLoginEnabled        bool   `json:"isTwitterLoginEnabled"`
+	IsGithubLoginEnabled         bool   `json:"is_github_login_enabled"`
-	IsGithubLoginEnabled         bool   `json:"isGithubLoginEnabled"`
+	IsEmailVerificationEnabled   bool   `json:"is_email_verification_enabled"`
-	IsEmailVerificationEnabled   bool   `json:"isEmailVerificationEnabled"`
+	IsBasicAuthenticationEnabled bool   `json:"is_basic_authentication_enabled"`
-	IsBasicAuthenticationEnabled bool   `json:"isBasicAuthenticationEnabled"`
+	IsMagicLinkLoginEnabled      bool   `json:"is_magic_link_login_enabled"`
-	IsMagicLoginEnabled          bool   `json:"isMagicLoginEnabled"`
 }
 
 type ResendVerifyEmailInput struct {
@@ -60,7 +50,7 @@ type ResendVerifyEmailInput struct {
 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 +58,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"`
+	ConfirmPassword string   `json:"confirm_password"`
-	Image           *string  `json:"image"`
 	Roles           []string `json:"roles"`
 }
 
 type UpdateProfileInput struct {
-	OldPassword        *string `json:"oldPassword"`
+	OldPassword        *string `json:"old_password"`
-	NewPassword        *string `json:"newPassword"`
+	NewPassword        *string `json:"new_password"`
-	ConfirmNewPassword *string `json:"confirmNewPassword"`
+	ConfirmNewPassword *string `json:"confirm_new_password"`
-	FirstName          *string `json:"firstName"`
-	LastName           *string `json:"lastName"`
-	Image              *string `json:"image"`
 	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"`
+	ID                  string   `json:"id"`
-	Email           string   `json:"email"`
+	Email               string   `json:"email"`
-	SignupMethod    string   `json:"signupMethod"`
+	EmailVerified       bool     `json:"email_verified"`
-	FirstName       *string  `json:"firstName"`
+	SignupMethods       string   `json:"signup_methods"`
-	LastName        *string  `json:"lastName"`
+	GivenName           *string  `json:"given_name"`
-	EmailVerifiedAt *int64   `json:"emailVerifiedAt"`
+	FamilyName          *string  `json:"family_name"`
-	Image           *string  `json:"image"`
+	MiddleName          *string  `json:"middle_name"`
-	CreatedAt       *int64   `json:"createdAt"`
+	Nickname            *string  `json:"nickname"`
-	UpdatedAt       *int64   `json:"updatedAt"`
+	PreferredUsername   *string  `json:"preferred_username"`
-	Roles           []string `json:"roles"`
+	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 +127,8 @@ type VerificationRequest struct {
 	Token      *string `json:"token"`
 	Email      *string `json:"email"`
 	Expires    *int64  `json:"expires"`
-	CreatedAt  *int64  `json:"createdAt"`
+	CreatedAt  *int64  `json:"created_at"`
-	UpdatedAt  *int64  `json:"updatedAt"`
+	UpdatedAt  *int64  `json:"updated_at"`
 }
 
 type VerifyEmailInput struct {

server/graph/schema.graphqls

@@ -7,26 +7,33 @@ scalar Any
 
 type Meta {
 	version: String!
-	isGoogleLoginEnabled: Boolean!
+	is_google_login_enabled: Boolean!
-	isFacebookLoginEnabled: Boolean!
+	is_facebook_login_enabled: Boolean!
-	isTwitterLoginEnabled: Boolean!
+	is_github_login_enabled: Boolean!
-	isGithubLoginEnabled: Boolean!
+	is_email_verification_enabled: Boolean!
-	isEmailVerificationEnabled: Boolean!
+	is_basic_authentication_enabled: Boolean!
-	isBasicAuthenticationEnabled: Boolean!
+	is_magic_link_login_enabled: Boolean!
-	isMagicLoginEnabled: Boolean!
 }
 
 type User {
 	id: ID!
 	email: String!
-	signupMethod: String!
+	email_verified: Boolean!
-	firstName: String
+	signup_methods: String!
-	lastName: String
+	given_name: String
-	emailVerifiedAt: Int64
+	family_name: String
-	image: String
+	middle_name: String
-	createdAt: Int64
+	nickname: String
-	updatedAt: Int64
+	# 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
+	created_at: Int64
-	updatedAt: Int64
+	updated_at: Int64
 }
 
 type Error {
@@ -46,8 +53,8 @@ type Error {
 
 type AuthResponse {
 	message: String!
-	accessToken: String
+	access_token: String
-	accessTokenExpiresAt: Int64
+	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!
+	confirm_password: String!
-	image: String
 	roles: [String!]
 }
 
@@ -80,22 +92,31 @@ input ResendVerifyEmailInput {
 }
 
 input UpdateProfileInput {
-	oldPassword: String
+	old_password: String
-	newPassword: String
+	new_password: String
-	confirmNewPassword: String
+	confirm_new_password: String
-	firstName: String
-	lastName: String
-	image: 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
+	given_name: String
-	lastName: String
+	family_name: String
-	image: String
+	middle_name: String
+	nickname: String
+	gender: String
+	birthdate: String
+	phone_number: String
+	picture: String
 	roles: [String]
 }
 
@@ -106,14 +127,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 +142,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!
+	update_profile(params: UpdateProfileInput!): Response!
-	adminUpdateUser(params: AdminUpdateUserInput!): User!
+	verify_email(params: VerifyEmailInput!): AuthResponse!
-	verifyEmail(params: VerifyEmailInput!): AuthResponse!
+	resend_verify_email(params: ResendVerifyEmailInput!): Response!
-	resendVerifyEmail(params: ResendVerifyEmailInput!): Response!
+	forgot_password(params: ForgotPasswordInput!): Response!
-	forgotPassword(params: ForgotPasswordInput!): Response!
+	reset_password(params: ResetPasswordInput!): Response!
-	resetPassword(params: ResetPasswordInput!): Response!
+	# admin only apis
-	deleteUser(params: DeleteUserInput!): Response!
+	_delete_user(params: DeleteUserInput!): Response!
+	_update_user(params: UpdateUserInput!): User!
 }
 
 type Query {
 	meta: Meta!
-	users: [User!]!
 	token(roles: [String!]): AuthResponse
 	profile: User!
-	verificationRequests: [VerificationRequest!]!
+	# admin only apis
+	_users: [User!]!
+	_verification_requests: [VerificationRequest!]!
 }

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) {
+func (r *mutationResolver) MagicLinkLogin(ctx context.Context, params model.MagicLinkLoginInput) (*model.Response, error) {
-	return resolvers.MagicLogin(ctx, params)
+	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,12 +51,12 @@ func (r *mutationResolver) DeleteUser(ctx context.Context, params model.DeleteUs
 	return resolvers.DeleteUser(ctx, params)
 }
 
-func (r *queryResolver) Meta(ctx context.Context) (*model.Meta, error) {
+func (r *mutationResolver) UpdateUser(ctx context.Context, params model.UpdateUserInput) (*model.User, error) {
-	return resolvers.Meta(ctx)
+	return resolvers.UpdateUser(ctx, params)
 }
 
-func (r *queryResolver) Users(ctx context.Context) ([]*model.User, error) {
+func (r *queryResolver) Meta(ctx context.Context) (*model.Meta, error) {
-	return resolvers.Users(ctx)
+	return resolvers.Meta(ctx)
 }
 
 func (r *queryResolver) Token(ctx context.Context, roles []string) (*model.AuthResponse, error) {
@@ -71,6 +67,10 @@ 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 (
-type queryResolver struct{ *Resolver }
+	mutationResolver struct{ *Resolver }
+	queryResolver    struct{ *Resolver }
+)

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
+	if err := idToken.Claims(&user); err != nil {
-	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 {
 		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,12 @@ func processGithubUserInfo(code string) (db.User, error) {
 	if len(name) > 1 && strings.TrimSpace(name[1]) != "" {
 		lastName = name[0]
 	}
+
 	user = db.User{
-		FirstName:       firstName,
+		GivenName:  firstName,
-		LastName:        lastName,
+		FamilyName: lastName,
-		Image:           userRawData["avatar_url"],
+		Picture:    userRawData["avatar_url"],
-		Email:           userRawData["email"],
+		Email:      userRawData["email"],
-		EmailVerifiedAt: time.Now().Unix(),
 	}
 
 	return user, nil
@@ -147,11 +131,10 @@ func processFacebookUserInfo(code string) (db.User, error) {
 	picObject := userRawData["picture"].(map[string]interface{})["data"]
 	picDataObject := picObject.(map[string]interface{})
 	user = db.User{
-		FirstName:       fmt.Sprintf("%v", userRawData["first_name"]),
+		GivenName:  fmt.Sprintf("%v", userRawData["first_name"]),
-		LastName:        fmt.Sprintf("%v", userRawData["last_name"]),
+		FamilyName: fmt.Sprintf("%v", userRawData["last_name"]),
-		Image:           fmt.Sprintf("%v", picDataObject["url"]),
+		Picture:    fmt.Sprintf("%v", picDataObject["url"]),
-		Email:           email,
+		Email:      email,
-		EmailVerifiedAt: time.Now().Unix(),
 	}
 
 	return user, nil
@@ -202,7 +185,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,16 +200,17 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 			}
 
 			user.Roles = strings.Join(inputRoles, ",")
+			user.EmailVerifiedAt = time.Now().Unix()
 			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
@@ -262,7 +246,7 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 				user.Roles = existingUser.Roles
 			}
 			user.Key = existingUser.Key
-			user.ObjectID = existingUser.ObjectID
+			// user.ObjectID = existingUser.ObjectID
 			user.ID = existingUser.ID
 			user, err = db.Mgr.UpdateUser(user)
 		}

server/integration_test/cors_test.go

@@ -14,6 +14,8 @@ import (
 )
 
 func TestCors(t *testing.T) {
+	constants.DATABASE_TYPE = "sqlite"
+	constants.DATABASE_URL = "data.db"
 	constants.ENV_PATH = "../../.env.local"
 	env.InitEnv()
 	r := gin.Default()

server/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"github.com/authorizerdev/authorizer/server/constants"
 	"github.com/authorizerdev/authorizer/server/db"
 	"github.com/authorizerdev/authorizer/server/env"
 	"github.com/authorizerdev/authorizer/server/handlers"
@@ -40,5 +41,5 @@ func main() {
 		app.GET("/reset-password", handlers.AppHandler())
 	}
 
-	r.Run()
+	r.Run(":" + constants.PORT)
 }

server/middlewares/context.go

@@ -14,7 +14,7 @@ func GinContextToContextMiddleware() gin.HandlerFunc {
 		if constants.AUTHORIZER_URL == "" {
 			url := location.Get(c)
 			constants.AUTHORIZER_URL = url.Scheme + "://" + c.Request.Host
-			log.Println("=> authorizer url:", constants.AUTHORIZER_URL)
+			log.Println("authorizer url:", constants.AUTHORIZER_URL)
 		}
 		ctx := context.WithValue(c.Request.Context(), "GinContextKey", c)
 		c.Request = c.Request.WithContext(ctx)

server/resolvers/login.go

@@ -32,7 +32,7 @@ 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`)
 	}
 
@@ -55,12 +55,11 @@ 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)
+	session.SetToken(user.ID, accessToken, refreshToken)
 	go func() {
 		sessionData := db.Session{
 			UserID:    user.ID,
@@ -72,21 +71,10 @@ func Login(ctx context.Context, params model.LoginInput) (*model.AuthResponse, e
 	}()
 
 	res = &model.AuthResponse{
-		Message:              `Logged in successfully`,
+		Message:     `Logged in successfully`,
-		AccessToken:          &accessToken,
+		AccessToken: &accessToken,
-		AccessTokenExpiresAt: &expiresAt,
+		ExpiresAt:   &expiresAt,
-		User: &model.User{
+		User:        utils.GetResUser(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,
-		},
 	}
 
 	utils.SetCookie(gc, accessToken)

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 {
+	if constants.DISABLE_MAGIC_LINK_LOGIN {
 		return res, fmt.Errorf(`magic link login is disabled for this instance`)
 	}
 
@@ -37,7 +37,7 @@ func MagicLogin(ctx context.Context, params model.MagicLoginInput) (*model.Respo
 	existingUser, err := db.Mgr.GetUserByEmail(params.Email)
 
 	if err != nil {
-		user.SignupMethod = enum.MagicLink.String()
+		user.SignupMethods = enum.MagicLink.String()
 		// define roles for new user
 		if len(params.Roles) > 0 {
 			// check if roles exists
@@ -86,12 +86,12 @@ func MagicLogin(ctx context.Context, params model.MagicLoginInput) (*model.Respo
 			user.Roles = existingUser.Roles
 		}
 
-		signupMethod := existingUser.SignupMethod
+		signupMethod := existingUser.SignupMethods
 		if !strings.Contains(signupMethod, enum.MagicLink.String()) {
 			signupMethod = signupMethod + "," + enum.MagicLink.String()
 		}
 
-		user.SignupMethod = signupMethod
+		user.SignupMethods = signupMethod
 		user, _ = db.Mgr.UpdateUser(user)
 		if err != nil {
 			log.Println("error updating user:", err)

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 = utils.GetResUser(user)
-
-	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,
-	}
 
 	return res, nil
 }

server/resolvers/reset_password.go

@@ -41,11 +41,11 @@ func ResetPassword(ctx context.Context, params model.ResetPasswordInput) (*model
 	password, _ := utils.HashPassword(params.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.DeleteVerificationRequest(verificationRequest)

server/resolvers/signup.go

@@ -70,15 +70,39 @@ func Signup(ctx context.Context, params model.SignUpInput) (*model.AuthResponse,
 	password, _ := utils.HashPassword(params.Password)
 	user.Password = password
 
-	if params.FirstName != nil {
+	if params.GivenName != nil {
-		user.FirstName = *params.FirstName
+		user.GivenName = *params.GivenName
 	}
 
-	if params.LastName != nil {
+	if params.FamilyName != nil {
-		user.LastName = *params.LastName
+		user.FamilyName = *params.FamilyName
 	}
 
-	user.SignupMethod = enum.BasicAuth.String()
+	if params.MiddleName != nil {
+		user.MiddleName = *params.MiddleName
+	}
+
+	if params.Nickname != nil {
+		user.Nickname = *params.Nickname
+	}
+
+	if params.Gender != nil {
+		user.Gender = *params.Gender
+	}
+
+	if params.Birthdate != nil {
+		user.Birthdate = *params.Birthdate
+	}
+
+	if params.PhoneNumber != nil {
+		user.PhoneNumber = *params.PhoneNumber
+	}
+
+	if params.Picture != nil {
+		user.Picture = *params.Picture
+	}
+
+	user.SignupMethods = enum.BasicAuth.String()
 	if constants.DISABLE_EMAIL_VERIFICATION {
 		user.EmailVerifiedAt = time.Now().Unix()
 	}
@@ -88,18 +112,7 @@ func Signup(ctx context.Context, params model.SignUpInput) (*model.AuthResponse,
 	}
 	userIdStr := fmt.Sprintf("%v", user.ID)
 	roles := strings.Split(user.Roles, ",")
-	userToReturn := &model.User{
+	userToReturn := utils.GetResUser(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,
-	}
 
 	if !constants.DISABLE_EMAIL_VERIFICATION {
 		// insert verification request
@@ -141,10 +154,10 @@ func Signup(ctx context.Context, params model.SignUpInput) (*model.AuthResponse,
 			db.Mgr.AddSession(sessionData)
 		}()
 		res = &model.AuthResponse{
-			Message:              `Signed up successfully.`,
+			Message:     `Signed up successfully.`,
-			AccessToken:          &accessToken,
+			AccessToken: &accessToken,
-			AccessTokenExpiresAt: &expiresAt,
+			ExpiresAt:   &expiresAt,
-			User:                 userToReturn,
+			User:        userToReturn,
 		}
 
 		utils.SetCookie(gc, accessToken)

server/resolvers/token.go

@@ -3,7 +3,6 @@ package resolvers
 import (
 	"context"
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/authorizerdev/authorizer/server/constants"
@@ -80,21 +79,10 @@ func Token(ctx context.Context, roles []string) (*model.AuthResponse, error) {
 
 	utils.SetCookie(gc, token)
 	res = &model.AuthResponse{
-		Message:              `Token verified`,
+		Message:     `Token verified`,
-		AccessToken:          &token,
+		AccessToken: &token,
-		AccessTokenExpiresAt: &expiresAt,
+		ExpiresAt:   &expiresAt,
-		User: &model.User{
+		User:        utils.GetResUser(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,
-		},
 	}
 	return res, nil
 }

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,16 +50,36 @@ func UpdateProfile(ctx context.Context, params model.UpdateProfileInput) (*model
 		return res, err
 	}
 
-	if params.FirstName != nil && user.FirstName != *params.FirstName {
+	if params.GivenName != nil && user.GivenName != *params.GivenName {
-		user.FirstName = *params.FirstName
+		user.GivenName = *params.GivenName
 	}
 
-	if params.LastName != nil && user.LastName != *params.LastName {
+	if params.FamilyName != nil && user.FamilyName != *params.FamilyName {
-		user.LastName = *params.LastName
+		user.FamilyName = *params.FamilyName
 	}
 
-	if params.Image != nil && user.Image != *params.Image {
+	if params.MiddleName != nil && user.MiddleName != *params.MiddleName {
-		user.Image = *params.Image
+		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 {

server/resolvers/update_user.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 {
+	if params.GivenName != nil && user.GivenName != *params.GivenName {
-		user.FirstName = *params.FirstName
+		user.GivenName = *params.GivenName
 	}
 
-	if params.LastName != nil && user.LastName != *params.LastName {
+	if params.FamilyName != nil && user.FamilyName != *params.FamilyName {
-		user.LastName = *params.LastName
+		user.FamilyName = *params.FamilyName
 	}
 
-	if params.Image != nil && user.Image != *params.Image {
+	if params.MiddleName != nil && user.MiddleName != *params.MiddleName {
-		user.Image = *params.Image
+		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 {
@@ -115,14 +135,14 @@ func AdminUpdateUser(ctx context.Context, params model.AdminUpdateUserInput) (*m
 	}
 
 	res = &model.User{
-		ID:        params.ID,
+		ID:         params.ID,
-		Email:     user.Email,
+		Email:      user.Email,
-		Image:     &user.Image,
+		Picture:    &user.Picture,
-		FirstName: &user.FirstName,
+		GivenName:  &user.GivenName,
-		LastName:  &user.LastName,
+		FamilyName: &user.FamilyName,
-		Roles:     strings.Split(user.Roles, ","),
+		Roles:      strings.Split(user.Roles, ","),
-		CreatedAt: &user.CreatedAt,
+		CreatedAt:  &user.CreatedAt,
-		UpdatedAt: &user.UpdatedAt,
+		UpdatedAt:  &user.UpdatedAt,
 	}
 	return res, nil
 }

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{
+		res = append(res, utils.GetResUser(users[i]))
-			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,
-		})
 	}
 
 	return res, nil

server/resolvers/verify_email.go

@@ -60,21 +60,10 @@ func VerifyEmail(ctx context.Context, params model.VerifyEmailInput) (*model.Aut
 	}()
 
 	res = &model.AuthResponse{
-		Message:              `Email verified successfully.`,
+		Message:     `Email verified successfully.`,
-		AccessToken:          &accessToken,
+		AccessToken: &accessToken,
-		AccessTokenExpiresAt: &expiresAt,
+		ExpiresAt:   &expiresAt,
-		User: &model.User{
+		User:        utils.GetResUser(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,
-		},
 	}
 
 	utils.SetCookie(gc, accessToken)

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 := GetResUser(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;

server/utils/get_res_user.go

@@ -0,0 +1,32 @@
+package utils
+
+import (
+	"strings"
+
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+)
+
+func GetResUser(user db.User) *model.User {
+	isEmailVerified := user.EmailVerifiedAt > 0
+	isPhoneVerified := user.PhoneNumberVerifiedAt > 0
+	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,
+	}
+}

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,
 		IsEmailVerificationEnabled:   !constants.DISABLE_EMAIL_VERIFICATION,
-		IsMagicLoginEnabled:          !constants.DISABLE_MAGIC_LOGIN,
+		IsMagicLinkLoginEnabled:      !constants.DISABLE_MAGIC_LINK_LOGIN,
 	}
 }