diff --git a/server/resolvers/login.go b/server/resolvers/login.go index 8f7e0cb..00b444e 100644 --- a/server/resolvers/login.go +++ b/server/resolvers/login.go @@ -66,7 +66,7 @@ func Login(ctx context.Context, params model.LoginInput) (*model.AuthResponse, e Message: `Logged in successfully`, AccessToken: &accessToken, ExpiresAt: &expiresAt, - User: utils.GetResUser(user), + User: utils.GetResponseUserData(user), } utils.SetCookie(gc, accessToken) diff --git a/server/resolvers/profile.go b/server/resolvers/profile.go index f65460d..97d28e0 100644 --- a/server/resolvers/profile.go +++ b/server/resolvers/profile.go @@ -40,7 +40,7 @@ func Profile(ctx context.Context) (*model.User, error) { return res, err } - res = utils.GetResUser(user) + res = utils.GetResponseUserData(user) return res, nil } diff --git a/server/resolvers/session.go b/server/resolvers/session.go index e4b1a1c..cecc0fe 100644 --- a/server/resolvers/session.go +++ b/server/resolvers/session.go @@ -74,7 +74,7 @@ func Session(ctx context.Context, roles []string) (*model.AuthResponse, error) { Message: `Token verified`, AccessToken: &token, ExpiresAt: &expiresAt, - User: utils.GetResUser(user), + User: utils.GetResponseUserData(user), } return res, nil } diff --git a/server/resolvers/signup.go b/server/resolvers/signup.go index a29833a..46e057f 100644 --- a/server/resolvers/signup.go +++ b/server/resolvers/signup.go @@ -113,7 +113,7 @@ func Signup(ctx context.Context, params model.SignUpInput) (*model.AuthResponse, } userIdStr := fmt.Sprintf("%v", user.ID) roles := strings.Split(user.Roles, ",") - userToReturn := utils.GetResUser(user) + userToReturn := utils.GetResponseUserData(user) if !constants.DISABLE_EMAIL_VERIFICATION { // insert verification request diff --git a/server/resolvers/users.go b/server/resolvers/users.go index 07dbee8..ce8d8ac 100644 --- a/server/resolvers/users.go +++ b/server/resolvers/users.go @@ -26,7 +26,7 @@ func Users(ctx context.Context) ([]*model.User, error) { } for i := 0; i < len(users); i++ { - res = append(res, utils.GetResUser(users[i])) + res = append(res, utils.GetResponseUserData(users[i])) } return res, nil diff --git a/server/resolvers/verify_email.go b/server/resolvers/verify_email.go index cc41902..423766e 100644 --- a/server/resolvers/verify_email.go +++ b/server/resolvers/verify_email.go @@ -55,7 +55,7 @@ func VerifyEmail(ctx context.Context, params model.VerifyEmailInput) (*model.Aut Message: `Email verified successfully.`, AccessToken: &accessToken, ExpiresAt: &expiresAt, - User: utils.GetResUser(user), + User: utils.GetResponseUserData(user), } utils.SetCookie(gc, accessToken) diff --git a/server/utils/auth_token.go b/server/utils/auth_token.go index 5c8ce75..23995de 100644 --- a/server/utils/auth_token.go +++ b/server/utils/auth_token.go @@ -26,7 +26,7 @@ func CreateAuthToken(user db.User, tokenType enum.TokenType, roles []string) (st expiresAt := time.Now().Add(expiryBound).Unix() - resUser := GetResUser(user) + resUser := GetResponseUserData(user) userBytes, _ := json.Marshal(&resUser) var userMap map[string]interface{} json.Unmarshal(userBytes, &userMap) diff --git a/server/utils/get_res_user.go b/server/utils/get_response_user_data.go similarity index 94% rename from server/utils/get_res_user.go rename to server/utils/get_response_user_data.go index d235887..2c34ccd 100644 --- a/server/utils/get_res_user.go +++ b/server/utils/get_response_user_data.go @@ -7,7 +7,7 @@ import ( "github.com/authorizerdev/authorizer/server/graph/model" ) -func GetResUser(user db.User) *model.User { +func GetResponseUserData(user db.User) *model.User { isEmailVerified := user.EmailVerifiedAt != nil isPhoneVerified := user.PhoneNumberVerifiedAt != nil return &model.User{