@hexclave/next 1.0.72 → 1.0.74

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

@@ -20,6 +20,7 @@ let ______common_js = require("../../common.js");
 let ______projects_index_js = require("../../projects/index.js");
 let _hexclave_shared_dist_sessions = require("@hexclave/shared/dist/sessions");
 let _hexclave_shared_dist_utils_stores = require("@hexclave/shared/dist/utils/stores");
+let __redirect_page_urls_js = require("./redirect-page-urls.js");
 let _hexclave_shared_dist_utils_compile_time = require("@hexclave/shared/dist/utils/compile-time");
 let _hexclave_shared_dist_utils_json = require("@hexclave/shared/dist/utils/json");
 let _hexclave_shared_dist_utils_maps = require("@hexclave/shared/dist/utils/maps");
@@ -41,7 +42,6 @@ let __redirect_loop_breaker_js = require("./redirect-loop-breaker.js");
 let ______passkey_rp_id_js = require("../../passkey-rp-id.js");
 let ______users_index_js = require("../../users/index.js");
 let __event_tracker_js = require("./event-tracker.js");
-let __redirect_page_urls_js = require("./redirect-page-urls.js");
 let __session_refresh_subscription_js = require("./session-refresh-subscription.js");
 let __session_replay_js = require("./session-replay.js");
 let ____________clickmap_index_js = require("../../../../clickmap/index.js");
@@ -54,6 +54,7 @@ let isReactServer = false;
 isReactServer = _hexclave_sc.isReactServer;
 const NextNavigation = (0, _hexclave_shared_dist_utils_compile_time.scrambleDuringCompileTime)(next_navigation);
 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",
@@ -61,7 +62,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.";
@@ -425,15 +426,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 ((0, _hexclave_shared_dist_utils_env.isBrowserLike)() && (resolvedOptions.tokenStore === "cookie" || resolvedOptions.tokenStore === "nextjs-cookie")) {
 			(0, _hexclave_shared_dist_utils_promises.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({
@@ -548,9 +551,24 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 	}
 	async _redirectToOAuthCallbackError(error) {
 		const errorUrl = new URL(this._getUrls().error, window.location.href);
+		const callbackUrl = (0, __redirect_back_state_js.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",
+			__redirect_page_urls_js.crossDomainAuthQueryParams.state,
+			__redirect_page_urls_js.crossDomainAuthQueryParams.codeChallenge,
+			__redirect_page_urls_js.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() {
@@ -1978,7 +1996,8 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 			projectId: forProjectId,
 			tokenStore: null,
 			projectOwnerSession: session,
-			noAutomaticPrefetch: true
+			noAutomaticPrefetch: true,
+			automaticSideEffects: false
 		}));
 		return this._ownedAdminApps.get([session, forProjectId]);
 	}
@@ -2197,10 +2216,12 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 		});
 	}
 	async _getRedirectToHandlerUrl(handlerName, options, internalOptions) {
-		const rawHandlerUrl = (0, __common_js.getUrls)(this._urlOptions, { projectId: this.projectId })[handlerName];
+		const rawUrls = (0, __common_js.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 = (0, __redirect_back_state_js.augmentUrlWithPersistedRedirectBackState)({
+		const shouldRestorePersistedRedirectBackState = options?.noRedirectBack !== true && (handlerName === "afterSignIn" || handlerName === "afterSignUp") || handlerName === "forgotPassword" || handlerName === "passwordReset" || handlerName === "signIn" && options?.noRedirectBack === true;
+		if (currentUrl != null && shouldRestorePersistedRedirectBackState) currentUrl = (0, __redirect_back_state_js.augmentUrlWithPersistedRedirectBackState)({
 			currentUrl,
 			projectId: this.projectId
 		});
@@ -2210,6 +2231,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({
@@ -2901,13 +2923,15 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 				return clientApp;
 			}
 			const { analytics, ...restJson } = (0, _hexclave_shared_dist_utils_objects.omit)(json, ["uniqueIdentifier"]);
-			return new _HexclaveClientAppImplIncomplete({
+			const app = new _HexclaveClientAppImplIncomplete({
 				...restJson,
 				analytics: (0, __session_replay_js.analyticsOptionsFromJson)(analytics)
 			}, {
 				uniqueIdentifier: json.uniqueIdentifier,
 				checkString: providedCheckString
 			});
+			if (json.automaticSideEffects === false) app._initUniqueIdentifier();
+			return app;
 		} };
 	}
 	get [______common_js.hexclaveAppInternalsSymbol]() {
@@ -2926,6 +2950,7 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 					redirectMethod: this._redirectMethod,
 					extraRequestHeaders: this._options.extraRequestHeaders,
 					devTool: this._options.devTool,
+					automaticSideEffects: this._options.automaticSideEffects,
 					analytics: (0, __session_replay_js.analyticsOptionsToJson)(this._analyticsOptions)
 				};
 			},
@@ -2961,6 +2986,13 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 			redirectToHandler: async (handlerName, options) => {
 				await this._redirectToHandler(handlerName, options);
 			},
+			getRawAfterAuthReturnTo: () => {
+				if (isReactServer || typeof window === "undefined") return null;
+				return (0, __redirect_back_state_js.getRawAfterAuthReturnTo)({
+					currentUrl: new URL(window.location.href),
+					projectId: this.projectId
+				});
+			},
 			refreshOwnedProjects: async () => {
 				await this._refreshOwnedProjects(await this._getSession());
 			},