@hexclave/next 1.0.72 → 1.0.74

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

@@ -16,6 +16,7 @@ import { hexclaveAppInternalsSymbol } from "../../common.js";
 import { adminProjectCreateOptionsToCrud } from "../../projects/index.js";
 import { InternalSession } from "@hexclave/shared/dist/sessions";
 import { Store, storeLock } from "@hexclave/shared/dist/utils/stores";
+import { crossDomainAuthQueryParams, getCrossDomainHandoffParamsFromCurrentUrl, planRedirectToHandler } from "./redirect-page-urls.js";
 import { scrambleDuringCompileTime } from "@hexclave/shared/dist/utils/compile-time";
 import { parseJson } from "@hexclave/shared/dist/utils/json";
 import { DependenciesMap } from "@hexclave/shared/dist/utils/maps";
@@ -31,12 +32,11 @@ import { apiKeyCreationOptionsToCrud } from "../../api-keys/index.js";
 import { contactChannelCreateOptionsToCrud, contactChannelUpdateOptionsToCrud } from "../../contact-channels/index.js";
 import { teamCreateOptionsToCrud, teamUpdateOptionsToCrud } from "../../teams/index.js";
 import { buildCliAuthConfirmUrl, getHostedHandlerUrl, isHostedHandlerUrlForProject, resolveHandlerUrls } from "../../url-targets.js";
-import { augmentUrlWithPersistedRedirectBackState, saveRedirectBackStateFromUrl } from "./redirect-back-state.js";
+import { augmentUrlWithPersistedRedirectBackState, getRawAfterAuthReturnTo, saveRedirectBackStateFromUrl } from "./redirect-back-state.js";
 import { recordRedirectAndThrowIfLoopDetected } from "./redirect-loop-breaker.js";
 import { scopePasskeyAuthenticationToHostname, scopePasskeyRegistrationToHostname } from "../../passkey-rp-id.js";
 import { userUpdateOptionsToCrud, withUserDestructureGuard } from "../../users/index.js";
 import { EventTracker } from "./event-tracker.js";
-import { crossDomainAuthQueryParams, getCrossDomainHandoffParamsFromCurrentUrl, planRedirectToHandler } from "./redirect-page-urls.js";
 import { subscribeSessionRefresh } from "./session-refresh-subscription.js";
 import { SessionRecorder, analyticsOptionsFromJson, analyticsOptionsToJson, getSessionReplayOptions } from "./session-replay.js";
 import { mountClickmapOverlay } from "../../../../clickmap/index.js";
@@ -49,6 +49,7 @@ let isReactServer = false;
 isReactServer = sc.isReactServer;
 const NextNavigation = scrambleDuringCompileTime(NextNavigationUnscrambled);
 const prefetchedCrossDomainHandoffTtlMs = 3300 * 1e3;
