@stacksjs/browser 0.74.59 → 0.74.61

package/dist/composables/useAuth.js

@@ -1 +1 @@
-import{readSessionHandoff,stripSessionHandoff,useStorage}from"@stacksjs/composables";import{ref}from"@stacksjs/stx";import{withCsrfHeader}from"./csrf";const token=useStorage("token",""),refreshToken=useStorage("refresh_token",""),stacksConfig=globalThis.__STACKS_CONFIG__||{},baseUrl=stacksConfig.API_URL||(typeof window<"u"?window.location.origin:""),ME_PATH=stacksConfig.AUTH_ME_PATH||"/api/me",REFRESH_PATH=stacksConfig.AUTH_REFRESH_PATH||"/auth/refresh",user=ref(null),isAuthenticated=ref(!1);let inFlightRefresh=null;function applySessionHandoff(pack){const resolved=pack??(typeof window<"u"?readSessionHandoff(window.location.hash):null);if(!resolved)return!1;token.value=resolved.token;if(resolved.refreshToken)refreshToken.value=resolved.refreshToken;if(resolved.user!==void 0&&resolved.user!==null)user.value=resolved.user;isAuthenticated.value=!0;if(typeof window<"u"&&!pack){const rest=stripSessionHandoff(window.location.hash);window.history.replaceState(null,"",`${window.location.pathname}${window.location.search}${rest}`)}return!0}function clearSession(){token.value="";refreshToken.value="";user.value=null;isAuthenticated.value=!1}async function performRefresh(){if(!refreshToken.value)return!1;const response=await fetch(`${baseUrl}${REFRESH_PATH}`,{method:"POST",credentials:"same-origin",headers:withCsrfHeader({"Content-Type":"application/json",Accept:"application/json"}),body:JSON.stringify({refresh_token:refreshToken.value})});if(!response.ok){clearSession();return!1}const data=await response.json(),nextAccess=data.access_token??data.token;if(!nextAccess){clearSession();return!1}token.value=nextAccess;if(data.refresh_token)refreshToken.value=data.refresh_token;return!0}export async function refreshSession(){if(inFlightRefresh)return inFlightRefresh;inFlightRefresh=performRefresh().catch(()=>{return!1}).finally(()=>{inFlightRefresh=null});return inFlightRefresh}export async function authFetch(input,init={}){const send=()=>fetch(input.startsWith("http")?input:`${baseUrl}${input}`,{...init,headers:{...init.headers,...token.value?{Authorization:`Bearer ${token.value}`}:{},Accept:"application/json"}}),response=await send();if(response.status!==401||!refreshToken.value)return response;if(!await refreshSession())return response;return await send()}export function useAuth(){async function fetchAuthUser(){try{if(!token.value){isAuthenticated.value=!1;user.value=null;return null}const response=await authFetch(ME_PATH);if(!response.ok){clearSession();return null}const data=await response.json();user.value=data;isAuthenticated.value=!0;return data}catch(error){console.error("Error fetching user:",error);isAuthenticated.value=!1;user.value=null;return null}}async function checkAuthentication(){try{return await fetchAuthUser()!==null}catch(error){console.error("Error checking authentication:",error);return!1}}async function register(user){const url=`${baseUrl}/register`,data=await(await fetch(url,{method:"POST",credentials:"same-origin",headers:withCsrfHeader({"Content-Type":"application/json"}),body:JSON.stringify(user)})).json();if(isRegisterError(data))return data;if(isRegisterResponse(data)){token.value=data.token;const refreshed=data.refresh_token;if(refreshed)refreshToken.value=refreshed;return data}return data}function isRegisterError(data){return"errors"in data}function isRegisterResponse(data){return"token"in data&&"user"in data}async function login(user){try{const url=`${baseUrl}/login`,response=await fetch(url,{method:"POST",credentials:"same-origin",headers:withCsrfHeader({"Content-Type":"application/json"}),body:JSON.stringify(user)});if(!response.ok){const errorData=await response.json();throw Error(errorData.message||`HTTP error! status: ${response.status}`)}const data=await response.json();token.value=data.token;const refreshed=data.refresh_token;if(refreshed)refreshToken.value=refreshed;await fetchAuthUser();return data}catch(error){return error}}async function logout(){try{const currentToken=token.value;if(currentToken)await fetch(`${baseUrl}/logout`,{method:"POST",headers:{Authorization:`Bearer ${currentToken}`,Accept:"application/json"}})}catch(error){console.error("Error during logout:",error)}finally{clearSession()}}async function completeSocialLogin(pack){const applied=applySessionHandoff(pack),confirmed=await fetchAuthUser();if(confirmed||applied)return confirmed;return null}return{user,isAuthenticated,token,getToken:()=>token.value,register,login,logout,fetchAuthUser,completeSocialLogin,checkAuthentication,refreshToken,getRefreshToken:()=>refreshToken.value,refreshSession,authFetch}}export function authGuard(options={}){const guest=options.guest??!1,{isAuthenticated}=useAuth();if(guest){if(isAuthenticated.value)window.location.replace("/");return}if(!isAuthenticated.value)window.location.replace("/login")}
+import{readSessionHandoff,stripSessionHandoff,useStorage}from"@stacksjs/composables";import{ref}from"@stacksjs/stx";import{CSRF_COOKIE_NAME,readCsrfToken,withCsrfHeader}from"./csrf";const token=useStorage("token",""),refreshToken=useStorage("refresh_token",""),stacksConfig=globalThis.__STACKS_CONFIG__||{},baseUrl=stacksConfig.API_URL||(typeof window<"u"?window.location.origin:""),ME_PATH=stacksConfig.AUTH_ME_PATH||"/api/me",REFRESH_PATH=stacksConfig.AUTH_REFRESH_PATH||"/auth/refresh",user=ref(null),isAuthenticated=ref(!1);let inFlightRefresh=null;function applySessionHandoff(pack){const resolved=pack??(typeof window<"u"?readSessionHandoff(window.location.hash):null);if(!resolved)return!1;token.value=resolved.token;if(resolved.refreshToken)refreshToken.value=resolved.refreshToken;if(resolved.user!==void 0&&resolved.user!==null)user.value=resolved.user;isAuthenticated.value=!0;if(typeof window<"u"&&!pack){const rest=stripSessionHandoff(window.location.hash);window.history.replaceState(null,"",`${window.location.pathname}${window.location.search}${rest}`)}return!0}function clearSession(){token.value="";refreshToken.value="";user.value=null;isAuthenticated.value=!1}async function performRefresh(){if(!refreshToken.value)return!1;const response=await fetch(`${baseUrl}${REFRESH_PATH}`,{method:"POST",credentials:"same-origin",headers:withCsrfHeader({"Content-Type":"application/json",Accept:"application/json"}),body:JSON.stringify({refresh_token:refreshToken.value})});if(!response.ok){clearSession();return!1}const data=await response.json(),nextAccess=data.access_token??data.token;if(!nextAccess){clearSession();return!1}token.value=nextAccess;if(data.refresh_token)refreshToken.value=data.refresh_token;return!0}export async function refreshSession(){if(inFlightRefresh)return inFlightRefresh;inFlightRefresh=performRefresh().catch(()=>{return!1}).finally(()=>{inFlightRefresh=null});return inFlightRefresh}export async function authFetch(input,init={}){const send=()=>{const target=input.startsWith("http")?input:`${baseUrl}${input}`,headers=new Headers(init.headers);if(token.value)headers.set("Authorization",`Bearer ${token.value}`);headers.set("Accept","application/json");const method=(init.method||"GET").toUpperCase(),pageOrigin=typeof window<"u"?window.location?.origin:void 0,sameOrigin=!!pageOrigin&&new URL(target,pageOrigin).origin===pageOrigin;if(!["GET","HEAD","OPTIONS"].includes(method)&&sameOrigin&&!headers.has(CSRF_COOKIE_NAME)){const csrfToken=readCsrfToken();if(csrfToken)headers.set(CSRF_COOKIE_NAME,csrfToken)}return fetch(target,{credentials:"same-origin",...init,headers})},response=await send();if(response.status!==401||!refreshToken.value)return response;if(!await refreshSession())return response;return await send()}export function useAuth(){function isTwoFactorChallenge(data){if(!data||typeof data!=="object")return!1;const candidate=data;return candidate.requires_two_factor===!0&&typeof candidate.challenge_token==="string"&&candidate.challenge_token.length>0}function isLoginResponse(data){if(!data||typeof data!=="object")return!1;const candidate=data;return typeof candidate.token==="string"&&candidate.token.length>0&&typeof candidate.user==="object"&&candidate.user!==null&&(candidate.refresh_token===void 0||typeof candidate.refresh_token==="string"&&candidate.refresh_token.length>0)}function storeTokenPack(data){token.value=data.token;refreshToken.value=data.refresh_token??""}async function fetchAuthUser(){try{const response=await authFetch(ME_PATH);if(!response.ok){clearSession();return null}const data=await response.json();user.value=data;isAuthenticated.value=!0;return data}catch(error){console.error("Error fetching user:",error);isAuthenticated.value=!1;user.value=null;return null}}async function checkAuthentication(){try{return await fetchAuthUser()!==null}catch(error){console.error("Error checking authentication:",error);return!1}}async function register(user){const url=`${baseUrl}/register`,data=await(await fetch(url,{method:"POST",credentials:"same-origin",headers:withCsrfHeader({"Content-Type":"application/json"}),body:JSON.stringify(user)})).json();if(isRegisterError(data))return data;if(isRegisterResponse(data)){token.value=data.token;const refreshed=data.refresh_token;refreshToken.value=refreshed??"";return data}return data}function isRegisterError(data){return"errors"in data}function isRegisterResponse(data){return"token"in data&&"user"in data}async function login(user){try{const url=`${baseUrl}/login`,response=await fetch(url,{method:"POST",credentials:"same-origin",headers:withCsrfHeader({"Content-Type":"application/json"}),body:JSON.stringify(user)});if(!response.ok){const errorData=await response.json();throw Error(errorData.message||`HTTP error! status: ${response.status}`)}const data=await response.json();if(isTwoFactorChallenge(data))return data;if(!isLoginResponse(data))throw Error("The login response did not contain a valid session.");storeTokenPack(data);await fetchAuthUser();return data}catch(error){return error}}async function verifyTwoFactorLogin(challengeToken,code){try{const response=await fetch(`${baseUrl}/verify-two-factor-login`,{method:"POST",credentials:"same-origin",headers:withCsrfHeader({"Content-Type":"application/json"}),body:JSON.stringify({challenge_token:challengeToken,code})});if(!response.ok){const errorData=await response.json();throw Error(errorData.message||`HTTP error! status: ${response.status}`)}const data=await response.json();if(!isLoginResponse(data))throw Error("The two-factor response did not contain a valid session.");storeTokenPack(data);await fetchAuthUser();return data}catch(error){return error}}async function logout(){const currentToken=token.value,response=await fetch(`${baseUrl}/logout`,{method:"POST",credentials:"same-origin",headers:withCsrfHeader({...currentToken?{Authorization:`Bearer ${currentToken}`}:{},Accept:"application/json"})});if(!response.ok)throw Error(`Logout failed with status ${response.status}`);clearSession()}async function completeSocialLogin(pack){const applied=applySessionHandoff(pack),confirmed=await fetchAuthUser();if(confirmed||applied)return confirmed;return null}return{user,isAuthenticated,token,getToken:()=>token.value,register,login,verifyTwoFactorLogin,logout,fetchAuthUser,completeSocialLogin,checkAuthentication,refreshToken,getRefreshToken:()=>refreshToken.value,refreshSession,authFetch}}export function authGuard(options={}){const guest=options.guest??!1,{isAuthenticated}=useAuth();if(guest){if(isAuthenticated.value)window.location.replace("/");return}if(!isAuthenticated.value)window.location.replace("/login")}

