@stackframe/stack 2.3.7 → 2.4.0

package/dist/components-page/oauth-callback.js

@@ -43,11 +43,20 @@ var import_jsx_runtime = require("react/jsx-runtime");
 function OAuthCallback() {
   const app = (0, import__.useStackApp)();
   const called = (0, import_react.useRef)(false);
+  const [error, setError] = (0, import_react.useState)(null);
   (0, import_react.useEffect)(() => (0, import_promises.runAsynchronously)(async () => {
     if (called.current)
       return;
     called.current = true;
-    await app.callOAuthCallback();
+    try {
+      await app.callOAuthCallback();
+    } catch (e) {
+      setError(e);
+    }
   }), []);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_message_card.default, { title: "Redirecting...", fullPage: true });
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_message_card.default, { title: "Redirecting...", fullPage: true, children: error ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { children: "Something went wrong while processing the OAuth callback:" }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("pre", { children: JSON.stringify(error, null, 2) }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { children: "This is most likely an error in Stack. Please report it." })
+  ] }) : null });
 }

package/dist/esm/components-page/oauth-callback.js

@@ -2,21 +2,30 @@
 "use client";
 
 // src/components-page/oauth-callback.tsx
-import { useRef, useEffect } from "react";
+import { useRef, useEffect, useState } from "react";
 import { useStackApp } from "..";
 import { runAsynchronously } from "@stackframe/stack-shared/dist/utils/promises";
 import MessageCard from "../components/message-card";
