@sesamy/sesamy-js 1.125.2 → 1.125.3

package/dist/sesamy-js.mjs

@@ -2512,44 +2512,46 @@ function Yn() {
 function Xn(e) {
 	return e.vendorId || e.clientId || "";
 }
-function Zn(e) {
-	return e ? `sesamy_is_authenticated_${e}` : "sesamy_is_authenticated";
-}
+var Zn = "sesamy_is_authenticated";
 function Qn(e) {
-	return e ? `sesamy:userinfo:${e}` : "sesamy:userinfo";
+	return e ? `sesamy_is_authenticated_${e}` : Zn;
 }
 function $n(e) {
+	return e ? `sesamy:userinfo:${e}` : "sesamy:userinfo";
+}
+function er(e) {
 	if (typeof document > "u") return !1;
-	let t = Zn(e);
+	let t = [Qn(e)];
+	e && t.push(Zn);
 	try {
-		return document.cookie.split(";").some((e) => e.trim().startsWith(`${t}=true`));
+		return document.cookie.split(";").some((e) => t.some((t) => e.trim().startsWith(`${t}=true`)));
 	} catch {
 		return !1;
 	}
 }
-function er(e, t) {
+function tr(e, t) {
 	if (typeof document > "u" || typeof window > "u") return;
-	let n = Zn(e);
+	let n = Qn(e);
 	try {
 		let e = t ? 720 * 60 * 60 : 0, r = window.location.protocol === "https:" ? "; Secure" : "";
 		document.cookie = `${n}=${t}; path=/; max-age=${e}; SameSite=Lax${r}`;
 	} catch {}
 }
 Vn(), zn();
-var tr = "sesamy:legacy-migration-attempted";
-function nr() {
+var nr = "sesamy:legacy-migration-attempted";
+function rr() {
 	try {
-		return sessionStorage.getItem(tr) === "1";
+		return sessionStorage.getItem(nr) === "1";
 	} catch {
 		return !1;
 	}
 }
-function rr() {
+function ir() {
 	try {
-		sessionStorage.setItem(tr, "1");
+		sessionStorage.setItem(nr, "1");
 	} catch {}
 }
-function ir() {
+function ar() {
 	try {
 		for (let e of Object.keys(localStorage)) if (e.startsWith("@@auth0spajs@@")) try {
 			let t = JSON.parse(localStorage.getItem(e) || "{}");
@@ -2559,7 +2561,7 @@ function ir() {
 	} catch {}
 	return !1;
 }
-function ar() {
+function or() {
 	try {
 		for (let e of Object.keys(localStorage)) e.startsWith("@@auth0spajs@@") && localStorage.removeItem(e);
 		localStorage.removeItem("sesamyRefreshToken"), localStorage.removeItem("sesamyAccessToken");
@@ -2567,7 +2569,7 @@ function ar() {
 		document.cookie = `auth0.is.authenticated=; path=/; max-age=0; SameSite=Lax${e}`;
 	} catch {}
 }
-function or() {
+function sr() {
 	try {
 		let e = document.getElementById("sesamy-server-state");
 		return e?.textContent ? JSON.parse(e.textContent) : null;
@@ -2575,7 +2577,7 @@ function or() {
 		return null;
 	}
 }
-function sr(e) {
+function cr(e) {
 	try {
 		let t = e.split(".");
 		if (t.length !== 3) return null;
@@ -2585,8 +2587,8 @@ function sr(e) {
 		return null;
 	}
 }
-function cr(e = {}) {
-	let t = e.baseUrl ?? "", n = "", r = !1, i = null, a = null, o = Qn("");
+function lr(e = {}) {
+	let t = e.baseUrl ?? "", n = "", r = !1, i = null, a = null, o = $n("");
 	function s() {
 		try {
 			let e = sessionStorage.getItem(o);
@@ -2634,16 +2636,16 @@ function cr(e = {}) {
 	}
 	let d = {
 		async init(e) {
-			n = Xn(e), o = Qn(n), q(`[cookie-auth] Initializing with baseUrl: ${t}`);
-			let s = or(), l = e.idToken || s?.idToken;
+			n = Xn(e), o = $n(n), q(`[cookie-auth] Initializing with baseUrl: ${t}`);
+			let s = sr(), l = e.idToken || s?.idToken;
 			if (l) {
-				let e = sr(l);
+				let e = cr(l);
 				if (e && typeof e.exp == "number" && e.exp > Date.now() / 1e3) {
 					let t = {
 						...e,
 						authenticated: !0
 					};
-					i = !0, a = t, er(n, !0), c(t), q(`[cookie-auth] Using server-injected id-token for sub: ${e.sub}`), Wn(J.AUTHENTICATED, {
+					i = !0, a = t, tr(n, !0), c(t), q(`[cookie-auth] Using server-injected id-token for sub: ${e.sub}`), Wn(J.AUTHENTICATED, {
 						sub: e.sub,
 						appState: void 0
 					}), r = !0, Wn(J.AUTH_INITIALIZED, {});
@@ -2651,23 +2653,23 @@ function cr(e = {}) {
 				}
 				q("[cookie-auth] Server-injected id-token is expired or invalid — falling through");
 			}
-			if ($n(n)) {
+			if (er(n)) {
 				let e = await u();
-				e === null ? q("[cookie-auth] userinfo fetch failed transiently; retaining session hint") : e.authenticated && e.sub ? (i = !0, a = e, er(n, !0), Wn(J.AUTHENTICATED, {
+				e === null ? q("[cookie-auth] userinfo fetch failed transiently; retaining session hint") : e.authenticated && e.sub ? (i = !0, a = e, tr(n, !0), Wn(J.AUTHENTICATED, {
 					sub: e.sub,
 					appState: void 0
-				})) : (i = !1, er(n, !1), c(null));
+				})) : (i = !1, tr(n, !1), c(null));
 			} else i = !1;
 			if (e.migrateLegacySession && i === !1) {
-				if (ir() && !nr()) {
-					rr(), q("[cookie-auth] Legacy Auth0 session found — attempting silent BFF migration"), await d.login({
+				if (ar() && !rr()) {
+					ir(), q("[cookie-auth] Legacy Auth0 session found — attempting silent BFF migration"), await d.login({
 						prompt: "none",
 						returnTo: window.location.href
 					});
 					return;
 				}
-				ar();
-			} else e.migrateLegacySession && i === !0 && ar();
+				or();
+			} else e.migrateLegacySession && i === !0 && or();
 			r = !0, Wn(J.AUTH_INITIALIZED, {});
 		},
 		async isAuthenticated() {
@@ -2715,16 +2717,16 @@ function cr(e = {}) {
 				});
 				if (!o.ok) return q(`[cookie-auth] refresh: userinfo returned ${o.status}`), e;
 				let s = await o.json();
-				return s.authenticated && s.sub ? (i = !0, a = s, er(n, !0), c(s), (!e || r !== s.sub) && Wn(J.AUTHENTICATED, {
+				return s.authenticated && s.sub ? (i = !0, a = s, tr(n, !0), c(s), (!e || r !== s.sub) && Wn(J.AUTHENTICATED, {
 					sub: s.sub,
 					appState: void 0
-				}), !0) : (i = !1, a = null, er(n, !1), e && Wn(J.LOGOUT, {}), !1);
+				}), !0) : (i = !1, a = null, tr(n, !1), e && Wn(J.LOGOUT, {}), !1);
 			} catch (t) {
 				return q(`[cookie-auth] refresh failed: ${t.message}`), e;
 			}
 		},
 		async logout(e) {
-			i = !1, a = null, er(n, !1), c(null), Wn(J.LOGOUT, {});
+			i = !1, a = null, tr(n, !1), c(null), Wn(J.LOGOUT, {});
 			let r = e?.returnTo ?? window.location.href, o = new URL(`${t}/auth/${encodeURIComponent(n)}/logout`, window.location.origin);
 			o.searchParams.set("return_to", r), e?.localOnly && o.searchParams.set("local_only", "true"), window.location.href = o.toString();
 		}
@@ -2734,45 +2736,42 @@ function cr(e = {}) {
 //#endregion
 //#region src/services/auth/index.ts
 zn();
-var lr = "sesamyAccessToken", ur = !1;
-function dr() {
+var ur = "sesamyAccessToken", dr = !1;
+function fr() {
 	let e = Jn();
 	if (!e) throw Error("[sesamy-js] No auth plugin registered. This should not happen.");
 	return e;
 }
-async function fr(e) {
+async function pr(e) {
 	if (e.enabled === !1) {
-		q("Auth disabled via config"), ur = !0;
+		q("Auth disabled via config"), dr = !0;
 		return;
 	}
-	e.useHttpCookies ? (q("useHttpCookies=true — using cookie-based BFF plugin"), qn(cr({ baseUrl: e.baseUrl }))) : Jn() || (q("No auth plugin registered — falling back to cookie-based BFF plugin"), qn(cr({ baseUrl: e.baseUrl }))), Xn(e), await dr().init(e), ur = !0;
+	e.useHttpCookies ? (q("useHttpCookies=true — using cookie-based BFF plugin"), qn(lr({ baseUrl: e.baseUrl }))) : Jn() || (q("No auth plugin registered — falling back to cookie-based BFF plugin"), qn(lr({ baseUrl: e.baseUrl }))), Xn(e), await fr().init(e), dr = !0;
 }
-async function pr() {
-	return ur ? dr().isAuthenticated() : !1;
+async function mr() {
+	return dr ? fr().isAuthenticated() : !1;
 }
-async function mr(e = !0, t = !1) {
-	return ur ? dr().getTokenSilently(e, t) : null;
-}
-async function hr() {
-	return ur ? dr().getUser() : null;
+async function hr(e = !0, t = !1) {
+	return dr ? fr().getTokenSilently(e, t) : null;
 }
 function gr() {
-	return ur ? Jn()?.getProxyAuthBaseUrl?.() ?? null : null;
+	return dr ? Jn()?.getProxyAuthBaseUrl?.() ?? null : null;
 }
 async function _r(e) {
-	return dr().login(e);
+	return fr().login(e);
 }
 async function vr(e) {
-	return dr().loginWithRedirect(e);
+	return fr().loginWithRedirect(e);
 }
 async function yr(e) {
-	return dr().loginWithPopup(e);
+	return fr().loginWithPopup(e);
 }
 async function br(e = {}) {
-	return dr().logout(e);
+	return fr().logout(e);
 }
 async function xr() {
-	if (!ur) return !1;
+	if (!dr) return !1;
 	let e = Jn();
 	return e ? typeof e.refresh == "function" ? e.refresh() : e.isAuthenticated() : !1;
 }
@@ -2781,7 +2780,7 @@ async function Sr(e) {
 	if (t.length !== 3) throw Error("Invalid token");
 	let n = decodeURIComponent(atob(t[1].replace(/-/g, "+").replace(/_/g, "/")).split("").map((e) => "%" + ("00" + e.charCodeAt(0).toString(16)).slice(-2)).join("")), r = JSON.parse(n);
 	if (!r?.exp || r.exp < Date.now() / 1e3) throw Error("Invalid token");
-	q("Set token"), localStorage.setItem(lr, e);
+	q("Set token"), localStorage.setItem(ur, e);
 	let { triggerEvent: i } = await Promise.resolve().then(() => (Gn(), Hn)), { Events: a } = await Promise.resolve().then(() => (Vn(), Bn));
 	i(a.AUTHENTICATED, {
 		...r,
@@ -5443,7 +5442,7 @@ function Cc() {
 }
 //#endregion
 //#region package.json
-var wc = "@sesamy/sesamy-js", Tc = "1.125.2";
+var wc = "@sesamy/sesamy-js", Tc = "1.125.3";
 //#endregion
 //#region src/services/analytics/listeners/route.ts
 function Ec(e) {
@@ -6526,8 +6525,8 @@ function Tu(e) {
 		baseUrl: t,
 		tokenProvider: async () => {
 			if (r) return null;
-			if (await pr()) try {
-				let e = await mr(!1);
+			if (await mr()) try {
+				let e = await hr(!1);
 				if (e) return `Bearer ${e}`;
 				if (n) return null;
 			} catch {}
@@ -6554,9 +6553,9 @@ function Tu(e) {
 		...n,
 		credentials: "include"
 	}), s = (e = !0) => (t) => async (r, i) => {
-		let a = await mr(e);
+		let a = await hr(e);
 		if (!a) {
-			if (n && await pr()) return t(r, {
+			if (n && await mr()) return t(r, {
 				...i,
 				credentials: "include"
 			});
@@ -6583,7 +6582,7 @@ function Tu(e) {
 		})
 	]);
 	async function l(e = {}) {
-		let { waitForEntitlementAfter: t, includeSignedLinks: n = !0 } = e, r = await pr() ? await i.entitlements.list({ waitForEntitlementAfter: t?.toISOString() }) : [];
+		let { waitForEntitlementAfter: t, includeSignedLinks: n = !0 } = e, r = await mr() ? await i.entitlements.list({ waitForEntitlementAfter: t?.toISOString() }) : [];
 		return n && r.push(...ma()), r;
 	}
 	async function u(e, t = []) {
@@ -6603,7 +6602,7 @@ function Tu(e) {
 	}
 	async function f(e) {
 		if (!e) throw Error("SKU is required to get fulfillments");
-		return await pr() ? await c.get(`/fulfillments?sku=${encodeURIComponent(e)}`).json() : [];
+		return await mr() ? await c.get(`/fulfillments?sku=${encodeURIComponent(e)}`).json() : [];
 	}
 	async function p(e, t) {
 		if (!e || !t) throw Error("SKU and itemId are required to request delivery");
@@ -6641,7 +6640,7 @@ function Tu(e) {
 		return await i.tallies.push(e, t);
 	}
 	async function C() {
-		return !await mr(!1) && !await pr() ? null : await c.url("/profile").get().json();
+		return !await hr(!1) && !await mr() ? null : await c.url("/profile").get().json();
 	}
 	async function w(e) {
 		let t = await c.url("/profile").patch(e).res();
@@ -6654,14 +6653,14 @@ function Tu(e) {
 		return (await c.url("/profile/unlink-spotify").post().res()).ok;
 	}
 	async function D(t) {
-		let n = await mr(!1);
+		let n = await hr(!1);
 		if (n) {
 			let r = new URL(`${Hi("access-sync", e.environment)}/spotify/sesamy-callback`);
 			r.searchParams.set("access_token", n), r.searchParams.set("state", t), window.location.href = r.toString();
 			return;
 		}
 		let r = gr();
-		if (r !== null && await pr()) {
+		if (r !== null && await mr()) {
 			let e = new URL(`${r}/auth/spotify-link`, window.location.origin);
 			e.searchParams.set("sku", t), window.location.href = e.toString();
 			return;
@@ -6680,7 +6679,7 @@ function Tu(e) {
 		return n;
 	}
 	async function A(t) {
-		let n = await mr(!1, !0), r, i = t.language || Yn(), a = xa();
+		let n = await hr(!1, !0), r, i = t.language || Yn(), a = xa();
 		switch (t.target) {
 			case "account":
 				r = new URL(`${Hi("account", e.environment)}/${encodeURIComponent(t.language || i)}/subscriptions/${encodeURIComponent(e.vendorId || e.clientId)}${t.contractId ? `/${encodeURIComponent(t.contractId)}` : ""}`), r.searchParams.set("sesamy-redirect-url", t.redirectUrl || window.location.href);
@@ -6705,7 +6704,7 @@ function Tu(e) {
 		return n && (r.hash = `#access_token=${n}`), t.shorten ? k(r.href, t.ttl) : r.href;
 	}
 	async function j() {
-		let t = await mr(!1), n = new URL(`${Hi("account", e.environment)}/subscriptions/${e.vendorId || e.clientId}`);
+		let t = await hr(!1), n = new URL(`${Hi("account", e.environment)}/subscriptions/${e.vendorId || e.clientId}`);
 		t && (n.hash = `#access_token=${t}`), window.location.href = n.toString();
 	}
 	async function M(e) {
@@ -7206,7 +7205,7 @@ function Ku(e, t) {
 		return;
 	}
 	n.init(e, {
-		getToken: mr,
+		getToken: hr,
 		apiEndpoint: t
 	}), q("[capsule] DcaClient initialized"), window.addEventListener(J.AUTH_INITIALIZED, () => {
 		Ju();
@@ -7410,9 +7409,9 @@ async function od(e) {
 	} catch (e) {
 		t.push(`SessionStorage collection failed: ${e.message}`);
 	}
-	if (await pr()) {
+	if (await mr()) {
 		try {
-			let e = await mr(!1);
+			let e = await hr(!1);
 			if (e) {
 				let t = e.split(".");
 				t.length >= 2 && (n.userId = JSON.parse(atob(t[1])).sub);
@@ -7450,8 +7449,8 @@ async function od(e) {
 }
 async function sd(e, t, n) {
 	let r = `${Hi("api2", t)}/diagnostics`, i = { "Content-Type": "application/json" };
-	if (await pr()) try {
-		let e = await mr(!1);
+	if (await mr()) try {
+		let e = await hr(!1);
 		e && (i.Authorization = `Bearer ${e}`);
 	} catch {}
 	if (!i.Authorization && n) {
@@ -7542,8 +7541,8 @@ function hd(e) {
 		},
 		auth: {
 			getUser: d,
-			getTokenSilently: mr,
-			isAuthenticated: pr,
+			getTokenSilently: hr,
+			isAuthenticated: mr,
 			loginWithRedirect: vr,
 			loginWithPopup: yr,
 			login: _r,
@@ -7754,7 +7753,7 @@ async function Sd(e, t) {
 //#region src/services/transform/index.ts
 async function Cd({ enabled: e = !1, rules: t }) {
 	e && tl(async () => {
-		let e = await pr(), n = window.location.href;
+		let e = await mr(), n = window.location.href;
 		for (let r of t) {
 			let t = document.querySelectorAll(r.selector);
 			if (!(r.path && !new RegExp(r.path).test(n))) for (let n of t) {
@@ -7913,10 +7912,12 @@ var Fd = "sesamy-user";
 async function Id() {
 	let e = new URLSearchParams(window.location.search).get(Fd)?.toLowerCase();
 	if (!e) return;
-	let t = await hr();
-	t?.email === e ? q(`Current user matches sesamy user: ${t?.email} === ${e}`) : (q(`Current user does not match sesamy user: ${t?.email} !== ${e}`), fi(), vr({ authorizationParams: { login_hint: e } }));
-	let n = new URL(window.location.href);
-	n.searchParams.delete(Fd), window.history.replaceState(null, "", n);
+	let t = new URL(window.location.href);
+	if (t.searchParams.delete(Fd), window.history.replaceState(null, "", t), await mr()) {
+		q("sesamy-user hint ignored — already authenticated");
+		return;
+	}
+	q(`sesamy-user hint — not authenticated, starting login for ${e}`), fi(), vr({ authorizationParams: { login_hint: e } });
 }
 zn(), Gn(), Vn();
 var Ld = "sesamy-purchase";
@@ -7933,7 +7934,7 @@ var zd = "sesamy-login", Bd = "sesamy_login";
 async function Vd() {
 	let e = new URLSearchParams(window.location.search);
 	if (!(e.get(zd) || e.get(Bd))) return;
-	await pr() || vr();
+	await mr() || vr();
 	let t = new URL(window.location.href);
 	t.searchParams.delete(zd), window.history.replaceState(null, "", t);
 }
@@ -8049,7 +8050,7 @@ async function Qd(e, t, n) {
 			clientId: e.clientId,
 			environment: e.environment,
 			...e.analytics
-		}), n && qn(n), await fr({
+		}), n && qn(n), await pr({
 			clientId: e.clientId,
 			vendorId: e.vendorId || e.clientId,
 			organization: e.organization,

package/package.json

@@ -6,7 +6,7 @@
     "registry": "https://registry.npmjs.org/",
     "tag": "latest"
   },
-  "version": "1.125.2",
+  "version": "1.125.3",
   "main": "dist/sesamy-js.cjs",
   "module": "dist/sesamy-js.mjs",
   "types": "dist/sesamy-js.d.ts",