fix

Author: wxiaoguang

services/auth/oauth2.go

@@ -27,11 +27,12 @@ var (
 
 // CheckOAuthAccessToken returns uid of user from oauth token
 func CheckOAuthAccessToken(ctx context.Context, accessToken string) int64 {
-	// JWT tokens require a "."
-	if !strings.Contains(accessToken, ".") {
+	if !setting.OAuth2.Enabled {
 		return 0
 	}
-	if !setting.OAuth2.Enabled {
+
+	// JWT tokens require a ".", if the token isn't like that, return early
+	if !strings.Contains(accessToken, ".") {
 		return 0
 	}
 

tests/integration/oauth_test.go

@@ -7,10 +7,8 @@ import (
 	"bytes"
 	"io"
 	"net/http"
-	"net/url"
 	"testing"
 
-	auth_model "code.gitea.io/gitea/models/auth"
 	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/setting"
 	oauth2_provider "code.gitea.io/gitea/services/oauth2_provider"
@@ -479,24 +477,3 @@ func TestOAuthIntrospection(t *testing.T) {
 	resp = MakeRequest(t, req, http.StatusUnauthorized)
 	assert.Contains(t, resp.Body.String(), "no valid authorization")
 }
-
-func TestGitOpWithOAuthDisabled(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-
-	setting.OAuth2.Enabled = false
-	defer func() {
-		setting.OAuth2.Enabled = true
-	}()
-
-	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		httpContext := NewAPITestContext(t, "user2", "repo1", auth_model.AccessTokenScopeWriteRepository)
-
-		u.Path = httpContext.GitPath()
-		dstPath := t.TempDir()
-
-		u.Path = httpContext.GitPath()
-		u.User = url.UserPassword("user2", userPassword)
-
-		t.Run("Clone", doGitClone(dstPath, u))
-	})
-}