@hexclave/next 1.0.3 → 1.0.6

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

@@ -18,12 +18,12 @@ let _hexclave_shared_dist_utils_redirect_urls = require("@hexclave/shared/dist/u
 let _hexclave_shared_dist_utils_bytes = require("@hexclave/shared/dist/utils/bytes");
 let ______common_js = require("../../common.js");
 let ______projects_index_js = require("../../projects/index.js");
-let _simplewebauthn_browser = require("@simplewebauthn/browser");
 let _hexclave_shared_dist_sessions = require("@hexclave/shared/dist/sessions");
+let _hexclave_shared_dist_utils_stores = require("@hexclave/shared/dist/utils/stores");
+let _simplewebauthn_browser = require("@simplewebauthn/browser");
 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");
-let _hexclave_shared_dist_utils_stores = require("@hexclave/shared/dist/utils/stores");
 let _hexclave_shared_dist_utils_turnstile_flow = require("@hexclave/shared/dist/utils/turnstile-flow");
 let _hexclave_shared_dist_utils_uuids = require("@hexclave/shared/dist/utils/uuids");
 let cookie = require("cookie");
@@ -31,7 +31,7 @@ cookie = require_chunk.__toESM(cookie);
 let ____________utils_url_js = require("../../../../utils/url.js");
 let _________auth_js = require("../../../auth.js");
 let _________cookie_js = require("../../../cookie.js");
-let _________env_js = require("../../../env.js");
+let ____________generated_env_js = require("../../../../generated/env.js");
 let ______api_keys_index_js = require("../../api-keys/index.js");
 let ______contact_channels_index_js = require("../../contact-channels/index.js");
 let ______teams_index_js = require("../../teams/index.js");
@@ -45,7 +45,7 @@ let ____________dev_tool_index_js = require("../../../../dev-tool/index.js");
 let _hexclave_sc = require("@hexclave/sc");
 _hexclave_sc = require_chunk.__toESM(_hexclave_sc);
 
-//#region src/lib/stack-app/apps/implementations/client-app-impl.ts
+//#region src/lib/hexclave-app/apps/implementations/client-app-impl.ts
 let isReactServer = false;
 isReactServer = _hexclave_sc.isReactServer;
 const NextNavigation = (0, _hexclave_shared_dist_utils_compile_time.scrambleDuringCompileTime)(next_navigation);
@@ -109,7 +109,7 @@ function getHeaderValueFromRequestLikeHeaders(headers, name) {
 async function getServerRequestHost() {
 	return (await _hexclave_sc.headers?.())?.get("host") ?? null;
 }
-var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
+var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 	static {
 		this.LazyStackAdminAppImpl = { value: void 0 };
 	}
@@ -380,7 +380,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)();
@@ -443,7 +443,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 () => {
@@ -491,12 +491,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;
@@ -505,15 +510,15 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		for (const param of oauthCallbackResponseQueryParams) currentUrl.searchParams.delete(param);
 		return currentUrl.toString();
 	}
-	async _getCurrentRefreshTokenIdIfSignedIn(options) {
-		const tokens = await (await this._getSession(options?.overrideTokenStoreInit, options)).getOrFetchLikelyValidTokens(0, null);
+	async _fetchCurrentRefreshTokenIdIfSignedIn(options) {
+		const tokens = await (await this._getSession(options?.overrideTokenStoreInit, options)).fetchNewTokens();
 		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({
+		const refreshTokenId = await this._fetchCurrentRefreshTokenIdIfSignedIn({
 			awaitPendingAuthResolutions: options.awaitPendingAuthResolutions,
 			overrideTokenStoreInit: options.overrideTokenStoreInit
 		});
@@ -544,7 +549,7 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 			const afterCallbackRedirectUrlString = currentUrl.searchParams.get(nestedCrossDomainAuthQueryParams.afterCallbackRedirectUrl);
 			const afterCallbackRedirectUrl = afterCallbackRedirectUrlString == null ? redirectUriUrl : new URL(afterCallbackRedirectUrlString, redirectUriUrl);
 			if (!await this._isTrusted(afterCallbackRedirectUrl.toString())) throw new Error(`Nested cross-domain auth after-callback redirect URL ${afterCallbackRedirectUrlString} is not trusted.`);
-			if (await this._getCurrentRefreshTokenIdIfSignedIn({ awaitPendingAuthResolutions: false }) !== refreshTokenId) throw new Error("Nested cross-domain auth source session does not match the requested refresh token ID.");
+			if (await this._fetchCurrentRefreshTokenIdIfSignedIn({ awaitPendingAuthResolutions: false }) !== refreshTokenId) throw new Error("Nested cross-domain auth source session does not match the requested refresh token ID.");
 			await this._redirectTo({
 				url: await this._createCrossDomainAuthRedirectUrl({
 					redirectUri: redirectUriUrl.toString(),
@@ -557,7 +562,9 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 			});
 			return true;
 		}
-		if (await this._getCurrentRefreshTokenIdIfSignedIn({ awaitPendingAuthResolutions: false }) === refreshTokenId) return false;
+		const currentRefreshTokenId = await this._fetchCurrentRefreshTokenIdIfSignedIn({ awaitPendingAuthResolutions: false });
+		if (currentRefreshTokenId === refreshTokenId) return false;
+		if (currentRefreshTokenId != null) (await this._getSession(void 0, { awaitPendingAuthResolutions: false })).markInvalid();
 		const callbackUrlString = currentUrl.searchParams.get(nestedCrossDomainAuthQueryParams.callbackUrl);
 		if (callbackUrlString == null) throw new _hexclave_shared_dist_utils_errors.HexclaveAssertionError("Nested cross-domain auth URL is missing callback URL");
 		if ((0, _hexclave_shared_dist_utils_urls.isRelative)(callbackUrlString)) throw new Error("Nested cross-domain auth callback URL must be absolute.");
@@ -566,20 +573,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);
@@ -592,9 +590,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
@@ -722,6 +717,13 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 			accessToken
 		};
 	}
+	_getCurrentBrowserCookieTokenStoreValue(old) {
+		const tokens = this._getTokensFromCookies(this._getAllBrowserCookies());
+		return {
+			refreshToken: tokens.refreshToken,
+			accessToken: tokens.accessToken ?? (old?.refreshToken === tokens.refreshToken ? old.accessToken : null)
+		};
+	}
 	get _accessTokenCookieName() {
 		return `hexclave-access`;
 	}
@@ -826,19 +828,12 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 	_getBrowserCookieTokenStore() {
 		if (!(0, _hexclave_shared_dist_utils_env.isBrowserLike)()) throw new Error("Cannot use cookie token store on the server!");
 		if (this._storedBrowserCookieTokenStore === null) {
-			const getCurrentValue = (old) => {
-				const tokens = this._getTokensFromCookies(this._getAllBrowserCookies());
-				return {
-					refreshToken: tokens.refreshToken,
-					accessToken: tokens.accessToken ?? (old?.refreshToken === tokens.refreshToken ? old.accessToken : null)
-				};
-			};
-			this._storedBrowserCookieTokenStore = new _hexclave_shared_dist_utils_stores.Store(getCurrentValue(null));
+			this._storedBrowserCookieTokenStore = new _hexclave_shared_dist_utils_stores.Store(this._getCurrentBrowserCookieTokenStoreValue(null));
 			let hasSucceededInWriting = true;
 			setInterval(() => {
 				if (hasSucceededInWriting) {
 					const oldValue = this._storedBrowserCookieTokenStore.get();
-					const currentValue = getCurrentValue(oldValue);
+					const currentValue = this._getCurrentBrowserCookieTokenStoreValue(oldValue);
 					if (!(0, _hexclave_shared_dist_utils_objects.deepPlainEquals)(currentValue, oldValue)) this._storedBrowserCookieTokenStore.set(currentValue);
 				}
 			}, 100);
@@ -864,6 +859,10 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 					else throw e;
 				}
 			});
+		} else {
+			const oldValue = this._storedBrowserCookieTokenStore.get();
+			const currentValue = this._getCurrentBrowserCookieTokenStoreValue(oldValue);
+			if (!(0, _hexclave_shared_dist_utils_objects.deepPlainEquals)(currentValue, oldValue)) this._storedBrowserCookieTokenStore.set(currentValue);
 		}
 		return this._storedBrowserCookieTokenStore;
 	}
