@stacksjs/auth 0.70.258 → 0.70.260

package/dist/two-factor.js

@@ -1,113 +1 @@
-import { randomBytes } from "node:crypto";
-import { db, sqlDateTime, parseSqlDateTime } from "@stacksjs/database";
-import { generateTwoFactorSecret, generateTwoFactorUri, verifyTwoFactorCode } from "./authenticator";
-import { RateLimiter } from "./rate-limiter";
-const DEFAULT_CHALLENGE_TTL_SECONDS = 300, TWO_FACTOR_RATE_LIMIT_PREFIX = "2fa:", TWO_FACTOR_STEP_SECONDS = 30;
-function currentTotpStep() {
-  return Math.floor(Date.now() / 1000 / TWO_FACTOR_STEP_SECONDS);
-}
-async function getLastUsedTwoFactorStep(userId) {
-  try {
-    const value = (await db.selectFrom("users").where("id", "=", userId).selectAll().executeTakeFirst())?.two_factor_last_used_step;
-    return value == null ? null : Number(value);
-  } catch {
-    return null;
-  }
-}
-async function setLastUsedTwoFactorStep(userId, step) {
-  try {
-    await db.updateTable("users").set({ two_factor_last_used_step: step }).where("id", "=", userId).executeTakeFirst();
-  } catch {}
-}
-export async function getTwoFactorState(userId) {
-  const row = await db.selectFrom("users").where("id", "=", userId).select(["two_factor_secret", "two_factor_enabled"]).executeTakeFirst();
-  return {
-    secret: row?.two_factor_secret ?? null,
-    enabled: Boolean(row?.two_factor_enabled)
-  };
-}
-export function isTwoFactorEnabled(user) {
-  return Boolean(user.two_factor_enabled);
-}
-export function generateTwoFactorSetup(email, serviceName) {
-  const secret = generateTwoFactorSecret(), uri = generateTwoFactorUri(email, serviceName, secret);
-  return { secret, uri };
-}
-const PENDING_SECRET_TTL_SECONDS = 600;
-export async function stashPendingTwoFactorSecret(userId, secret, ttlSeconds = PENDING_SECRET_TTL_SECONDS) {
-  const expiresAt = sqlDateTime(new Date(Date.now() + ttlSeconds * 1000));
-  await db.deleteFrom("two_factor_pending_secrets").where("user_id", "=", userId).execute();
-  await db.insertInto("two_factor_pending_secrets").values({
-    user_id: userId,
-    secret,
-    expires_at: expiresAt
-  }).execute();
-}
-export async function consumePendingTwoFactorSecret(userId) {
-  const row = await db.selectFrom("two_factor_pending_secrets").where("user_id", "=", userId).selectAll().executeTakeFirst();
-  if (!row)
-    return null;
-  await db.deleteFrom("two_factor_pending_secrets").where("user_id", "=", userId).execute();
-  const expiresAt = parseSqlDateTime(row.expires_at)?.getTime() ?? 0;
-  if (Date.now() > expiresAt)
-    return null;
-  return String(row.secret);
-}
-export async function enableTwoFactor(userId, secret, code) {
-  if (!await verifyTwoFactorCode(code, secret))
-    return !1;
-  await db.updateTable("users").set({ two_factor_secret: secret, two_factor_enabled: !0 }).where("id", "=", userId).executeTakeFirst();
-  return !0;
-}
-export async function disableTwoFactor(userId) {
-  await db.updateTable("users").set({ two_factor_secret: null, two_factor_enabled: !1 }).where("id", "=", userId).executeTakeFirst();
-}
-export async function verifyTwoFactorLoginCode(userId, code) {
-  const rateKey = `${TWO_FACTOR_RATE_LIMIT_PREFIX}${userId}`;
-  await RateLimiter.validateAttempt(rateKey);
-  const { secret, enabled } = await getTwoFactorState(userId);
-  if (!enabled || !secret)
-    return !1;
-  if (!await verifyTwoFactorCode(code, secret)) {
-    await RateLimiter.recordFailedAttempt(rateKey);
-    return !1;
-  }
-  const step = currentTotpStep(), lastStep = await getLastUsedTwoFactorStep(userId);
-  if (lastStep !== null && step <= lastStep)
-    return !1;
-  await setLastUsedTwoFactorStep(userId, step);
-  await RateLimiter.resetAttempts(rateKey);
-  return !0;
-}
-export async function createTwoFactorChallenge(userId, ttlSeconds = DEFAULT_CHALLENGE_TTL_SECONDS) {
-  const id = randomBytes(32).toString("hex"), expiresAt = sqlDateTime(new Date(Date.now() + ttlSeconds * 1000));
-  await db.deleteFrom("two_factor_challenges").where("user_id", "=", userId).execute();
-  await db.insertInto("two_factor_challenges").values({
-    id,
-    user_id: userId,
-    expires_at: expiresAt
-  }).execute();
-  return id;
-}
-export async function consumeTwoFactorChallenge(challengeToken) {
-  const row = await db.selectFrom("two_factor_challenges").where("id", "=", challengeToken).selectAll().executeTakeFirst();
-  if (!row)
-    return null;
-  await db.deleteFrom("two_factor_challenges").where("id", "=", challengeToken).execute();
-  const expiresAt = parseSqlDateTime(row.expires_at)?.getTime() ?? 0;
-  if (Date.now() > expiresAt)
-    return null;
-  return Number(row.user_id);
-}
-export const TwoFactor = {
-  isEnabled: isTwoFactorEnabled,
-  getState: getTwoFactorState,
-  generateSetup: generateTwoFactorSetup,
-  stashPendingSecret: stashPendingTwoFactorSecret,
-  consumePendingSecret: consumePendingTwoFactorSecret,
-  enable: enableTwoFactor,
-  disable: disableTwoFactor,
-  verifyLoginCode: verifyTwoFactorLoginCode,
-  createChallenge: createTwoFactorChallenge,
-  consumeChallenge: consumeTwoFactorChallenge
-};
+import{randomBytes}from"node:crypto";import{db,sqlDateTime,parseSqlDateTime}from"@stacksjs/database";import{generateTwoFactorSecret,generateTwoFactorUri,verifyTwoFactorCode}from"./authenticator";import{RateLimiter}from"./rate-limiter";const DEFAULT_CHALLENGE_TTL_SECONDS=300,TWO_FACTOR_RATE_LIMIT_PREFIX="2fa:",TWO_FACTOR_STEP_SECONDS=30;function currentTotpStep(){return Math.floor(Date.now()/1000/TWO_FACTOR_STEP_SECONDS)}async function getLastUsedTwoFactorStep(userId){try{const value=(await db.selectFrom("users").where("id","=",userId).selectAll().executeTakeFirst())?.two_factor_last_used_step;return value==null?null:Number(value)}catch{return null}}async function setLastUsedTwoFactorStep(userId,step){try{await db.updateTable("users").set({two_factor_last_used_step:step}).where("id","=",userId).executeTakeFirst()}catch{}}export async function getTwoFactorState(userId){const row=await db.selectFrom("users").where("id","=",userId).select(["two_factor_secret","two_factor_enabled"]).executeTakeFirst();return{secret:row?.two_factor_secret??null,enabled:Boolean(row?.two_factor_enabled)}}export function isTwoFactorEnabled(user){return Boolean(user.two_factor_enabled)}export function generateTwoFactorSetup(email,serviceName){const secret=generateTwoFactorSecret(),uri=generateTwoFactorUri(email,serviceName,secret);return{secret,uri}}const PENDING_SECRET_TTL_SECONDS=600;export async function stashPendingTwoFactorSecret(userId,secret,ttlSeconds=PENDING_SECRET_TTL_SECONDS){const expiresAt=sqlDateTime(new Date(Date.now()+ttlSeconds*1000));await db.deleteFrom("two_factor_pending_secrets").where("user_id","=",userId).execute();await db.insertInto("two_factor_pending_secrets").values({user_id:userId,secret,expires_at:expiresAt}).execute()}export async function consumePendingTwoFactorSecret(userId){const row=await db.selectFrom("two_factor_pending_secrets").where("user_id","=",userId).selectAll().executeTakeFirst();if(!row)return null;await db.deleteFrom("two_factor_pending_secrets").where("user_id","=",userId).execute();const expiresAt=parseSqlDateTime(row.expires_at)?.getTime()??0;if(Date.now()>expiresAt)return null;return String(row.secret)}export async function enableTwoFactor(userId,secret,code){if(!await verifyTwoFactorCode(code,secret))return!1;await db.updateTable("users").set({two_factor_secret:secret,two_factor_enabled:!0}).where("id","=",userId).executeTakeFirst();return!0}export async function disableTwoFactor(userId){await db.updateTable("users").set({two_factor_secret:null,two_factor_enabled:!1}).where("id","=",userId).executeTakeFirst()}export async function verifyTwoFactorLoginCode(userId,code){const rateKey=`${TWO_FACTOR_RATE_LIMIT_PREFIX}${userId}`;await RateLimiter.validateAttempt(rateKey);const{secret,enabled}=await getTwoFactorState(userId);if(!enabled||!secret)return!1;if(!await verifyTwoFactorCode(code,secret)){await RateLimiter.recordFailedAttempt(rateKey);return!1}const step=currentTotpStep(),lastStep=await getLastUsedTwoFactorStep(userId);if(lastStep!==null&&step<=lastStep)return!1;await setLastUsedTwoFactorStep(userId,step);await RateLimiter.resetAttempts(rateKey);return!0}export async function createTwoFactorChallenge(userId,ttlSeconds=DEFAULT_CHALLENGE_TTL_SECONDS){const id=randomBytes(32).toString("hex"),expiresAt=sqlDateTime(new Date(Date.now()+ttlSeconds*1000));await db.deleteFrom("two_factor_challenges").where("user_id","=",userId).execute();await db.insertInto("two_factor_challenges").values({id,user_id:userId,expires_at:expiresAt}).execute();return id}export async function consumeTwoFactorChallenge(challengeToken){const row=await db.selectFrom("two_factor_challenges").where("id","=",challengeToken).selectAll().executeTakeFirst();if(!row)return null;await db.deleteFrom("two_factor_challenges").where("id","=",challengeToken).execute();const expiresAt=parseSqlDateTime(row.expires_at)?.getTime()??0;if(Date.now()>expiresAt)return null;return Number(row.user_id)}export const TwoFactor={isEnabled:isTwoFactorEnabled,getState:getTwoFactorState,generateSetup:generateTwoFactorSetup,stashPendingSecret:stashPendingTwoFactorSecret,consumePendingSecret:consumePendingTwoFactorSecret,enable:enableTwoFactor,disable:disableTwoFactor,verifyLoginCode:verifyTwoFactorLoginCode,createChallenge:createTwoFactorChallenge,consumeChallenge:consumeTwoFactorChallenge};

