mstar/linstrom
1
0
Fork 0
Code Issues 27 Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add first helper method to user

Browse source
This commit is contained in:
Melody Becker 2025-04-04 13:46:11 +02:00
parent f3a139b809
commit 11e0059631
Signed by: mstar
SSH key fingerprint: SHA256:9VAo09aaVNTWKzPW7Hq2LW+ox9OdwmTSHRoD4mlz1yI
6 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
auth-new/helpers.go
View file

@ -177,7 +177,7 @@ func oneStorageAuthToLoginState(in models.AuthenticationMethodType) LoginNextSta
//
// TODO: Decide whether to include the reason for disallowed login
func (a *Authenticator) canUsernameLogin(username string) (bool, error) {
acc, err := dbgen.User.Where(dbgen.User.Username.Eq(username)).First()
acc, err := dbgen.User.GetByUsername(username)
if err != nil {
return false, err
}

6
auth-new/passkey.go
View file

@ -31,7 +31,7 @@ func (a *Authenticator) StartPasskeyLogin(
if ok, err := a.canUsernameLogin(username); !ok {
return nil, "", other.Error("auth", "user may not login", err)
}
acc, err := dbgen.User.Where(dbgen.User.Username.Eq(username)).First()
acc, err := dbgen.User.GetByUsername(username)
if err != nil {
return nil, "", other.Error("auth", "failed to acquire user for login", err)
}
@ -64,7 +64,7 @@ func (a *Authenticator) CompletePasskeyLogin(
response *http.Request,
) (accessToken string, err error) {
// Get user in question
acc, err := dbgen.User.Where(dbgen.User.Username.Eq(username)).First()
acc, err := dbgen.User.GetByUsername(username)
if err != nil {
return "", other.Error("auth", "failed to get user for passkey login completion", err)
}
@ -140,7 +140,7 @@ func (a *Authenticator) StartPasskeyRegistration(
if ok, err := a.canUsernameLogin(username); !ok {
return nil, "", other.Error("auth", "user may not login", err)
}
acc, err := dbgen.User.Where(dbgen.User.Username.Eq(username)).First()
acc, err := dbgen.User.GetByUsername(username)
if err != nil {
return nil, "", other.Error("auth", "failed to acquire user for login", err)
}

4
auth-new/password.go
View file

@ -24,7 +24,7 @@ func (a *Authenticator) PerformPasswordLogin(
if ok, err := a.canUsernameLogin(username); !ok {
return LoginNextFailure, "", other.Error("auth", "user may not login", err)
}
acc, err := dbgen.User.Where(dbgen.User.Username.Eq(username)).First()
acc, err := dbgen.User.GetByUsername(username)
switch err {
case nil:
break
@ -110,7 +110,7 @@ func (a *Authenticator) PerformPasswordLogin(
// If there is no password set yet (i.e. during account registration or passkey only so far)
// it creates the password link
func (a *Authenticator) PerformPasswordRegister(username, password string) error {
acc, err := dbgen.User.Where(dbgen.User.Username.Eq(username)).First()
acc, err := dbgen.User.GetByUsername(username)
if err != nil {
return other.Error("auth", "failed to get user to add a password to", err)
}

2
auth-new/totp.go
View file

@ -129,7 +129,7 @@ func (a *Authenticator) StartTotpRegistration(
if ok, err := a.canUsernameLogin(username); !ok {
return nil, other.Error("auth", "user may not login", err)
}
acc, err := dbgen.User.Where(dbgen.User.Username.Eq(username)).First()
acc, err := dbgen.User.GetByUsername(username)
if err != nil {
return nil, other.Error("auth", "failed to find account", err)
}