Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-02-20 15:58:47 +03:00
parent 4ca8abb52f
commit 47ca23f970
5 changed files with 29 additions and 13 deletions

View File

@@ -207,6 +207,23 @@ func InitRoutes(pgDB *sql.DB, mssql *sql.DB, ml *mailer.GraphMailer) *mux.Router
routes.AuthRefreshHandler(pgDB), routes.AuthRefreshHandler(pgDB),
) )
// Password reset flow (public)
bindV3(r, pgDB,
"/api/password/forgot", "POST",
"auth", "update",
routes.ForgotPasswordHandler(pgDB, ml),
)
bindV3(r, pgDB,
"/api/password/reset/validate/{token}", "GET",
"auth", "view",
routes.ValidatePasswordResetTokenHandler(pgDB),
)
bindV3(r, pgDB,
"/api/password/reset", "POST",
"auth", "update",
routes.CompletePasswordResetHandler(pgDB),
)
// ============================================================ // ============================================================
// SYSTEM // SYSTEM
// ============================================================ // ============================================================

View File

@@ -73,7 +73,7 @@ func ForgotPasswordHandler(
_, _ = db.Exec(` _, _ = db.Exec(`
INSERT INTO dfusr_password_reset ( INSERT INTO dfusr_password_reset (
dfusr_id, dfusr_id,
token, token_hash,
expires_at expires_at
) )
VALUES ($1, $2, $3) VALUES ($1, $2, $3)

View File

@@ -43,9 +43,9 @@ func CompletePasswordResetHandler(db *sql.DB) http.HandlerFunc {
var expiresAt time.Time var expiresAt time.Time
err := db.QueryRow(` err := db.QueryRow(`
SELECT mk_dfusr_id, expires_at SELECT dfusr_id, expires_at
FROM mk_dfusr_password_reset FROM dfusr_password_reset
WHERE token = $1 WHERE token_hash = $1
AND used_at IS NULL AND used_at IS NULL
`, tokenHash).Scan(&userID, &expiresAt) `, tokenHash).Scan(&userID, &expiresAt)
@@ -84,9 +84,10 @@ func CompletePasswordResetHandler(db *sql.DB) http.HandlerFunc {
// token tüket // token tüket
if _, err := tx.Exec(` if _, err := tx.Exec(`
UPDATE mk_dfusr_password_reset UPDATE dfusr_password_reset
SET used_at = now() SET used_at = now()
WHERE token = $1 WHERE token_hash = $1
AND used_at IS NULL
`, tokenHash); err != nil { `, tokenHash); err != nil {
http.Error(w, "token update failed", http.StatusInternalServerError) http.Error(w, "token update failed", http.StatusInternalServerError)
return return

View File

@@ -1,9 +1,8 @@
package routes package routes
import ( import (
"crypto/sha256" "bssapp-backend/internal/security"
"database/sql" "database/sql"
"encoding/hex"
"net/http" "net/http"
"time" "time"
@@ -21,8 +20,7 @@ func ValidatePasswordResetTokenHandler(db *sql.DB) http.HandlerFunc {
} }
// 🔐 plain token -> hash // 🔐 plain token -> hash
h := sha256.Sum256([]byte(token)) tokenHash := security.HashToken(token)
tokenHash := hex.EncodeToString(h[:])
var ( var (
userID int64 userID int64
@@ -31,8 +29,8 @@ func ValidatePasswordResetTokenHandler(db *sql.DB) http.HandlerFunc {
) )
err := db.QueryRow(` err := db.QueryRow(`
SELECT user_id, expires_at, used_at SELECT dfusr_id, expires_at, used_at
FROM password_reset_tokens FROM dfusr_password_reset
WHERE token_hash = $1 WHERE token_hash = $1
LIMIT 1 LIMIT 1
`, tokenHash).Scan(&userID, &expiresAt, &usedAt) `, tokenHash).Scan(&userID, &expiresAt, &usedAt)

View File

@@ -456,7 +456,7 @@ func SendPasswordResetMailHandler(
// 💾 DB → SADECE HASH // 💾 DB → SADECE HASH
_, _ = db.Exec(` _, _ = db.Exec(`
INSERT INTO dfusr_password_reset (dfusr_id, token, expires_at) INSERT INTO dfusr_password_reset (dfusr_id, token_hash, expires_at)
VALUES ($1,$2,$3) VALUES ($1,$2,$3)
`, userID, hash, expires) `, userID, hash, expires)