Move getRoutePrefix to coreProvider

Author: Alex-Tideman

src/hooks.client.ts

@@ -24,6 +24,7 @@ consumeAuthCookies();
 initCoreProvider({
   getAccessToken: async () => getAuthUser().accessToken ?? '',
   getIdToken: async () => getAuthUser().idToken,
+  getRoutePrefix: () => '',
   api: {
     preRequest: ossPreRequest,
     postResponse: ossPostResponse,

src/lib/stores/route-prefix.ts

@@ -17,6 +17,7 @@ export type PostResponseHook = (
 export type CoreProvider = {
   getAccessToken: () => Promise<string>;
   getIdToken: () => Promise<string | undefined>;
+  getRoutePrefix: () => string;
   api: {
     preRequest: PreRequestHook;
     postResponse: PostResponseHook;
@@ -28,6 +29,7 @@ export type CoreProvider = {
 export type InitOptions = {
   getAccessToken: () => Promise<string>;
   getIdToken?: () => Promise<string | undefined>;
+  getRoutePrefix?: () => string;
   api?: {
     preRequest?: PreRequestHook;
     postResponse?: PostResponseHook;
@@ -45,6 +47,7 @@ export function initCoreProvider(options: InitOptions): void {
   provider = {
     getAccessToken: options.getAccessToken,
     getIdToken: options.getIdToken ?? (async () => undefined),
+    getRoutePrefix: options.getRoutePrefix ?? (() => ''),
     api: {
       preRequest: options.api?.preRequest ?? passthrough,
       postResponse: options.api?.postResponse ?? passthroughResponse,
@@ -64,6 +67,11 @@ export async function getIdToken(): Promise<string | undefined> {
   return provider.getIdToken();
 }
 
+export function getRoutePrefix(): string {
+  if (!BROWSER || !provider) return '';
+  return provider.getRoutePrefix();
+}
+
 export async function getDataEncoderEndpoint(
   namespace: string,
 ): Promise<string> {

src/lib/utilities/core-provider.ts

@@ -2,8 +2,7 @@ import { afterEach, describe, expect, it } from 'vitest';
 
 import { base } from '$app/paths';
 
-import { routePrefix } from '$lib/stores/route-prefix';
-
+import { initCoreProvider } from './core-provider';
 import * as routeForModule from './route-for';
 import {
   routeForArchivalEventHistory,
@@ -237,7 +236,10 @@ describe('routeFor functions with prefix should resolve base + prefix correctly'
   };
 
   afterEach(() => {
-    routePrefix.set('');
+    initCoreProvider({
+      getAccessToken: async () => '',
+      getRoutePrefix: () => '',
+    });
   });
 
   const prefixedCases: [string, () => string | undefined][] = [
@@ -369,7 +371,10 @@ describe('routeFor functions with prefix should resolve base + prefix correctly'
   it.each(prefixedCases)(
     '%s should include base + prefix when prefix is set',
     (_name, fn) => {
-      routePrefix.set(prefix);
+      initCoreProvider({
+        getAccessToken: async () => '',
+        getRoutePrefix: () => prefix,
+      });
       const result = fn();
       expect(typeof result).toBe('string');
       expect(result).toMatch(new RegExp(`^${base}${prefix}`));
@@ -382,7 +387,10 @@ describe('routeFor functions with prefix should resolve base + prefix correctly'
   it.each(authCases)(
     '%s should NOT include prefix (auth routes excluded)',
     (_name, fn) => {
-      routePrefix.set(prefix);
+      initCoreProvider({
+        getAccessToken: async () => '',
+        getRoutePrefix: () => prefix,
+      });
       const result = fn();
       expect(typeof result).toBe('string');
       expect(result).not.toContain(prefix);

src/lib/utilities/route-for-base-path.test.ts

@@ -1,15 +1,15 @@
 import { writable } from 'svelte/store';
 
-import { afterEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { base } from '$app/paths';
 
 import type {
   EventSortOrder,
   WorkflowViewPreference,
 } from '$lib/stores/event-view';
-import { routePrefix } from '$lib/stores/route-prefix';
 
+import { initCoreProvider } from './core-provider';
 import {
   baseRouteForWorkflow,
   hasParameters,
@@ -536,31 +536,30 @@ describe('routeForWorkflow', () => {
 describe('routeFor with prefix', () => {
   const prefix = '/projects/my-project';
 
-  afterEach(() => {
-    routePrefix.set('');
+  beforeEach(() => {
+    initCoreProvider({
+      getAccessToken: async () => '',
+      getRoutePrefix: () => prefix,
+    });
   });
 
   it('should prepend prefix to root route', () => {
-    routePrefix.set(prefix);
     expect(routeForNamespaces()).toBe(`${base}${prefix}/namespaces`);
   });
 
   it('should prepend prefix to namespace route', () => {
-    routePrefix.set(prefix);
     expect(routeForNamespace({ namespace: 'default' })).toBe(
       `${base}${prefix}/namespaces/default`,
     );
   });
 
   it('should propagate prefix through leaf functions', () => {
-    routePrefix.set(prefix);
     expect(routeForWorkflows({ namespace: 'default' })).toBe(
       `${base}${prefix}/namespaces/default/workflows`,
     );
   });
 
   it('should propagate prefix through deep leaf functions', () => {
-    routePrefix.set(prefix);
     expect(
       routeForCallStack({
         namespace: 'default',
@@ -571,40 +570,41 @@ describe('routeFor with prefix', () => {
   });
 
   it('should propagate prefix to nexus routes', () => {
-    routePrefix.set(prefix);
     expect(routeForNexus()).toBe(`${base}${prefix}/nexus`);
   });
 
   it('should propagate prefix to schedule routes', () => {
-    routePrefix.set(prefix);
     expect(routeForSchedules({ namespace: 'default' })).toBe(
       `${base}${prefix}/namespaces/default/schedules`,
     );
   });
 
   it('should not apply prefix when store is empty', () => {
-    routePrefix.set('');
+    initCoreProvider({
+      getAccessToken: async () => '',
+      getRoutePrefix: () => '',
+    });
     expect(routeForNamespaces()).toBe(`${base}/namespaces`);
   });
 
   it('should not apply prefix to auth routes', () => {
-    routePrefix.set(prefix);
     const settings = { auth: {}, baseUrl: 'https://localhost' };
     const searchParams = new URLSearchParams();
     const sso = routeForAuthentication({ settings, searchParams });
     expect(sso).not.toContain(prefix);
   });
 
   it('should not apply prefix to login page', () => {
-    routePrefix.set(prefix);
     const login = routeForLoginPage('', false);
     expect(login).not.toContain(prefix);
   });
 
   it('should revert to default behavior when prefix is cleared', () => {
-    routePrefix.set(prefix);
     expect(routeForNamespaces()).toBe(`${base}${prefix}/namespaces`);
-    routePrefix.set('');
+    initCoreProvider({
+      getAccessToken: async () => '',
+      getRoutePrefix: () => '',
+    });
     expect(routeForNamespaces()).toBe(`${base}/namespaces`);
   });
 });

src/lib/utilities/route-for.test.ts

@@ -9,12 +9,13 @@ import {
   eventFilterSort,
   workflowViewPreference,
 } from '$lib/stores/event-view';
-import { getRoutePrefix } from '$lib/stores/route-prefix';
 import type { EventView } from '$lib/types/events';
 import type { Settings } from '$lib/types/global';
 import { encodeURIForSvelte } from '$lib/utilities/encode-uri';
 import { toURL } from '$lib/utilities/to-url';
 
+import { getRoutePrefix } from './core-provider';
+
 const withPrefix = (path: ResolvedPathname): ResolvedPathname => {
   const prefix = getRoutePrefix();
   if (!prefix) return path;