package/dist/types/dashboard.d.ts

@@ -7,7 +7,9 @@ export declare interface ValidationError {
   }[]
 }
 export declare interface RegisterError {
-  errors: ResponseError
+  errors?: ResponseError
+  error?: string
+  message?: string
 }
 // LoginAction/RegisterAction/AuthUserAction respond via `response.json(...)`,
 // which serializes flat (see @stacksjs/bun-router's ResponseFactory.json) —
@@ -26,7 +28,7 @@ export declare interface RegisterResponse {
 // is kept alongside `access_token` for backward compatibility.
 export declare interface LoginResponse {
   access_token: string
-  refresh_token: string
+  refresh_token?: string
   token_type: string
   expires_in: number
   token: string
@@ -36,6 +38,10 @@ export declare interface LoginResponse {
     name: string
   }
 }
+export declare interface TwoFactorLoginChallenge {
+  requires_two_factor: true
+  challenge_token: string
+}
 export declare interface Response<T> {
   errors: ResponseError
   data: T
@@ -43,6 +49,7 @@ export declare interface Response<T> {
 export declare interface AuthUser {
   email: string
   password: string
+  remember?: boolean
 }
 export declare interface ErrorResponse {
   message: string
@@ -55,12 +62,13 @@ export declare interface UserData {
 export declare interface AuthComposable {
   isAuthenticated: Ref<boolean>
   user: Ref<UserData | null>
-  login: (user: AuthUser) => Promise<LoginResponse | LoginError>
+  login: (user: AuthUser) => Promise<LoginResult | LoginError>
+  verifyTwoFactorLogin: (challengeToken: string, code: string) => Promise<LoginResponse | LoginError>
   register: (user: AuthUser) => Promise<RegisterResponse | RegisterError>
   fetchAuthUser: () => Promise<UserData | null>
   completeSocialLogin: (pack?: SessionHandoffPack | null) => Promise<UserData | null>
   checkAuthentication: () => Promise<boolean>
-  logout: () => void
+  logout: () => Promise<void>
   getToken: () => string | null
   token: Ref<string | null>
   refreshToken: Ref<string | null>
@@ -72,4 +80,5 @@ export type ResponseError = {
   error: string
 } | ValidationError;
 export type LoginError = RegisterError;
+export type LoginResult = LoginResponse | TwoFactorLoginChallenge;
 export type MeResponse = UserData;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/browser",
   "type": "module",
   "sideEffects": false,
-  "version": "0.74.59",
+  "version": "0.74.61",
   "description": "Stacks core frontend/browser functionalities.",
   "author": "Chris Breuer",
   "contributors": [
@@ -75,9 +75,9 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@stacksjs/composables": "0.74.59",
-    "@stacksjs/datetime": "0.74.59",
-    "@stacksjs/strings": "0.74.59",
+    "@stacksjs/composables": "0.74.61",
+    "@stacksjs/datetime": "0.74.61",
+    "@stacksjs/strings": "0.74.61",
     "@stacksjs/stx": "^0.2.286",
     "bun-query-builder": "^0.2.70"
   },
@@ -90,7 +90,7 @@
     }
   },
   "devDependencies": {
-    "@stacksjs/utils": "0.74.59",
+    "@stacksjs/utils": "0.74.61",
     "@stripe/stripe-js": "^9.10.0",
     "better-dx": "^0.2.24"
   }