till/managarten
1
0
Fork 0
mirror of https://github.com/Memo-2023/mana-monorepo.git synced 2026-05-14 20:21:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(manacore-web): add runtime env injection for auth URLs

Browse source 
Same fix as todo, calendar, clock - uses hooks.server.ts to inject
PUBLIC_MANA_CORE_AUTH_URL_CLIENT at runtime for Docker deployments.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Wuesteon 2025-12-08 21:47:02 +01:00
parent e02e2b37b1
commit 7caeea4abd
3 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apps/manacore/apps/web/src/hooks.server.ts
View file

@ -3,9 +3,21 @@ import type { Handle } from '@sveltejs/kit';
/** /**
* Server hooks for ManaCore web app * Server hooks for ManaCore web app
* *
* Authentication is handled entirely by Mana Core Auth (@manacore/shared-auth). * Injects runtime environment variables into the HTML for client-side access.
* No Supabase is needed - all data comes from mana-core-auth APIs. * This is necessary because SvelteKit's $env/static/public bakes values at build time,
* but Docker containers need runtime configuration.
*/ */
const PUBLIC_MANA_CORE_AUTH_URL_CLIENT =
process.env.PUBLIC_MANA_CORE_AUTH_URL_CLIENT || process.env.PUBLIC_MANA_CORE_AUTH_URL || '';
export const handle: Handle = async ({ event, resolve }) => { export const handle: Handle = async ({ event, resolve }) => {
return resolve(event); return resolve(event, {
transformPageChunk: ({ html }) => {
const envScript = `<script>
window.__PUBLIC_MANA_CORE_AUTH_URL__ = "${PUBLIC_MANA_CORE_AUTH_URL_CLIENT}";
</script>`;
return html.replace('<head>', `<head>${envScript}`);
},
});
}; };

17
apps/manacore/apps/web/src/lib/stores/auth.svelte.ts
View file

@ -7,9 +7,18 @@ import { browser } from '$app/environment';
import { initializeWebAuth } from '@manacore/shared-auth'; import { initializeWebAuth } from '@manacore/shared-auth';
import type { UserData } from '@manacore/shared-auth'; import type { UserData } from '@manacore/shared-auth';
// Initialize Mana Core Auth only on the client side // Get auth URL dynamically at runtime - fallback for SSR and client
// TODO: Use PUBLIC_MANA_CORE_AUTH_URL from env when available function getAuthUrl(): string {
const MANA_AUTH_URL = 'http://localhost:3001'; if (browser && typeof window !== 'undefined') {
// Client-side: use injected window variable (set by hooks.server.ts)
// Falls back to localhost for local development
const injectedUrl = (window as unknown as { __PUBLIC_MANA_CORE_AUTH_URL__?: string })
.__PUBLIC_MANA_CORE_AUTH_URL__;
return injectedUrl || 'http://localhost:3001';
}
// Server-side (SSR): use Docker internal URL for container-to-container communication
return process.env.PUBLIC_MANA_CORE_AUTH_URL || 'http://localhost:3001';
}
// Lazy initialization to avoid SSR issues with localStorage // Lazy initialization to avoid SSR issues with localStorage
let _authService: ReturnType<typeof initializeWebAuth>['authService'] | null = null; let _authService: ReturnType<typeof initializeWebAuth>['authService'] | null = null;
@ -18,7 +27,7 @@ let _tokenManager: ReturnType<typeof initializeWebAuth>['tokenManager'] | null =
function getAuthService() { function getAuthService() {
if (!browser) return null; if (!browser) return null;
if (!_authService) { if (!_authService) {
const auth = initializeWebAuth({ baseUrl: MANA_AUTH_URL }); const auth = initializeWebAuth({ baseUrl: getAuthUrl() });
_authService = auth.authService; _authService = auth.authService;
_tokenManager = auth.tokenManager; _tokenManager = auth.tokenManager;
} }

14
apps/manacore/apps/web/src/lib/stores/user-settings.svelte.ts
View file

@ -7,14 +7,22 @@
* - localStorage caching for offline support * - localStorage caching for offline support
*/ */
import { browser } from '$app/environment';
import { createUserSettingsStore } from '@manacore/shared-theme'; import { createUserSettingsStore } from '@manacore/shared-theme';
import { authStore } from './auth.svelte'; import { authStore } from './auth.svelte';
// TODO: Use PUBLIC_MANA_CORE_AUTH_URL from env when available // Get auth URL dynamically at runtime
const MANA_AUTH_URL = 'http://localhost:3001'; function getAuthUrl(): string {
if (browser && typeof window !== 'undefined') {
const injectedUrl = (window as unknown as { __PUBLIC_MANA_CORE_AUTH_URL__?: string })
.__PUBLIC_MANA_CORE_AUTH_URL__;
return injectedUrl || 'http://localhost:3001';
}
return 'http://localhost:3001';
}
export const userSettings = createUserSettingsStore({ export const userSettings = createUserSettingsStore({
appId: 'manacore', appId: 'manacore',
authUrl: MANA_AUTH_URL, authUrl: getAuthUrl(),
getAccessToken: () => authStore.getAccessToken(), getAccessToken: () => authStore.getAccessToken(),
}); });