Improve API endpoint config

Author: janheinrichmerker

browser/src/app/config/api.config.ts

@@ -7,16 +7,16 @@ export const API_CONFIG = {
 
   endpoints: {
     // Search Engine Results Page
-    serps: '/api/serps',
-    serp: (serpId: string) => `/api/serps/${serpId}`,
-    serpsPreview: '/api/serps/preview',
+    serps: '/serps',
+    serp: (serpId: string) => `/serps/${serpId}`,
+    serpsPreview: '/serps/preview',
     // Providers
-    providers: '/api/providers',
-    provider: (providerId: string) => `/api/providers/${providerId}`,
-    providerStatistics: (providerId: string) => `/api/providers/${providerId}/statistics`,
+    providers: '/providers',
+    provider: (providerId: string) => `/providers/${providerId}`,
+    providerStatistics: (providerId: string) => `/providers/${providerId}/statistics`,
     // Archives
-    archives: '/api/archives',
-    archive: (archiveId: string) => `/api/archives/${archiveId}`,
-    archiveStatistics: (archiveId: string) => `/api/archives/${archiveId}/statistics`,
+    archives: '/archives',
+    archive: (archiveId: string) => `/archives/${archiveId}`,
+    archiveStatistics: (archiveId: string) => `/archives/${archiveId}/statistics`,
   },
 } as const;

browser/src/app/pages/compare-page/compare-page.component.ts

@@ -63,7 +63,7 @@ export class ComparePageComponent {
 
           const idsParam = ids.join(',');
           return this.http
-            .get<CompareApiResponse>(`${environment.apiUrl}/api/serps/compare`, {
+            .get<CompareApiResponse>(`${environment.apiUrl}/serps/compare`, {
               params: { ids: idsParam },
             })
             .pipe(

browser/src/app/services/provider.service.spec.ts

@@ -44,7 +44,7 @@ describe('ProviderService', () => {
       done();
     });
 
-    const req = httpMock.expectOne(`${environment.apiUrl}/api/providers`);
+    const req = httpMock.expectOne(`${environment.apiUrl}/providers`);
     expect(req.request.method).toBe('GET');
     req.flush(mockApiResponse);
   });
@@ -57,7 +57,7 @@ describe('ProviderService', () => {
       done();
     });
 
-    const req = httpMock.expectOne(`${environment.apiUrl}/api/providers`);
+    const req = httpMock.expectOne(`${environment.apiUrl}/providers`);
     req.flush(mockApiResponse);
   });
 
@@ -72,7 +72,7 @@ describe('ProviderService', () => {
     });
 
     // Only one request should be made
-    const req = httpMock.expectOne(`${environment.apiUrl}/api/providers`);
+    const req = httpMock.expectOne(`${environment.apiUrl}/providers`);
     req.flush(mockApiResponse);
   });
 
@@ -82,7 +82,7 @@ describe('ProviderService', () => {
       done();
     });
 
-    const req = httpMock.expectOne(`${environment.apiUrl}/api/providers`);
+    const req = httpMock.expectOne(`${environment.apiUrl}/providers`);
     req.error(new ErrorEvent('Network error'));
   });
 
@@ -97,11 +97,11 @@ describe('ProviderService', () => {
         done();
       });
 
-      const req2 = httpMock.expectOne(`${environment.apiUrl}/api/providers`);
+      const req2 = httpMock.expectOne(`${environment.apiUrl}/providers`);
       req2.flush(mockApiResponse);
     });
 
-    const req1 = httpMock.expectOne(`${environment.apiUrl}/api/providers`);
+    const req1 = httpMock.expectOne(`${environment.apiUrl}/providers`);
     req1.flush(mockApiResponse);
   });
 
@@ -118,7 +118,7 @@ describe('ProviderService', () => {
       done();
     });
 
-    const req = httpMock.expectOne(`${environment.apiUrl}/api/providers`);
+    const req = httpMock.expectOne(`${environment.apiUrl}/providers`);
     req.flush(mockApiResponse);
   });
 
@@ -147,7 +147,7 @@ describe('ProviderService', () => {
         done();
       });
 
-      const req = httpMock.expectOne(`${environment.apiUrl}/api/providers/google`);
+      const req = httpMock.expectOne(`${environment.apiUrl}/providers/google`);
       expect(req.request.method).toBe('GET');
       req.flush(mockProviderDetailResponse);
     });
@@ -158,7 +158,7 @@ describe('ProviderService', () => {
         done();
       });
 
-      const req = httpMock.expectOne(`${environment.apiUrl}/api/providers/unknown`);
+      const req = httpMock.expectOne(`${environment.apiUrl}/providers/unknown`);
       req.error(new ErrorEvent('Network error'));
     });
 
@@ -183,7 +183,7 @@ describe('ProviderService', () => {
         done();
       });
 
-      const req = httpMock.expectOne(`${environment.apiUrl}/api/providers/minimal`);
+      const req = httpMock.expectOne(`${environment.apiUrl}/providers/minimal`);
       req.flush(minimalResponse);
     });
   });

browser/src/app/services/suggestions.service.spec.ts

@@ -183,7 +183,7 @@ describe('SuggestionsService', () => {
 
       // We should only call the search API once for the input
       expect(mockApiService.get).toHaveBeenCalledTimes(1);
-      expect(mockApiService.get).toHaveBeenCalledWith('/api/serps', {
+      expect(mockApiService.get).toHaveBeenCalledWith('/serps', {
         query: 'test3',
         size: 5,
       });
@@ -351,7 +351,7 @@ describe('SuggestionsService', () => {
       tick(service.DEBOUNCE_TIME_MS);
       flushMicrotasks();
 
-      expect(mockApiService.get).toHaveBeenCalledWith('/api/serps', {
+      expect(mockApiService.get).toHaveBeenCalledWith('/serps', {
         query: 'search term',
         size: 5,
       });

browser/src/environments/environment.ts

@@ -1,6 +1,6 @@
 export const environment = {
   production: true,
   // Assume that both the API and web app are routed on the same hostname.
-  apiUrl: '',
+  apiUrl: '/api',
   apiTimeout: 60000,
 };