@take-out/better-auth-utils 0.0.66 → 0.0.68

package/dist/esm/createAuthClient.mjs

@@ -7,7 +7,8 @@ function createBetterAuthClient(options) {
       createUser,
       storagePrefix = "auth",
       retryDelay = 4e3,
-      tokenValidationEndpoint = "/api/auth/validateToken",
+      useJWT = !1,
+      authCookieNames = ["better-auth.jwt", "better-auth.session_token"],
       ...authClientOptions
     } = options,
     empty = {
@@ -16,19 +17,25 @@ function createBetterAuthClient(options) {
       user: null,
       token: null
     },
+    keysStorage = createStorageValue(`${storagePrefix}-keys`),
+    stateStorage = createStorageValue(`${storagePrefix}-state`),
     createAuthClientWithSession = session => createAuthClient({
       ...authClientOptions,
       fetchOptions: {
-        headers: {
+        credentials: "include",
+        headers: useJWT ? {
           Authorization: `Bearer ${session}`
-        }
+        } : void 0
       }
-    }),
-    keysStorage = createStorageValue(`${storagePrefix}-keys`),
-    stateStorage = createStorageValue(`${storagePrefix}-state`);
+    });
   let authClient = (() => {
     const existingSession = keysStorage.get()?.session;
-    return existingSession ? createAuthClientWithSession(existingSession) : createAuthClient(authClientOptions);
+    return existingSession ? createAuthClientWithSession(existingSession) : createAuthClient({
+      ...authClientOptions,
+      fetchOptions: {
+        credentials: "include"
+      }
+    });
   })();
   const authState = createEmitter("authState", stateStorage.get() || empty, {
       comparator: isEqualDeepLite
@@ -42,6 +49,9 @@ function createBetterAuthClient(options) {
       stateStorage.set(next), authState.emit(next), next.token && next.session ? keysStorage.set({
         token: next.token,
         session: next.session.token
+      }) : next.session ? keysStorage.set({
+        token: "",
+        session: next.session.token
       }) : keysStorage.set({
         token: "",
         session: ""
@@ -72,15 +82,19 @@ function createBetterAuthClient(options) {
         sessionUpdate = nextState === "loading" ? {} : {
           session: data?.session ?? null,
           user: data?.user ? createUser ? createUser(data.user) : data.user : null
-        };
+        },
+        previousSession = authState.value?.session,
+        isNewSession = data?.session && (!previousSession || previousSession.id !== data.session.id || previousSession.userId !== data.session.userId);
       setState({
         state: nextState,
         ...sessionUpdate
-      }), data?.session && !authState.value.token && getValidToken().then(token => {
+      }), useJWT && data?.session && (isNewSession || !authState.value.token) && (isNewSession && authState.value.token && setState({
+        token: null
+      }), getValidToken().then(token => {
         token && setState({
           token
         });
-      });
+      }));
     });
   }
   function scheduleAuthRetry(delayMs) {
@@ -89,20 +103,6 @@ function createBetterAuthClient(options) {
     }, delayMs);
   }
   async function getValidToken() {
-    const existing = keysStorage.get()?.token;
-    if (existing) try {
-      if ((await fetch(tokenValidationEndpoint, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({
-          token: existing
-        })
-      }).then(res2 => res2.json()))?.valid) return existing;
-    } catch (error) {
-      console.error("Error validating token:", error);
-    }
     const res = await authClient.$fetch("/token");
     if (res.error) {
       console.error(`Error fetching token: ${res.error.statusText}`);
@@ -111,9 +111,19 @@ function createBetterAuthClient(options) {
     return res.data?.token;
   }
   const clearAuthClientToken = () => {
-      keysStorage.remove();
-    },
-    getAuth = () => {
+    keysStorage.remove();
+  };
+  function clearAuthCookies() {
+    if (!(typeof document > "u")) for (const cookieName of authCookieNames) {
+      document.cookie = `${cookieName}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/`;
+      const domain = window.location.hostname;
+      document.cookie = `${cookieName}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=${domain}`, domain.startsWith(".") && (document.cookie = `${cookieName}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=${domain.slice(1)}`);
+    }
+  }
+  function clearAllAuth() {
+    clearAuthCookies(), clearState();
+  }
+  const getAuth = () => {
       const state = authState?.value || empty;
       return {
         ...state,
@@ -144,6 +154,7 @@ function createBetterAuthClient(options) {
     authClient: proxiedAuthClient,
     setAuthClientToken,
     clearAuthClientToken,
+    clearAllAuth,
     useAuth,
     getAuth,
     getValidToken,

package/dist/esm/createAuthClient.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["createEmitter","createStorageValue","isEqualDeepLite","useEmitterValue","createAuthClient","createBetterAuthClient","options","onAuthStateChange","onAuthError","createUser","storagePrefix","retryDelay","tokenValidationEndpoint","authClientOptions","empty","state","session","user","token","createAuthClientWithSession","fetchOptions","headers","Authorization","keysStorage","stateStorage","authClient","existingSession","get","authState","comparator","authClientVersion","setState","update","next","value","set","emit","setAuthClientToken","props","updateAuthClient","Math","random","subscribeToAuthEffect","dispose","retryTimer","useSession","subscribe","data","dataGeneric","isPending","error","scheduleAuthRetry","hasPersistedSession","nextState","sessionUpdate","getValidToken","then","delayMs","clearTimeout","setTimeout","existing","fetch","method","body","JSON","stringify","res2","json","valid","console","res","$fetch","statusText","clearAuthClientToken","remove","getAuth","loggedIn","useAuth","clearState","window","addEventListener","cleanup","proxiedAuthClient","Proxy","_target","key","signOut","location","reload","Reflect"],"sources":["../../src/createAuthClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createEmitter","createStorageValue","isEqualDeepLite","useEmitterValue","createAuthClient","createBetterAuthClient","options","onAuthStateChange","onAuthError","createUser","storagePrefix","retryDelay","useJWT","authCookieNames","authClientOptions","empty","state","session","user","token","keysStorage","stateStorage","createAuthClientWithSession","fetchOptions","credentials","headers","Authorization","authClient","existingSession","get","authState","comparator","authClientVersion","setState","update","next","value","set","emit","setAuthClientToken","props","updateAuthClient","Math","random","subscribeToAuthEffect","dispose","retryTimer","useSession","subscribe","data","dataGeneric","isPending","error","scheduleAuthRetry","hasPersistedSession","nextState","sessionUpdate","previousSession","isNewSession","id","userId","getValidToken","then","delayMs","clearTimeout","setTimeout","res","$fetch","console","statusText","clearAuthClientToken","remove","clearAuthCookies","document","cookieName","cookie","domain","window","location","hostname","startsWith","slice","clearAllAuth","clearState","getAuth","loggedIn","useAuth","addEventListener","cleanup","proxiedAuthClient","Proxy","_target","key","signOut","reload","Reflect"],"sources":["../../src/createAuthClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/createAuthClient.native.js

@@ -7,7 +7,8 @@ function createBetterAuthClient(options) {
       createUser,
       storagePrefix = "auth",
       retryDelay = 4e3,
-      tokenValidationEndpoint = "/api/auth/validateToken",
+      useJWT = !1,
+      authCookieNames = ["better-auth.jwt", "better-auth.session_token"],
       ...authClientOptions
     } = options,
     empty = {
@@ -16,22 +17,28 @@ function createBetterAuthClient(options) {
       user: null,
       token: null
     },
+    keysStorage = createStorageValue(`${storagePrefix}-keys`),
+    stateStorage = createStorageValue(`${storagePrefix}-state`),
     createAuthClientWithSession = function (session) {
       return createAuthClient({
         ...authClientOptions,
         fetchOptions: {
-          headers: {
+          credentials: "include",
+          headers: useJWT ? {
             Authorization: `Bearer ${session}`
-          }
+          } : void 0
         }
       });
     },
-    keysStorage = createStorageValue(`${storagePrefix}-keys`),
-    stateStorage = createStorageValue(`${storagePrefix}-state`),
     authClient = function () {
       var _keysStorage_get,
         existingSession = (_keysStorage_get = keysStorage.get()) === null || _keysStorage_get === void 0 ? void 0 : _keysStorage_get.session;
-      return existingSession ? createAuthClientWithSession(existingSession) : createAuthClient(authClientOptions);
+      return existingSession ? createAuthClientWithSession(existingSession) : createAuthClient({
+        ...authClientOptions,
+        fetchOptions: {
+          credentials: "include"
+        }
+      });
     }(),
     authState = createEmitter("authState", stateStorage.get() || empty, {
       comparator: isEqualDeepLite
@@ -46,6 +53,9 @@ function createBetterAuthClient(options) {
       stateStorage.set(next), authState.emit(next), next.token && next.session ? keysStorage.set({
         token: next.token,
         session: next.session.token
+      }) : next.session ? keysStorage.set({
+        token: "",
+        session: next.session.token
       }) : keysStorage.set({
         token: "",
         session: ""
@@ -62,6 +72,7 @@ function createBetterAuthClient(options) {
   function subscribeToAuthEffect() {
     dispose?.(), dispose = authClient.useSession.subscribe(async function (props) {
       var _keysStorage_get,
+        _authState_value,
         {
           data: dataGeneric,
           isPending,
@@ -78,15 +89,19 @@ function createBetterAuthClient(options) {
         sessionUpdate = nextState === "loading" ? {} : {
           session: (_data_session = data?.session) !== null && _data_session !== void 0 ? _data_session : null,
           user: data?.user ? createUser ? createUser(data.user) : data.user : null
-        };
+        },
+        previousSession = (_authState_value = authState.value) === null || _authState_value === void 0 ? void 0 : _authState_value.session,
+        isNewSession = data?.session && (!previousSession || previousSession.id !== data.session.id || previousSession.userId !== data.session.userId);
       setState({
         state: nextState,
         ...sessionUpdate
-      }), data?.session && !authState.value.token && getValidToken().then(function (token) {
+      }), useJWT && data?.session && (isNewSession || !authState.value.token) && (isNewSession && authState.value.token && setState({
+        token: null
+      }), getValidToken().then(function (token) {
         token && setState({
           token
         });
-      });
+      }));
     });
   }
   function scheduleAuthRetry(delayMs) {
@@ -95,36 +110,44 @@ function createBetterAuthClient(options) {
     }, delayMs);
   }
   async function getValidToken() {
-    var _keysStorage_get,
-      existing = (_keysStorage_get = keysStorage.get()) === null || _keysStorage_get === void 0 ? void 0 : _keysStorage_get.token;
-    if (existing) try {
-      var response = await fetch(tokenValidationEndpoint, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({
-          token: existing
-        })
-      }).then(function (res2) {
-        return res2.json();
-      });
-      if (response?.valid) return existing;
-    } catch (error) {
-      console.error("Error validating token:", error);
-    }
-    var res = await authClient.$fetch("/token");
+    var _res_data,
+      res = await authClient.$fetch("/token");
     if (res.error) {
       console.error(`Error fetching token: ${res.error.statusText}`);
       return;
     }
-    var data = res.data;
-    return data?.token;
+    return (_res_data = res.data) === null || _res_data === void 0 ? void 0 : _res_data.token;
   }
   var clearAuthClientToken = function () {
-      keysStorage.remove();
-    },
-    getAuth = function () {
+    keysStorage.remove();
+  };
+  function clearAuthCookies() {
+    if (!(typeof document > "u")) {
+      var _iteratorNormalCompletion = !0,
+        _didIteratorError = !1,
+        _iteratorError = void 0;
+      try {
+        for (var _iterator = authCookieNames[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+          var cookieName = _step.value;
+          document.cookie = `${cookieName}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/`;
+          var domain = window.location.hostname;
+          document.cookie = `${cookieName}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=${domain}`, domain.startsWith(".") && (document.cookie = `${cookieName}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=${domain.slice(1)}`);
+        }
+      } catch (err) {
+        _didIteratorError = !0, _iteratorError = err;
+      } finally {
+        try {
+          !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+        } finally {
+          if (_didIteratorError) throw _iteratorError;
+        }
+      }
+    }
+  }
+  function clearAllAuth() {
+    clearAuthCookies(), clearState();
+  }
+  var getAuth = function () {
       var state = authState?.value || empty;
       return {
         ...state,
@@ -161,6 +184,7 @@ function createBetterAuthClient(options) {
     authClient: proxiedAuthClient,
     setAuthClientToken,
     clearAuthClientToken,
+    clearAllAuth,
     useAuth,
     getAuth,
     getValidToken,

package/dist/esm/createAuthClient.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["createEmitter","createStorageValue","isEqualDeepLite","useEmitterValue","createAuthClient","createBetterAuthClient","options","onAuthStateChange","onAuthError","createUser","storagePrefix","retryDelay","tokenValidationEndpoint","authClientOptions","empty","state","session","user","token","createAuthClientWithSession","fetchOptions","headers","Authorization","keysStorage","stateStorage","authClient","_keysStorage_get","existingSession","get","authState","comparator","authClientVersion","setState","update","current","value","next","set","emit","setAuthClientToken","props","updateAuthClient","Math","random","subscribeToAuthEffect","dispose","retryTimer","useSession","subscribe","data","dataGeneric","isPending","error","scheduleAuthRetry","hasPersistedSession","nextState","_data_session","sessionUpdate","getValidToken","then","delayMs","clearTimeout","setTimeout","existing","response","fetch","method","body","JSON","stringify","res2","json","valid","console","res","$fetch","statusText","clearAuthClientToken","remove","getAuth","loggedIn","useAuth","clearState","window","addEventListener","cleanup","proxiedAuthClient","Proxy","_target","key","_authClient_signOut","signOut","call","_window_location_reload","_window_location","location","reload","Reflect"],"sources":["../../src/createAuthClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createEmitter","createStorageValue","isEqualDeepLite","useEmitterValue","createAuthClient","createBetterAuthClient","options","onAuthStateChange","onAuthError","createUser","storagePrefix","retryDelay","useJWT","authCookieNames","authClientOptions","empty","state","session","user","token","keysStorage","stateStorage","createAuthClientWithSession","fetchOptions","credentials","headers","Authorization","authClient","_keysStorage_get","existingSession","get","authState","comparator","authClientVersion","setState","update","current","value","next","set","emit","setAuthClientToken","props","updateAuthClient","Math","random","subscribeToAuthEffect","dispose","retryTimer","useSession","subscribe","_authState_value","data","dataGeneric","isPending","error","scheduleAuthRetry","hasPersistedSession","nextState","_data_session","sessionUpdate","previousSession","isNewSession","id","userId","getValidToken","then","delayMs","clearTimeout","setTimeout","_res_data","res","$fetch","console","statusText","clearAuthClientToken","remove","clearAuthCookies","document","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","done","cookieName","cookie","domain","window","location","hostname","startsWith","slice","err","return","clearAllAuth","clearState","getAuth","loggedIn","useAuth","addEventListener","cleanup","proxiedAuthClient","Proxy"],"sources":["../../src/createAuthClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/server.js

@@ -0,0 +1,71 @@
+import { createRemoteJWKSet, jwtVerify } from "jose";
+class NotAuthenticatedError extends Error {
+}
+class InvalidTokenError extends Error {
+}
+async function getAuthDataFromRequest(authServer, req, tokenOptions) {
+  const authHeader = req.headers.get("authorization"), cookie = authHeader?.split("Bearer ")[1], newHeaders = new Headers(req.headers);
+  cookie && newHeaders.set("Cookie", cookie);
+  try {
+    const session = await authServer.api.getSession({ headers: newHeaders });
+    if (session?.user)
+      return {
+        id: session.user.id,
+        email: session.user.email || void 0,
+        role: session.user.role === "admin" ? "admin" : void 0
+      };
+  } catch {
+  }
+  const jwtToken = authHeader?.replace("Bearer ", "");
+  if (jwtToken)
+    try {
+      const payload = await validateToken(jwtToken, tokenOptions), userId = payload?.id || payload?.sub;
+      if (userId)
+        return {
+          id: userId,
+          email: payload.email,
+          role: payload.role === "admin" ? "admin" : void 0
+        };
+    } catch (err) {
+      if (!(err instanceof InvalidTokenError))
+        throw err;
+    }
+  return null;
+}
+async function validateToken(token, options) {
+  const {
+    baseUrl = process.env.ONE_SERVER_URL,
+    forceIssuer = process.env.FORCE_ISSUER || "",
+    jwksPath = "/api/auth/jwks"
+  } = options || {};
+  if (!baseUrl)
+    throw new Error("No baseURL!");
+  const normalizedBaseUrl = removeTrailingSlash(baseUrl), url = `${forceIssuer || normalizedBaseUrl}${jwksPath}`, JWKS = createRemoteJWKSet(new URL(url));
+  try {
+    const verifyOptions = forceIssuer ? {} : {
+      issuer: normalizedBaseUrl,
+      audience: normalizedBaseUrl
+    }, { payload } = await jwtVerify(token, JWKS, verifyOptions);
+    return payload;
+  } catch (error) {
+    throw new InvalidTokenError(`${error}`);
+  }
+}
+async function isValidJWT(token, options) {
+  try {
+    return await validateToken(token, options), !0;
+  } catch {
+    return !1;
+  }
+}
+function removeTrailingSlash(str) {
+  return str.replace(/\/$/, "");
+}
+export {
+  InvalidTokenError,
+  NotAuthenticatedError,
+  getAuthDataFromRequest,
+  isValidJWT,
+  validateToken
+};
+//# sourceMappingURL=server.js.map

package/dist/esm/server.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../src/server.ts"],
+  "mappings": "AAMA,SAAS,oBAAoB,iBAAkC;AAiBxD,MAAM,8BAA8B,MAAM;AAAC;AAC3C,MAAM,0BAA0B,MAAM;AAAC;AAiB9C,eAAsB,uBACpB,YACA,KACA,cAC0B;AAI1B,QAAM,aAAa,IAAI,QAAQ,IAAI,eAAe,GAC5C,SAAS,YAAY,MAAM,SAAS,EAAE,CAAC,GAEvC,aAAa,IAAI,QAAQ,IAAI,OAAO;AAC1C,EAAI,UACF,WAAW,IAAI,UAAU,MAAM;AAIjC,MAAI;AACF,UAAM,UAAU,MAAM,WAAW,IAAI,WAAW,EAAE,SAAS,WAAW,CAAC;AACvE,QAAI,SAAS;AACX,aAAO;AAAA,QACL,IAAI,QAAQ,KAAK;AAAA,QACjB,OAAO,QAAQ,KAAK,SAAS;AAAA,QAC7B,MAAM,QAAQ,KAAK,SAAS,UAAU,UAAU;AAAA,MAClD;AAAA,EAEJ,QAAQ;AAAA,EAER;AAIA,QAAM,WAAW,YAAY,QAAQ,WAAW,EAAE;AAElD,MAAI;AACF,QAAI;AACF,YAAM,UAAU,MAAM,cAAc,UAAU,YAAY,GACpD,SAAU,SAAiB,MAAM,SAAS;AAChD,UAAI;AACF,eAAO;AAAA,UACL,IAAI;AAAA,UACJ,OAAQ,QAAgB;AAAA,UACxB,MAAO,QAAgB,SAAS,UAAU,UAAU;AAAA,QACtD;AAAA,IAEJ,SAAS,KAAK;AACZ,UAAI,EAAE,eAAe;AACnB,cAAM;AAAA,IAEV;AAGF,SAAO;AACT;AAIA,eAAsB,cACpB,OACA,SACqB;AACrB,QAAM;AAAA,IACJ,UAAU,QAAQ,IAAI;AAAA,IACtB,cAAc,QAAQ,IAAI,gBAAgB;AAAA,IAC1C,WAAW;AAAA,EACb,IAAI,WAAW,CAAC;AAEhB,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,aAAa;AAG/B,QAAM,oBAAoB,oBAAoB,OAAO,GAC/C,MAAM,GAAG,eAAe,iBAAiB,GAAG,QAAQ,IAGpD,OAAO,mBAAmB,IAAI,IAAI,GAAG,CAAC;AAE5C,MAAI;AACF,UAAM,gBAAgB,cAClB,CAAC,IACD;AAAA,MACE,QAAQ;AAAA,MACR,UAAU;AAAA,IACZ,GAEE,EAAE,QAAQ,IAAI,MAAM,UAAU,OAAO,MAAM,aAAa;AAE9D,WAAO;AAAA,EACT,SAAS,OAAO;AACd,UAAM,IAAI,kBAAkB,GAAG,KAAK,EAAE;AAAA,EACxC;AACF;AAEA,eAAsB,WACpB,OACA,SACkB;AAClB,MAAI;AACF,iBAAM,cAAc,OAAO,OAAO,GAC3B;AAAA,EACT,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEA,SAAS,oBAAoB,KAAa;AACxC,SAAO,IAAI,QAAQ,OAAO,EAAE;AAC9B;",
+  "names": []
+}

package/dist/esm/server.mjs

@@ -0,0 +1,67 @@
+import { createRemoteJWKSet, jwtVerify } from "jose";
+class NotAuthenticatedError extends Error {}
+class InvalidTokenError extends Error {}
+async function getAuthDataFromRequest(authServer, req, tokenOptions) {
+  const authHeader = req.headers.get("authorization"),
+    cookie = authHeader?.split("Bearer ")[1],
+    newHeaders = new Headers(req.headers);
+  cookie && newHeaders.set("Cookie", cookie);
+  try {
+    const session = await authServer.api.getSession({
+      headers: newHeaders
+    });
+    if (session?.user) return {
+      id: session.user.id,
+      email: session.user.email || void 0,
+      role: session.user.role === "admin" ? "admin" : void 0
+    };
+  } catch {}
+  const jwtToken = authHeader?.replace("Bearer ", "");
+  if (jwtToken) try {
+    const payload = await validateToken(jwtToken, tokenOptions),
+      userId = payload?.id || payload?.sub;
+    if (userId) return {
+      id: userId,
+      email: payload.email,
+      role: payload.role === "admin" ? "admin" : void 0
+    };
+  } catch (err) {
+    if (!(err instanceof InvalidTokenError)) throw err;
+  }
+  return null;
+}
+async function validateToken(token, options) {
+  const {
+    baseUrl = process.env.ONE_SERVER_URL,
+    forceIssuer = process.env.FORCE_ISSUER || "",
+    jwksPath = "/api/auth/jwks"
+  } = options || {};
+  if (!baseUrl) throw new Error("No baseURL!");
+  const normalizedBaseUrl = removeTrailingSlash(baseUrl),
+    url = `${forceIssuer || normalizedBaseUrl}${jwksPath}`,
+    JWKS = createRemoteJWKSet(new URL(url));
+  try {
+    const verifyOptions = forceIssuer ? {} : {
+        issuer: normalizedBaseUrl,
+        audience: normalizedBaseUrl
+      },
+      {
+        payload
+      } = await jwtVerify(token, JWKS, verifyOptions);
+    return payload;
+  } catch (error) {
+    throw new InvalidTokenError(`${error}`);
+  }
+}
+async function isValidJWT(token, options) {
+  try {
+    return await validateToken(token, options), !0;
+  } catch {
+    return !1;
+  }
+}
+function removeTrailingSlash(str) {
+  return str.replace(/\/$/, "");
+}
+export { InvalidTokenError, NotAuthenticatedError, getAuthDataFromRequest, isValidJWT, validateToken };
+//# sourceMappingURL=server.mjs.map

package/dist/esm/server.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["createRemoteJWKSet","jwtVerify","NotAuthenticatedError","Error","InvalidTokenError","getAuthDataFromRequest","authServer","req","tokenOptions","authHeader","headers","get","cookie","split","newHeaders","Headers","set","session","api","getSession","user","id","email","role","jwtToken","replace","payload","validateToken","userId","sub","err","token","options","baseUrl","process","env","ONE_SERVER_URL","forceIssuer","FORCE_ISSUER","jwksPath","normalizedBaseUrl","removeTrailingSlash","url","JWKS","URL","verifyOptions","issuer","audience","error","isValidJWT","str"],"sources":["../../src/server.ts"],"sourcesContent":[null],"mappings":"AAMA,SAASA,kBAAA,EAAoBC,SAAA,QAAkC;AAiBxD,MAAMC,qBAAA,SAA8BC,KAAA,CAAM;AAC1C,MAAMC,iBAAA,SAA0BD,KAAA,CAAM;AAiB7C,eAAsBE,uBACpBC,UAAA,EACAC,GAAA,EACAC,YAAA,EAC0B;EAI1B,MAAMC,UAAA,GAAaF,GAAA,CAAIG,OAAA,CAAQC,GAAA,CAAI,eAAe;IAC5CC,MAAA,GAASH,UAAA,EAAYI,KAAA,CAAM,SAAS,EAAE,CAAC;IAEvCC,UAAA,GAAa,IAAIC,OAAA,CAAQR,GAAA,CAAIG,OAAO;EACtCE,MAAA,IACFE,UAAA,CAAWE,GAAA,CAAI,UAAUJ,MAAM;EAIjC,IAAI;IACF,MAAMK,OAAA,GAAU,MAAMX,UAAA,CAAWY,GAAA,CAAIC,UAAA,CAAW;MAAET,OAAA,EAASI;IAAW,CAAC;IACvE,IAAIG,OAAA,EAASG,IAAA,EACX,OAAO;MACLC,EAAA,EAAIJ,OAAA,CAAQG,IAAA,CAAKC,EAAA;MACjBC,KAAA,EAAOL,OAAA,CAAQG,IAAA,CAAKE,KAAA,IAAS;MAC7BC,IAAA,EAAMN,OAAA,CAAQG,IAAA,CAAKG,IAAA,KAAS,UAAU,UAAU;IAClD;EAEJ,QAAQ,CAER;EAIA,MAAMC,QAAA,GAAWf,UAAA,EAAYgB,OAAA,CAAQ,WAAW,EAAE;EAElD,IAAID,QAAA,EACF,IAAI;IACF,MAAME,OAAA,GAAU,MAAMC,aAAA,CAAcH,QAAA,EAAUhB,YAAY;MACpDoB,MAAA,GAAUF,OAAA,EAAiBL,EAAA,IAAMK,OAAA,EAASG,GAAA;IAChD,IAAID,MAAA,EACF,OAAO;MACLP,EAAA,EAAIO,MAAA;MACJN,KAAA,EAAQI,OAAA,CAAgBJ,KAAA;MACxBC,IAAA,EAAOG,OAAA,CAAgBH,IAAA,KAAS,UAAU,UAAU;IACtD;EAEJ,SAASO,GAAA,EAAK;IACZ,IAAI,EAAEA,GAAA,YAAe1B,iBAAA,GACnB,MAAM0B,GAAA;EAEV;EAGF,OAAO;AACT;AAIA,eAAsBH,cACpBI,KAAA,EACAC,OAAA,EACqB;EACrB,MAAM;IACJC,OAAA,GAAUC,OAAA,CAAQC,GAAA,CAAIC,cAAA;IACtBC,WAAA,GAAcH,OAAA,CAAQC,GAAA,CAAIG,YAAA,IAAgB;IAC1CC,QAAA,GAAW;EACb,IAAIP,OAAA,IAAW,CAAC;EAEhB,IAAI,CAACC,OAAA,EACH,MAAM,IAAI9B,KAAA,CAAM,aAAa;EAG/B,MAAMqC,iBAAA,GAAoBC,mBAAA,CAAoBR,OAAO;IAC/CS,GAAA,GAAM,GAAGL,WAAA,IAAeG,iBAAiB,GAAGD,QAAQ;IAGpDI,IAAA,GAAO3C,kBAAA,CAAmB,IAAI4C,GAAA,CAAIF,GAAG,CAAC;EAE5C,IAAI;IACF,MAAMG,aAAA,GAAgBR,WAAA,GAClB,CAAC,IACD;QACES,MAAA,EAAQN,iBAAA;QACRO,QAAA,EAAUP;MACZ;MAEE;QAAEd;MAAQ,IAAI,MAAMzB,SAAA,CAAU8B,KAAA,EAAOY,IAAA,EAAME,aAAa;IAE9D,OAAOnB,OAAA;EACT,SAASsB,KAAA,EAAO;IACd,MAAM,IAAI5C,iBAAA,CAAkB,GAAG4C,KAAK,EAAE;EACxC;AACF;AAEA,eAAsBC,WACpBlB,KAAA,EACAC,OAAA,EACkB;EAClB,IAAI;IACF,aAAML,aAAA,CAAcI,KAAA,EAAOC,OAAO,GAC3B;EACT,QAAQ;IACN,OAAO;EACT;AACF;AAEA,SAASS,oBAAoBS,GAAA,EAAa;EACxC,OAAOA,GAAA,CAAIzB,OAAA,CAAQ,OAAO,EAAE;AAC9B","ignoreList":[]}