@stackframe/tanstack-start 2.8.95 → 2.8.96

package/dist/lib/stack-app/apps/implementations/client-app-impl.js

@@ -503,14 +503,17 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		return currentUrl.toString();
 	}
 	async _getCurrentRefreshTokenIdIfSignedIn(options) {
-		const tokens = await (await this._getSession(void 0, options)).getOrFetchLikelyValidTokens(0, null);
+		const tokens = await (await this._getSession(options?.overrideTokenStoreInit, options)).getOrFetchLikelyValidTokens(0, null);
 		if (tokens?.refreshToken == null) return null;
 		return tokens.accessToken.payload.refresh_token_id;
 	}
 	async _addNestedCrossDomainAuthParamsToRedirectUrl(options) {
 		const targetUrl = new URL(options.url, options.currentUrl);
 		if (targetUrl.origin === options.currentUrl.origin) return options.url;
-		const refreshTokenId = await this._getCurrentRefreshTokenIdIfSignedIn({ awaitPendingAuthResolutions: options.awaitPendingAuthResolutions });
+		const refreshTokenId = await this._getCurrentRefreshTokenIdIfSignedIn({
+			awaitPendingAuthResolutions: options.awaitPendingAuthResolutions,
+			overrideTokenStoreInit: options.overrideTokenStoreInit
+		});
 		if (refreshTokenId == null) return options.url;
 		targetUrl.searchParams.set(nestedCrossDomainAuthQueryParams.refreshTokenId, refreshTokenId);
 		targetUrl.searchParams.set(nestedCrossDomainAuthQueryParams.callbackUrl, new URL(this._getOAuthCallbackRedirectUri(), options.currentUrl).toString());
@@ -958,6 +961,13 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		const newSession = this._getSessionFromTokenStore(tokenStore);
 		this._currentUserCache.getOrWait([newSession], "write-only").catch(() => {});
 	}
+	_getTokenStoreInitForFreshTokens(tokens) {
+		if (tokens.accessToken == null) return;
+		return {
+			accessToken: tokens.accessToken,
+			refreshToken: tokens.refreshToken
+		};
+	}
 	_hasPersistentTokenStore(overrideTokenStoreInit) {
 		return (overrideTokenStoreInit !== void 0 ? overrideTokenStoreInit : this._tokenStoreInit) !== null;
 	}
@@ -1999,7 +2009,7 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		}).oauthCallback;
 	}
 	async _createCrossDomainAuthRedirectUrl(options) {
-		const session = await this._getSession(void 0, { awaitPendingAuthResolutions: options.awaitPendingAuthResolutions });
+		const session = await this._getSession(options.overrideTokenStoreInit, { awaitPendingAuthResolutions: options.awaitPendingAuthResolutions });
 		const response = await this._interface.sendClientRequest("/auth/oauth/cross-domain/authorize", {
 			method: "POST",
 			headers: { "Content-Type": "application/json" },
@@ -2011,7 +2021,10 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 				after_callback_redirect_url: options.afterCallbackRedirectUrl
 			})
 		}, session);
-		if (!response.ok) throw new _stackframe_stack_shared_dist_utils_errors.StackAssertionError(`Cross-domain authorization endpoint failed: ${response.status} ${await response.text()}`);
+		if (!response.ok) {
+			const responseBody = await response.text();
+			throw new _stackframe_stack_shared_dist_utils_errors.StackAssertionError(`Cross-domain authorization endpoint failed: ${response.status} ${responseBody}`);
+		}
 		const result = await response.json();
 		if (!("redirect_url" in result) || typeof result.redirect_url !== "string") throw new _stackframe_stack_shared_dist_utils_errors.StackAssertionError("Cross-domain authorization endpoint returned an invalid payload", { result });
 		return result.redirect_url;
@@ -2071,7 +2084,8 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 				state: plan.state,
 				codeChallenge: plan.codeChallenge,
 				afterCallbackRedirectUrl: plan.afterCallbackRedirectUrl,
-				awaitPendingAuthResolutions: internalOptions?.awaitPendingAuthResolutions
+				awaitPendingAuthResolutions: internalOptions?.awaitPendingAuthResolutions,
+				overrideTokenStoreInit: internalOptions?.overrideTokenStoreInit
 			});
 			await this._redirectTo({
 				url: crossDomainRedirectUrl,
@@ -2082,7 +2096,8 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		const redirectUrl = currentUrl != null && handlerName !== "signOut" && handlerName !== "afterSignOut" && handlerName !== "oauthCallback" ? await this._addNestedCrossDomainAuthParamsToRedirectUrl({
 			url: plan.url,
 			currentUrl,
-			awaitPendingAuthResolutions: internalOptions?.awaitPendingAuthResolutions
+			awaitPendingAuthResolutions: internalOptions?.awaitPendingAuthResolutions,
+			overrideTokenStoreInit: internalOptions?.overrideTokenStoreInit
 		}) : plan.url;
 		await this._redirectIfTrusted(redirectUrl, options);
 	}
@@ -2407,7 +2422,7 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		}
 		if (result.status === "ok") {
 			await this._signInToAccountWithTokens(result.data);
-			if (!options.noRedirect) await this.redirectToAfterSignIn({ replace: true });
+			if (!options.noRedirect) await this._redirectToHandler("afterSignIn", { replace: true }, { overrideTokenStoreInit: this._getTokenStoreInitForFreshTokens(result.data) });
 			return _stackframe_stack_shared_dist_utils_results.Result.ok(void 0);
 		} else return _stackframe_stack_shared_dist_utils_results.Result.error(result.error);
 	}
