gsadmin/libredesk
1
0
Fork 0
mirror of https://github.com/abhinavxd/libredesk.git synced 2026-09-23 19:06:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #196 from trabulium/fix/null-password-handling

Browse Source 
fix: Handle NULL password field for imported contacts
This commit is contained in:
Abhinav Raut
2025-12-21 20:22:30 +05:30
committed by GitHub
parent bb89728eee 0a5e5de544
commit bb6b56eeef
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/user/models/models.go
+1 -1
View File
@@ -57,7 +57,7 @@ type User struct {
PhoneNumber null.String `db:"phone_number" json:"phone_number"`
AvatarURL null.String `db:"avatar_url" json:"avatar_url"`
Enabled bool `db:"enabled" json:"enabled"`
Password string `db:"password" json:"-"`
Password null.String `db:"password" json:"-"`
LastActiveAt null.Time `db:"last_active_at" json:"last_active_at"`
LastLoginAt null.Time `db:"last_login_at" json:"last_login_at"`
Roles pq.StringArray `db:"roles" json:"roles"`
internal/user/user.go
+1 -1
View File
@@ -114,7 +114,7 @@ func (u *Manager) VerifyPassword(email string, password []byte) (models.User, er
u.lo.Error("error fetching user from db", "error", err)
return user, envelope.NewError(envelope.GeneralError, u.i18n.Ts("globals.messages.errorFetching", "name", "{globals.terms.user}"), nil)
}
if err := u.verifyPassword(password, user.Password); err != nil {
if err := u.verifyPassword(password, user.Password.String); err != nil {
return user, envelope.NewError(envelope.InputError, u.i18n.T("user.invalidEmailPassword"), nil)
}
return user, nil