@@ -462,25 +462,20 @@ func processAppleUserInfo(code string) (models.User, error) {
462462 return user , fmt .Errorf ("invalid apple exchange code: %s" , err .Error ())
463463 }
464464
465- fmt .Println ("=> token" , oauth2Token .AccessToken )
466-
467465 // Extract the ID Token from OAuth2 token.
468466 rawIDToken , ok := oauth2Token .Extra ("id_token" ).(string )
469467 if ! ok {
470468 log .Debug ("Failed to extract ID Token from OAuth2 token" )
471469 return user , fmt .Errorf ("unable to extract id_token" )
472470 }
473471
474- fmt .Println ("=> rawIDToken" , rawIDToken )
475-
476472 tokenSplit := strings .Split (rawIDToken , "." )
477473 claimsData := tokenSplit [1 ]
478474 decodedClaimsData , err := crypto .DecryptB64 (claimsData )
479475 if err != nil {
480476 log .Debug ("Failed to decrypt claims data: " , err )
481477 return user , fmt .Errorf ("failed to decrypt claims data: %s" , err .Error ())
482478 }
483- fmt .Println ("=> decoded claims data" , decodedClaimsData )
484479
485480 claims := make (map [string ]interface {})
486481 err = json .Unmarshal ([]byte (decodedClaimsData ), & claims )
@@ -489,8 +484,6 @@ func processAppleUserInfo(code string) (models.User, error) {
489484 return user , fmt .Errorf ("failed to unmarshal claims data: %s" , err .Error ())
490485 }
491486
492- fmt .Println ("=> claims" , claims )
493-
494487 if val , ok := claims ["email" ]; ! ok {
495488 log .Debug ("Failed to extract email from claims." )
496489 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) {
500493
501494 if val , ok := claims ["name" ]; ok {
502495 nameData := val .(map [string ]interface {})
503- givenName := nameData ["firstName" ].(string )
504- familyName := nameData ["lastName" ].(string )
505- user .GivenName = & givenName
506- user .FamilyName = & familyName
496+ if nameVal , ok := nameData ["firstName" ]; ok {
497+ givenName := nameVal .(string )
498+ user .GivenName = & givenName
499+ }
500+
501+ if nameVal , ok := nameData ["lastName" ]; ok {
502+ familyName := nameVal .(string )
503+ user .FamilyName = & familyName
504+ }
507505 }
508506
509507 return user , err
0 commit comments