Skip to content

Commit 48fd9a3

Browse files
lunnylunny
committed
Fix lint
1 parent 448fc86 commit 48fd9a3

File tree

6 files changed

+25
-29
lines changed

6 files changed

+25
-29
lines changed

‎routers/web/auth/oauth_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,30 @@ import (
1111
"code.gitea.io/gitea/models/unittest"
1212
user_model "code.gitea.io/gitea/models/user"
1313
"code.gitea.io/gitea/modules/setting"
14-
"code.gitea.io/gitea/services/auth/source/oauth2"
14+
"code.gitea.io/gitea/services/oauth2_provider"
1515

1616
"github.com/golang-jwt/jwt/v5"
1717
"github.com/stretchr/testify/assert"
1818
)
1919

20-
func createAndParseToken(t *testing.T, grant *auth.OAuth2Grant) *oauth2.OIDCToken {
21-
signingKey, err := oauth2.CreateJWTSigningKey("HS256", make([]byte, 32))
20+
func createAndParseToken(t *testing.T, grant *auth.OAuth2Grant) *oauth2_provider.OIDCToken {
21+
signingKey, err := oauth2_provider.CreateJWTSigningKey("HS256", make([]byte, 32))
2222
assert.NoError(t, err)
2323
assert.NotNil(t, signingKey)
2424

25-
response, terr := newAccessTokenResponse(db.DefaultContext, grant, signingKey, signingKey)
25+
response, terr := oauth2_provider.NewAccessTokenResponse(db.DefaultContext, grant, signingKey, signingKey)
2626
assert.Nil(t, terr)
2727
assert.NotNil(t, response)
2828

29-
parsedToken, err := jwt.ParseWithClaims(response.IDToken, &oauth2.OIDCToken{}, func(token *jwt.Token) (any, error) {
29+
parsedToken, err := jwt.ParseWithClaims(response.IDToken, &oauth2_provider.OIDCToken{}, func(token *jwt.Token) (any, error) {
3030
assert.NotNil(t, token.Method)
3131
assert.Equal(t, signingKey.SigningMethod().Alg(), token.Method.Alg())
3232
return signingKey.VerifyKey(), nil
3333
})
3434
assert.NoError(t, err)
3535
assert.True(t, parsedToken.Valid)
3636

37-
oidcToken, ok := parsedToken.Claims.(*oauth2.OIDCToken)
37+
oidcToken, ok := parsedToken.Claims.(*oauth2_provider.OIDCToken)
3838
assert.True(t, ok)
3939
assert.NotNil(t, oidcToken)
4040

‎services/oauth2_provider/access_token.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2024 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
package oauth2_provider
4+
package oauth2_provider //nolint
55

66
import (
77
"context"

‎services/oauth2_provider/init.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2024 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
package oauth2_provider
4+
package oauth2_provider //nolint
55

66
import (
77
"context"
@@ -15,9 +15,5 @@ func Init(ctx context.Context) error {
1515
return nil
1616
}
1717

18-
if err := InitSigningKey(); err != nil {
19-
return err
20-
}
21-
22-
return nil
18+
return InitSigningKey()
2319
}

‎services/oauth2_provider/jwtsigningkey.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2021 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
package oauth2_provider
4+
package oauth2_provider //nolint
55

66
import (
77
"crypto/ecdsa"

‎services/oauth2_provider/token.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2021 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
package oauth2_provider
4+
package oauth2_provider //nolint
55

66
import (
77
"fmt"

‎tests/integration/oauth_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"code.gitea.io/gitea/modules/json"
1313
"code.gitea.io/gitea/modules/setting"
14-
"code.gitea.io/gitea/routers/web/auth"
14+
oauth2_provider "code.gitea.io/gitea/services/oauth2_provider"
1515
"code.gitea.io/gitea/tests"
1616

1717
"github.com/stretchr/testify/assert"
@@ -177,7 +177,7 @@ func TestAccessTokenExchangeWithoutPKCE(t *testing.T) {
177177
"code": "authcode",
178178
})
179179
resp := MakeRequest(t, req, http.StatusBadRequest)
180-
parsedError := new(auth.AccessTokenError)
180+
parsedError := new(oauth2_provider.AccessTokenError)
181181
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), parsedError))
182182
assert.Equal(t, "unauthorized_client", string(parsedError.ErrorCode))
183183
assert.Equal(t, "failed PKCE code challenge", parsedError.ErrorDescription)
@@ -195,7 +195,7 @@ func TestAccessTokenExchangeWithInvalidCredentials(t *testing.T) {
195195
"code_verifier": "N1Zo9-8Rfwhkt68r1r29ty8YwIraXR8eh_1Qwxg7yQXsonBt",
196196
})
197197
resp := MakeRequest(t, req, http.StatusBadRequest)
198-
parsedError := new(auth.AccessTokenError)
198+
parsedError := new(oauth2_provider.AccessTokenError)
199199
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), parsedError))
200200
assert.Equal(t, "invalid_client", string(parsedError.ErrorCode))
201201
assert.Equal(t, "cannot load client with client id: '???'", parsedError.ErrorDescription)
@@ -210,7 +210,7 @@ func TestAccessTokenExchangeWithInvalidCredentials(t *testing.T) {
210210
"code_verifier": "N1Zo9-8Rfwhkt68r1r29ty8YwIraXR8eh_1Qwxg7yQXsonBt",
211211
})
212212
resp = MakeRequest(t, req, http.StatusBadRequest)
213-
parsedError = new(auth.AccessTokenError)
213+
parsedError = new(oauth2_provider.AccessTokenError)
214214
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), parsedError))
215215
assert.Equal(t, "unauthorized_client", string(parsedError.ErrorCode))
216216
assert.Equal(t, "invalid client secret", parsedError.ErrorDescription)
@@ -225,7 +225,7 @@ func TestAccessTokenExchangeWithInvalidCredentials(t *testing.T) {
225225
"code_verifier": "N1Zo9-8Rfwhkt68r1r29ty8YwIraXR8eh_1Qwxg7yQXsonBt",
226226
})
227227
resp = MakeRequest(t, req, http.StatusBadRequest)
228-
parsedError = new(auth.AccessTokenError)
228+
parsedError = new(oauth2_provider.AccessTokenError)
229229
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), parsedError))
230230
assert.Equal(t, "unauthorized_client", string(parsedError.ErrorCode))
231231
assert.Equal(t, "unexpected redirect URI", parsedError.ErrorDescription)
@@ -240,7 +240,7 @@ func TestAccessTokenExchangeWithInvalidCredentials(t *testing.T) {
240240
"code_verifier": "N1Zo9-8Rfwhkt68r1r29ty8YwIraXR8eh_1Qwxg7yQXsonBt",
241241
})
242242
resp = MakeRequest(t, req, http.StatusBadRequest)
243-
parsedError = new(auth.AccessTokenError)
243+
parsedError = new(oauth2_provider.AccessTokenError)
244244
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), parsedError))
245245
assert.Equal(t, "unauthorized_client", string(parsedError.ErrorCode))
246246
assert.Equal(t, "client is not authorized", parsedError.ErrorDescription)
@@ -255,7 +255,7 @@ func TestAccessTokenExchangeWithInvalidCredentials(t *testing.T) {
255255
"code_verifier": "N1Zo9-8Rfwhkt68r1r29ty8YwIraXR8eh_1Qwxg7yQXsonBt",
256256
})
257257
resp = MakeRequest(t, req, http.StatusBadRequest)
258-
parsedError = new(auth.AccessTokenError)
258+
parsedError = new(oauth2_provider.AccessTokenError)
259259
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), parsedError))
260260
assert.Equal(t, "unsupported_grant_type", string(parsedError.ErrorCode))
261261
assert.Equal(t, "Only refresh_token or authorization_code grant type is supported", parsedError.ErrorDescription)
@@ -292,7 +292,7 @@ func TestAccessTokenExchangeWithBasicAuth(t *testing.T) {
292292
})
293293
req.Header.Add("Authorization", "Basic ZGE3ZGEzYmEtOWExMy00MTY3LTg1NmYtMzg5OWRlMGIwMTM4OmJsYWJsYQ==")
294294
resp = MakeRequest(t, req, http.StatusBadRequest)
295-
parsedError := new(auth.AccessTokenError)
295+
parsedError := new(oauth2_provider.AccessTokenError)
296296
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), parsedError))
297297
assert.Equal(t, "unauthorized_client", string(parsedError.ErrorCode))
298298
assert.Equal(t, "invalid client secret", parsedError.ErrorDescription)
@@ -305,7 +305,7 @@ func TestAccessTokenExchangeWithBasicAuth(t *testing.T) {
305305
"code_verifier": "N1Zo9-8Rfwhkt68r1r29ty8YwIraXR8eh_1Qwxg7yQXsonBt",
306306
})
307307
resp = MakeRequest(t, req, http.StatusBadRequest)
308-
parsedError = new(auth.AccessTokenError)
308+
parsedError = new(oauth2_provider.AccessTokenError)
309309
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), parsedError))
310310
assert.Equal(t, "invalid_client", string(parsedError.ErrorCode))
311311
assert.Equal(t, "cannot load client with client id: ''", parsedError.ErrorDescription)
@@ -319,7 +319,7 @@ func TestAccessTokenExchangeWithBasicAuth(t *testing.T) {
319319
})
320320
req.Header.Add("Authorization", "Basic ZGE3ZGEzYmEtOWExMy00MTY3LTg1NmYtMzg5OWRlMGIwMTM4OjRNSzhOYTZSNTVzbWRDWTBXdUNDdW1aNmhqUlBuR1k1c2FXVlJISGpKaUE9")
321321
resp = MakeRequest(t, req, http.StatusBadRequest)
322-
parsedError = new(auth.AccessTokenError)
322+
parsedError = new(oauth2_provider.AccessTokenError)
323323
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), parsedError))
324324
assert.Equal(t, "invalid_request", string(parsedError.ErrorCode))
325325
assert.Equal(t, "client_id in request body inconsistent with Authorization header", parsedError.ErrorDescription)
@@ -333,7 +333,7 @@ func TestAccessTokenExchangeWithBasicAuth(t *testing.T) {
333333
})
334334
req.Header.Add("Authorization", "Basic ZGE3ZGEzYmEtOWExMy00MTY3LTg1NmYtMzg5OWRlMGIwMTM4OjRNSzhOYTZSNTVzbWRDWTBXdUNDdW1aNmhqUlBuR1k1c2FXVlJISGpKaUE9")
335335
resp = MakeRequest(t, req, http.StatusBadRequest)
336-
parsedError = new(auth.AccessTokenError)
336+
parsedError = new(oauth2_provider.AccessTokenError)
337337
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), parsedError))
338338
assert.Equal(t, "invalid_request", string(parsedError.ErrorCode))
339339
assert.Equal(t, "client_secret in request body inconsistent with Authorization header", parsedError.ErrorDescription)
@@ -371,7 +371,7 @@ func TestRefreshTokenInvalidation(t *testing.T) {
371371
"refresh_token": parsed.RefreshToken,
372372
})
373373
resp = MakeRequest(t, req, http.StatusBadRequest)
374-
parsedError := new(auth.AccessTokenError)
374+
parsedError := new(oauth2_provider.AccessTokenError)
375375
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), parsedError))
376376
assert.Equal(t, "invalid_client", string(parsedError.ErrorCode))
377377
assert.Equal(t, "invalid empty client secret", parsedError.ErrorDescription)
@@ -384,7 +384,7 @@ func TestRefreshTokenInvalidation(t *testing.T) {
384384
"refresh_token": "UNEXPECTED",
385385
})
386386
resp = MakeRequest(t, req, http.StatusBadRequest)
387-
parsedError = new(auth.AccessTokenError)
387+
parsedError = new(oauth2_provider.AccessTokenError)
388388
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), parsedError))
389389
assert.Equal(t, "unauthorized_client", string(parsedError.ErrorCode))
390390
assert.Equal(t, "unable to parse refresh token", parsedError.ErrorDescription)
@@ -414,7 +414,7 @@ func TestRefreshTokenInvalidation(t *testing.T) {
414414
// repeat request should fail
415415
req.Body = io.NopCloser(bytes.NewReader(bs))
416416
resp = MakeRequest(t, req, http.StatusBadRequest)
417-
parsedError = new(auth.AccessTokenError)
417+
parsedError = new(oauth2_provider.AccessTokenError)
418418
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), parsedError))
419419
assert.Equal(t, "unauthorized_client", string(parsedError.ErrorCode))
420420
assert.Equal(t, "token was already used", parsedError.ErrorDescription)

0 commit comments

Comments
 (0)