@fonderie/auth 7.16.0 → 7.17.0

package/brain/signatures.md

@@ -92,6 +92,7 @@ interface IAuthSecrets {
 
 interface IAuthRuntimeConfig {
     sessionDuration?: string;
+    sessionMaxAge?: string;
     verificationCooldown?: number;
     mfa?: boolean;
     requireVerification?: boolean;

package/dist/index.cjs

@@ -288,8 +288,11 @@ var import_events = require("@fonderie/events");
 
 // src/config.ts
 var DEFAULT_VERIFICATION_COOLDOWN = 5 * 60 * 1e3;
+var DEFAULT_SESSION_DURATION = "90d";
+var DEFAULT_ACCESS_TOKEN_DURATION = "1h";
 var AUTH_CONFIG_KEYS = {
   sessionDuration: "auth.session.duration",
+  sessionMaxAge: "auth.session.max_age",
   verificationCooldown: "auth.verification.cooldown",
   mfa: "auth.mfa.enabled",
   requireVerification: "auth.verification.required"
@@ -354,13 +357,14 @@ function issueMfaPendingToken(userId, config, loginMethod) {
   );
 }
 function issueTokenPair(userId, config, options) {
-  const duration = config.sessionDuration ?? "7d";
-  const accessDuration = config.accessTokenDuration ?? "24h";
+  const duration = config.sessionDuration ?? DEFAULT_SESSION_DURATION;
+  const accessDuration = config.accessTokenDuration ?? DEFAULT_ACCESS_TOKEN_DURATION;
+  const authTime = options.authTime ?? Math.floor(Date.now() / 1e3);
   const loginMethod = options.loginMethod;
   const phoneVerified = options.phoneVerified ?? false;
   const sid = options.sid ?? (0, import_node_crypto.randomUUID)();
   const accessToken = import_jsonwebtoken.default.sign(
-    { sub: userId, type: "access", loginMethod, phoneVerified, sid },
+    { sub: userId, type: "access", loginMethod, phoneVerified, sid, auth_time: authTime },
     config.jwtSecret,
     // jwtid: every token is unique. With the session id kept across rotations,
     // two tokens issued in the same second would otherwise be byte-identical —
@@ -368,7 +372,7 @@ function issueTokenPair(userId, config, options) {
     { expiresIn: accessDuration, keyid: keyIdOf(config.jwtSecret), jwtid: (0, import_node_crypto.randomUUID)() }
   );
   const refreshToken = import_jsonwebtoken.default.sign(
-    { sub: userId, type: "refresh", loginMethod, phoneVerified, sid },
+    { sub: userId, type: "refresh", loginMethod, phoneVerified, sid, auth_time: authTime },
     config.jwtSecret,
     { expiresIn: duration, keyid: keyIdOf(config.jwtSecret), jwtid: (0, import_node_crypto.randomUUID)() }
   );
@@ -390,6 +394,13 @@ function verifyToken(token, config) {
   }
   return null;
 }
+function durationMs(value) {
+  const m = /^\s*(\d+)\s*(ms|s|m|h|d|w|y)?\s*$/i.exec(value ?? "");
+  if (!m) return null;
+  const unit = (m[2] ?? "s").toLowerCase();
+  const scale = { ms: 1, s: 1e3, m: 6e4, h: 36e5, d: 864e5, w: 6048e5, y: 315576e5 };
+  return Number(m[1]) * (scale[unit] ?? 1e3);
+}
 
 // src/services/mfa.ts
 var import_node_crypto2 = require("crypto");
@@ -1039,12 +1050,12 @@ var SessionModel = class {
   async match(token) {
     const hash = hashRefreshToken(token);
     const [current] = await this.store.query(
-      `SELECT id, user_id, sid, token FROM fonderie_sessions WHERE token IN ($1, $2) AND expires_at > now() LIMIT 1`,
+      `SELECT id, user_id, sid, token, created_at FROM fonderie_sessions WHERE token IN ($1, $2) AND expires_at > now() LIMIT 1`,
       [hash, token]
     );
     if (current) return { kind: "current", row: toRow(current) };
     const [previous] = await this.store.query(
-      `SELECT id, user_id, sid, token, (previous_valid_until > now()) AS in_grace
+      `SELECT id, user_id, sid, token, created_at, (previous_valid_until > now()) AS in_grace
 			   FROM fonderie_sessions WHERE previous_token_hash = $1 AND expires_at > now() LIMIT 1`,
       [hash]
     );
@@ -1159,7 +1170,7 @@ var SessionModel = class {
   }
 };
 function toRow(r) {
-  return { id: r.id, userId: r.user_id, sid: r.sid, stored: r.token };
+  return { id: r.id, userId: r.user_id, sid: r.sid, stored: r.token, createdAt: r.created_at ? new Date(r.created_at) : /* @__PURE__ */ new Date() };
 }
 
 // src/models/backup-code.model.ts
@@ -2003,6 +2014,8 @@ function authController(store, config, bus, locales = (0, import_core6.defineLoc
       if (!payload || payload.type !== "refresh") {
         return (0, import_core6.setApiResponse)(import_core6.HTTP.UNAUTHORIZED, "TOKEN_REFRESH_FAILED", "Invalid refresh token");
       }
+      const resolvedRefresh = { ...config, ...config.resolve?.(ctx) };
+      const maxAgeMs = durationMs(resolvedRefresh.sessionMaxAge);
       let issued = null;
       for (let attempt = 0; attempt < 3 && !issued; attempt++) {
         const found = await sessions.match(token);
@@ -2016,14 +2029,20 @@ function authController(store, config, bus, locales = (0, import_core6.defineLoc
           );
           return (0, import_core6.setApiResponse)(import_core6.HTTP.UNAUTHORIZED, "TOKEN_REFRESH_FAILED", "Session expired or already revoked");
         }
+        if (maxAgeMs !== null && Date.now() - found.row.createdAt.getTime() > maxAgeMs) {
+          await sessions.revokeById(found.row.id);
+          return (0, import_core6.setApiResponse)(import_core6.HTTP.UNAUTHORIZED, "TOKEN_REFRESH_FAILED", "Session reached its maximum age \u2014 sign in again");
+        }
         const user = await users.findById(found.row.userId);
         if (!user || user.suspended || user.deletedAt || user.id !== payload.sub) {
           return (0, import_core6.setApiResponse)(import_core6.HTTP.UNAUTHORIZED, "UNAUTHORIZED", "Unauthorized");
         }
-        const pair = issueTokenPair(user.id, config, {
+        const pair = issueTokenPair(user.id, resolvedRefresh, {
           loginMethod: payload.loginMethod ?? "email",
           phoneVerified: payload.phoneVerified ?? false,
-          ...found.row.sid ? { sid: found.row.sid } : {}
+          ...found.row.sid ? { sid: found.row.sid } : {},
+          // A refresh is not a sign-in: keep when the user last signed in.
+          ...typeof payload.auth_time === "number" ? { authTime: payload.auth_time } : {}
         });
         const next = { token: pair.refreshToken, expiresAt: refreshTokenExpiry(pair.refreshToken) };
         if (await sessions.rotate(found.row, token, next, found.kind)) issued = pair;
@@ -3655,7 +3674,7 @@ var AuthModule = class {
   name = "@fonderie/auth";
   // Baked in at build time by tsup.base, so the operator's Modules page can
   // say what is actually deployed rather than 'not reported'.
-  version = "7.16.0";
+  version = "7.17.0";
   // Users, sessions, login history, suspend — only through @fonderie/admin.
   describeAdmin() {
     return { routes: describeAuthAdminRoutes(this.store) };