Skip to content

Commit de43812

Browse files
committed
fix: add nonce to supported claims
1 parent a916b8c commit de43812

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

app/src/Root.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export default function Root({
3939
? searchParams.get('scope')?.toString().split(' ')
4040
: ['openid', 'profile', 'email'];
4141
const code = searchParams.get('code') || ''
42-
const nonce = searchParams.get('nonce') || ''
4342

4443
const urlProps: Record<string, any> = {
4544
state,
@@ -59,14 +58,12 @@ export default function Root({
5958
useEffect(() => {
6059
if (token) {
6160
let redirectURL = config.redirectURL || '/app';
62-
let params = `access_token=${token.access_token}&id_token=${token.id_token}&expires_in=${token.expires_in}&state=${globalState.state}&code=`+code;
61+
let params = `access_token=${token.access_token}&id_token=${token.id_token}&expires_in=${token.expires_in}&state=${globalState.state}`;
6362

6463
if (code !== '') {
6564
params += `&code=${code}`
6665
}
67-
if (nonce !== '') {
68-
params += `&nonce=${nonce}`
69-
}
66+
7067
if (token.refresh_token) {
7168
params += `&refresh_token=${token.refresh_token}`;
7269
}

server/handlers/authorize.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func AuthorizeHandler() gin.HandlerFunc {
188188
// },
189189
// })
190190

191-
params := "code=" + code + "&state=" + state + "&nonce=" + nonce
191+
params := "code=" + code + "&state=" + state
192192
if responseMode == constants.ResponseModeQuery {
193193
if strings.Contains(redirectURI, "?") {
194194
redirectURI = redirectURI + "&" + params
@@ -243,7 +243,7 @@ func AuthorizeHandler() gin.HandlerFunc {
243243
}
244244

245245
// used of query mode
246-
params := "access_token=" + authToken.AccessToken.Token + "&token_type=bearer&expires_in=" + strconv.FormatInt(expiresIn, 10) + "&state=" + state + "&id_token=" + authToken.IDToken.Token + "&code=" + code + "&nonce=" + nonce
246+
params := "access_token=" + authToken.AccessToken.Token + "&token_type=bearer&expires_in=" + strconv.FormatInt(expiresIn, 10) + "&state=" + state + "&id_token=" + authToken.IDToken.Token + "&code=" + code
247247

248248
res := map[string]interface{}{
249249
"access_token": authToken.AccessToken.Token,
@@ -253,7 +253,6 @@ func AuthorizeHandler() gin.HandlerFunc {
253253
"token_type": "Bearer",
254254
"expires_in": expiresIn,
255255
"code": code,
256-
"nonce": nonce,
257256
}
258257

259258
if authToken.RefreshToken != nil {

server/handlers/openid_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func OpenIDConfigurationHandler() gin.HandlerFunc {
2424
"scopes_supported": []string{"openid", "email", "profile", "email_verified", "given_name", "family_name", "nick_name", "picture"},
2525
"response_modes_supported": []string{"query", "fragment", "form_post", "web_message"},
2626
"id_token_signing_alg_values_supported": []string{jwtType},
27-
"claims_supported": []string{"aud", "exp", "iss", "iat", "sub", "given_name", "family_name", "middle_name", "nickname", "preferred_username", "picture", "email", "email_verified", "roles", "gender", "birthdate", "phone_number", "phone_number_verified"},
27+
"claims_supported": []string{"aud", "exp", "iss", "iat", "sub", "given_name", "family_name", "middle_name", "nickname", "preferred_username", "picture", "email", "email_verified", "roles", "gender", "birthdate", "phone_number", "phone_number_verified", "nonce"},
2828
})
2929
}
3030
}

server/handlers/token.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
func TokenHandler() gin.HandlerFunc {
2323
return func(gc *gin.Context) {
2424
var reqBody map[string]string
25-
if err := gc.BindJSON(&reqBody); err != nil {
25+
if err := gc.Bind(&reqBody); err != nil {
2626
log.Debug("Error binding JSON: ", err)
2727
gc.JSON(http.StatusBadRequest, gin.H{
2828
"error": "error_binding_json",

0 commit comments

Comments
 (0)