johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

API: Apply "golangci-lint" recommendations #5330

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2025-11-22 09:25:01 +01:00
parent 264bc78d51
commit 4eac10c9d1
35 changed files with 146 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/api/oauth_token.go
View File

@@ -86,11 +86,12 @@ func OAuthToken(router *gin.RouterGroup) {
return
}
if frm.ClientID != "" {
switch {
case frm.ClientID != "":
actor = fmt.Sprintf("client %s", clean.Log(frm.ClientID))
} else if frm.Username != "" {
case frm.Username != "":
actor = fmt.Sprintf("user %s", clean.Log(frm.Username))
} else if frm.GrantType == authn.GrantPassword {
case frm.GrantType == authn.GrantPassword:
actor = "unknown user"
}
@@ -150,17 +151,18 @@ func OAuthToken(router *gin.RouterGroup) {
authUser, authProvider, authMethod, authErr := entity.Auth(loginForm, nil, c)
if authProvider.IsClient() {
switch {
case authProvider.IsClient():
event.AuditErr([]string{clientIp, "oauth2", actor, action, status.Denied})
AbortInvalidCredentials(c)
return
} else if authMethod.Is(authn.Method2FA) && errors.Is(authErr, authn.ErrPasscodeRequired) {
case authMethod.Is(authn.Method2FA) && errors.Is(authErr, authn.ErrPasscodeRequired):
// Ok.
} else if authErr != nil {
case authErr != nil:
event.AuditErr([]string{clientIp, "oauth2", actor, action, status.Error(authErr)})
AbortInvalidCredentials(c)
return
} else if !authUser.Equal(s.GetUser()) {
case !authUser.Equal(s.GetUser()):
event.AuditErr([]string{clientIp, "oauth2", actor, action, authn.ErrUserDoesNotMatch.Error()})
AbortInvalidCredentials(c)
return