Added refresh token logic to the jwt auth flow.

This commit is contained in:
2026-04-28 16:28:47 +02:00
parent 806f5794fc
commit 1acc9da792
+59 -8
View File
@@ -1,13 +1,17 @@
package web package web
import ( import (
"fmt" "crypto/rand"
"crypto/sha256"
"encoding/hex"
"log" "log"
"net/http" "net/http"
"nfeeder/internal/db" "nfeeder/internal/db"
"strconv"
"time" "time"
"github.com/golang-jwt/jwt/v5" "github.com/golang-jwt/jwt/v5"
"github.com/jackc/pgx/v5/pgtype"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
) )
@@ -40,7 +44,7 @@ func (s *Server) handleRegister() http.HandlerFunc {
} }
// Auto-login after reg // Auto-login after reg
s.issueTokenAndRedirect(w, r, fmt.Sprintf("%d", user.ID)) s.issueTokenAndRedirect(w, r, user.ID)
} }
} }
@@ -62,7 +66,7 @@ func (s *Server) handleLogin() http.HandlerFunc {
return return
} }
s.issueTokenAndRedirect(w, r, fmt.Sprintf("%d", user.ID)) s.issueTokenAndRedirect(w, r, user.ID)
} }
} }
@@ -80,12 +84,32 @@ func (s *Server) handleLogout() http.HandlerFunc {
} }
} }
func (s *Server) issueTokenAndRedirect(w http.ResponseWriter, r *http.Request, userID string) { func (s *Server) handleRefresh() http.HandlerFunc {
// TODO: refresh logic
/*
Read the refresh token cookie
Hash it with sha256
Look up the hash in the DB
Check it's not expired
Delete the old DB record
Call issueTokenAndRedirect — which creates a new JWT and a new refresh token in one go
*/
return func(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, "/", http.StatusOK)
}
}
func (s *Server) issueTokenAndRedirect(w http.ResponseWriter, r *http.Request, userID int64) {
nowTime := time.Now()
jwtExpireTime := nowTime.Add(24 * time.Hour)
refreshExpireTime := nowTime.Add((24 * time.Hour) * 3)
claims := jwt.RegisteredClaims{ claims := jwt.RegisteredClaims{
Issuer: ISSUER, Issuer: ISSUER,
Subject: userID, Subject: strconv.FormatInt(userID, 10),
ExpiresAt: jwt.NewNumericDate(time.Now().Add(24 * time.Hour)), ExpiresAt: jwt.NewNumericDate(jwtExpireTime),
IssuedAt: jwt.NewNumericDate(time.Now()), IssuedAt: jwt.NewNumericDate(nowTime),
} }
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
@@ -102,7 +126,34 @@ func (s *Server) issueTokenAndRedirect(w http.ResponseWriter, r *http.Request, u
HttpOnly: true, HttpOnly: true,
Secure: false, // Set to true in prod for HTTPS Secure: false, // Set to true in prod for HTTPS
SameSite: http.SameSiteLaxMode, SameSite: http.SameSiteLaxMode,
Expires: time.Now().Add(24 * time.Hour), Expires: jwtExpireTime,
})
// Generate refresh token
rawToken := rand.Text()
hash := sha256.Sum256([]byte(rawToken))
hex_token := hex.EncodeToString(hash[:])
_, err = s.store.CreateRefreshToken(r.Context(), db.CreateRefreshTokenParams{
UserID: userID,
TokenHash: hex_token,
ExpiresAt: pgtype.Timestamptz{Time: refreshExpireTime, Valid: true},
})
if err != nil {
// Log the actual error for yourself, send a generic one to the user
log.Printf("failed to create refresh token: %v", err)
http.Error(w, "Internal server error", http.StatusInternalServerError)
return
}
http.SetCookie(w, &http.Cookie{
Name: "nfeeder_refresh",
Value: string(rawToken),
Path: "/",
HttpOnly: true,
Secure: false, // Set to true in prod for HTTPS
SameSite: http.SameSiteLaxMode,
Expires: refreshExpireTime,
}) })
http.Redirect(w, r, "/", http.StatusSeeOther) http.Redirect(w, r, "/", http.StatusSeeOther)