Merge pull request #38 from JuribaDev/hotfix

hotfix
JuribaDev · Aug 31, 2024 · 924df8d · 924df8d
2 parents 56b513d + 893c0bc
commit 924df8d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/apps/client/nginx.conf b/apps/client/nginx.conf
@@ -27,6 +27,19 @@ http {
 
         location / {
             try_files $uri $uri/ /index.html;
+            add_header 'Access-Control-Allow-Origin' '$http_origin' always;
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE, PUT' always;
+            add_header 'Access-Control-Allow-Headers' 'Origin, X-Requested-With, Content-Type, Accept, Authorization' always;
+            add_header 'Access-Control-Allow-Credentials' 'true' always;
+            if ($request_method = 'OPTIONS') {
+                add_header 'Access-Control-Allow-Origin' '$http_origin' always;
+                add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE, PUT' always;
+                add_header 'Access-Control-Allow-Headers' 'Origin, X-Requested-With, Content-Type, Accept, Authorization' always;
+                add_header 'Access-Control-Allow-Credentials' 'true' always;
+                add_header 'Content-Type' 'text/plain charset=UTF-8';
+                add_header 'Content-Length' 0;
+                return 204;
+            }
         }
 
         location ~* ^(?!/assets/).*$ {

diff --git a/apps/client/project.json b/apps/client/project.json
@@ -27,6 +27,12 @@
       },
       "configurations": {
         "production": {
+          "fileReplacements": [
+            {
+              "replace": "apps/client/src/environments/environment.ts",
+              "with": "apps/client/src/environments/environment.prod.ts"
+            }
+          ],
           "budgets": [
             {
               "type": "initial",

diff --git a/apps/client/server.ts b/apps/client/server.ts
@@ -33,6 +33,8 @@ export function app(): express.Express {
   // All regular routes use the Angular engine
   server.get('*', (req, res, next) => {
     const { protocol, originalUrl, baseUrl, headers } = req;
+    console.log(`SSR request: ${protocol}://${headers.host}${originalUrl}`);
+
 
     commonEngine
       .render({

diff --git a/apps/client/src/app/shared/api-client.service.ts b/apps/client/src/app/shared/api-client.service.ts
@@ -22,6 +22,8 @@ export class ApiClientService {
 
   // Auth endpoints
   login(loginData: LoginRequestDto): Observable<AuthResponseDto> {
+    console.log(`Making login request to: ${this.baseUrl}/auth/login`);
+
     return this.http.post<AuthResponseDto>(`${this.baseUrl}/auth/login`, loginData);
   }
 

diff --git a/apps/client/src/environments/environment.prod.ts b/apps/client/src/environments/environment.prod.ts
@@ -1,4 +1,4 @@
 export const environment = {
   production: true,
-  apiUrl: '/api/v1'
+  apiUrl: typeof window !== 'undefined' ? window.location.origin + '/api/v1' : '${API_URL}/api/v1'
 };