package/dist/user.js

@@ -1,38 +1 @@
-import { request } from "@stacksjs/router";
-import { Auth } from "./authentication";
-export async function authUser() {
-  const middlewareUser = request?._authenticatedUser;
-  if (middlewareUser)
-    return middlewareUser;
-  let token = request.bearerToken?.();
-  if (!token) {
-    const authHeader = request.headers?.get?.("authorization") || request.headers?.get?.("Authorization");
-    if (authHeader && authHeader.startsWith("Bearer "))
-      token = authHeader.substring(7);
-  }
-  if (!token)
-    return;
-  return await Auth.getUserFromToken(token);
-}
-export async function check() {
-  return !!await authUser();
-}
-export async function id() {
-  return (await authUser())?.id;
-}
-export async function email() {
-  return (await authUser())?.email;
-}
-export async function name() {
-  return (await authUser())?.name;
-}
-export async function isAuthenticated() {
-  return await check();
-}
-export async function logout() {
-  await Auth.logout();
-}
-export async function refresh() {
-  if (request?._authenticatedUser)
-    request._authenticatedUser = void 0;
-}
+import{request}from"@stacksjs/router";import{Auth}from"./authentication";export async function authUser(){const middlewareUser=request?._authenticatedUser;if(middlewareUser)return middlewareUser;let token=request.bearerToken?.();if(!token){const authHeader=request.headers?.get?.("authorization")||request.headers?.get?.("Authorization");if(authHeader&&authHeader.startsWith("Bearer "))token=authHeader.substring(7)}if(!token)return;return await Auth.getUserFromToken(token)}export async function check(){return!!await authUser()}export async function id(){return(await authUser())?.id}export async function email(){return(await authUser())?.email}export async function name(){return(await authUser())?.name}export async function isAuthenticated(){return await check()}export async function logout(){await Auth.logout()}export async function refresh(){if(request?._authenticatedUser)request._authenticatedUser=void 0}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/auth",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.258",
+  "version": "0.70.260",
   "description": "A more simplistic way to authenticate.",
   "author": "Chris Breuer",
   "contributors": [
@@ -32,9 +32,16 @@
       "default": "./dist/index.js"
     },
     "./*": {
-      "bun": "./dist/*",
-      "import": "./dist/*",
-      "default": "./dist/*"
+      "types": "./dist/*.d.ts",
+      "bun": "./dist/*.js",
+      "import": "./dist/*.js",
+      "default": "./dist/*.js"
+    },
+    "./*.js": {
+      "types": "./dist/*.d.ts",
+      "bun": "./dist/*.js",
+      "import": "./dist/*.js",
+      "default": "./dist/*.js"
     }
   },
   "module": "dist/index.js",
@@ -54,7 +61,7 @@
   },
   "devDependencies": {
     "better-dx": "^0.2.17",
-    "@stacksjs/error-handling": "0.70.258",
-    "@stacksjs/router": "0.70.258"
+    "@stacksjs/error-handling": "0.70.260",
+    "@stacksjs/router": "0.70.260"
   }
 }