@stackframe/stack 2.7.19 → 2.7.20

package/dist/lib/stack-app.d.mts

@@ -14,7 +14,10 @@ type RequestLike = {
         get: (name: string) => string | null;
     };
 };
-type RedirectMethod = "window" | "nextjs" | "none";
+type RedirectMethod = "window" | "nextjs" | "none" | {
+    useNavigate: () => (to: string) => void;
+    navigate?: (to: string) => void;
+};
 type TokenStoreInit<HasTokenStore extends boolean = boolean> = HasTokenStore extends true ? ("cookie" | "nextjs-cookie" | "memory" | RequestLike | {
     accessToken: string;
     refreshToken: string;
@@ -677,6 +680,7 @@ type StackClientApp<HasTokenStore extends boolean = boolean, ProjectId extends s
         or: 'throw';
     }): Promise<ProjectCurrentUser<ProjectId>>;
     getUser(options?: GetUserOptions<HasTokenStore>): Promise<ProjectCurrentUser<ProjectId> | null>;
+    useNavigate(): (to: string) => void;
     [stackAppInternalsSymbol]: {
         toClientJson(): StackClientAppJson<HasTokenStore, ProjectId>;
         setCurrentUser(userJsonPromise: Promise<CurrentUserCrud['Client']['Read'] | null>): void;

package/dist/lib/stack-app.d.ts

@@ -14,7 +14,10 @@ type RequestLike = {
         get: (name: string) => string | null;
     };
 };
-type RedirectMethod = "window" | "nextjs" | "none";
+type RedirectMethod = "window" | "nextjs" | "none" | {
+    useNavigate: () => (to: string) => void;
+    navigate?: (to: string) => void;
+};
 type TokenStoreInit<HasTokenStore extends boolean = boolean> = HasTokenStore extends true ? ("cookie" | "nextjs-cookie" | "memory" | RequestLike | {
     accessToken: string;
     refreshToken: string;
@@ -677,6 +680,7 @@ type StackClientApp<HasTokenStore extends boolean = boolean, ProjectId extends s
         or: 'throw';
     }): Promise<ProjectCurrentUser<ProjectId>>;
     getUser(options?: GetUserOptions<HasTokenStore>): Promise<ProjectCurrentUser<ProjectId> | null>;
+    useNavigate(): (to: string) => void;
     [stackAppInternalsSymbol]: {
         toClientJson(): StackClientAppJson<HasTokenStore, ProjectId>;
         setCurrentUser(userJsonPromise: Promise<CurrentUserCrud['Client']['Read'] | null>): void;

package/dist/lib/stack-app.js

@@ -63,10 +63,11 @@ var import_url = require("../utils/url");
 var import_auth = require("./auth");
 var import_cookie = require("./cookie");
 var sc = __toESM(require("@stackframe/stack-sc"));
+var import_stack_sc = require("@stackframe/stack-sc");
 var isReactServer2 = false;
 isReactServer2 = sc.isReactServer;
 var NextNavigation = (0, import_compile_time.scrambleDuringCompileTime)(NextNavigationUnscrambled);
-var clientVersion = "js @stackframe/stack@2.7.19";
+var clientVersion = "js @stackframe/stack@2.7.20";
 if (clientVersion.startsWith("STACK_COMPILE_TIME")) {
   throw new import_errors.StackAssertionError("Client version was not replaced. Something went wrong during build!");
 }
@@ -280,7 +281,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 (0, import_stack_sc.cookies)?.();
+        }
       });
     }
     this._tokenStoreInit = _options.tokenStore;
@@ -384,9 +388,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,
@@ -959,16 +963,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 (0, import_promises.wait)(2e3);
+    }
+    await (0, import_promises.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) {
@@ -1135,7 +1152,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) {
@@ -1432,6 +1448,9 @@ var _StackClientAppImpl = class __StackClientAppImpl {
         if (!("publishableClientKey" in this._interface.options)) {
           throw new import_errors.StackAssertionError("Cannot serialize to JSON from an application without a publishable client key");
         }
+        if (typeof this._redirectMethod !== "string") {
+          throw new import_errors.StackAssertionError("Cannot serialize to JSON from an application with a non-string redirect method");
+        }
         return {
           baseUrl: this._options.baseUrl,
           projectId: this.projectId,
@@ -1439,7 +1458,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) => {
@@ -1473,7 +1493,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) => {
@@ -1869,7 +1890,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) {
@@ -1981,7 +2001,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();