naystack 1.8.3 → 1.8.5

package/dist/auth/index.d.mts

@@ -13,4 +13,5 @@ import 'googleapis';
 import '../socials/instagram/types.mjs';
 import 'react';
 import './email/client.mjs';
+import 'naystack/auth/token-store';
 import '../graphql/types.mjs';

package/dist/auth/index.d.ts

@@ -13,4 +13,5 @@ import 'googleapis';
 import '../socials/instagram/types.js';
 import 'react';
 import './email/client.js';
+import 'naystack/auth/token-store';
 import '../graphql/types.js';

package/dist/auth/index.esm.js

@@ -104,11 +104,13 @@ function getEnv(key, skipCheck) {
 // src/auth/email/token.ts
 function generateAccessToken(id) {
   return sign({ id }, getEnv("SIGNING_KEY" /* SIGNING_KEY */), {
-    expiresIn: "2h"
+    expiresIn: "24h"
   });
 }
 function generateRefreshToken(id) {
-  return sign({ id }, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
+  return sign({ id }, getEnv("REFRESH_KEY" /* REFRESH_KEY */), {
+    expiresIn: "365d"
+  });
 }
 function getTokenizedResponse(id) {
   const accessToken = id ? generateAccessToken(id) : void 0;

package/dist/auth/token-store.cjs.js

@@ -0,0 +1,120 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/auth/token-store.ts
+var token_store_exports = {};
+__export(token_store_exports, {
+  getAccessToken: () => getAccessToken,
+  refreshAccessToken: () => refreshAccessToken,
+  setAccessToken: () => setAccessToken,
+  subscribeToAccessToken: () => subscribeToAccessToken
+});
+module.exports = __toCommonJS(token_store_exports);
+
+// src/env.ts
+var EXTRA_ENV = globalThis.__NAYSTACK_ENV__ || (globalThis.__NAYSTACK_ENV__ = {});
+var getEnvValue = (key) => {
+  switch (key) {
+    case "NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */:
+      return process.env.NEXT_PUBLIC_GRAPHQL_ENDPOINT || EXTRA_ENV.GRAPHQL_ENDPOINT;
+    case "NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */:
+      return process.env.NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT || EXTRA_ENV.EMAIL_AUTH_ENDPOINT;
+    case "NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT" /* NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT */:
+      return process.env.NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT || EXTRA_ENV.GOOGLE_AUTH_ENDPOINT;
+    case "NEXT_PUBLIC_INSTAGRAM_AUTH_ENDPOINT" /* NEXT_PUBLIC_INSTAGRAM_AUTH_ENDPOINT */:
+      return process.env.NEXT_PUBLIC_INSTAGRAM_AUTH_ENDPOINT || EXTRA_ENV.INSTAGRAM_AUTH_ENDPOINT;
+    case "NEXT_PUBLIC_FILE_ENDPOINT" /* NEXT_PUBLIC_FILE_ENDPOINT */:
+      return process.env.NEXT_PUBLIC_FILE_ENDPOINT || EXTRA_ENV.FILE_ENDPOINT;
+    case "NEXT_PUBLIC_BASE_URL" /* NEXT_PUBLIC_BASE_URL */:
+      return process.env.NEXT_PUBLIC_BASE_URL || EXTRA_ENV.BASE_URL;
+    case "REFRESH_KEY" /* REFRESH_KEY */:
+      return process.env.REFRESH_KEY;
+    case "SIGNING_KEY" /* SIGNING_KEY */:
+      return process.env.SIGNING_KEY;
+    case "INSTAGRAM_CLIENT_SECRET" /* INSTAGRAM_CLIENT_SECRET */:
+      return process.env.INSTAGRAM_CLIENT_SECRET;
+    case "INSTAGRAM_CLIENT_ID" /* INSTAGRAM_CLIENT_ID */:
+      return process.env.INSTAGRAM_CLIENT_ID;
+    case "GOOGLE_CLIENT_SECRET" /* GOOGLE_CLIENT_SECRET */:
+      return process.env.GOOGLE_CLIENT_SECRET;
+    case "GOOGLE_CLIENT_ID" /* GOOGLE_CLIENT_ID */:
+      return process.env.GOOGLE_CLIENT_ID;
+    case "TURNSTILE_KEY" /* TURNSTILE_KEY */:
+      return process.env.TURNSTILE_KEY;
+    case "S3_ACCESS_KEY_ID" /* S3_ACCESS_KEY_ID */:
+      return process.env.S3_ACCESS_KEY_ID;
+    case "S3_ACCESS_KEY_SECRET" /* S3_ACCESS_KEY_SECRET */:
+      return process.env.S3_ACCESS_KEY_SECRET;
+    case "S3_REGION" /* S3_REGION */:
+      return process.env.S3_REGION;
+    case "S3_BUCKET" /* S3_BUCKET */:
+      return process.env.S3_BUCKET;
+    case "NODE_ENV" /* NODE_ENV */:
+      return process.env.NODE_ENV;
+    default:
+      return process.env[key];
+  }
+};
+function getEnv(key, skipCheck) {
+  const value = getEnvValue(key);
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  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 subscribeToAccessToken(listener) {
+  listeners.add(listener);
+  return () => {
+    listeners.delete(listener);
+  };
+}
+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;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getAccessToken,
+  refreshAccessToken,
+  setAccessToken,
+  subscribeToAccessToken
+});

package/dist/auth/token-store.d.mts

@@ -0,0 +1,42 @@
+/**
+ * Reads the current access token synchronously, outside React.
+ * Used by the Apollo auth link; components should use `useToken()`.
+ *
+ * @returns The access token, `null` when logged out, or `undefined` before the first fetch resolves.
+ * @category Auth
+ */
+declare function getAccessToken(): string | null | undefined;
+/**
+ * Writes the access token and notifies subscribers (which updates `TokenContext`).
+ *
+ * @param token - New token, or `null` to clear the session.
+ * @category Auth
+ */
+declare function setAccessToken(token: string | null | undefined): void;
+/**
+ * Subscribes to token changes. `AuthWrapper` uses this to mirror the store into React state.
+ *
+ * @param listener - Called with the new token on every change.
+ * @returns Unsubscribe function.
+ * @category Auth
+ */
+declare function subscribeToAccessToken(listener: (token: string | null | undefined) => void): () => void;
+/**
+ * Exchanges the httpOnly refresh cookie for a fresh access token via the auth endpoint,
+ * and stores the result. Concurrent callers share one request.
+ *
+ * The auth endpoint answers 200 in both directions, so the body is the signal:
+ * a token means the session is alive, an empty body means the refresh cookie is
+ * gone or expired and the user is logged out (which clears the token, and in turn
+ * trips `ClearStoreOnLogout`).
+ *
+ * A transport failure (offline, 5xx) rejects **without** clearing the token — a
+ * flaky network shouldn't end a valid session.
+ *
+ * @returns The new access token, or `null` if the session has ended.
+ * @throws If the request fails at the transport level or the endpoint returns non-2xx.
+ * @category Auth
+ */
+declare function refreshAccessToken(): Promise<string | null>;
+
+export { getAccessToken, refreshAccessToken, setAccessToken, subscribeToAccessToken };

package/dist/auth/token-store.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Reads the current access token synchronously, outside React.
+ * Used by the Apollo auth link; components should use `useToken()`.
+ *
+ * @returns The access token, `null` when logged out, or `undefined` before the first fetch resolves.
+ * @category Auth
+ */
+declare function getAccessToken(): string | null | undefined;
+/**
+ * Writes the access token and notifies subscribers (which updates `TokenContext`).
+ *
+ * @param token - New token, or `null` to clear the session.
+ * @category Auth
+ */
+declare function setAccessToken(token: string | null | undefined): void;
+/**
+ * Subscribes to token changes. `AuthWrapper` uses this to mirror the store into React state.
+ *
+ * @param listener - Called with the new token on every change.
+ * @returns Unsubscribe function.
+ * @category Auth
+ */
+declare function subscribeToAccessToken(listener: (token: string | null | undefined) => void): () => void;
+/**
+ * Exchanges the httpOnly refresh cookie for a fresh access token via the auth endpoint,
+ * and stores the result. Concurrent callers share one request.
+ *
+ * The auth endpoint answers 200 in both directions, so the body is the signal:
+ * a token means the session is alive, an empty body means the refresh cookie is
+ * gone or expired and the user is logged out (which clears the token, and in turn
+ * trips `ClearStoreOnLogout`).
+ *
+ * A transport failure (offline, 5xx) rejects **without** clearing the token — a
+ * flaky network shouldn't end a valid session.
+ *
+ * @returns The new access token, or `null` if the session has ended.
+ * @throws If the request fails at the transport level or the endpoint returns non-2xx.
+ * @category Auth
+ */
+declare function refreshAccessToken(): Promise<string | null>;
+
+export { getAccessToken, refreshAccessToken, setAccessToken, subscribeToAccessToken };

package/dist/auth/token-store.esm.js

@@ -0,0 +1,90 @@
+// src/env.ts
+var EXTRA_ENV = globalThis.__NAYSTACK_ENV__ || (globalThis.__NAYSTACK_ENV__ = {});
+var getEnvValue = (key) => {
+  switch (key) {
+    case "NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */:
+      return process.env.NEXT_PUBLIC_GRAPHQL_ENDPOINT || EXTRA_ENV.GRAPHQL_ENDPOINT;
+    case "NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */:
+      return process.env.NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT || EXTRA_ENV.EMAIL_AUTH_ENDPOINT;
+    case "NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT" /* NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT */:
+      return process.env.NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT || EXTRA_ENV.GOOGLE_AUTH_ENDPOINT;
+    case "NEXT_PUBLIC_INSTAGRAM_AUTH_ENDPOINT" /* NEXT_PUBLIC_INSTAGRAM_AUTH_ENDPOINT */:
+      return process.env.NEXT_PUBLIC_INSTAGRAM_AUTH_ENDPOINT || EXTRA_ENV.INSTAGRAM_AUTH_ENDPOINT;
+    case "NEXT_PUBLIC_FILE_ENDPOINT" /* NEXT_PUBLIC_FILE_ENDPOINT */:
+      return process.env.NEXT_PUBLIC_FILE_ENDPOINT || EXTRA_ENV.FILE_ENDPOINT;
+    case "NEXT_PUBLIC_BASE_URL" /* NEXT_PUBLIC_BASE_URL */:
+      return process.env.NEXT_PUBLIC_BASE_URL || EXTRA_ENV.BASE_URL;
+    case "REFRESH_KEY" /* REFRESH_KEY */:
+      return process.env.REFRESH_KEY;
+    case "SIGNING_KEY" /* SIGNING_KEY */:
+      return process.env.SIGNING_KEY;
+    case "INSTAGRAM_CLIENT_SECRET" /* INSTAGRAM_CLIENT_SECRET */:
+      return process.env.INSTAGRAM_CLIENT_SECRET;
+    case "INSTAGRAM_CLIENT_ID" /* INSTAGRAM_CLIENT_ID */:
+      return process.env.INSTAGRAM_CLIENT_ID;
+    case "GOOGLE_CLIENT_SECRET" /* GOOGLE_CLIENT_SECRET */:
+      return process.env.GOOGLE_CLIENT_SECRET;
+    case "GOOGLE_CLIENT_ID" /* GOOGLE_CLIENT_ID */:
+      return process.env.GOOGLE_CLIENT_ID;
+    case "TURNSTILE_KEY" /* TURNSTILE_KEY */:
+      return process.env.TURNSTILE_KEY;
+    case "S3_ACCESS_KEY_ID" /* S3_ACCESS_KEY_ID */:
+      return process.env.S3_ACCESS_KEY_ID;
+    case "S3_ACCESS_KEY_SECRET" /* S3_ACCESS_KEY_SECRET */:
+      return process.env.S3_ACCESS_KEY_SECRET;
+    case "S3_REGION" /* S3_REGION */:
+      return process.env.S3_REGION;
+    case "S3_BUCKET" /* S3_BUCKET */:
+      return process.env.S3_BUCKET;
+    case "NODE_ENV" /* NODE_ENV */:
+      return process.env.NODE_ENV;
+    default:
+      return process.env[key];
+  }
+};
+function getEnv(key, skipCheck) {
+  const value = getEnvValue(key);
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  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 subscribeToAccessToken(listener) {
+  listeners.add(listener);
+  return () => {
+    listeners.delete(listener);
+  };
+}
+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;
+}
+export {
+  getAccessToken,
+  refreshAccessToken,
+  setAccessToken,
+  subscribeToAccessToken
+};

package/dist/graphql/client.cjs.js

@@ -37,10 +37,35 @@ __export(client_exports, {
   useAuthQuery: () => useAuthQuery
 });
 module.exports = __toCommonJS(client_exports);
-var import_client3 = require("@apollo/client");
-var import_client4 = require("naystack/auth/client");
+var import_client4 = require("@apollo/client");
+var import_client5 = require("naystack/auth/client");
 var import_react2 = __toESM(require("react"));
 
+// src/graphql/clear-store.tsx
+var import_client = require("@apollo/client");
+var import_client2 = require("naystack/auth/client");
+var import_react = require("react");
+function ClearStoreOnLogout() {
+  const client = (0, import_client.useApolloClient)();
+  const token = (0, import_client2.useToken)();
+  const hadToken = (0, import_react.useRef)(false);
+  (0, import_react.useEffect)(() => {
+    if (token) {
+      hadToken.current = true;
+    } else if (token === null && hadToken.current) {
+      hadToken.current = false;
+      void client.clearStore();
+    }
+  }, [client, token]);
+  return null;
+}
+
+// src/graphql/links.ts
+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__ = {});
 var getEnvValue = (key) => {
@@ -91,32 +116,54 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
-// src/graphql/clear-store.tsx
-var import_client = require("@apollo/client");
-var import_client2 = require("naystack/auth/client");
-var import_react = require("react");
-function ClearStoreOnLogout() {
-  const client = (0, import_client.useApolloClient)();
-  const token = (0, import_client2.useToken)();
-  const hadToken = (0, import_react.useRef)(false);
-  (0, import_react.useEffect)(() => {
-    if (token) {
-      hadToken.current = true;
-    } else if (token === null && hadToken.current) {
-      hadToken.current = false;
-      void client.clearStore();
-    }
-  }, [client, token]);
-  return null;
+// 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 = (0, import_token_store.getAccessToken)();
+  if (!token || previousContext.credentials === "include")
+    return previousContext;
+  return {
+    ...previousContext,
+    headers: {
+      ...previousContext.headers,
+      authorization: `Bearer ${token}`
+    },
+    credentials: "omit"
+  };
+});
+var refreshLink = (0, import_error.onError)(({ graphQLErrors, operation, forward }) => {
+  if (!graphQLErrors?.some(isExpiredTokenError)) return;
+  if (operation.getContext()[RETRY_CONTEXT_KEY]) return;
+  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.
+    (0, import_token_store.refreshAccessToken)().catch(() => null)
+  ).flatMap(() => {
+    operation.setContext((previousContext) => ({
+      ...previousContext,
+      [RETRY_CONTEXT_KEY]: true
+    }));
+    return forward(operation);
+  });
+});
+function makeAuthLink() {
+  return import_client3.ApolloLink.from([
+    refreshLink,
+    authLink,
+    new import_client3.HttpLink({
+      uri: getEnv("NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */)
+    })
+  ]);
 }
 
 // src/graphql/client.tsx
 function makeClient(cacheConfig) {
-  return new import_client3.ApolloClient({
-    cache: new import_client3.InMemoryCache(cacheConfig),
-    link: new import_client3.HttpLink({
-      uri: getEnv("NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */)
-    })
+  return new import_client4.ApolloClient({
+    cache: new import_client4.InMemoryCache(cacheConfig),
+    link: makeAuthLink()
   });
 }
 var ApolloWrapper = ({
@@ -125,7 +172,7 @@ var ApolloWrapper = ({
 }) => {
   const clientRef = (0, import_react2.useRef)(null);
   if (!clientRef.current) clientRef.current = makeClient(cacheConfig);
-  return /* @__PURE__ */ import_react2.default.createElement(import_client3.ApolloProvider, { client: clientRef.current }, /* @__PURE__ */ import_react2.default.createElement(ClearStoreOnLogout, null), children);
+  return /* @__PURE__ */ import_react2.default.createElement(import_client4.ApolloProvider, { client: clientRef.current }, /* @__PURE__ */ import_react2.default.createElement(ClearStoreOnLogout, null), children);
 };
 var tokenContext = (token) => {
   if (!token) return void 0;
@@ -137,7 +184,7 @@ var tokenContext = (token) => {
   };
 };
 function useAuthQuery(query, variables, options) {
-  const [fetch, result] = (0, import_client3.useLazyQuery)(query, {
+  const [fetch, result] = (0, import_client4.useLazyQuery)(query, {
     fetchPolicy: "no-cache",
     ...options
   });
@@ -168,15 +215,14 @@ function useAuthQuery(query, variables, options) {
   return [reFetch, result];
 }
 function useAuthMutation(mutation, options) {
-  const token = (0, import_client4.useToken)();
-  const [mutate, result] = (0, import_client3.useMutation)(mutation, options);
+  const token = (0, import_client5.useToken)();
+  const [mutate, result] = (0, import_client4.useMutation)(mutation, options);
   const method = (0, import_react2.useCallback)(
     (input) => mutate({
       // @ts-expect-error -- to allow dynamic props
-      variables: { input },
-      context: tokenContext(token)
+      variables: { input }
     }),
-    [token]
+    [mutate]
   );
   return [method, { ...result, hasAuth: !!token }];
 }

package/dist/graphql/client.esm.js

@@ -4,7 +4,6 @@
 import {
   ApolloClient,
   ApolloProvider,
-  HttpLink,
   InMemoryCache,
   useLazyQuery,
   useMutation
@@ -16,6 +15,31 @@ import React, {
   useRef as useRef2
 } from "react";
 
+// src/graphql/clear-store.tsx
+import { useApolloClient } from "@apollo/client";
+import { useToken } from "naystack/auth/client";
+import { useEffect, useRef } from "react";
+function ClearStoreOnLogout() {
+  const client = useApolloClient();
+  const token = useToken();
+  const hadToken = useRef(false);
+  useEffect(() => {
+    if (token) {
+      hadToken.current = true;
+    } else if (token === null && hadToken.current) {
+      hadToken.current = false;
+      void client.clearStore();
+    }
+  }, [client, token]);
+  return null;
+}
+
+// src/graphql/links.ts
+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__ = {});
 var getEnvValue = (key) => {
@@ -66,32 +90,54 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
-// src/graphql/clear-store.tsx
-import { useApolloClient } from "@apollo/client";
-import { useToken } from "naystack/auth/client";
-import { useEffect, useRef } from "react";
-function ClearStoreOnLogout() {
-  const client = useApolloClient();
-  const token = useToken();
-  const hadToken = useRef(false);
-  useEffect(() => {
-    if (token) {
-      hadToken.current = true;
-    } else if (token === null && hadToken.current) {
-      hadToken.current = false;
-      void client.clearStore();
-    }
-  }, [client, token]);
-  return null;
+// src/graphql/links.ts
+var RETRY_CONTEXT_KEY = "__naystackRetried";
+function isExpiredTokenError(error) {
+  return error.extensions?.code === "UNAUTHENTICATED";
+}
+var authLink = setContext((_, previousContext) => {
+  const token = getAccessToken();
+  if (!token || previousContext.credentials === "include")
+    return previousContext;
+  return {
+    ...previousContext,
+    headers: {
+      ...previousContext.headers,
+      authorization: `Bearer ${token}`
+    },
+    credentials: "omit"
+  };
+});
+var refreshLink = onError(({ graphQLErrors, operation, forward }) => {
+  if (!graphQLErrors?.some(isExpiredTokenError)) return;
+  if (operation.getContext()[RETRY_CONTEXT_KEY]) return;
+  return 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)
+  ).flatMap(() => {
+    operation.setContext((previousContext) => ({
+      ...previousContext,
+      [RETRY_CONTEXT_KEY]: true
+    }));
+    return forward(operation);
+  });
+});
+function makeAuthLink() {
+  return ApolloLink.from([
+    refreshLink,
+    authLink,
+    new HttpLink({
+      uri: getEnv("NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */)
+    })
+  ]);
 }
 
 // src/graphql/client.tsx
 function makeClient(cacheConfig) {
   return new ApolloClient({
     cache: new InMemoryCache(cacheConfig),
-    link: new HttpLink({
-      uri: getEnv("NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */)
-    })
+    link: makeAuthLink()
   });
 }
 var ApolloWrapper = ({
@@ -148,10 +194,9 @@ function useAuthMutation(mutation, options) {
   const method = useCallback(
     (input) => mutate({
       // @ts-expect-error -- to allow dynamic props
-      variables: { input },
-      context: tokenContext(token)
+      variables: { input }
     }),
-    [token]
+    [mutate]
   );
   return [method, { ...result, hasAuth: !!token }];
 }