From 9829a969f4a14c14a6aac7b6906ad063a0a2fbd0 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 21 Nov 2024 11:02:42 +0800 Subject: [PATCH] fix merge and conflict --- services/auth/oauth2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/auth/oauth2.go b/services/auth/oauth2.go index 24366102ab..6f2cadd4ab 100644 --- a/services/auth/oauth2.go +++ b/services/auth/oauth2.go @@ -122,7 +122,7 @@ func (o *OAuth2) userIDFromToken(ctx context.Context, tokenSHA string, store Dat } // Otherwise, check if this is an OAuth access token - accessTokenScope, uid := GetOAuthAccessTokenScopeAndUserID(ctx, tokenSHA) + accessTokenScope, uid := GetOAuthAccessTokenScopeAndUserID(ctx, tokenSHA) if uid != 0 { store.GetData()["IsApiToken"] = true store.GetData()["ApiTokenScope"] = accessTokenScope