From db351f777168f512b9719b8c7b8796460147f7e3 Mon Sep 17 00:00:00 2001 From: Lakhan Samani Date: Tue, 14 Jun 2022 15:45:06 +0530 Subject: [PATCH] fix: remove debug logs --- server/handlers/oauth_callback.go | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/server/handlers/oauth_callback.go b/server/handlers/oauth_callback.go index 22efe43..0ed4261 100644 --- a/server/handlers/oauth_callback.go +++ b/server/handlers/oauth_callback.go @@ -462,8 +462,6 @@ func processAppleUserInfo(code string) (models.User, error) { return user, fmt.Errorf("invalid apple exchange code: %s", err.Error()) } - fmt.Println("=> token", oauth2Token.AccessToken) - // Extract the ID Token from OAuth2 token. rawIDToken, ok := oauth2Token.Extra("id_token").(string) if !ok { @@ -471,8 +469,6 @@ func processAppleUserInfo(code string) (models.User, error) { return user, fmt.Errorf("unable to extract id_token") } - fmt.Println("=> rawIDToken", rawIDToken) - tokenSplit := strings.Split(rawIDToken, ".") claimsData := tokenSplit[1] decodedClaimsData, err := crypto.DecryptB64(claimsData) @@ -480,7 +476,6 @@ func processAppleUserInfo(code string) (models.User, error) { log.Debug("Failed to decrypt claims data: ", err) return user, fmt.Errorf("failed to decrypt claims data: %s", err.Error()) } - fmt.Println("=> decoded claims data", decodedClaimsData) claims := make(map[string]interface{}) err = json.Unmarshal([]byte(decodedClaimsData), &claims) @@ -489,8 +484,6 @@ func processAppleUserInfo(code string) (models.User, error) { return user, fmt.Errorf("failed to unmarshal claims data: %s", err.Error()) } - fmt.Println("=> claims", claims) - if val, ok := claims["email"]; !ok { log.Debug("Failed to extract email from claims.") return user, fmt.Errorf("unable to extract email, please check the scopes enabled for your app. It needs `email`, `name` scopes") @@ -500,10 +493,15 @@ func processAppleUserInfo(code string) (models.User, error) { if val, ok := claims["name"]; ok { nameData := val.(map[string]interface{}) - givenName := nameData["firstName"].(string) - familyName := nameData["lastName"].(string) - user.GivenName = &givenName - user.FamilyName = &familyName + if nameVal, ok := nameData["firstName"]; ok { + givenName := nameVal.(string) + user.GivenName = &givenName + } + + if nameVal, ok := nameData["lastName"]; ok { + familyName := nameVal.(string) + user.FamilyName = &familyName + } } return user, err