@@ -958,17 +957,17 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 			accessToken: tokenObj.accessToken
 		});
 		session.onAccessTokenChange((newAccessToken) => {
-			tokenStore.update((old) => ({
+			tokenStore.update((old) => _hexclave_shared_dist_sessions.InternalSession.calculateSessionKey(old) === sessionKey ? {
 				...old,
 				accessToken: newAccessToken?.token ?? null
-			}));
+			} : old);
 		});
 		session.onInvalidate(() => {
-			tokenStore.update((old) => ({
+			tokenStore.update((old) => _hexclave_shared_dist_sessions.InternalSession.calculateSessionKey(old) === sessionKey ? {
 				...old,
 				accessToken: null,
 				refreshToken: null
-			}));
+			} : old);
 		});
 		let sessionsBySessionKey = this._sessionsByTokenStoreAndSessionKey.get(tokenStore) ?? /* @__PURE__ */ new Map();
 		this._sessionsByTokenStoreAndSessionKey.set(tokenStore, sessionsBySessionKey);
@@ -1900,7 +1899,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,
@@ -1917,17 +1916,17 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 	}
 	_getBotChallengeSiteKeys() {
 		if (!(0, _hexclave_shared_dist_utils_env.isBrowserLike)()) return null;
-		const visibleSiteKey = _________env_js.envVars.NEXT_PUBLIC_STACK_BOT_CHALLENGE_SITE_KEY;
+		const visibleSiteKey = ____________generated_env_js.envVars.HEXCLAVE_BOT_CHALLENGE_SITE_KEY;
 		if (!visibleSiteKey) {
 			if (!this._botChallengeSiteKeysWarned) {
 				this._botChallengeSiteKeysWarned = true;
-				console.warn("[stack-auth] NEXT_PUBLIC_STACK_BOT_CHALLENGE_SITE_KEY is not set — bot challenge fraud protection is disabled. Set the env variable to enable it.");
+				console.warn("[stack-auth] HEXCLAVE_BOT_CHALLENGE_SITE_KEY is not set — bot challenge fraud protection is disabled. Set the env variable to enable it.");
 			}
 			return null;
 		}
 		return {
 			visibleSiteKey,
-			invisibleSiteKey: _________env_js.envVars.NEXT_PUBLIC_STACK_BOT_CHALLENGE_INVISIBLE_SITE_KEY ?? visibleSiteKey
+			invisibleSiteKey: ____________generated_env_js.envVars.HEXCLAVE_BOT_CHALLENGE_INVISIBLE_SITE_KEY ?? visibleSiteKey
 		};
 	}
 	_getBotChallengeFlowFailure(error) {
@@ -2049,6 +2048,7 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 	}
 	async _createCrossDomainAuthRedirectUrl(options) {
 		const session = await this._getSession(options.overrideTokenStoreInit, { awaitPendingAuthResolutions: options.awaitPendingAuthResolutions });
+		await session.fetchNewTokens();
 		const response = await this._interface.sendClientRequest("/auth/oauth/cross-domain/authorize", {
 			method: "POST",
 			headers: { "Content-Type": "application/json" },
@@ -2149,6 +2149,8 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 		return await this._redirectToHandler("signUp", options);
 	}
 	async redirectToSignOut(options) {
+		const configuredSignOutTarget = this._urlOptions.signOut ?? this._urlOptions.default;
+		if (typeof configuredSignOutTarget !== "string" && configuredSignOutTarget?.type === "hosted") return await this.signOut();
 		return await this._redirectToHandler("signOut", options);
 	}
 	async redirectToEmailVerification(options) {
@@ -2636,7 +2638,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();
@@ -2686,9 +2688,27 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 				url: options.redirectUrl,
 				replace: true
 			});
-			else await this.redirectToAfterSignOut();
+			else await this._redirectToDefaultAfterSignOut();
 		});
 	}
