@stackframe/stack 2.7.19 → 2.7.21

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

@@ -22,12 +22,13 @@ import * as NextNavigationUnscrambled from "next/navigation";
 import React, { useCallback, useMemo } from "react";
 import { constructRedirectUrl } from "../utils/url";
 import { addNewOAuthProviderOrScope, callOAuthCallback, signInWithOAuth } from "./auth";
-import { createBrowserCookieHelper, createCookieHelper, createEmptyCookieHelper, deleteCookieClient, getCookieClient, setOrDeleteCookie, setOrDeleteCookieClient } from "./cookie";
+import { createBrowserCookieHelper, createCookieHelper, createPlaceholderCookieHelper, deleteCookieClient, getCookieClient, setOrDeleteCookie, setOrDeleteCookieClient } from "./cookie";
 import * as sc from "@stackframe/stack-sc";
+import { cookies } from "@stackframe/stack-sc";
 var isReactServer2 = false;
 isReactServer2 = sc.isReactServer;
 var NextNavigation = scrambleDuringCompileTime(NextNavigationUnscrambled);
-var clientVersion = "js @stackframe/stack@2.7.19";
+var clientVersion = "js @stackframe/stack@2.7.21";
 if (clientVersion.startsWith("STACK_COMPILE_TIME")) {
   throw new StackAssertionError("Client version was not replaced. Something went wrong during build!");
 }
@@ -223,6 +224,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       }
     );
     this._memoryTokenStore = createEmptyTokenStore();
