fixeed browser scope bugs

Author: sojs-coder

src/lib/authentication.ts

@@ -7,19 +7,27 @@ export interface Tokens {
     idToken: string | undefined;
     refreshToken: string | undefined;
 }
-const cognitoAuthConfig = {
-    authority: "https://cognito-idp.us-west-2.amazonaws.com/us-west-2_lg1qptg2n",
-    client_id: "4d6esoka62s46lo4d398o3sqpi",
-    redirect_uri: window.location.origin + "/auth/callback",
-    response_type: "code",
-    scope: "aws.cognito.signin.user.admin email openid phone profile"
-};
 
-export const userManager = new UserManager({
-    ...cognitoAuthConfig
-});
+
+let userManager: UserManager | null = null;
+export function createUserManager(origin: String) {
+    if (userManager) {
+        return userManager;
+    }
+    const cognitoAuthConfig = {
+        authority: "https://cognito-idp.us-west-2.amazonaws.com/us-west-2_lg1qptg2n",
+        client_id: "4d6esoka62s46lo4d398o3sqpi",
+        redirect_uri: origin + "/auth/callback",
+        response_type: "code",
+        scope: "aws.cognito.signin.user.admin email openid phone profile"
+    };
+    userManager = new UserManager({
+        ...cognitoAuthConfig
+    });
+    return userManager;
+}
 
 
-export async function signinRequest() {
-    await userManager.signinRedirect();
+export async function signinRequest(url: URL) {
+    await (createUserManager(url.origin)).signinRedirect();
 }

src/lib/state.ts

@@ -176,7 +176,7 @@ export async function initializeTooling() {
                             label: 'Log in',
                             onClick: () => {
                                 // Attempt a fresh sign-in redirect
-                                try { signinRequest(); } catch {}
+                                try { signinRequest(new URL(window.location.href)); } catch {}
                             }
                         },
                         {

src/routes/auth/callback/+page.ts

@@ -3,8 +3,11 @@ import { redirect } from '@sveltejs/kit';
 export const ssr = false;
 export const csr = true;
 
-import { userManager } from '$lib/authentication.js';
+import { createUserManager } from '$lib/authentication.js';
 import { SessionState } from '$lib/state.js';
+import { create } from 'domain';
+import { page } from '$app/state';
+import { UserManager } from 'oidc-client-ts';
 
 const TOKEN_STORAGE_KEY = 'ccported_tokens';
 
@@ -17,9 +20,10 @@ type StoredTokens = {
 
 export async function load() {
 	// This runs in the browser only (ssr=false)
+	const usernManager = createUserManager(page.url.origin);
 	try {
 		// Complete the sign-in redirect flow and obtain the user
-		const user = await userManager.signinCallback(window.location.href);
+		const user = await usernManager.signinCallback(window.location.href);
 
 		const tokens: StoredTokens = {
 			accessToken: user?.access_token,
@@ -44,7 +48,7 @@ export async function load() {
 	} catch (err) {
 		console.error('[auth/callback] signinCallback failed, trying signinRedirectCallback()', err);
 		try {
-			const user = await (userManager as any).signinRedirectCallback?.(window.location.href);
+			const user = await (usernManager as any).signinRedirectCallback?.(window.location.href);
 			const tokens: StoredTokens = {
 				accessToken: user?.access_token,
 				idToken: user?.id_token,

src/routes/auth/login/+page.svelte

@@ -2,8 +2,9 @@
     import Navigation from "$lib/components/Navigation.svelte";
     import { onMount } from "svelte";
     import { browser } from "$app/environment";
-    import { userManager, signinRequest } from "$lib/authentication.js";
-    import { SessionState, State } from "$lib/state.js";
+    import { createUserManager, signinRequest } from "$lib/authentication.js";
+    import { SessionState } from "$lib/state.js";
+    import { page } from "$app/state";
 
     let user: any = null;
     let loading = false;
@@ -13,7 +14,7 @@
         if (!browser) return;
         try {
             loading = true;
-            await signinRequest();
+            await signinRequest(page.url);
         } catch (err) {
             error = err instanceof Error ? err.message : String(err);
         } finally {
@@ -24,7 +25,7 @@
     async function signOut() {
         if (!browser) return;
         try {
-            await userManager.removeUser();
+            await (createUserManager(window.location.origin)).removeUser();
             user = null;
             SessionState.user = null;
             SessionState.loggedIn = false;
@@ -36,7 +37,7 @@
     onMount(async () => {
         if (!browser) return;
         try {
-            const stored = await userManager.getUser();
+            const stored = await (createUserManager(window.location.origin)).getUser();
             if (stored) {
                 user = stored.profile || stored;
                 SessionState.user = user;

static/version.txt

@@ -1 +1 @@
-2025-10-21T23:54:01.488Z
+2025-10-22T08:27:34.267Z