+	async _redirectToDefaultAfterSignOut() {
+		if (this._urlOptions.afterSignOut != null) {
+			await this.redirectToAfterSignOut({ replace: true });
+			return;
+		}
+		if (this._urlOptions.home != null) {
+			await this.redirectToHome({ replace: true });
+			return;
+		}
+		if (this._urlOptions.default?.type === "hosted" && typeof window !== "undefined") {
+			await this._redirectTo({
+				url: (0, _hexclave_shared_dist_utils_urls.getRelativePart)(new URL(window.location.href)),
+				replace: true
+			});
+			return;
+		}
+		await this.redirectToAfterSignOut({ replace: true });
+	}
 	async signOut(options) {
 		const user = await this.getUser({ tokenStore: options?.tokenStore ?? void 0 });
 		if (user) await user.signOut({ redirectUrl: options?.redirectUrl });
@@ -2779,7 +2799,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);
@@ -2792,7 +2812,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)
 			}, {
@@ -2801,7 +2821,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");
@@ -2859,5 +2879,5 @@ var _StackClientAppImplIncomplete = class _StackClientAppImplIncomplete {
 };
 
 //#endregion
-exports._StackClientAppImplIncomplete = _StackClientAppImplIncomplete;
+exports._HexclaveClientAppImplIncomplete = _HexclaveClientAppImplIncomplete;
 //# sourceMappingURL=client-app-impl.js.map