LumeWeb
/
portal
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

refactor: add bypassSecurity to doLogin

This commit is contained in:
Derrick Hammer 2024-02-26 08:26:59 -05:00
parent b270d6f414
commit 2573936000
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
account/account.go
View File

@ -201,7 +201,7 @@ func (s AccountServiceDefault) LoginPassword(email string, password string, ip s
return "", nil, nil return "", nil, nil
} }
token, err := s.doLogin(user, ip) token, err := s.doLogin(user, ip, false)
if err != nil { if err != nil {
return "", nil, err return "", nil, err
@ -297,7 +297,7 @@ func (s AccountServiceDefault) LoginPubkey(pubkey string) (string, error) {
user := model.User user := model.User
token, err := s.doLogin(&user, "") token, err := s.doLogin(&user, "", true)
if err != nil { if err != nil {
return "", err return "", err
@ -463,10 +463,10 @@ func GenerateSecurityToken() string {
return string(b) return string(b)
} }
func (s AccountServiceDefault) doLogin(user *models.User, ip string) (string, error) { func (s AccountServiceDefault) doLogin(user *models.User, ip string, bypassSecurity bool) (string, error) {
purpose := JWTPurposeLogin purpose := JWTPurposeLogin
if user.OTPEnabled { if user.OTPEnabled && !bypassSecurity {
purpose = JWTPurpose2FA purpose = JWTPurpose2FA
} }