@hexclave/js 1.0.2 → 1.0.5

package/dist/lib/{stack-app → hexclave-app}/apps/implementations/client-app-impl.js

@@ -36,7 +36,7 @@ let __redirect_page_urls_js = require("./redirect-page-urls.js");
 let __session_replay_js = require("./session-replay.js");
 let ____________dev_tool_index_js = require("../../../../dev-tool/index.js");
 
-//#region src/lib/stack-app/apps/implementations/client-app-impl.ts
+//#region src/lib/hexclave-app/apps/implementations/client-app-impl.ts
 const prefetchedCrossDomainHandoffTtlMs = 3300 * 1e3;
 const nestedCrossDomainAuthQueryParams = {
 	refreshTokenId: "stack_nested_cross_domain_auth_refresh_token_id",
@@ -97,7 +97,7 @@ function getHeaderValueFromRequestLikeHeaders(headers, name) {
 async function getServerRequestHost() {
 	return null;
 }
-var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
+var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 	static {
 		this.LazyStackAdminAppImpl = { value: void 0 };
 	}
@@ -344,7 +344,7 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		this._sessionsByTokenStoreAndSessionKey = /* @__PURE__ */ new WeakMap();
 		this._botChallengeSiteKeysWarned = false;
 		const resolvedOptions = (0, __common_js.resolveConstructorOptions)(options);
-		if (!_StackClientAppImplIncomplete.LazyStackAdminAppImpl.value) throw new _hexclave_shared_dist_utils_errors.HexclaveAssertionError("Admin app implementation not initialized. Did you import the _StackClientApp from stack-app/apps/implementations/index.ts? You can't import it directly from ./apps/implementations/client-app-impl.ts as that causes a circular dependency (see the comment at _LazyStackAdminAppImpl for more details).");
+		if (!_HexclaveClientAppImplIncomplete.LazyStackAdminAppImpl.value) throw new _hexclave_shared_dist_utils_errors.HexclaveAssertionError("Admin app implementation not initialized. Did you import the _HexclaveClientApp from hexclave-app/apps/implementations/index.ts? You can't import it directly from ./apps/implementations/client-app-impl.ts as that causes a circular dependency (see the comment at _LazyHexclaveAdminAppImpl for more details).");
 		this._options = resolvedOptions;
 		this._extraOptions = extraOptions;
 		const projectId = resolvedOptions.projectId ?? (0, __common_js.getDefaultProjectId)();
@@ -404,7 +404,7 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 			});
 			this._eventTracker.start();
 		}
