@hexclave/next 1.0.33 → 1.0.34

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

@@ -1,11 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_chunk = require('../../../../chunk-BE-pF4vm.js');
-let _hexclave_shared_dist_utils_errors = require("@hexclave/shared/dist/utils/errors");
 let _hexclave_shared_dist_utils_promises = require("@hexclave/shared/dist/utils/promises");
+let _hexclave_shared_dist_utils_strings = require("@hexclave/shared/dist/utils/strings");
+let _hexclave_shared_dist_utils_errors = require("@hexclave/shared/dist/utils/errors");
 let react = require("react");
 react = require_chunk.__toESM(react);
 let _hexclave_shared = require("@hexclave/shared");
-let _hexclave_shared_dist_utils_strings = require("@hexclave/shared/dist/utils/strings");
 let _hexclave_shared_dist_utils_react = require("@hexclave/shared/dist/utils/react");
 let _hexclave_shared_dist_utils_objects = require("@hexclave/shared/dist/utils/objects");
 let _hexclave_shared_dist_utils_urls = require("@hexclave/shared/dist/utils/urls");
@@ -2156,6 +2156,12 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 		});
 	}
 	async _redirectToHandler(handlerName, options, internalOptions) {
+		await this._redirectTo({
+			url: await this._getRedirectToHandlerUrl(handlerName, options, internalOptions),
+			...options
+		});
+	}
+	async _getRedirectToHandlerUrl(handlerName, options, internalOptions) {
 		const rawHandlerUrl = (0, __common_js.getUrls)(this._urlOptions, { projectId: this.projectId })[handlerName];
 		if (!rawHandlerUrl) throw new Error(`No URL for handler name ${handlerName}`);
 		const currentUrl = isReactServer || typeof window === "undefined" ? null : new URL(window.location.href);
@@ -2167,28 +2173,22 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 			localOAuthCallbackUrl: this._getLocalOAuthCallbackHandlerUrl(),
 			getCrossDomainHandoffParams: async (href) => await this._getCrossDomainHandoffParamsForRedirect(href)
 		});
-		if (plan.type === "cross-domain-authorize") {
-			const crossDomainRedirectUrl = await this._createCrossDomainAuthRedirectUrl({
-				redirectUri: plan.redirectUri,
-				state: plan.state,
-				codeChallenge: plan.codeChallenge,
-				afterCallbackRedirectUrl: plan.afterCallbackRedirectUrl,
-				awaitPendingAuthResolutions: internalOptions?.awaitPendingAuthResolutions,
-				overrideTokenStoreInit: internalOptions?.overrideTokenStoreInit
-			});
-			await this._redirectTo({
-				url: crossDomainRedirectUrl,
-				...options
-			});
-			return;
-		}
+		if (plan.type === "cross-domain-authorize") return await this._createCrossDomainAuthRedirectUrl({
+			redirectUri: plan.redirectUri,
+			state: plan.state,
+			codeChallenge: plan.codeChallenge,
+			afterCallbackRedirectUrl: plan.afterCallbackRedirectUrl,
+			awaitPendingAuthResolutions: internalOptions?.awaitPendingAuthResolutions,
+			overrideTokenStoreInit: internalOptions?.overrideTokenStoreInit
+		});
 		const redirectUrl = currentUrl != null && handlerName !== "signOut" && handlerName !== "afterSignOut" && handlerName !== "oauthCallback" ? await this._addNestedCrossDomainAuthParamsToRedirectUrl({
 			url: plan.url,
 			currentUrl,
 			awaitPendingAuthResolutions: internalOptions?.awaitPendingAuthResolutions,
 			overrideTokenStoreInit: internalOptions?.overrideTokenStoreInit
 		}) : plan.url;
-		await this._redirectIfTrusted(redirectUrl, options);
+		if (!await this._isTrusted(redirectUrl)) throw new Error(`Redirect URL ${redirectUrl} is not trusted; should be relative.`);
+		return redirectUrl;
 	}
 	_redirectToHandlerDuringRender(handlerName, options) {
 		return false;
@@ -2917,6 +2917,9 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 					...options
 				});
 			},
+			getRedirectToHandlerUrl: async (handlerName, options) => {
+				return await this._getRedirectToHandlerUrl(handlerName, options);
+			},
 			redirectToHandler: async (handlerName, options) => {
 				await this._redirectToHandler(handlerName, options);
 			},