+    this._nextServerCookiesTokenStores = /* @__PURE__ */ new WeakMap();
     this._requestTokenStores = /* @__PURE__ */ new WeakMap();
     this._storedBrowserCookieTokenStore = null;
     /**
@@ -241,7 +243,10 @@ var _StackClientAppImpl = class __StackClientAppImpl {
         getBaseUrl: () => getBaseUrl(_options.baseUrl),
         projectId: _options.projectId ?? getDefaultProjectId(),
         clientVersion,
-        publishableClientKey: _options.publishableClientKey ?? getDefaultPublishableClientKey()
+        publishableClientKey: _options.publishableClientKey ?? getDefaultPublishableClientKey(),
+        prepareRequest: async () => {
+          await cookies?.();
+        }
       });
     }
     this._tokenStoreInit = _options.tokenStore;
@@ -264,7 +269,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     if (this._tokenStoreInit === "nextjs-cookie" || this._tokenStoreInit === "cookie") {
       return await createCookieHelper();
     } else {
-      return await createEmptyCookieHelper();
+      return await createPlaceholderCookieHelper();
     }
   }
   async _getUserOAuthConnectionCacheFn(options) {
@@ -345,9 +350,9 @@ var _StackClientAppImpl = class __StackClientAppImpl {
   get _refreshTokenCookieName() {
     return `stack-refresh-${this.projectId}`;
   }
-  _getTokensFromCookies(cookies) {
-    const refreshToken = cookies.refreshTokenCookie;
-    const accessTokenObject = cookies.accessTokenCookie?.startsWith('["') ? JSON.parse(cookies.accessTokenCookie) : null;
+  _getTokensFromCookies(cookies2) {
+    const refreshToken = cookies2.refreshTokenCookie;
+    const accessTokenObject = cookies2.accessTokenCookie?.startsWith('["') ? JSON.parse(cookies2.accessTokenCookie) : null;
     const accessToken = accessTokenObject && refreshToken === accessTokenObject[0] ? accessTokenObject[1] : null;
     return {
       refreshToken,
@@ -920,16 +925,29 @@ var _StackClientAppImpl = class __StackClientAppImpl {
   async _redirectTo(options) {
     if (this._redirectMethod === "none") {
       return;
-    }
-    if (isReactServer2 && this._redirectMethod === "nextjs") {
+    } else if (isReactServer2 && this._redirectMethod === "nextjs") {
       NextNavigation.redirect(options.url.toString(), options.replace ? NextNavigation.RedirectType.replace : NextNavigation.RedirectType.push);
+    } else if (typeof this._redirectMethod === "object" && this._redirectMethod.navigate) {
+      this._redirectMethod.navigate(options.url.toString());
     } else {
       if (options.replace) {
         window.location.replace(options.url);
       } else {
         window.location.assign(options.url);
       }
-      await wait(2e3);
+    }
+    await wait(2e3);
+  }
+  useNavigate() {
+    if (typeof this._redirectMethod === "object") {
+      return this._redirectMethod.useNavigate();
+    } else if (this._redirectMethod === "window") {
+      return () => window.location.assign;
+    } else if (this._redirectMethod === "nextjs") {
+      return NextNavigation.useRouter().push;
+    } else {
+      return (to) => {
+      };
     }
   }
   async _redirectIfTrusted(url, options) {
@@ -1096,7 +1114,6 @@ var _StackClientAppImpl = class __StackClientAppImpl {
   }
   useUser(options) {
     this._ensurePersistentTokenStore(options?.tokenStore);
-    const router = NextNavigation.useRouter();
     const session = this._useSession(options?.tokenStore);
     const crud = useAsyncCache(this._currentUserCache, [session], "useUser()");
     if (crud === null) {
@@ -1194,7 +1211,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
   async signUpWithCredential(options) {
     this._ensurePersistentTokenStore();
     const session = await this._getSession();
-    const emailVerificationRedirectUrl = constructRedirectUrl(this.urls.emailVerification);
+    const emailVerificationRedirectUrl = options.verificationCallbackUrl ?? constructRedirectUrl(this.urls.emailVerification);
     const result = await this._interface.signUpWithCredential(
       options.email,
       options.password,
@@ -1393,6 +1410,9 @@ var _StackClientAppImpl = class __StackClientAppImpl {
         if (!("publishableClientKey" in this._interface.options)) {
           throw new StackAssertionError("Cannot serialize to JSON from an application without a publishable client key");
         }
+        if (typeof this._redirectMethod !== "string") {
+          throw new StackAssertionError("Cannot serialize to JSON from an application with a non-string redirect method");
+        }
         return {
           baseUrl: this._options.baseUrl,
           projectId: this.projectId,
@@ -1400,7 +1420,8 @@ var _StackClientAppImpl = class __StackClientAppImpl {
           tokenStore: this._tokenStoreInit,
           urls: this._urlOptions,
           oauthScopesOnSignIn: this._oauthScopesOnSignIn,
-          uniqueIdentifier: this._getUniqueIdentifier()
+          uniqueIdentifier: this._getUniqueIdentifier(),
+          redirectMethod: this._redirectMethod
         };
       },
       setCurrentUser: (userJsonPromise) => {
@@ -1434,7 +1455,8 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
       publishableClientKey: options.publishableClientKey,
       tokenStore: options.tokenStore,
       urls: options.urls ?? {},
-      oauthScopesOnSignIn: options.oauthScopesOnSignIn ?? {}
+      oauthScopesOnSignIn: options.oauthScopesOnSignIn ?? {},
+      redirectMethod: options.redirectMethod
     });
     // TODO override the client user cache to use the server user cache, so we save some requests
     this._currentServerUserCache = createCacheBySession(async (session) => {
@@ -1830,7 +1852,6 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
       return this.useUserById(options);
     } else {
       this._ensurePersistentTokenStore(options?.tokenStore);
-      const router = NextNavigation.useRouter();
       const session = this._useSession(options?.tokenStore);
       const crud = useAsyncCache(this._currentServerUserCache, [session], "useUser()");
       if (crud === null) {
@@ -1942,7 +1963,8 @@ var _StackAdminAppImpl = class extends _StackServerAppImpl {
       projectId: options.projectId,
       tokenStore: options.tokenStore,
       urls: options.urls,
-      oauthScopesOnSignIn: options.oauthScopesOnSignIn
+      oauthScopesOnSignIn: options.oauthScopesOnSignIn,
+      redirectMethod: options.redirectMethod
     });
     this._adminProjectCache = createCache(async () => {
       return await this._interface.getProject();