include expiry field on login handler

Author: Hopertz

cmd/api/admin.go

@@ -76,7 +76,9 @@ func (app *application) registerAdminHandler(c echo.Context) error {
 
 	}
 
-	token, err := app.store.NewToken(a.ID, 3*24*time.Hour, db.ScopeActivation)
+	expiry := time.Now().Add(3 * 24 * time.Hour)
+
+	token, err := app.store.NewToken(a.ID, expiry, db.ScopeActivation)
 	if err != nil {
 		slog.Error("error generating new token", "error", err)
 		return c.JSON(http.StatusInternalServerError, envelope{"error": "internal server error"})

cmd/api/tokens.go

@@ -43,7 +43,7 @@ func (app *application) createAuthenticationTokenHandler(c echo.Context) error {
 	if !admin.Activated {
 		return c.JSON(http.StatusBadRequest, envelope{"error": "admin not activated"})
 	}
-	
+
 	pwd := db.Password{
 		Hash:      admin.PasswordHash,
 		Plaintext: input.Password,
@@ -62,13 +62,14 @@ func (app *application) createAuthenticationTokenHandler(c echo.Context) error {
 		return c.JSON(http.StatusUnauthorized, envelope{"error": "invalid phone number or password"})
 	}
 
-	token, err := app.store.NewToken(admin.ID, 3*24*time.Hour, db.ScopeAuthentication)
+	expiry := time.Now().Add(3 * 24 * time.Hour)
+	token, err := app.store.NewToken(admin.ID, expiry, db.ScopeAuthentication)
 	if err != nil {
 		slog.Error("error generating new token", "error", err)
 		return c.JSON(http.StatusInternalServerError, envelope{"error": "internal server error"})
 	}
 
-	return c.JSON(http.StatusCreated, envelope{"token": token.Plaintext})
+	return c.JSON(http.StatusCreated, envelope{"token": token.Plaintext, "expiry": expiry})
 }
 
 func (app *application) createPasswordResetTokenHandler(c echo.Context) error {
@@ -102,7 +103,9 @@ func (app *application) createPasswordResetTokenHandler(c echo.Context) error {
 		return c.JSON(http.StatusForbidden, envelope{"errors": "account not activated"})
 	}
 
-	token, err := app.store.NewToken(admin.ID, 45*time.Minute, db.ScopePasswordReset)
+	expiry := time.Now().Add(45 * time.Minute)
+
+	token, err := app.store.NewToken(admin.ID, expiry, db.ScopePasswordReset)
 	if err != nil {
 		slog.Error("error generating new token", "error", err)
 		return c.JSON(http.StatusInternalServerError, envelope{"error": "internal server error"})
@@ -151,7 +154,9 @@ func (app *application) createActivationTokenHandler(c echo.Context) error {
 		return c.JSON(http.StatusForbidden, envelope{"errors": "account already activated"})
 	}
 
-	token, err := app.store.NewToken(admin.ID, 3*24*time.Hour, db.ScopeActivation)
+	expiry := time.Now().Add(3 * 24 * time.Hour)
+
+	token, err := app.store.NewToken(admin.ID, expiry, db.ScopeActivation)
 	if err != nil {
 		slog.Error("error generating new token", "error", err)
 		return c.JSON(http.StatusInternalServerError, envelope{"error": "internal server error"})

db/sqlc/store.go

@@ -10,7 +10,7 @@ import (
 
 type Store interface {
 	Querier
-	NewToken(id uuid.UUID, ttl time.Duration, scope string) (*TokenLoc, error)
+	NewToken(id uuid.UUID, expiry time.Time, scope string) (*TokenLoc, error)
 	BulkInsert(ctx context.Context, houses []HouseBulk) error
 	TxnCreateTenant(ctx context.Context, args CreateTenantParams) error
 	TxnUpdateTenantHouse(ctx context.Context, args UpdateTenantParams, prev_house_id uuid.UUID) error

db/sqlc/utils.go

@@ -36,11 +36,11 @@ type TokenLoc struct {
 	Scope     string    `json:"-"`
 }
 
-func generateToken(id uuid.UUID, ttl time.Duration, scope string) (*TokenLoc, error) {
+func generateToken(id uuid.UUID, expiry time.Time, scope string) (*TokenLoc, error) {
 
 	token := &TokenLoc{
 		AdminID: id,
-		Expiry:  time.Now().Add(ttl),
+		Expiry:  expiry,
 		Scope:   scope,
 	}
 
@@ -68,8 +68,8 @@ func IsValidTokenPlaintext(tokenPlaintext string) (bool, error) {
 	return true, nil
 }
 
-func (s *SQLStore) NewToken(id uuid.UUID, ttl time.Duration, scope string) (*TokenLoc, error) {
-	token, err := generateToken(id, ttl, scope)
+func (s *SQLStore) NewToken(id uuid.UUID, expiry time.Time, scope string) (*TokenLoc, error) {
+	token, err := generateToken(id, expiry, scope)
 	if err != nil {
 		return nil, err
 	}