Mathis/lemma
1
0
Fork 0
mirror of https://github.com/lordmathis/lemma.git synced 2025-11-06 07:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Retrieve pass hash from db

Browse Source
This commit is contained in:
Matúš Námešný
2024-11-06 21:52:46 +01:00
parent 48f75b3839
commit 1a14c06be2
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/internal/db/users.go
View File

@@ -82,11 +82,11 @@ func (db *DB) GetUserByID(id int) (*models.User, error) {
user := &models.User{} user := &models.User{}
err := db.QueryRow(` err := db.QueryRow(`
SELECT SELECT
id, email, display_name, role, created_at, id, email, display_name, password_hash, role, created_at,
last_workspace_id last_workspace_id
FROM users FROM users
WHERE id = ?`, id). WHERE id = ?`, id).
Scan(&user.ID, &user.Email, &user.DisplayName, &user.Role, &user.CreatedAt, Scan(&user.ID, &user.Email, &user.DisplayName, &user.PasswordHash, &user.Role, &user.CreatedAt,
&user.LastWorkspaceID) &user.LastWorkspaceID)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -114,9 +114,9 @@ func (db *DB) GetUserByEmail(email string) (*models.User, error) {
func (db *DB) UpdateUser(user *models.User) error { func (db *DB) UpdateUser(user *models.User) error {
_, err := db.Exec(` _, err := db.Exec(`
UPDATE users UPDATE users
SET email = ?, display_name = ?, role = ?, last_workspace_id = ? SET email = ?, display_name = ?, password_hash = ?, role = ?, last_workspace_id = ?
WHERE id = ?`, WHERE id = ?`,
user.Email, user.DisplayName, user.Role, user.LastWorkspaceID, user.ID) user.Email, user.DisplayName, user.PasswordHash, user.Role, user.LastWorkspaceID, user.ID)
return err return err
} }

4
backend/internal/handlers/user_handlers.go
View File

@@ -93,10 +93,6 @@ func (h *Handler) UpdateProfile() http.HandlerFunc {
return return
} }
user.PasswordHash = string(hashedPassword) user.PasswordHash = string(hashedPassword)
} else if req.CurrentPassword != "" {
// If current password is provided but no new password, that's an error
http.Error(w, "New password is required when current password is provided", http.StatusBadRequest)
return
} }
// Handle email update if requested // Handle email update if requested