+const oauthAfterCallbackRedirectUrlQueryParam = "after_callback_redirect_url";
 const nestedCrossDomainAuthQueryParams = {
 	refreshTokenId: "stack_nested_cross_domain_auth_refresh_token_id",
 	callbackUrl: "stack_nested_cross_domain_auth_callback_url",
@@ -56,7 +57,7 @@ const nestedCrossDomainAuthQueryParams = {
 	state: "state",
 	codeChallenge: "code_challenge",
 	codeChallengeMethod: "code_challenge_method",
-	afterCallbackRedirectUrl: "after_callback_redirect_url"
+	afterCallbackRedirectUrl: oauthAfterCallbackRedirectUrlQueryParam
 };
 function getRedirectHelperInstruction(handlerName) {
 	if (handlerName === "handler") return "Use a page-specific redirect helper such as app.redirectToSignIn() instead.";
@@ -420,15 +421,17 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 		this._redirectMethod = resolvedOptions.redirectMethod || "nextjs";
 		this._urlOptions = resolvedOptions.urls ?? {};
 		this._oauthScopesOnSignIn = resolvedOptions.oauthScopesOnSignIn ?? {};
+		this._analyticsOptions = resolvedOptions.analytics;
+		if (extraOptions?.uniqueIdentifier !== void 0) this._uniqueIdentifier = extraOptions.uniqueIdentifier;
+		if (resolvedOptions.automaticSideEffects === false) return;
+		this._initializeAutomaticSideEffects(resolvedOptions);
+	}
+	_initializeAutomaticSideEffects(resolvedOptions) {
 		if (isBrowserLike() && (resolvedOptions.tokenStore === "cookie" || resolvedOptions.tokenStore === "nextjs-cookie")) {
 			runAsynchronously(this._trustedParentDomainCache.getOrWait([window.location.hostname], "write-only"));
 			this._ensureCrossSubdomainCookieExists();
 		}
-		if (extraOptions && extraOptions.uniqueIdentifier) {
-			this._uniqueIdentifier = extraOptions.uniqueIdentifier;
-			this._initUniqueIdentifier();
-		}
-		this._analyticsOptions = resolvedOptions.analytics;
+		if (this._uniqueIdentifier !== void 0) this._initUniqueIdentifier();
 		const getAnalyticsSession = async () => {
 			this._ensurePersistentTokenStore();
 			if (await this.getPartialUser({
@@ -543,9 +546,24 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 	}
 	async _redirectToOAuthCallbackError(error) {
 		const errorUrl = new URL(this._getUrls().error, window.location.href);
+		const callbackUrl = augmentUrlWithPersistedRedirectBackState({
+			currentUrl: new URL(window.location.href),
+			projectId: this.projectId
+		});
 		errorUrl.searchParams.set("errorCode", error.errorCode);
 		errorUrl.searchParams.set("message", error.message);
 		errorUrl.searchParams.set("details", JSON.stringify(error.details ?? {}));
+		for (const paramName of [
+			"after_auth_return_to",
+			crossDomainAuthQueryParams.state,
+			crossDomainAuthQueryParams.codeChallenge,
+			crossDomainAuthQueryParams.afterCallbackRedirectUrl
+		]) {
+			const value = callbackUrl.searchParams.get(paramName);
+			if (value != null) errorUrl.searchParams.set(paramName, value);
+		}
+		const afterCallbackRedirectUrl = callbackUrl.searchParams.get(oauthAfterCallbackRedirectUrlQueryParam);
+		if (afterCallbackRedirectUrl != null) errorUrl.searchParams.set(oauthAfterCallbackRedirectUrlQueryParam, afterCallbackRedirectUrl);
 		await this._redirectIfTrusted(errorUrl.toString(), { replace: true });
 	}
 	async _handleHostedOAuthCallbackDuringStartup() {
@@ -1973,7 +1991,8 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 			projectId: forProjectId,
 			tokenStore: null,
 			projectOwnerSession: session,
-			noAutomaticPrefetch: true
+			noAutomaticPrefetch: true,
+			automaticSideEffects: false
 		}));
 		return this._ownedAdminApps.get([session, forProjectId]);
 	}
@@ -2192,10 +2211,12 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 		});
 	}
 	async _getRedirectToHandlerUrl(handlerName, options, internalOptions) {
-		const rawHandlerUrl = getUrls(this._urlOptions, { projectId: this.projectId })[handlerName];
+		const rawUrls = getUrls(this._urlOptions, { projectId: this.projectId });
+		const rawHandlerUrl = rawUrls[handlerName];
 		if (!rawHandlerUrl) throw new Error(`No URL for handler name ${handlerName}`);
 		let currentUrl = isReactServer || typeof window === "undefined" ? null : new URL(window.location.href);
-		if (currentUrl != null && options?.noRedirectBack !== true && (handlerName === "afterSignIn" || handlerName === "afterSignUp")) currentUrl = augmentUrlWithPersistedRedirectBackState({
+		const shouldRestorePersistedRedirectBackState = options?.noRedirectBack !== true && (handlerName === "afterSignIn" || handlerName === "afterSignUp") || handlerName === "forgotPassword" || handlerName === "passwordReset" || handlerName === "signIn" && options?.noRedirectBack === true;
+		if (currentUrl != null && shouldRestorePersistedRedirectBackState) currentUrl = augmentUrlWithPersistedRedirectBackState({
 			currentUrl,
 			projectId: this.projectId
 		});
@@ -2205,6 +2226,7 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 			noRedirectBack: options?.noRedirectBack === true,
 			currentUrl,
 			localOAuthCallbackUrl: this._getLocalOAuthCallbackHandlerUrl(),
+			rawHomeUrl: rawUrls.home,
 			getCrossDomainHandoffParams: async (href) => await this._getCrossDomainHandoffParamsForRedirect(href)
 		});
 		if (plan.type === "cross-domain-authorize") return await this._createCrossDomainAuthRedirectUrl({
@@ -2896,13 +2918,15 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 				return clientApp;
 			}
 			const { analytics, ...restJson } = omit(json, ["uniqueIdentifier"]);
-			return new _HexclaveClientAppImplIncomplete({
+			const app = new _HexclaveClientAppImplIncomplete({
 				...restJson,
 				analytics: analyticsOptionsFromJson(analytics)
 			}, {
 				uniqueIdentifier: json.uniqueIdentifier,
 				checkString: providedCheckString
 			});
+			if (json.automaticSideEffects === false) app._initUniqueIdentifier();
+			return app;
 		} };
 	}
 	get [hexclaveAppInternalsSymbol]() {
@@ -2921,6 +2945,7 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 					redirectMethod: this._redirectMethod,
 					extraRequestHeaders: this._options.extraRequestHeaders,
 					devTool: this._options.devTool,
+					automaticSideEffects: this._options.automaticSideEffects,
 					analytics: analyticsOptionsToJson(this._analyticsOptions)
 				};
 			},
@@ -2956,6 +2981,13 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 			redirectToHandler: async (handlerName, options) => {
 				await this._redirectToHandler(handlerName, options);
 			},
+			getRawAfterAuthReturnTo: () => {
+				if (isReactServer || typeof window === "undefined") return null;
+				return getRawAfterAuthReturnTo({
+					currentUrl: new URL(window.location.href),
+					projectId: this.projectId
+				});
+			},
 			refreshOwnedProjects: async () => {
 				await this._refreshOwnedProjects(await this._getSession());
 			},