fix: refactor schema for open id claim standards

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,
 	}
 }