change remaining uses

Author: icecrasher321

apps/sim/lib/security/csp.ts

@@ -1,4 +1,5 @@
-import { env, getEnv } from '../env'
+import { env, getEnv } from '@/lib/env'
+import { getBaseUrl } from '@/lib/urls/utils'
 
 /**
  * Content Security Policy (CSP) configuration builder
@@ -76,7 +77,7 @@ export const buildTimeCSPDirectives: CSPDirectives = {
 
   'connect-src': [
     "'self'",
-    env.NEXT_PUBLIC_APP_URL || '',
+    getBaseUrl(),
     env.OLLAMA_URL || 'http://localhost:11434',
     env.NEXT_PUBLIC_SOCKET_URL || 'http://localhost:3002',
     env.NEXT_PUBLIC_SOCKET_URL?.replace('http://', 'ws://').replace('https://', 'wss://') ||

apps/sim/socket-server/config/socket.ts

@@ -3,6 +3,7 @@ import { Server } from 'socket.io'
 import { env } from '@/lib/env'
 import { isProd } from '@/lib/environment'
 import { createLogger } from '@/lib/logs/console/logger'
+import { getBaseUrl } from '@/lib/urls/utils'
 
 const logger = createLogger('SocketIOConfig')
 
@@ -11,7 +12,7 @@ const logger = createLogger('SocketIOConfig')
  */
 function getAllowedOrigins(): string[] {
   const allowedOrigins = [
-    env.NEXT_PUBLIC_APP_URL,
+    getBaseUrl(),
     'http://localhost:3000',
     'http://localhost:3001',
     ...(env.ALLOWED_ORIGINS?.split(',') || []),