@@ -2433,7 +2448,7 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		});
 		if (result.status === "ok") {
 			await this._signInToAccountWithTokens(result.data);
-			if (!options.noRedirect) await this.redirectToAfterSignUp({ replace: true });
+			if (!options.noRedirect) await this._redirectToHandler("afterSignUp", { replace: true }, { overrideTokenStoreInit: this._getTokenStoreInitForFreshTokens(result.data) });
 			return _stackframe_stack_shared_dist_utils_results.Result.ok(void 0);
 		} else return _stackframe_stack_shared_dist_utils_results.Result.error(result.error);
 	}
@@ -2464,8 +2479,14 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		}
 		if (result.status === "ok") {
 			await this._signInToAccountWithTokens(result.data);
-			if (!options?.noRedirect) if (result.data.newUser) await this._redirectToHandler("afterSignUp", { replace: true }, { awaitPendingAuthResolutions: false });
-			else await this._redirectToHandler("afterSignIn", { replace: true }, { awaitPendingAuthResolutions: false });
+			if (!options?.noRedirect) if (result.data.newUser) await this._redirectToHandler("afterSignUp", { replace: true }, {
+				awaitPendingAuthResolutions: false,
+				overrideTokenStoreInit: this._getTokenStoreInitForFreshTokens(result.data)
+			});
+			else await this._redirectToHandler("afterSignIn", { replace: true }, {
+				awaitPendingAuthResolutions: false,
+				overrideTokenStoreInit: this._getTokenStoreInitForFreshTokens(result.data)
+			});
 			return _stackframe_stack_shared_dist_utils_results.Result.ok(void 0);
 		} else return _stackframe_stack_shared_dist_utils_results.Result.error(result.error);
 	}
@@ -2547,8 +2568,8 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		}
 		if (result.status === "ok") {
 			await this._signInToAccountWithTokens(result.data);
-			if (!options?.noRedirect) if (result.data.newUser) await this.redirectToAfterSignUp({ replace: true });
-			else await this.redirectToAfterSignIn({ replace: true });
+			if (!options?.noRedirect) if (result.data.newUser) await this._redirectToHandler("afterSignUp", { replace: true }, { overrideTokenStoreInit: this._getTokenStoreInitForFreshTokens(result.data) });
+			else await this._redirectToHandler("afterSignIn", { replace: true }, { overrideTokenStoreInit: this._getTokenStoreInitForFreshTokens(result.data) });
 			return _stackframe_stack_shared_dist_utils_results.Result.ok(void 0);
 		}
 		return _stackframe_stack_shared_dist_utils_results.Result.error(result.error);
@@ -2576,7 +2597,7 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		}
 		if (result.status === "ok") {
 			await this._signInToAccountWithTokens(result.data);
-			await this.redirectToAfterSignIn({ replace: true });
+			await this._redirectToHandler("afterSignIn", { replace: true }, { overrideTokenStoreInit: this._getTokenStoreInitForFreshTokens(result.data) });
 			return _stackframe_stack_shared_dist_utils_results.Result.ok(void 0);
 		} else return _stackframe_stack_shared_dist_utils_results.Result.error(result.error);
 	}
@@ -2611,10 +2632,16 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 				});
 				return true;
 			} else if (result.data.newUser) {
-				await this._redirectToHandler("afterSignUp", { replace: true }, { awaitPendingAuthResolutions: false });
+				await this._redirectToHandler("afterSignUp", { replace: true }, {
+					awaitPendingAuthResolutions: false,
+					overrideTokenStoreInit: this._getTokenStoreInitForFreshTokens(result.data)
+				});
 				return true;
 			} else {
-				await this._redirectToHandler("afterSignIn", { replace: true }, { awaitPendingAuthResolutions: false });
+				await this._redirectToHandler("afterSignIn", { replace: true }, {
+					awaitPendingAuthResolutions: false,
+					overrideTokenStoreInit: this._getTokenStoreInitForFreshTokens(result.data)
+				});
 				return true;
 			}
 		}
@@ -2788,6 +2815,9 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 					...options
 				});
 			},
+			redirectToHandler: async (handlerName, options) => {
+				await this._redirectToHandler(handlerName, options);
+			},
 			refreshOwnedProjects: async () => {
 				await this._refreshOwnedProjects(await this._getSession());
 			},