Skip to content

Commit b2e0a33

Browse files
committed
fix: revert nonce
1 parent a68876a commit b2e0a33

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

.github/workflows/release.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ on:
22
workflow_dispatch:
33
inputs:
44
logLevel:
5-
description: 'Log level'
5+
description: 'Log level'
66
required: true
7-
default: 'warning'
7+
default: 'warning'
88
type: choice
99
options:
1010
- info
1111
- warning
12-
- debug
12+
- debug
1313
tags:
1414
description: 'Tags'
15-
required: false
15+
required: false
1616
type: boolean
1717
release:
1818
types: [created]
@@ -28,7 +28,7 @@ jobs:
2828
node-version: '16'
2929
- uses: actions/setup-go@v2
3030
with:
31-
go-version: '^1.17.3'
31+
go-version: '^1.19.1'
3232
- name: Install dependencies
3333
run: |
3434
sudo apt-get install build-essential wget zip gcc-mingw-w64 && \

app/src/Root.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ 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') || ''
4243

4344
const urlProps: Record<string, any> = {
4445
state,
@@ -64,6 +65,10 @@ export default function Root({
6465
params += `&code=${code}`
6566
}
6667

68+
if (nonce !== '') {
69+
params += `&nonce=${nonce}`
70+
}
71+
6772
if (token.refresh_token) {
6873
params += `&refresh_token=${token.refresh_token}`;
6974
}

server/handlers/authorize.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func AuthorizeHandler() gin.HandlerFunc {
8585
memorystore.Provider.SetState(codeChallenge, code)
8686

8787
// used for response mode query or fragment
88-
loginState := "state=" + state + "&scope=" + strings.Join(scope, " ") + "&redirect_uri=" + redirectURI + "&code=" + code
88+
loginState := "state=" + state + "&scope=" + strings.Join(scope, " ") + "&redirect_uri=" + redirectURI + "&code=" + code + "&nonce=" + nonce
8989
loginURL := "/app?" + loginState
9090

9191
if responseMode == constants.ResponseModeFragment {
@@ -191,7 +191,7 @@ func AuthorizeHandler() gin.HandlerFunc {
191191
// },
192192
// })
193193

194-
params := "code=" + code + "&state=" + state
194+
params := "code=" + code + "&state=" + state + "&nonce=" + nonce
195195
if responseMode == constants.ResponseModeQuery {
196196
if strings.Contains(redirectURI, "?") {
197197
redirectURI = redirectURI + "&" + params
@@ -246,7 +246,7 @@ func AuthorizeHandler() gin.HandlerFunc {
246246
}
247247

248248
// used of query mode
249-
params := "access_token=" + authToken.AccessToken.Token + "&token_type=bearer&expires_in=" + strconv.FormatInt(expiresIn, 10) + "&state=" + state + "&id_token=" + authToken.IDToken.Token + "&code=" + code
249+
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
250250

251251
res := map[string]interface{}{
252252
"access_token": authToken.AccessToken.Token,
@@ -256,6 +256,7 @@ func AuthorizeHandler() gin.HandlerFunc {
256256
"token_type": "Bearer",
257257
"expires_in": expiresIn,
258258
"code": code,
259+
"nonce": nonce,
259260
}
260261

261262
if authToken.RefreshToken != nil {

0 commit comments

Comments
 (0)