naystack 1.8.4 → 1.8.6

package/dist/graphql/client.esm.js

@@ -38,6 +38,7 @@ function ClearStoreOnLogout() {
 import { ApolloLink, fromPromise, HttpLink } from "@apollo/client";
 import { setContext } from "@apollo/client/link/context";
 import { onError } from "@apollo/client/link/error";
+import { getAccessToken, refreshAccessToken } from "naystack/auth/token-store";
 
 // src/env.ts
 var EXTRA_ENV = globalThis.__NAYSTACK_ENV__ || (globalThis.__NAYSTACK_ENV__ = {});
@@ -89,35 +90,6 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
-// src/auth/token-store.ts
-var currentToken;
-var listeners = /* @__PURE__ */ new Set();
-var inFlightRefresh = null;
-function getAccessToken() {
-  return currentToken;
-}
-function setAccessToken(token) {
-  if (token === currentToken) return;
-  currentToken = token;
-  listeners.forEach((listener) => listener(token));
-}
-function refreshAccessToken() {
-  if (inFlightRefresh) return inFlightRefresh;
-  inFlightRefresh = (async () => {
-    const res = await fetch(
-      getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */),
-      { credentials: "include" }
-    );
-    if (!res.ok) throw new Error(`Token refresh failed: ${res.status}`);
-    const token = await res.text() || null;
-    setAccessToken(token);
-    return token;
-  })().finally(() => {
-    inFlightRefresh = null;
-  });
-  return inFlightRefresh;
-}
-
 // src/graphql/links.ts
 var RETRY_CONTEXT_KEY = "__naystackRetried";
 function isExpiredTokenError(error) {
@@ -186,7 +158,7 @@ var tokenContext = (token) => {
   };
 };
 function useAuthQuery(query, variables, options) {
-  const [fetch2, result] = useLazyQuery(query, {
+  const [fetch, result] = useLazyQuery(query, {
     fetchPolicy: "no-cache",
     ...options
   });
@@ -195,7 +167,7 @@ function useAuthQuery(query, variables, options) {
     const serialized = JSON.stringify(variables);
     if (variables && prevVarsRef.current !== serialized) {
       prevVarsRef.current = serialized;
-      void fetch2({
+      void fetch({
         // @ts-expect-error -- to allow dynamic props
         variables: { input: variables },
         context: {
@@ -203,16 +175,16 @@ function useAuthQuery(query, variables, options) {
         }
       });
     }
-  }, [fetch2, variables]);
+  }, [fetch, variables]);
   const reFetch = useCallback(
-    (input) => fetch2({
+    (input) => fetch({
       // @ts-expect-error -- to allow dynamic props
       variables: { input },
       context: {
         credentials: `include`
       }
     }),
-    [fetch2]
+    [fetch]
   );
   return [reFetch, result];
 }

package/dist/graphql/links.cjs.js

@@ -26,6 +26,7 @@ module.exports = __toCommonJS(links_exports);
 var import_client = require("@apollo/client");
 var import_context = require("@apollo/client/link/context");
 var import_error = require("@apollo/client/link/error");
+var import_token_store = require("naystack/auth/token-store");
 
 // src/env.ts
 var EXTRA_ENV = globalThis.__NAYSTACK_ENV__ || (globalThis.__NAYSTACK_ENV__ = {});
@@ -77,42 +78,13 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
-// src/auth/token-store.ts
-var currentToken;
-var listeners = /* @__PURE__ */ new Set();
-var inFlightRefresh = null;
-function getAccessToken() {
-  return currentToken;
-}
-function setAccessToken(token) {
-  if (token === currentToken) return;
-  currentToken = token;
-  listeners.forEach((listener) => listener(token));
-}
-function refreshAccessToken() {
-  if (inFlightRefresh) return inFlightRefresh;
-  inFlightRefresh = (async () => {
-    const res = await fetch(
-      getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */),
-      { credentials: "include" }
-    );
-    if (!res.ok) throw new Error(`Token refresh failed: ${res.status}`);
-    const token = await res.text() || null;
-    setAccessToken(token);
-    return token;
-  })().finally(() => {
-    inFlightRefresh = null;
-  });
-  return inFlightRefresh;
-}
-
 // src/graphql/links.ts
 var RETRY_CONTEXT_KEY = "__naystackRetried";
 function isExpiredTokenError(error) {
   return error.extensions?.code === "UNAUTHENTICATED";
 }
 var authLink = (0, import_context.setContext)((_, previousContext) => {
-  const token = getAccessToken();
+  const token = (0, import_token_store.getAccessToken)();
   if (!token || previousContext.credentials === "include")
     return previousContext;
   return {
@@ -130,7 +102,7 @@ var refreshLink = (0, import_error.onError)(({ graphQLErrors, operation, forward
   return (0, import_client.fromPromise)(
     // A failed refresh still replays once: the retry reproduces the original
     // error for the caller instead of surfacing the refresh's error in its place.
-    refreshAccessToken().catch(() => null)
+    (0, import_token_store.refreshAccessToken)().catch(() => null)
   ).flatMap(() => {
     operation.setContext((previousContext) => ({
       ...previousContext,

package/dist/graphql/links.esm.js

@@ -2,6 +2,7 @@
 import { ApolloLink, fromPromise, HttpLink } from "@apollo/client";
 import { setContext } from "@apollo/client/link/context";
 import { onError } from "@apollo/client/link/error";
+import { getAccessToken, refreshAccessToken } from "naystack/auth/token-store";
 
 // src/env.ts
 var EXTRA_ENV = globalThis.__NAYSTACK_ENV__ || (globalThis.__NAYSTACK_ENV__ = {});
@@ -53,35 +54,6 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
-// src/auth/token-store.ts
-var currentToken;
-var listeners = /* @__PURE__ */ new Set();
-var inFlightRefresh = null;
-function getAccessToken() {
-  return currentToken;
-}
-function setAccessToken(token) {
-  if (token === currentToken) return;
-  currentToken = token;
-  listeners.forEach((listener) => listener(token));
-}
-function refreshAccessToken() {
-  if (inFlightRefresh) return inFlightRefresh;
-  inFlightRefresh = (async () => {
-    const res = await fetch(
-      getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */),
-      { credentials: "include" }
-    );
-    if (!res.ok) throw new Error(`Token refresh failed: ${res.status}`);
-    const token = await res.text() || null;
-    setAccessToken(token);
-    return token;
-  })().finally(() => {
-    inFlightRefresh = null;
-  });
-  return inFlightRefresh;
-}
-
 // src/graphql/links.ts
 var RETRY_CONTEXT_KEY = "__naystackRetried";
 function isExpiredTokenError(error) {

package/dist/graphql/next.cjs.js

@@ -60,6 +60,7 @@ function ClearStoreOnLogout() {
 var import_client3 = require("@apollo/client");
 var import_context = require("@apollo/client/link/context");
 var import_error = require("@apollo/client/link/error");
+var import_token_store = require("naystack/auth/token-store");
 
 // src/env.ts
 var EXTRA_ENV = globalThis.__NAYSTACK_ENV__ || (globalThis.__NAYSTACK_ENV__ = {});
@@ -111,42 +112,13 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
-// src/auth/token-store.ts
-var currentToken;
-var listeners = /* @__PURE__ */ new Set();
-var inFlightRefresh = null;
-function getAccessToken() {
-  return currentToken;
-}
-function setAccessToken(token) {
-  if (token === currentToken) return;
-  currentToken = token;
-  listeners.forEach((listener) => listener(token));
-}
-function refreshAccessToken() {
-  if (inFlightRefresh) return inFlightRefresh;
-  inFlightRefresh = (async () => {
-    const res = await fetch(
-      getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */),
-      { credentials: "include" }
-    );
-    if (!res.ok) throw new Error(`Token refresh failed: ${res.status}`);
-    const token = await res.text() || null;
-    setAccessToken(token);
-    return token;
-  })().finally(() => {
-    inFlightRefresh = null;
-  });
-  return inFlightRefresh;
-}
-
 // src/graphql/links.ts
 var RETRY_CONTEXT_KEY = "__naystackRetried";
 function isExpiredTokenError(error) {
   return error.extensions?.code === "UNAUTHENTICATED";
 }
 var authLink = (0, import_context.setContext)((_, previousContext) => {
-  const token = getAccessToken();
+  const token = (0, import_token_store.getAccessToken)();
   if (!token || previousContext.credentials === "include")
     return previousContext;
   return {
@@ -164,7 +136,7 @@ var refreshLink = (0, import_error.onError)(({ graphQLErrors, operation, forward
   return (0, import_client3.fromPromise)(
     // A failed refresh still replays once: the retry reproduces the original
     // error for the caller instead of surfacing the refresh's error in its place.
-    refreshAccessToken().catch(() => null)
+    (0, import_token_store.refreshAccessToken)().catch(() => null)
   ).flatMap(() => {
     operation.setContext((previousContext) => ({
       ...previousContext,

package/dist/graphql/next.esm.js

@@ -31,6 +31,7 @@ function ClearStoreOnLogout() {
 import { ApolloLink, fromPromise, HttpLink } from "@apollo/client";
 import { setContext } from "@apollo/client/link/context";
 import { onError } from "@apollo/client/link/error";
+import { getAccessToken, refreshAccessToken } from "naystack/auth/token-store";
 
 // src/env.ts
 var EXTRA_ENV = globalThis.__NAYSTACK_ENV__ || (globalThis.__NAYSTACK_ENV__ = {});
@@ -82,35 +83,6 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
-// src/auth/token-store.ts
-var currentToken;
-var listeners = /* @__PURE__ */ new Set();
-var inFlightRefresh = null;
-function getAccessToken() {
-  return currentToken;
-}
-function setAccessToken(token) {
-  if (token === currentToken) return;
-  currentToken = token;
-  listeners.forEach((listener) => listener(token));
-}
-function refreshAccessToken() {
-  if (inFlightRefresh) return inFlightRefresh;
-  inFlightRefresh = (async () => {
-    const res = await fetch(
-      getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */),
-      { credentials: "include" }
-    );
-    if (!res.ok) throw new Error(`Token refresh failed: ${res.status}`);
-    const token = await res.text() || null;
-    setAccessToken(token);
-    return token;
-  })().finally(() => {
-    inFlightRefresh = null;
-  });
-  return inFlightRefresh;
-}
-
 // src/graphql/links.ts
 var RETRY_CONTEXT_KEY = "__naystackRetried";
 function isExpiredTokenError(error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naystack",
-  "version": "1.8.4",
+  "version": "1.8.6",
   "description": "A stack built with Next + GraphQL + S3 + Auth",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -23,6 +23,11 @@
       "import": "./dist/auth/client.esm.js",
       "require": "./dist/auth/client.cjs.js"
     },
+    "./auth/token-store": {
+      "types": "./dist/auth/token-store.d.ts",
+      "import": "./dist/auth/token-store.esm.js",
+      "require": "./dist/auth/token-store.cjs.js"
+    },
     "./graphql": {
       "types": "./dist/graphql/index.d.ts",
       "import": "./dist/graphql/index.esm.js",