fix: update scope for apple login
This commit is contained in:
parent
fadd9f6168
commit
c9ba0b13f8
|
@ -492,8 +492,8 @@ func processAppleUserInfo(code string) (models.User, error) {
|
||||||
fmt.Println("=> claims", claims)
|
fmt.Println("=> claims", claims)
|
||||||
|
|
||||||
if val, ok := claims["email"]; !ok {
|
if val, ok := claims["email"]; !ok {
|
||||||
log.Debug("Failed to extract email from claims")
|
log.Debug("Failed to extract email from claims.")
|
||||||
return user, fmt.Errorf("unable to extract email")
|
return user, fmt.Errorf("unable to extract email, please check the scopes enabled for your app. It needs `email`, `name` scopes")
|
||||||
} else {
|
} else {
|
||||||
user.Email = val.(string)
|
user.Email = val.(string)
|
||||||
}
|
}
|
||||||
|
|
|
@ -184,7 +184,8 @@ func OAuthLoginHandler() gin.HandlerFunc {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
oauth.OAuthProviders.AppleConfig.RedirectURL = hostname + "/oauth_callback/" + constants.SignupMethodApple
|
oauth.OAuthProviders.AppleConfig.RedirectURL = hostname + "/oauth_callback/" + constants.SignupMethodApple
|
||||||
url := oauth.OAuthProviders.AppleConfig.AuthCodeURL(oauthStateString, oauth2.SetAuthURLParam("response_mode", "form_post"))
|
// Scope from the root config was not passed for apple login
|
||||||
|
url := oauth.OAuthProviders.AppleConfig.AuthCodeURL(oauthStateString, oauth2.SetAuthURLParam("response_mode", "form_post"), oauth2.SetAuthURLParam("scope", "name email"))
|
||||||
c.Redirect(http.StatusTemporaryRedirect, url)
|
c.Redirect(http.StatusTemporaryRedirect, url)
|
||||||
default:
|
default:
|
||||||
log.Debug("Invalid oauth provider: ", provider)
|
log.Debug("Invalid oauth provider: ", provider)
|
||||||
|
|
|
@ -130,7 +130,6 @@ func InitOAuth() error {
|
||||||
AuthURL: "https://appleid.apple.com/auth/authorize",
|
AuthURL: "https://appleid.apple.com/auth/authorize",
|
||||||
TokenURL: "https://appleid.apple.com/auth/token",
|
TokenURL: "https://appleid.apple.com/auth/token",
|
||||||
},
|
},
|
||||||
Scopes: []string{"openid", "name", "email"},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user