rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

User Management: Fix regressions

Browse source
This commit is contained in:
Tom Wiesing 2023-01-10 14:20:37 +01:00
parent 6f257bd27f
commit 66e57183d6
No known key found for this signature in database
6 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/dis/component/auth/panel/templates/user.html
View file

@ -23,7 +23,7 @@
{{ if .User.IsTOTPEnabled }}
<li>Passcode Enabled: <b>true</b></li>
{{ else }}
<li>Passcode Enabled: <b>false</b> <small>(some actions are disabled)</small></li>
<li>Passcode Enabled: <b>false</b> {{ if .User.IsAdmin }}<small>(some admin actions are disabled)</small>{{ end }}</li>
{{ end }}
</ul>
</p>

4
internal/dis/component/auth/protect.go
View file

@ -85,7 +85,7 @@ var Admin Permission = func(user *AuthUser, r *http.Request) (ok Grant, err erro
return Bool2Grant(user != nil && user.IsAdmin() && user.IsTOTPEnabled(), "user needs to have admin permissions and passcode enabled"), nil
}
// User represents a permission that checks if a user has totp enabled.
// User represents a permission that checks if a user is enabled
var User Permission = func(user *AuthUser, r *http.Request) (ok Grant, err error) {
return Bool2Grant(user != nil && user.IsEnabled() && user.IsTOTPEnabled(), "user needs to have passcode enabled"), nil
return Bool2Grant(user != nil && user.IsEnabled(), "user needs to be enabled"), nil
}