@webority/web-core 0.100.0 → 0.101.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- import{Logger as e}from"../logger/logger.js";import{ACCESS_TOKEN_KEY as t,REFRESH_TOKEN_KEY as n,clearSession as r,getToken as i,storeToken as a}from"../auth/authStore.js";import{withCrossTabRefreshLock as o}from"./crossTabRefreshLock.js";import s from"./publicClient.js";import c from"axios";var l=`session_revoked`,u=`session_expired`,d,f,p=e=>{d=e},m=e=>{f=e},h=null,g=[],_=(e,t=null)=>{g.forEach(({resolve:n,reject:r})=>{e?r(e):t!==null&&n(t)}),g=[]},v=()=>{h=null,_(Error(`[@webority/web-core] Session ended`))},y=e=>e instanceof Error?e.message:typeof e==`string`?e:`Unknown error`,b=()=>{if(!d||!f)throw Error(`User package store is not initialized. Call initUserAuth first.`);return{store:d,auth:f}},x=()=>f?.accountId,S=()=>f?.refresh.path,C=async()=>{let e=b();await e.store.dispatch(e.auth.logout())},w=async(e,t)=>{await r(e,{code:t}),await C()},T=e=>{let t=e&&typeof e==`object`?e.code:void 0;return t===`session_revoked`||t===`session_expired`?t:null},E=e=>{if(!c.isAxiosError(e)||!e.response)return null;let t=e.response.data,n=t&&typeof t==`object`?t.code:void 0;return typeof n==`string`&&f?.endSessionOn?.includes(n)?n:null},D=()=>h!==null,O=0,k=Promise.resolve(),A=null,j=()=>{O===0&&(k=new Promise(e=>{A=e})),O+=1;let e=!1;return()=>{e||(e=!0,--O,O===0&&(A?.(),A=null))}},M=()=>O===0?Promise.resolve():k,N=async r=>{let i;try{i=(f?.refresh.readTokens??B)(r)}catch(t){e.error(`A session-replacing response carried no tokens:`,y(t));return}await a(t,i.accessToken,i.accessTokenExpiry),await a(n,i.refreshToken,i.refreshTokenExpiry)},P=async e=>{let t=(await i(`accessToken`))?.token??null;return t!==null&&t!==e?t:null},F=()=>new Promise((e,t)=>{g.push({resolve:e,reject:t})}),I=class e extends Error{constructor(t){super(t),this.name=`SessionEndedError`,Object.setPrototypeOf(this,e.prototype)}},L=e=>e instanceof I||c.isAxiosError(e)&&(e.response?.status===400||e.response?.status===401),R=e=>!c.isAxiosError(e)||e.response?.status!==401?null:T(e.response.data),z=(e,t)=>{if(typeof e!=`string`||e===``)throw Error(`The refresh response has no "${t}".`);return e},B=e=>{let t=e??{};return{accessToken:z(t.accessToken,`accessToken`),accessTokenExpiry:z(t.accessTokenExpiration,`accessTokenExpiration`),refreshToken:z(t.refreshToken,`refreshToken`),refreshTokenExpiry:z(t.refreshTokenExpiration,`refreshTokenExpiration`)}},V=async r=>{await M();let o=await i(n);if(!o?.token)throw new I(`No refresh token available`);if(Date.parse(o.expiry)<=Date.now())throw new I(`Refresh token expired`);let c={accessToken:(await i(`accessToken`))?.token??null,refreshToken:o.token},l=r.body?await r.body(c):c,u=r.headers?await r.headers():void 0;e.info(`Refreshing the access token`);let{data:d}=await s.post(r.path,l,u?{headers:u}:void 0),f=(r.readTokens??B)(d);await M();let p=(await i(`refreshToken`))?.token===o.token?null:await i(t);return p?.token?(e.info(`Keeping the session that replaced this one during the refresh`),p.token):(await a(t,f.accessToken,f.accessTokenExpiry),await a(n,f.refreshToken,f.refreshTokenExpiry),e.info(`Access token refreshed`),f.accessToken)},H=30*1e3,U=async(n,r)=>{let a=await i(t);return a?.token&&a.token!==r&&Date.parse(a.expiry)>Date.now()+H?(e.info(`Adopting the access token another tab refreshed`),a.token):V(n)},W=()=>{if(h)return h;let t=(async()=>{let t=null;try{let{refresh:e}=b().auth;t=(await i(`accessToken`))?.token??null;let n=await o(()=>U(e,t));return _(null,n),n}catch(n){if(L(n)){await M();let n=await P(t);if(n)return e.info(`The session was replaced during the refresh; continuing with the new one`),_(null,n),n}let r=E(n);if(r!==null)throw _(n,null),await w(`terminated`,r),n;let i=c.isAxiosError(n)?n.response?.data:void 0;throw e.error(`Token refresh failed:`,i??y(n)),_(n,null),L(n)&&await w(`rejected`,R(n)),n}})().finally(()=>{h===t&&(h=null)});return h=t,t};export{u as SESSION_EXPIRED_CODE,l as SESSION_REVOKED_CODE,j as beginSessionReplacement,P as currentTokenIfReplaced,C as dispatchLogout,w as endSessionAndLogout,E as endSessionCodeOf,x as getAccountIdProvider,y as getErrorMessage,S as getRefreshPath,p as injectStore,m as injectUserAuth,D as isRefreshInFlight,F as queueBehindRefresh,W as refreshAccessToken,v as resetRefreshState,T as sessionCodeOf,N as storeReplacementSession,M as waitForSessionReplacement};
1
+ import{Logger as e}from"../logger/logger.js";import{ACCESS_TOKEN_KEY as t,REFRESH_TOKEN_KEY as n,clearSession as r,getToken as i,storeToken as a}from"../auth/authStore.js";import{withCrossTabRefreshLock as o}from"./crossTabRefreshLock.js";import s from"./publicClient.js";import c from"axios";var l=`session_revoked`,u=`session_expired`,d,f,p=e=>{d=e},m=e=>{f=e},h=null,g=[],_=(e,t=null)=>{g.forEach(({resolve:n,reject:r})=>{e?r(e):t!==null&&n(t)}),g=[]},v=()=>{h=null,_(Error(`[@webority/web-core] Session ended`))},y=e=>e instanceof Error?e.message:typeof e==`string`?e:`Unknown error`,b=()=>{if(!d||!f)throw Error(`User package store is not initialized. Call initUserAuth first.`);return{store:d,auth:f}},x=()=>f?.accountId,S=()=>f?.refresh.path,C=async()=>{let e=b();await e.store.dispatch(e.auth.logout())},w=async(e,t,n)=>{await r(e,{code:t,detail:n}),await C()},T=e=>{let t=e&&typeof e==`object`?e.code:void 0;return t===`session_revoked`||t===`session_expired`?t:null},E=e=>{let t=e&&typeof e==`object`?e.detail:void 0;return typeof t==`string`&&t!==``&&T(e)!==null?t:null},D=e=>{if(!c.isAxiosError(e)||!e.response)return null;let t=e.response.data,n=t&&typeof t==`object`?t.code:void 0;return typeof n==`string`&&f?.endSessionOn?.includes(n)?n:null},O=()=>h!==null,k=0,A=Promise.resolve(),j=null,M=()=>{k===0&&(A=new Promise(e=>{j=e})),k+=1;let e=!1;return()=>{e||(e=!0,--k,k===0&&(j?.(),j=null))}},N=()=>k===0?Promise.resolve():A,P=async r=>{let i;try{i=(f?.refresh.readTokens??H)(r)}catch(t){e.error(`A session-replacing response carried no tokens:`,y(t));return}await a(t,i.accessToken,i.accessTokenExpiry),await a(n,i.refreshToken,i.refreshTokenExpiry)},F=async e=>{let t=(await i(`accessToken`))?.token??null;return t!==null&&t!==e?t:null},I=()=>new Promise((e,t)=>{g.push({resolve:e,reject:t})}),L=class e extends Error{constructor(t){super(t),this.name=`SessionEndedError`,Object.setPrototypeOf(this,e.prototype)}},R=e=>e instanceof L||c.isAxiosError(e)&&(e.response?.status===400||e.response?.status===401),z=e=>!c.isAxiosError(e)||e.response?.status!==401?null:T(e.response.data),B=e=>!c.isAxiosError(e)||e.response?.status!==401?null:E(e.response.data),V=(e,t)=>{if(typeof e!=`string`||e===``)throw Error(`The refresh response has no "${t}".`);return e},H=e=>{let t=e??{};return{accessToken:V(t.accessToken,`accessToken`),accessTokenExpiry:V(t.accessTokenExpiration,`accessTokenExpiration`),refreshToken:V(t.refreshToken,`refreshToken`),refreshTokenExpiry:V(t.refreshTokenExpiration,`refreshTokenExpiration`)}},U=async r=>{await N();let o=await i(n);if(!o?.token)throw new L(`No refresh token available`);if(Date.parse(o.expiry)<=Date.now())throw new L(`Refresh token expired`);let c={accessToken:(await i(`accessToken`))?.token??null,refreshToken:o.token},l=r.body?await r.body(c):c,u=r.headers?await r.headers():void 0;e.info(`Refreshing the access token`);let{data:d}=await s.post(r.path,l,u?{headers:u}:void 0),f=(r.readTokens??H)(d);await N();let p=(await i(`refreshToken`))?.token===o.token?null:await i(t);return p?.token?(e.info(`Keeping the session that replaced this one during the refresh`),p.token):(await a(t,f.accessToken,f.accessTokenExpiry),await a(n,f.refreshToken,f.refreshTokenExpiry),e.info(`Access token refreshed`),f.accessToken)},W=30*1e3,G=async(n,r)=>{let a=await i(t);return a?.token&&a.token!==r&&Date.parse(a.expiry)>Date.now()+W?(e.info(`Adopting the access token another tab refreshed`),a.token):U(n)},K=()=>{if(h)return h;let t=(async()=>{let t=null;try{let{refresh:e}=b().auth;t=(await i(`accessToken`))?.token??null;let n=await o(()=>G(e,t));return _(null,n),n}catch(n){if(R(n)){await N();let n=await F(t);if(n)return e.info(`The session was replaced during the refresh; continuing with the new one`),_(null,n),n}let r=D(n);if(r!==null)throw _(n,null),await w(`terminated`,r,E(c.isAxiosError(n)?n.response?.data:void 0)),n;let i=c.isAxiosError(n)?n.response?.data:void 0;throw e.error(`Token refresh failed:`,i??y(n)),_(n,null),R(n)&&await w(`rejected`,z(n),B(n)),n}})().finally(()=>{h===t&&(h=null)});return h=t,t};export{u as SESSION_EXPIRED_CODE,l as SESSION_REVOKED_CODE,M as beginSessionReplacement,F as currentTokenIfReplaced,C as dispatchLogout,w as endSessionAndLogout,D as endSessionCodeOf,x as getAccountIdProvider,y as getErrorMessage,S as getRefreshPath,p as injectStore,m as injectUserAuth,O as isRefreshInFlight,I as queueBehindRefresh,K as refreshAccessToken,v as resetRefreshState,T as sessionCodeOf,E as sessionDetailOf,P as storeReplacementSession,N as waitForSessionReplacement};
@@ -1 +1 @@
1
- import{applyRequestDefaults as e}from"./requestDefaults.js";import{Logger as t}from"../logger/logger.js";import{ACCESS_TOKEN_KEY as n,getToken as r}from"../auth/authStore.js";import{getLastKnownNetworkStatus as i}from"../network/networkStatus.js";import{applyConfiguredBaseUrl as a}from"./baseUrl.js";import{applyClientHeaders as o,readAccountId as s,stampAccountId as c}from"./clientHeaders.js";import{applyDesignSample as l}from"./designSample.js";import{readMinAppVersion as u}from"./minAppVersion.js";import{sendFormDataAsMultipart as d}from"./multipart.js";import{responseBodyText as f}from"./responseBodyText.js";import{WorkspaceChangedError as p,isWorkspaceChangedResponse as m,workspaceChangedFromResponse as h}from"./workspaceChanged.js";import{attachRetry as g}from"./retry.js";import{SESSION_EXPIRED_CODE as _,SESSION_REVOKED_CODE as v,beginSessionReplacement as y,currentTokenIfReplaced as b,endSessionAndLogout as x,endSessionCodeOf as S,getAccountIdProvider as C,getErrorMessage as w,getRefreshPath as T,injectStore as E,injectUserAuth as D,isRefreshInFlight as O,queueBehindRefresh as k,refreshAccessToken as A,resetRefreshState as j,sessionCodeOf as M,storeReplacementSession as N,waitForSessionReplacement as P}from"./tokenRefresh.js";import F,{AxiosHeaders as I}from"axios";var L=class e extends Error{constructor(t=`Request blocked: device is offline`){super(t),this.name=`RequestOfflineError`,Object.setPrototypeOf(this,e.prototype)}},R=class e extends Error{constructor(){super(`No access token available`),this.name=`NoAccessTokenError`,Object.setPrototypeOf(this,e.prototype)}},z=e=>{e?._endReplacement?.(),e&&(e._endReplacement=void 0)},B=e=>{let t=e.headers instanceof I?e.headers.get(`Authorization`):void 0;return typeof t==`string`&&t.startsWith(`Bearer `)?t.slice(7):null},V=F.create({headers:{"Content-Type":`application/json`}});u(V),g(V);var H=(e,t)=>{e.headers instanceof I?e.headers.set(`Authorization`,`Bearer ${t}`):e.headers=I.from({...e.headers,Authorization:`Bearer ${t}`})},U=e=>{let t=T();return!!t&&!!e?.includes(t)};a(V),e(V),d(V),o(V),l(V),V.interceptors.request.use(async e=>{if(z(e),(await i()).isConnected===!1)return t.warn(`Request blocked: browser is offline. URL: ${e.url}`),Promise.reject(new L);try{if(U(e.url))return e;await c(e,C());let i=await r(n);if(!i?.token)throw new R;let a=Date.now();return Date.parse(i.expiry)<=a+30*1e3?(t.info(`Access token expired or about to expire, refreshing before request`),H(e,await A())):H(e,i.token),e.replacesSession&&(e._endReplacement=y()),e}catch(n){return n instanceof R?t.info(`Request not sent: signed out. URL: ${e.url}`):t.error(`Failed to attach token:`,w(n)),Promise.reject(n)}},e=>(t.error(`Request error:`,w(e)),Promise.reject(e))),V.interceptors.response.use(async e=>{let t=e.config;if(t._endReplacement)try{await N(e.data)}finally{z(t)}return e},async e=>{if(z(e?.config),F.isCancel(e)||e instanceof L||e instanceof R||e instanceof p)return Promise.reject(e);if(!F.isAxiosError(e))return t.error(`Non-axios error in response interceptor: ${w(e)}`),Promise.reject(e);let n=e,r=n.config;if(!n.response)return r?.skipErrorLog||t.error(`Network error or no response from server: ${n.message}, URL: ${r?.url}`),Promise.reject(e);if(m(n))return t.info(`Request refused: the workspace changed after it was made. URL: ${r?.url}`),Promise.reject(h(n));if(n.response.status===401&&r&&!r._replayedWithCurrentToken&&!r.replacesSession&&!U(r.url)&&(await P(),await b(B(r))))return(r._accountId??null)===await s(C())?(t.info(`Session changed while the request was in flight; sending it again. URL: ${r.url}`),r._replayedWithCurrentToken=!0,V(r)):(t.info(`Session moved to another workspace while the request was in flight; not sending it again. URL: ${r.url}`),Promise.reject(new p(void 0,{config:r,cause:e})));let i=U(r?.url)?null:S(n);if(i!==null)return t.warn(`Session ended by ${i}, logging out. URL: ${r?.url}`),j(),await x(`terminated`,i),Promise.reject(e);if(n.response.status===401&&r&&!r._retry){if(U(r.url))return Promise.reject(e);let i=M(n.response.data);if(i!==null)return t.warn(`Session ${i}, logging out without refresh. URL: ${r.url}`),j(),await x(`terminated`,i),Promise.reject(e);if(t.warn(`Unauthorized URL: ${r.url}`),r._retry=!0,O())return k().then(e=>(t.info(`Retrying request after token refresh:`,r.url),H(r,e),V(r))).catch(e=>(e instanceof p||t.error(`Failed to retry request after token refresh:`,w(e)),Promise.reject(e)));try{return H(r,await A()),V(r)}catch(e){return Promise.reject(e)}}if(!r?.skipErrorLog){let e=`Response error: ${f(n.response?.data,n.message)}, URL: ${r?.url}, Status: ${n.response.status}`;r?.expectedStatuses?.includes(n.response.status)?t.debug(e):t.error(e)}return Promise.reject(e)});export{L as RequestOfflineError,_ as SESSION_EXPIRED_CODE,v as SESSION_REVOKED_CODE,V as default,E as injectStore,D as injectUserAuth,j as resetRefreshState};
1
+ import{applyRequestDefaults as e}from"./requestDefaults.js";import{Logger as t}from"../logger/logger.js";import{ACCESS_TOKEN_KEY as n,getToken as r}from"../auth/authStore.js";import{getLastKnownNetworkStatus as i}from"../network/networkStatus.js";import{applyConfiguredBaseUrl as a}from"./baseUrl.js";import{applyClientHeaders as o,readAccountId as s,stampAccountId as c}from"./clientHeaders.js";import{applyDesignSample as l}from"./designSample.js";import{readMinAppVersion as u}from"./minAppVersion.js";import{sendFormDataAsMultipart as d}from"./multipart.js";import{responseBodyText as f}from"./responseBodyText.js";import{WorkspaceChangedError as p,isWorkspaceChangedResponse as m,workspaceChangedFromResponse as h}from"./workspaceChanged.js";import{attachRetry as g}from"./retry.js";import{SESSION_EXPIRED_CODE as _,SESSION_REVOKED_CODE as v,beginSessionReplacement as y,currentTokenIfReplaced as b,endSessionAndLogout as x,endSessionCodeOf as S,getAccountIdProvider as C,getErrorMessage as w,getRefreshPath as T,injectStore as E,injectUserAuth as D,isRefreshInFlight as O,queueBehindRefresh as k,refreshAccessToken as A,resetRefreshState as j,sessionCodeOf as M,sessionDetailOf as N,storeReplacementSession as P,waitForSessionReplacement as F}from"./tokenRefresh.js";import I,{AxiosHeaders as L}from"axios";var R=class e extends Error{constructor(t=`Request blocked: device is offline`){super(t),this.name=`RequestOfflineError`,Object.setPrototypeOf(this,e.prototype)}},z=class e extends Error{constructor(){super(`No access token available`),this.name=`NoAccessTokenError`,Object.setPrototypeOf(this,e.prototype)}},B=e=>{e?._endReplacement?.(),e&&(e._endReplacement=void 0)},V=e=>{let t=e.headers instanceof L?e.headers.get(`Authorization`):void 0;return typeof t==`string`&&t.startsWith(`Bearer `)?t.slice(7):null},H=I.create({headers:{"Content-Type":`application/json`}});u(H),g(H);var U=(e,t)=>{e.headers instanceof L?e.headers.set(`Authorization`,`Bearer ${t}`):e.headers=L.from({...e.headers,Authorization:`Bearer ${t}`})},W=e=>{let t=T();return!!t&&!!e?.includes(t)};a(H),e(H),d(H),o(H),l(H),H.interceptors.request.use(async e=>{if(B(e),(await i()).isConnected===!1)return t.warn(`Request blocked: browser is offline. URL: ${e.url}`),Promise.reject(new R);try{if(W(e.url))return e;await c(e,C());let i=await r(n);if(!i?.token)throw new z;let a=Date.now();return Date.parse(i.expiry)<=a+30*1e3?(t.info(`Access token expired or about to expire, refreshing before request`),U(e,await A())):U(e,i.token),e.replacesSession&&(e._endReplacement=y()),e}catch(n){return n instanceof z?t.info(`Request not sent: signed out. URL: ${e.url}`):t.error(`Failed to attach token:`,w(n)),Promise.reject(n)}},e=>(t.error(`Request error:`,w(e)),Promise.reject(e))),H.interceptors.response.use(async e=>{let t=e.config;if(t._endReplacement)try{await P(e.data)}finally{B(t)}return e},async e=>{if(B(e?.config),I.isCancel(e)||e instanceof R||e instanceof z||e instanceof p)return Promise.reject(e);if(!I.isAxiosError(e))return t.error(`Non-axios error in response interceptor: ${w(e)}`),Promise.reject(e);let n=e,r=n.config;if(!n.response)return r?.skipErrorLog||t.error(`Network error or no response from server: ${n.message}, URL: ${r?.url}`),Promise.reject(e);if(m(n))return t.info(`Request refused: the workspace changed after it was made. URL: ${r?.url}`),Promise.reject(h(n));if(n.response.status===401&&r&&!r._replayedWithCurrentToken&&!r.replacesSession&&!W(r.url)&&(await F(),await b(V(r))))return(r._accountId??null)===await s(C())?(t.info(`Session changed while the request was in flight; sending it again. URL: ${r.url}`),r._replayedWithCurrentToken=!0,H(r)):(t.info(`Session moved to another workspace while the request was in flight; not sending it again. URL: ${r.url}`),Promise.reject(new p(void 0,{config:r,cause:e})));let i=W(r?.url)?null:S(n);if(i!==null)return t.warn(`Session ended by ${i}, logging out. URL: ${r?.url}`),j(),await x(`terminated`,i,N(n.response?.data)),Promise.reject(e);if(n.response.status===401&&r&&!r._retry){if(W(r.url))return Promise.reject(e);let i=M(n.response.data);if(i!==null)return t.warn(`Session ${i}, logging out without refresh. URL: ${r.url}`),j(),await x(`terminated`,i,N(n.response.data)),Promise.reject(e);if(t.warn(`Unauthorized URL: ${r.url}`),r._retry=!0,O())return k().then(e=>(t.info(`Retrying request after token refresh:`,r.url),U(r,e),H(r))).catch(e=>(e instanceof p||t.error(`Failed to retry request after token refresh:`,w(e)),Promise.reject(e)));try{return U(r,await A()),H(r)}catch(e){return Promise.reject(e)}}if(!r?.skipErrorLog){let e=`Response error: ${f(n.response?.data,n.message)}, URL: ${r?.url}, Status: ${n.response.status}`;r?.expectedStatuses?.includes(n.response.status)?t.debug(e):t.error(e)}return Promise.reject(e)});export{R as RequestOfflineError,_ as SESSION_EXPIRED_CODE,v as SESSION_REVOKED_CODE,H as default,E as injectStore,D as injectUserAuth,j as resetRefreshState};
@@ -1 +1 @@
1
- import{Logger as e}from"../logger/logger.js";import{getJWTExpiry as t}from"./jwt.js";var n=`accessToken`,r=`refreshToken`,i=`sessionUser`,a=720*60*60*1e3,o=new Set([n,r,i]),s=null,c=()=>globalThis.localStorage,l=()=>globalThis.sessionStorage,u=(e,t)=>{try{return e().getItem(t)}catch{return null}},d=(e,t)=>{try{e().removeItem(t)}catch{}},f=()=>s===null?u(c,`refreshToken`)!==null||u(c,`accessToken`)!==null:s,p=()=>f()?c:l,m=()=>f()?l:c,h=t=>{s=t;let n=p(),r=m();for(let t of o){let i=u(r,t);if(i!==null)try{n().setItem(t,i),d(r,t)}catch(n){e.error(`[authStore] could not move "${t}" to the chosen store`,n)}}},g=new Set,_=`sessionEnded`,v=()=>u(l,_)!==null,y=(t,n)=>{try{l().setItem(_,t)}catch{}for(let r of[...g])try{r(t,n)}catch(t){e.error(`[authStore] a session-ended listener threw`,t)}},b=e=>{if(e.storageArea!==c())return;let t=e.key===`refreshToken`&&e.oldValue!==null&&e.newValue===null;!(e.key===null||t)||u(l,`refreshToken`)!==null||y(`otherTab`,{code:null})},x=e=>(g.size===0&&typeof window<`u`&&window.addEventListener(`storage`,b),g.add(e),()=>{g.delete(e),g.size===0&&typeof window<`u`&&window.removeEventListener(`storage`,b)}),S=async(t,n,r)=>{try{p()().setItem(t,JSON.stringify({token:n,expiry:r})),d(m(),t),d(l,_)}catch(n){throw e.error(`Error storing token for key: ${t}`,n),n}},C=e=>{try{let t=JSON.parse(e);return t&&typeof t==`object`&&typeof t.token==`string`&&typeof t.expiry==`string`?t:null}catch{return null}},w=e=>u(l,e)??u(c,e),T=async t=>{let n=w(t);return n===null&&j(t)&&L()&&(n=w(t)),n===null?null:C(n)||(e.warn(`Stored credentials for key "${t}" are not a valid token; clearing them.`),j(t)?await R(`corrupt`,!0):await D(t),null)},E=()=>{w(`refreshToken`)===null&&w(`accessToken`)===null&&L();let e=w(r);if(e!==null&&C(e)!==null)return!0;let t=w(n),i=t===null?null:C(t);if(i===null)return!1;let a=Date.parse(i.expiry);return Number.isNaN(a)||a>Date.now()},D=async e=>{d(c,e),d(l,e)},O=async t=>{try{p()().setItem(i,JSON.stringify(t)),d(m(),i)}catch(t){throw e.error(`Error storing the session user`,t),t}},k=async()=>{let t=w(i);if(t===null)return null;try{return JSON.parse(t)}catch{return e.warn(`The stored session user is not valid JSON; clearing it.`),await A(),null}},A=async()=>{d(c,i),d(l,i)},j=e=>e===`accessToken`||e===`refreshToken`,M=null,N=!1,P=e=>{M=e,N=!1},F=e=>{let t=C(e);if(t)return t;let n=e;try{let t=JSON.parse(e);typeof t==`string`&&(n=t)}catch{}return n.trim()===``?null:{token:n,expiry:null}},I=e=>e.split(`.`).length===3?t(e)?.toISOString()??null:null,L=()=>{if(!M||N)return!1;N=!0;let t=M,a=[c,l].every(e=>u(e,`accessToken`)===null&&u(e,`refreshToken`)===null),o=!1;for(let s of[c,l]){let l=u(s,t.accessToken),f=u(s,t.refreshToken),p=t.sessionUser?u(s,t.sessionUser):null;if(a&&!o&&(l!==null||f!==null))try{let t=l===null?null:F(l),a=f===null?null:F(f);if(t){let e=t.expiry??I(t.token)??new Date().toISOString();s().setItem(n,JSON.stringify({token:t.token,expiry:e}))}if(a){let e=a.expiry??I(a.token)??new Date(Date.now()+2592e6).toISOString();s().setItem(r,JSON.stringify({token:a.token,expiry:e}))}p!==null&&s().setItem(i,p),o=t!==null||a!==null,o&&e.breadcrumb(`[authStore] moved a session from the legacy token keys`,{store:s===c?`localStorage`:`sessionStorage`})}catch(t){e.error(`[authStore] could not move the session from the legacy token keys`,t)}for(let e of[t.accessToken,t.refreshToken,t.sessionUser])e&&d(s,e)}return o},R=async(e,t,i=null)=>{let a=t||await T(`accessToken`)!==null||await T(`refreshToken`)!==null;await D(n),await D(r),await A(),s=null,(a||t)&&y(e,{code:i})},z=async(e=`signedOut`,t={})=>R(e,!1,t.code??null);export{n as ACCESS_TOKEN_KEY,a as LEGACY_REFRESH_TOKEN_LIFETIME_MS,r as REFRESH_TOKEN_KEY,i as SESSION_USER_KEY,x as addSessionEndedListener,z as clearSession,f as getKeepSignedIn,k as getSessionUser,T as getToken,E as hasSession,v as hasSessionEndedInTab,A as removeSessionUser,D as removeToken,h as setKeepSignedIn,P as setLegacyTokenKeys,O as storeSessionUser,S as storeToken};
1
+ import{Logger as e}from"../logger/logger.js";import{getJWTExpiry as t}from"./jwt.js";var n=`accessToken`,r=`refreshToken`,i=`sessionUser`,a=720*60*60*1e3,o=new Set([n,r,i]),s=null,c=()=>globalThis.localStorage,l=()=>globalThis.sessionStorage,u=(e,t)=>{try{return e().getItem(t)}catch{return null}},d=(e,t)=>{try{e().removeItem(t)}catch{}},f=()=>s===null?u(c,`refreshToken`)!==null||u(c,`accessToken`)!==null:s,p=()=>f()?c:l,m=()=>f()?l:c,h=t=>{s=t;let n=p(),r=m();for(let t of o){let i=u(r,t);if(i!==null)try{n().setItem(t,i),d(r,t)}catch(n){e.error(`[authStore] could not move "${t}" to the chosen store`,n)}}},g=new Set,_=`sessionEnded`,v=()=>u(l,_)!==null,y=(t,n)=>{try{l().setItem(_,t)}catch{}for(let r of[...g])try{r(t,n)}catch(t){e.error(`[authStore] a session-ended listener threw`,t)}},b=e=>{if(e.storageArea!==c())return;let t=e.key===`refreshToken`&&e.oldValue!==null&&e.newValue===null;!(e.key===null||t)||u(l,`refreshToken`)!==null||y(`otherTab`,{code:null,detail:null})},x=e=>(g.size===0&&typeof window<`u`&&window.addEventListener(`storage`,b),g.add(e),()=>{g.delete(e),g.size===0&&typeof window<`u`&&window.removeEventListener(`storage`,b)}),S=async(t,n,r)=>{try{p()().setItem(t,JSON.stringify({token:n,expiry:r})),d(m(),t),d(l,_)}catch(n){throw e.error(`Error storing token for key: ${t}`,n),n}},C=e=>{try{let t=JSON.parse(e);return t&&typeof t==`object`&&typeof t.token==`string`&&typeof t.expiry==`string`?t:null}catch{return null}},w=e=>u(l,e)??u(c,e),T=async t=>{let n=w(t);return n===null&&j(t)&&L()&&(n=w(t)),n===null?null:C(n)||(e.warn(`Stored credentials for key "${t}" are not a valid token; clearing them.`),j(t)?await R(`corrupt`,!0):await D(t),null)},E=()=>{w(`refreshToken`)===null&&w(`accessToken`)===null&&L();let e=w(r);if(e!==null&&C(e)!==null)return!0;let t=w(n),i=t===null?null:C(t);if(i===null)return!1;let a=Date.parse(i.expiry);return Number.isNaN(a)||a>Date.now()},D=async e=>{d(c,e),d(l,e)},O=async t=>{try{p()().setItem(i,JSON.stringify(t)),d(m(),i)}catch(t){throw e.error(`Error storing the session user`,t),t}},k=async()=>{let t=w(i);if(t===null)return null;try{return JSON.parse(t)}catch{return e.warn(`The stored session user is not valid JSON; clearing it.`),await A(),null}},A=async()=>{d(c,i),d(l,i)},j=e=>e===`accessToken`||e===`refreshToken`,M=null,N=!1,P=e=>{M=e,N=!1},F=e=>{let t=C(e);if(t)return t;let n=e;try{let t=JSON.parse(e);typeof t==`string`&&(n=t)}catch{}return n.trim()===``?null:{token:n,expiry:null}},I=e=>e.split(`.`).length===3?t(e)?.toISOString()??null:null,L=()=>{if(!M||N)return!1;N=!0;let t=M,a=[c,l].every(e=>u(e,`accessToken`)===null&&u(e,`refreshToken`)===null),o=!1;for(let s of[c,l]){let l=u(s,t.accessToken),f=u(s,t.refreshToken),p=t.sessionUser?u(s,t.sessionUser):null;if(a&&!o&&(l!==null||f!==null))try{let t=l===null?null:F(l),a=f===null?null:F(f);if(t){let e=t.expiry??I(t.token)??new Date().toISOString();s().setItem(n,JSON.stringify({token:t.token,expiry:e}))}if(a){let e=a.expiry??I(a.token)??new Date(Date.now()+2592e6).toISOString();s().setItem(r,JSON.stringify({token:a.token,expiry:e}))}p!==null&&s().setItem(i,p),o=t!==null||a!==null,o&&e.breadcrumb(`[authStore] moved a session from the legacy token keys`,{store:s===c?`localStorage`:`sessionStorage`})}catch(t){e.error(`[authStore] could not move the session from the legacy token keys`,t)}for(let e of[t.accessToken,t.refreshToken,t.sessionUser])e&&d(s,e)}return o},R=async(e,t,i=null,a=null)=>{let o=t||await T(`accessToken`)!==null||await T(`refreshToken`)!==null;await D(n),await D(r),await A(),s=null,(o||t)&&y(e,{code:i,detail:a})},z=async(e=`signedOut`,t={})=>R(e,!1,t.code??null,t.detail??null);export{n as ACCESS_TOKEN_KEY,a as LEGACY_REFRESH_TOKEN_LIFETIME_MS,r as REFRESH_TOKEN_KEY,i as SESSION_USER_KEY,x as addSessionEndedListener,z as clearSession,f as getKeepSignedIn,k as getSessionUser,T as getToken,E as hasSession,v as hasSessionEndedInTab,A as removeSessionUser,D as removeToken,h as setKeepSignedIn,P as setLegacyTokenKeys,O as storeSessionUser,S as storeToken};
@@ -42,9 +42,11 @@ export declare const dispatchLogout: () => Promise<void>;
42
42
  * The session is over: clear it (tokens and session user removed, listeners told why, with
43
43
  * the server's code), then dispatch the app's logout.
44
44
  */
45
- export declare const endSessionAndLogout: (reason: SessionEndReason, code: string | null) => Promise<void>;
45
+ export declare const endSessionAndLogout: (reason: SessionEndReason, code: string | null, detail: string | null) => Promise<void>;
46
46
  /** The server's session code in a 401 body (`session_revoked`, `session_expired`), or null. */
47
47
  export declare const sessionCodeOf: (data: unknown) => string | null;
48
+ /** The server's sentence for the user when its session code (`sessionCodeOf`) ended the session, or null. */
49
+ export declare const sessionDetailOf: (data: unknown) => string | null;
48
50
  /** The server's problem-body code when it is one the app ends the session on (`endSessionOn`), at any status, or null. */
49
51
  export declare const endSessionCodeOf: (error: unknown) => string | null;
50
52
  export declare const isRefreshInFlight: () => boolean;
@@ -25,6 +25,8 @@ export type SessionEndReason = "signedOut" | "rejected" | "terminated" | "corrup
25
25
  export interface SessionEndDetail {
26
26
  /** The server's session code (`session_revoked`, `session_expired`) when the server ended the session; null when the app or another tab did. */
27
27
  code: string | null;
28
+ /** The server's sentence for the user (the problem's detail) when the server ended the session; null otherwise. */
29
+ detail: string | null;
28
30
  }
29
31
  export type SessionEndedListener = (reason: SessionEndReason, detail: SessionEndDetail) => void;
30
32
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webority/web-core",
3
- "version": "0.100.0",
3
+ "version": "0.101.1",
4
4
  "description": "Platform layer for Webority React web portals: HTTP clients with single-flight token refresh, auth store, API error extraction, RTK Query base query, logger, formatters, storage, version check and route guards. No UI.",
5
5
  "license": "SEE LICENSE IN LICENSE",
6
6
  "type": "module",