-import { jsx } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 function OAuthCallback() {
   const app = useStackApp();
   const called = useRef(false);
+  const [error, setError] = useState(null);
   useEffect(() => runAsynchronously(async () => {
     if (called.current)
       return;
     called.current = true;
-    await app.callOAuthCallback();
+    try {
+      await app.callOAuthCallback();
+    } catch (e) {
+      setError(e);
+    }
   }), []);
-  return /* @__PURE__ */ jsx(MessageCard, { title: "Redirecting...", fullPage: true });
+  return /* @__PURE__ */ jsx(MessageCard, { title: "Redirecting...", fullPage: true, children: error ? /* @__PURE__ */ jsxs("div", { children: [
+    /* @__PURE__ */ jsx("p", { children: "Something went wrong while processing the OAuth callback:" }),
+    /* @__PURE__ */ jsx("pre", { children: JSON.stringify(error, null, 2) }),
+    /* @__PURE__ */ jsx("p", { children: "This is most likely an error in Stack. Please report it." })
+  ] }) : null });
 }
 export {
   OAuthCallback as default

package/dist/esm/lib/cookie.js

@@ -128,40 +128,61 @@ var expectNoState = Symbol();
 // src/lib/cookie.ts
 import Cookies from "js-cookie";
 import { cookies as rscCookies } from "@stackframe/stack-sc";
+function isRscCookieUnavailableError(e) {
+  const allowedMessageSnippets = ["was called outside a request scope", "cookies() expects to have requestAsyncStorage"];
+  return typeof e?.message === "string" && allowedMessageSnippets.some((msg) => e.message.includes(msg));
+}
 function getCookie(name) {
-  if (rscCookies) {
+  try {
     return rscCookies().get(name)?.value ?? null;
-  } else {
-    return Cookies.get(name) ?? null;
+  } catch (e) {
+    if (isRscCookieUnavailableError(e)) {
+      return Cookies.get(name) ?? null;
+    } else {
+      throw e;
+    }
   }
 }
-function setOrDeleteCookie(name, value) {
+function setOrDeleteCookie(name, value, options = {}) {
   if (value === null) {
     deleteCookie(name);
   } else {
-    setCookie(name, value);
+    setCookie(name, value, options);
   }
 }
 function deleteCookie(name) {
-  if (rscCookies) {
+  try {
     rscCookies().delete(name);
-  } else {
-    Cookies.remove(name);
+  } catch (e) {
+    if (isRscCookieUnavailableError(e)) {
+      Cookies.remove(name);
+    } else {
+      throw e;
+    }
   }
 }
-function setCookie(name, value) {
-  if (rscCookies) {
-    rscCookies().set(name, value);
-  } else {
-    Cookies.set(name, value, { secure: window.location.protocol === "https:" });
+function setCookie(name, value, options = {}) {
+  try {
+    rscCookies().set(name, value, {
+      maxAge: options.maxAge
+    });
+  } catch (e) {
+    if (isRscCookieUnavailableError(e)) {
+      Cookies.set(name, value, {
+        secure: window.location.protocol === "https:",
+        expires: options.maxAge === void 0 ? void 0 : new Date(Date.now() + options.maxAge * 1e3)
+      });
+    } else {
+      throw e;
+    }
   }
 }
 async function saveVerifierAndState() {
   const codeVerifier = generateRandomCodeVerifier();
   const codeChallenge = await calculatePKCECodeChallenge(codeVerifier);
   const state = generateRandomState();
-  setCookie("stack-code-verifier", codeVerifier);
-  setCookie("stack-state", state);
+  setCookie("stack-code-verifier", codeVerifier, { maxAge: 60 * 10 });
+  setCookie("stack-state", state, { maxAge: 60 * 10 });
   return {
     codeChallenge,
     state

package/dist/esm/lib/stack-app.js

@@ -83,8 +83,8 @@ var cookieTokenStoreInitializer = () => {
     }, 10);
     cookieTokenStore.onChange((value) => {
       try {
-        setOrDeleteCookie("stack-refresh", value.refreshToken);
-        setOrDeleteCookie("stack-access", value.accessToken);
+        setOrDeleteCookie("stack-refresh", value.refreshToken, { maxAge: 60 * 60 * 24 * 365 });
+        setOrDeleteCookie("stack-access", value.accessToken, { maxAge: 60 * 60 * 24 });
         hasSucceededInWriting = true;
       } catch (e) {
         hasSucceededInWriting = false;
@@ -106,8 +106,8 @@ var tokenStoreInitializers = /* @__PURE__ */ new Map([
       });
       store.onChange((value) => {
         try {
-          setOrDeleteCookie("stack-refresh", value.refreshToken);
-          setOrDeleteCookie("stack-access", value.accessToken);
+          setOrDeleteCookie("stack-refresh", value.refreshToken, { maxAge: 60 * 60 * 24 * 365 });
+          setOrDeleteCookie("stack-access", value.accessToken, { maxAge: 60 * 60 * 24 });
         } catch (e) {
         }
       });
@@ -504,10 +504,12 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     this._ensurePersistentTokenStore();
     const tokenStore = getTokenStore(this._tokenStoreOptions);
     const result = await callOAuthCallback(this._interface, tokenStore, this.urls.oauthCallback);
-    if (result?.newUser) {
-      window.location.replace(this.urls.afterSignUp);
-    } else {
-      window.location.replace(this.urls.afterSignIn);
+    if (result) {
+      if (result.newUser) {
+        window.location.replace(this.urls.afterSignUp);
+      } else {
+        window.location.replace(this.urls.afterSignIn);
+      }
     }
     await neverResolve();
   }

package/dist/lib/cookie.d.mts

@@ -1,7 +1,10 @@
+type SetCookieOptions = {
+    maxAge?: number;
+};
 declare function getCookie(name: string): string | null;
-declare function setOrDeleteCookie(name: string, value: string | null): void;
+declare function setOrDeleteCookie(name: string, value: string | null, options?: SetCookieOptions): void;
 declare function deleteCookie(name: string): void;
-declare function setCookie(name: string, value: string): void;
+declare function setCookie(name: string, value: string, options?: SetCookieOptions): void;
 declare function saveVerifierAndState(): Promise<{
     codeChallenge: string;
     state: string;

package/dist/lib/cookie.d.ts

@@ -1,7 +1,10 @@
+type SetCookieOptions = {
+    maxAge?: number;
+};
 declare function getCookie(name: string): string | null;
-declare function setOrDeleteCookie(name: string, value: string | null): void;
+declare function setOrDeleteCookie(name: string, value: string | null, options?: SetCookieOptions): void;
 declare function deleteCookie(name: string): void;
-declare function setCookie(name: string, value: string): void;
+declare function setCookie(name: string, value: string, options?: SetCookieOptions): void;
 declare function saveVerifierAndState(): Promise<{
     codeChallenge: string;
     state: string;

package/dist/lib/cookie.js

@@ -169,40 +169,61 @@ var expectNoState = Symbol();
 // src/lib/cookie.ts
 var import_js_cookie = __toESM(require("js-cookie"));
 var import_stack_sc = require("@stackframe/stack-sc");
+function isRscCookieUnavailableError(e) {
+  const allowedMessageSnippets = ["was called outside a request scope", "cookies() expects to have requestAsyncStorage"];
+  return typeof e?.message === "string" && allowedMessageSnippets.some((msg) => e.message.includes(msg));
+}
 function getCookie(name) {
-  if (import_stack_sc.cookies) {
+  try {
     return (0, import_stack_sc.cookies)().get(name)?.value ?? null;
-  } else {
-    return import_js_cookie.default.get(name) ?? null;
+  } catch (e) {
+    if (isRscCookieUnavailableError(e)) {
+      return import_js_cookie.default.get(name) ?? null;
+    } else {
+      throw e;
+    }
   }
 }
-function setOrDeleteCookie(name, value) {
+function setOrDeleteCookie(name, value, options = {}) {
   if (value === null) {
     deleteCookie(name);
   } else {
-    setCookie(name, value);
+    setCookie(name, value, options);
   }
 }
 function deleteCookie(name) {
-  if (import_stack_sc.cookies) {
+  try {
     (0, import_stack_sc.cookies)().delete(name);
-  } else {
-    import_js_cookie.default.remove(name);
+  } catch (e) {
+    if (isRscCookieUnavailableError(e)) {
+      import_js_cookie.default.remove(name);
+    } else {
+      throw e;
+    }
   }
 }
-function setCookie(name, value) {
-  if (import_stack_sc.cookies) {
-    (0, import_stack_sc.cookies)().set(name, value);
-  } else {
-    import_js_cookie.default.set(name, value, { secure: window.location.protocol === "https:" });
+function setCookie(name, value, options = {}) {
+  try {
+    (0, import_stack_sc.cookies)().set(name, value, {
+      maxAge: options.maxAge
+    });
+  } catch (e) {
+    if (isRscCookieUnavailableError(e)) {
+      import_js_cookie.default.set(name, value, {
+        secure: window.location.protocol === "https:",
+        expires: options.maxAge === void 0 ? void 0 : new Date(Date.now() + options.maxAge * 1e3)
+      });
+    } else {
+      throw e;
+    }
   }
 }
 async function saveVerifierAndState() {
   const codeVerifier = generateRandomCodeVerifier();
   const codeChallenge = await calculatePKCECodeChallenge(codeVerifier);
   const state = generateRandomState();
-  setCookie("stack-code-verifier", codeVerifier);
-  setCookie("stack-state", state);
+  setCookie("stack-code-verifier", codeVerifier, { maxAge: 60 * 10 });
+  setCookie("stack-state", state, { maxAge: 60 * 10 });
   return {
     codeChallenge,
     state

package/dist/lib/stack-app.js

@@ -120,8 +120,8 @@ var cookieTokenStoreInitializer = () => {
     }, 10);
     cookieTokenStore.onChange((value) => {
       try {
-        (0, import_cookie.setOrDeleteCookie)("stack-refresh", value.refreshToken);
-        (0, import_cookie.setOrDeleteCookie)("stack-access", value.accessToken);
+        (0, import_cookie.setOrDeleteCookie)("stack-refresh", value.refreshToken, { maxAge: 60 * 60 * 24 * 365 });
+        (0, import_cookie.setOrDeleteCookie)("stack-access", value.accessToken, { maxAge: 60 * 60 * 24 });
         hasSucceededInWriting = true;
       } catch (e) {
         hasSucceededInWriting = false;
@@ -143,8 +143,8 @@ var tokenStoreInitializers = /* @__PURE__ */ new Map([
       });
       store.onChange((value) => {
         try {
-          (0, import_cookie.setOrDeleteCookie)("stack-refresh", value.refreshToken);
-          (0, import_cookie.setOrDeleteCookie)("stack-access", value.accessToken);
+          (0, import_cookie.setOrDeleteCookie)("stack-refresh", value.refreshToken, { maxAge: 60 * 60 * 24 * 365 });
+          (0, import_cookie.setOrDeleteCookie)("stack-access", value.accessToken, { maxAge: 60 * 60 * 24 });
         } catch (e) {
         }
       });
@@ -541,10 +541,12 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     this._ensurePersistentTokenStore();
     const tokenStore = getTokenStore(this._tokenStoreOptions);
     const result = await (0, import_auth.callOAuthCallback)(this._interface, tokenStore, this.urls.oauthCallback);
-    if (result?.newUser) {
-      window.location.replace(this.urls.afterSignUp);
-    } else {
-      window.location.replace(this.urls.afterSignIn);
+    if (result) {
+      if (result.newUser) {
+        window.location.replace(this.urls.afterSignUp);
+      } else {
+        window.location.replace(this.urls.afterSignIn);
+      }
     }
     await (0, import_promises.neverResolve)();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stackframe/stack",
-  "version": "2.3.7",
+  "version": "2.4.0",
   "sideEffects": false,
   "exports": {
     ".": {
@@ -42,8 +42,8 @@
     "server-only": "^0.0.1",
     "styled-components": "^6.1.8",
     "yup": "^1.4.0",
-    "@stackframe/stack-sc": "1.4.1",
-    "@stackframe/stack-shared": "2.3.5"
+    "@stackframe/stack-sc": "1.5.0",
+    "@stackframe/stack-shared": "2.4.0"
   },
   "peerDependencies": {
     "@mui/joy": "^5.0.0-beta.30",
@@ -59,7 +59,8 @@
     "@types/color": "^3.0.6",
     "@types/js-cookie": "^3.0.6",
     "@types/react": "^18.2.66",
-    "esbuild": "^0.20.2"
+    "esbuild": "^0.20.2",
+    "tsup": "^8.0.2"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",