mirror of
https://github.com/lordmathis/lemma.git
synced 2025-11-05 23:44:22 +00:00
Retrieve pass hash from db
This commit is contained in:
@@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user