feat: enhance API configuration and request service with improved environment variable handling and SSR check utility

Author: mitchdowney

src/config/index.ts

@@ -1,18 +1,26 @@
 export const config = {
   api: {
+    /*
+      Example:
+        API_PROTOCOL=http
+        API_HOST=localhost
+        API_PORT=1234
+        API_PREFIX=/api
+        API_VERSION=/v2
+    */
     internal: {
-      protocol: process.env.API_PROTOCOL || 'http',
-      host: process.env.API_HOST || 'localhost',
-      port: process.env.API_PORT || '1234',
-      prefix: process.env.API_PREFIX || '/api',
-      version: process.env.API_VERSION || '/v2'
+      protocol: process.env.API_PROTOCOL,
+      host: process.env.API_HOST,
+      port: process.env.API_PORT,
+      prefix: process.env.API_PREFIX,
+      version: process.env.API_VERSION
     },
     external: {
-      protocol: process.env.NEXT_PUBLIC_API_PROTOCOL || 'http',
-      host: process.env.NEXT_PUBLIC_API_HOST || 'localhost',
-      port: process.env.NEXT_PUBLIC_API_PORT || '1234',
-      prefix: process.env.NEXT_PUBLIC_API_PREFIX || '/api',
-      version: process.env.NEXT_PUBLIC_API_VERSION || '/v2'
+      protocol: process.env.NEXT_PUBLIC_API_PROTOCOL,
+      host: process.env.NEXT_PUBLIC_API_HOST,
+      port: process.env.NEXT_PUBLIC_API_PORT,
+      prefix: process.env.NEXT_PUBLIC_API_PREFIX,
+      version: process.env.NEXT_PUBLIC_API_VERSION
     }
   }
 };

src/factories/apiRequestService.ts

@@ -3,19 +3,19 @@ import { config } from "../config";
 
 export function getSSRApiRequestService(jwt?: string | null): ApiRequestService {
   return new ApiRequestService({
-    protocol: config.api.internal.protocol,
-    host: config.api.internal.host,
-    port: config.api.internal.port,
-    prefix: config.api.internal.prefix,
-    version: config.api.internal.version,
+    protocol: config.api.internal.protocol || '',
+    host: config.api.internal.host || '',
+    port: config.api.internal.port || '',
+    prefix: config.api.internal.prefix || '',
+    version: config.api.internal.version || '',
     ...(jwt ? { jwt } : {})
   });
 }
 
 export const apiRequestService = new ApiRequestService({
-  protocol: config.api.external.protocol,
-  host: config.api.external.host,
-  port: config.api.external.port,
-  prefix: config.api.external.prefix,
-  version: config.api.external.version
+  protocol: config.api.external.protocol || '',
+  host: config.api.external.host || '',
+  port: config.api.external.port || '',
+  prefix: config.api.external.prefix || '',
+  version: config.api.external.version || ''
 });

src/utils/auth/ssrAuth.ts

@@ -1,6 +1,6 @@
 import { cookies } from 'next/headers';
-import { apiRequestService, getSSRApiRequestService } from '../../factories/apiRequestService';
 import { DTOAccount } from 'podverse-helpers';
+import { getSSRApiRequestService } from '../../factories/apiRequestService';
 
 export async function getSSRJwtFromCookies(): Promise<string | undefined> {
   const cookieStore = await cookies();
@@ -25,17 +25,15 @@ export async function getSSRLoggedInAccount(): Promise<DTOAccount | null> {
 
 export async function getSSRAuthService(): Promise<{ isValidAuthSession: boolean; apiRequestService: typeof apiRequestService }> {
   const jwt = await getSSRJwtFromCookies();
-  
-  if (!jwt) {
-    return { isValidAuthSession: false, apiRequestService: apiRequestService };
-  }
-
-  const ssrApiRequestService = getSSRApiRequestService(jwt);
-
-  try {
-    await ssrApiRequestService.reqAuthCheckSession();
-    return { isValidAuthSession: true, apiRequestService: ssrApiRequestService };
-  } catch {
-    return { isValidAuthSession: false, apiRequestService: apiRequestService };
+  const apiRequestService = getSSRApiRequestService(jwt);
+  if (jwt) {
+    try {
+      await apiRequestService.reqAuthCheckSession();
+      return { isValidAuthSession: true, apiRequestService };
+    } catch {
+      return { isValidAuthSession: false, apiRequestService };
+    }
+  } else {
+    return { isValidAuthSession: false, apiRequestService };
   }
 }

src/utils/ssr.ts

@@ -0,0 +1,3 @@
+export const checkIfSSR = () => {
+  return typeof window === "undefined";  
+}