mirror of
https://github.com/go-gitea/gitea
synced 2024-11-21 18:37:04 +01:00
fix merge and conflict
This commit is contained in:
parent
225b734281
commit
9829a969f4
1 changed files with 1 additions and 1 deletions
|
@ -122,7 +122,7 @@ func (o *OAuth2) userIDFromToken(ctx context.Context, tokenSHA string, store Dat
|
||||||
}
|
}
|
||||||
|
|
||||||
// Otherwise, check if this is an OAuth access token
|
// Otherwise, check if this is an OAuth access token
|
||||||
accessTokenScope, uid := GetOAuthAccessTokenScopeAndUserID(ctx, tokenSHA)
|
accessTokenScope, uid := GetOAuthAccessTokenScopeAndUserID(ctx, tokenSHA)
|
||||||
if uid != 0 {
|
if uid != 0 {
|
||||||
store.GetData()["IsApiToken"] = true
|
store.GetData()["IsApiToken"] = true
|
||||||
store.GetData()["ApiTokenScope"] = accessTokenScope
|
store.GetData()["ApiTokenScope"] = accessTokenScope
|
||||||
|
|
Loading…
Reference in a new issue