Merge branch 'main' into profile-and-hostory-pages

Author: LimZiJia

compose.yml

@@ -24,6 +24,21 @@ services:
     networks:
       - gateway-network
     restart: always
+  
+  broker:
+    container_name: broker
+    hostname: broker
+    image: rabbitmq:4.0.2
+    user: rabbitmq
+    networks:
+      - gateway-network
+    healthcheck:
+      test: rabbitmq-diagnostics check_port_connectivity
+      interval: 30s
+      timeout: 30s
+      retries: 10
+      start_period: 30s
+    restart: always
 
   question:
     container_name: question
@@ -123,21 +138,6 @@ services:
       - match-db-network
     restart: always
 
-  broker:
-    container_name: broker
-    hostname: broker
-    image: rabbitmq:4.0.2
-    user: rabbitmq
-    networks:
-      - gateway-network
-    healthcheck:
-      test: rabbitmq-diagnostics check_port_connectivity
-      interval: 30s
-      timeout: 30s
-      retries: 10
-      start_period: 30s
-    restart: always
-
   collaboration:
     container_name: collaboration
     image: collaboration

frontend/angular.json

@@ -51,7 +51,13 @@
             "development": {
               "optimization": false,
               "extractLicenses": false,
-              "sourceMap": true
+              "sourceMap": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.development.ts"
+                }
+              ]
             }
           },
           "defaultConfiguration": "production"

frontend/package-lock.json

@@ -25,7 +25,7 @@
     "codemirror": "^6.0.1",
     "primeflex": "^3.3.1",
     "primeicons": "^7.0.0",
-    "primeng": "^17.18.10",
+    "primeng": "^17.18.11",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
     "typeface-poppins": "^1.1.13",

frontend/package.json

@@ -9,7 +9,6 @@ export class ErrorInterceptor implements HttpInterceptor {
         return next.handle(request).pipe(
             catchError(err => {
                 console.error(err);
-
                 const errorMessage = err.error.message;
                 return throwError(() => new Error(errorMessage, { cause: err }));
             }),

frontend/src/_interceptors/error.interceptor.ts

@@ -3,7 +3,7 @@ import { HttpTestingController, provideHttpClientTesting } from '@angular/common
 import { HTTP_INTERCEPTORS, HttpClient } from '@angular/common/http';
 import { JwtInterceptor } from './jwt.interceptor';
 import { AuthenticationService } from '../_services/authentication.service';
-import { API_CONFIG } from '../app/api.config';
+import { environment } from '../environments/environment.development';
 
 describe('JwtInterceptor', () => {
     let httpMock: HttpTestingController;
@@ -34,9 +34,9 @@ describe('JwtInterceptor', () => {
     });
 
     it('should add an Authorization header', () => {
-        httpClient.get(`${API_CONFIG.baseUrl}/user/test`).subscribe();
+        httpClient.get(`${environment.apiUrl}/user/test`).subscribe();
 
-        const httpRequest = httpMock.expectOne(`${API_CONFIG.baseUrl}/user/test`);
+        const httpRequest = httpMock.expectOne(`${environment.apiUrl}/user/test`);
 
         expect(httpRequest.request.headers.has('Authorization')).toBeTruthy();
         expect(httpRequest.request.headers.get('Authorization')).toBe('Bearer fake-jwt-token');
@@ -47,9 +47,9 @@ describe('JwtInterceptor', () => {
             userValue: {},
         });
 
-        httpClient.get(`${API_CONFIG.baseUrl}/user/test`).subscribe();
+        httpClient.get(`${environment.apiUrl}/user/test`).subscribe();
 
-        const httpRequest = httpMock.expectOne(`${API_CONFIG.baseUrl}/user/test`);
+        const httpRequest = httpMock.expectOne(`${environment.apiUrl}/user/test`);
 
         expect(httpRequest.request.headers.has('Authorization')).toBeFalsy();
     });

frontend/src/_interceptors/jwt.interceptor.spec.ts

@@ -0,0 +1,11 @@
+export interface UServRes {
+    message: string;
+    data: {
+        id: string;
+        username: string;
+        email: string;
+        accessToken: string;
+        isAdmin: boolean;
+        createdAt: string;
+    };
+}

frontend/src/_models/user.service.response.interface.ts

@@ -1,4 +1,4 @@
-import { API_CONFIG } from '../app/api.config';
+import { environment } from '../environments/environment';
 
 /**
  * Abstract class that serves as a base for API services.
@@ -16,6 +16,6 @@ export abstract class ApiService {
      * the specified apiPath.
      */
     get apiUrl(): string {
-        return API_CONFIG.baseUrl + this.apiPath;
+        return environment.apiUrl + this.apiPath;
     }
 }

frontend/src/_services/api.service.ts

@@ -84,4 +84,29 @@ export class AuthenticationService extends ApiService {
         this.userSubject.next(null);
         this.router.navigate(['/account/login']);
     }
+
+    // get user details from user service for authentication
+    getUserDetails() {
+        return this.http.get<UServRes>(`${this.apiUrl}/users/${this.userValue?.id}`, { observe: 'response' }).pipe(
+            map(response => {
+                if (response.status === 200) {
+                    let user: User = {} as User;
+                    if (response.body) {
+                        const body: UServRes = response.body;
+                        const data = body.data;
+                        user = {
+                            id: data.id,
+                            username: data.username,
+                            email: data.email,
+                            accessToken: data.accessToken,
+                            isAdmin: data.isAdmin,
+                            createdAt: data.createdAt,
+                        };
+                    }
+                    return user;
+                }
+                return null;
+            }),
+        );
+    }
 }