-		if ((0, _hexclave_shared_dist_utils_env.isBrowserLike)() && this._isOAuthCallbackUrlHosted() && this._currentUrlLooksLikeStackOAuthCallback()) this._trackPendingAuthResolution(async () => {
+		if ((0, _hexclave_shared_dist_utils_env.isBrowserLike)() && (this._isOAuthCallbackUrlHosted() || this._currentUrlLooksLikeNestedCrossDomainOAuthCallback()) && this._currentUrlLooksLikeHexclaveOAuthCallback()) this._trackPendingAuthResolution(async () => {
 			if ((0, _hexclave_shared_dist_utils_env.isBrowserLike)()) await this.callOAuthCallback({ dontWarnAboutMissingQueryParams: true });
 		});
 		if ((0, _hexclave_shared_dist_utils_env.isBrowserLike)()) this._trackPendingAuthResolution(async () => {
@@ -448,12 +448,17 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		const currentUrl = new URL(window.location.href);
 		return currentUrl.searchParams.has("code") && currentUrl.searchParams.has("state") || currentUrl.searchParams.has("errorCode") && currentUrl.searchParams.has("message");
 	}
-	_currentUrlLooksLikeStackOAuthCallback() {
+	_currentUrlLooksLikeHexclaveOAuthCallback() {
 		if (typeof window === "undefined") return false;
 		const currentUrl = new URL(window.location.href);
 		const state = currentUrl.searchParams.get("state");
 		if (!currentUrl.searchParams.has("code") || state == null) return false;
-		return (0, _________cookie_js.getCookieClient)(`stack-oauth-outer-${state}`) != null;
+		return (0, _________cookie_js.getCookieClient)(`stack-oauth-outer-${state}`) != null || currentUrl.searchParams.has(nestedCrossDomainAuthQueryParams.refreshTokenId);
+	}
+	_currentUrlLooksLikeNestedCrossDomainOAuthCallback() {
+		if (typeof window === "undefined") return false;
+		const currentUrl = new URL(window.location.href);
+		return currentUrl.searchParams.has("code") && currentUrl.searchParams.has("state") && currentUrl.searchParams.has(nestedCrossDomainAuthQueryParams.refreshTokenId);
 	}
 	_getOAuthCallbackRedirectUri() {
 		if (!this._isOAuthCallbackUrlHosted()) return this.urls.oauthCallback;
@@ -523,20 +528,11 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		const afterCallbackRedirectUrl = new URL(currentUrl);
 		afterCallbackRedirectUrl.searchParams.delete(nestedCrossDomainAuthQueryParams.refreshTokenId);
 		afterCallbackRedirectUrl.searchParams.delete(nestedCrossDomainAuthQueryParams.callbackUrl);
-		const { state: newState, codeChallenge: newCodeChallenge } = await this._getNestedCrossDomainAuthParamsForRedirect();
-		const nestedRedirectUri = new URL(this._getOAuthCallbackRedirectUri(), currentUrl);
-		nestedRedirectUri.searchParams.delete(nestedCrossDomainAuthQueryParams.refreshTokenId);
-		nestedRedirectUri.searchParams.delete(nestedCrossDomainAuthQueryParams.callbackUrl);
-		for (const param of [
-			"after_auth_return_to",
-			__redirect_page_urls_js.crossDomainAuthQueryParams.marker,
-			__redirect_page_urls_js.crossDomainAuthQueryParams.state,
-			__redirect_page_urls_js.crossDomainAuthQueryParams.codeChallenge,
-			__redirect_page_urls_js.crossDomainAuthQueryParams.afterCallbackRedirectUrl
-		]) {
-			const value = currentUrl.searchParams.get(param);
-			if (value != null && !nestedRedirectUri.searchParams.has(param)) nestedRedirectUri.searchParams.set(param, value);
-		}
+		const nestedHandoffSourceUrl = new URL(currentUrl);
+		nestedHandoffSourceUrl.searchParams.delete(__redirect_page_urls_js.crossDomainAuthQueryParams.state);
+		nestedHandoffSourceUrl.searchParams.delete(__redirect_page_urls_js.crossDomainAuthQueryParams.codeChallenge);
+		const { state: newState, codeChallenge: newCodeChallenge } = await this._getCrossDomainHandoffParamsForRedirect(nestedHandoffSourceUrl);
+		const nestedRedirectUri = new URL(currentUrl);
 		callbackUrl.searchParams.set(nestedCrossDomainAuthQueryParams.refreshTokenId, refreshTokenId);
 		callbackUrl.searchParams.set(nestedCrossDomainAuthQueryParams.redirectUri, nestedRedirectUri.toString());
 		callbackUrl.searchParams.set(nestedCrossDomainAuthQueryParams.state, newState);
@@ -549,9 +545,6 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		});
 		return true;
 	}
-	async _getNestedCrossDomainAuthParamsForRedirect() {
-		return await (0, _________cookie_js.saveVerifierAndState)();
-	}
 	/**
 	* Cloudflare workers does not allow use of randomness on the global scope (on which the Stack app is probably
 	* initialized). For that reason, we generate the unique identifier lazily when it is first needed instead of in the
@@ -1649,7 +1642,7 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		};
 	}
 	_getOwnedAdminApp(forProjectId, session) {
-		if (!this._ownedAdminApps.has([session, forProjectId])) this._ownedAdminApps.set([session, forProjectId], new _StackClientAppImplIncomplete.LazyStackAdminAppImpl.value({
+		if (!this._ownedAdminApps.has([session, forProjectId])) this._ownedAdminApps.set([session, forProjectId], new _HexclaveClientAppImplIncomplete.LazyStackAdminAppImpl.value({
 			baseUrl: this._interface.options.getBaseUrl(),
 			projectId: forProjectId,
 			tokenStore: null,
@@ -2329,7 +2322,7 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		if (this._currentUrlLooksLikeOAuthCallback()) this._ensurePersistentTokenStore();
 		let oauthCallbackRedirectUri = this._getOAuthCallbackRedirectUri();
 		const currentUrl = new URL(window.location.href);
-		if (currentUrl.searchParams.get(__redirect_page_urls_js.crossDomainAuthQueryParams.marker) === "1") {
+		if (currentUrl.searchParams.get(__redirect_page_urls_js.crossDomainAuthQueryParams.marker) === "1" || currentUrl.searchParams.has(nestedCrossDomainAuthQueryParams.refreshTokenId)) {
 			currentUrl.searchParams.delete("code");
 			currentUrl.searchParams.delete("state");
 			oauthCallbackRedirectUri = currentUrl.toString();
@@ -2439,7 +2432,7 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 	async _refreshOwnedProjects(session) {
 		await this._ownedProjectsCache.refresh([session]);
 	}
-	static get [______common_js.stackAppInternalsSymbol]() {
+	static get [______common_js.hexclaveAppInternalsSymbol]() {
 		return { fromClientJson: (json) => {
 			const providedCheckString = JSON.stringify((0, _hexclave_shared_dist_utils_objects.omit)(json, []));
 			const existing = allClientApps.get(json.uniqueIdentifier);
@@ -2452,7 +2445,7 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 				return clientApp;
 			}
 			const { analytics, ...restJson } = (0, _hexclave_shared_dist_utils_objects.omit)(json, ["uniqueIdentifier"]);
-			return new _StackClientAppImplIncomplete({
+			return new _HexclaveClientAppImplIncomplete({
 				...restJson,
 				analytics: (0, __session_replay_js.analyticsOptionsFromJson)(analytics)
 			}, {
@@ -2461,7 +2454,7 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 			});
 		} };
 	}
-	get [______common_js.stackAppInternalsSymbol]() {
+	get [______common_js.hexclaveAppInternalsSymbol]() {
 		return {
 			toClientJson: () => {
 				if (typeof this._redirectMethod !== "string") throw new _hexclave_shared_dist_utils_errors.HexclaveAssertionError("Cannot serialize to JSON from an application with a non-string redirect method");
@@ -2519,5 +2512,5 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 };
 
 //#endregion
-exports._StackClientAppImplIncomplete = _StackClientAppImplIncomplete;
+exports._HexclaveClientAppImplIncomplete = _HexclaveClientAppImplIncomplete;
 //# sourceMappingURL=client-app-impl.js.map