fix-Present the GlobalisationCode and translated it to the local languages as part of the message

	modified:   src/app/core/error-handler/error-handler.service.ts
	modified:   src/app/core/http/error-handler.interceptor.ts

Author: EDSONZ-WASSWA

src/app/core/error-handler/error-handler.service.ts

@@ -29,13 +29,24 @@ import { MatSnackBar } from '@angular/material/snack-bar';
 import { HttpErrorResponse } from '@angular/common/http';
 import { Observable, throwError } from 'rxjs';
 import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 
 export interface ErrorMessage {
   title: string;
   message: string;
   action?: string;
 }
 
+export interface FineractErrorDetail {
+  userMessageGlobalisationCode?: string;
+  defaultUserMessage?: string;
+}
+export interface FineractErrorResponse {
+  userMessageGlobalisationCode?: string;
+  defaultUserMessage?: string;
+  errors?: FineractErrorDetail[];
+}
+
 /**
  * Centralized error handler service for consistent error messaging
  * across the application. Converts HTTP errors into user-friendly
@@ -49,7 +60,9 @@ export class ErrorHandlerService {
     // eslint-disable-next-line @angular-eslint/prefer-inject
     private snackBar: MatSnackBar,
     // eslint-disable-next-line @angular-eslint/prefer-inject
-    private router: Router
+    private router: Router,
+    // eslint-disable-next-line @angular-eslint/prefer-inject
+    private translate: TranslateService
   ) {}
 
   /**
@@ -189,4 +202,58 @@ export class ErrorHandlerService {
       panelClass: ['info-snackbar']
     });
   }
+
+  /**
+   * Translates a Fineract error response into a single, translated message.
+   * Falls back to defaultUserMessage when translation keys are missing.
+   */
+  translateFineractError(errorResponse: FineractErrorResponse | null | undefined): string {
+    if (!errorResponse || typeof errorResponse !== 'object') {
+      return '';
+    }
+
+    const messages: string[] = [];
+
+    if (errorResponse.userMessageGlobalisationCode) {
+      const mainMsg = this.getMessageForCode(
+        errorResponse.userMessageGlobalisationCode,
+        errorResponse.defaultUserMessage
+      );
+      if (mainMsg) {
+        messages.push(mainMsg);
+      }
+    } else if (errorResponse.defaultUserMessage) {
+      messages.push(errorResponse.defaultUserMessage);
+    }
+    if (Array.isArray(errorResponse.errors)) {
+      errorResponse.errors.forEach((error: FineractErrorDetail) => {
+        if (!error || typeof error !== 'object') {
+          return;
+        }
+        if (error.userMessageGlobalisationCode) {
+          const nestedMsg = this.getMessageForCode(error.userMessageGlobalisationCode, error.defaultUserMessage);
+          if (nestedMsg) {
+            messages.push(nestedMsg);
+          }
+        } else if (error.defaultUserMessage) {
+          messages.push(error.defaultUserMessage);
+        }
+      });
+    }
+    const uniqueMessages = Array.from(new Set(messages.filter((m) => !!m && typeof m === 'string')));
+    return uniqueMessages.join(' ');
+  }
+
+  private getMessageForCode(code: string, defaultMessage?: string): string {
+    if (!code) {
+      return defaultMessage || '';
+    }
+
+    const translated = this.translate.instant(code);
+    if (translated && translated !== code) {
+      return translated;
+    }
+
+    return defaultMessage || '';
+  }
 }

src/app/core/http/error-handler.interceptor.ts

@@ -20,7 +20,8 @@ import { environment } from '../../../environments/environment';
 /** Custom Services */
 import { Logger } from '../logger/logger.service';
 import { AlertService } from '../alert/alert.service';
-import { TranslateService } from '@ngx-translate/core'; // Added import for TranslateService
+import { TranslateService } from '@ngx-translate/core';
+import { ErrorHandlerService } from '../error-handler/error-handler.service';
 
 /** Initialize Logger */
 const log = new Logger('ErrorHandlerInterceptor');
@@ -32,6 +33,7 @@ const log = new Logger('ErrorHandlerInterceptor');
 export class ErrorHandlerInterceptor implements HttpInterceptor {
   private alertService = inject(AlertService);
   private translate = inject(TranslateService);
+  private errorHandlerService = inject(ErrorHandlerService);
 
   /**
    * Intercepts a Http request and adds a default error handler.
@@ -45,33 +47,49 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
    */
   private handleError(response: HttpErrorResponse, request: HttpRequest<any>): Observable<HttpEvent<any>> {
     const status = response.status;
-    let errorMessage = response.error.developerMessage || response.message;
-    if (response.error.errors) {
-      if (response.error.errors[0]) {
-        errorMessage = response.error.errors[0].defaultUserMessage || response.error.errors[0].developerMessage;
-      }
-    }
+    const errorBody: any = response.error;
+    const translatedErrorMessage = this.errorHandlerService.translateFineractError(errorBody);
+    const developerMessage: string | undefined = errorBody?.developerMessage;
+    const errorMessage = translatedErrorMessage || errorBody?.defaultUserMessage || response.message;
 
     const isClientImage404 = status === 404 && request.url.includes('/clients/') && request.url.includes('/images');
 
     if (!environment.production && !isClientImage404) {
+      if (developerMessage) {
+        log.error(`Request Error (developerMessage): ${developerMessage}`);
+      }
       log.error(`Request Error: ${errorMessage}`);
     }
 
-    if (status === 401 || (environment.oauth.enabled && status === 400)) {
-      this.alertService.alert({ type: 'Authentication Error', message: 'Invalid User Details. Please try again!' });
-    } else if (status === 403 && errorMessage === 'The provided one time token is invalid') {
-      this.alertService.alert({ type: 'Invalid Token', message: 'Invalid Token. Please try again!' });
-    } else if (status === 400) {
+    // OAuth2 errors for invalid grants are returned as 400, so we need to check the URL.
+    if (status === 401 || (environment.oauth.enabled && status === 400 && request.url.includes('/oauth/token'))) {
       this.alertService.alert({
-        type: 'Bad Request',
-        message: errorMessage || 'Invalid parameters were passed in the request!'
+        type: this.translate.instant('error.resource.authenticationError.type'),
+        message: this.translate.instant('error.resource.authenticationError.message')
       });
-    } else if (status === 403) {
+    } else if (status === 400) {
       this.alertService.alert({
-        type: 'Unauthorized Request',
-        message: errorMessage || 'You are not authorized for this request!'
+        type: this.translate.instant('error.resource.badRequest.type'),
+        message: errorMessage || this.translate.instant('error.resource.badRequest.message')
       });
+    } else if (status === 403) {
+      // The token check must use a stable identifier, not the translated message.
+      const isInvalidToken =
+        errorBody?.userMessageGlobalisationCode === 'error.msg.invalid.onetime.token' ||
+        errorBody?.defaultUserMessage === 'The provided one time token is invalid' ||
+        errorMessage === 'The provided one time token is invalid';
+
+      if (isInvalidToken) {
+        this.alertService.alert({
+          type: this.translate.instant('error.resource.invalidToken.type'),
+          message: this.translate.instant('error.resource.invalidToken.message')
+        });
+      } else {
+        this.alertService.alert({
+          type: this.translate.instant('error.resource.unauthorizedRequest.type'),
+          message: errorMessage || this.translate.instant('error.resource.unauthorizedRequest.message')
+        });
+      }
     } else if (status === 404) {
       // Check if this is an image request that should be silently handled (client profile image)
       if (isClientImage404) {
@@ -81,21 +99,24 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
       } else {
         this.alertService.alert({
           type: this.translate.instant('error.resource.not.found'),
-          message: errorMessage || 'Resource does not exist!'
+          message: errorMessage || this.translate.instant('error.resource.notFound.message')
         });
       }
     } else if (status === 500) {
       this.alertService.alert({
-        type: 'Internal Server Error',
-        message: 'Internal Server Error. Please try again later.'
+        type: this.translate.instant('error.resource.internalServerError.type'),
+        message: this.translate.instant('error.resource.internalServerError.message')
       });
     } else if (status === 501) {
       this.alertService.alert({
         type: this.translate.instant('error.resource.notImplemented.type'),
         message: this.translate.instant('error.resource.notImplemented.message')
       });
     } else {
-      this.alertService.alert({ type: 'Unknown Error', message: 'Unknown Error. Please try again later.' });
+      this.alertService.alert({
+        type: this.translate.instant('error.resource.unknownError.type'),
+        message: errorMessage || this.translate.instant('error.resource.unknownError.message')
+      });
     }
 
     throw response;

src/assets/translations/cs-CS.json

@@ -4,6 +4,8 @@
   "Remember me": "Zapamatuj si mě",
   "error.resource.notImplemented.type": "Nenaimplementovaná chyba",
   "error.resource.notImplemented.message": "Funkce není implementována!",
+  "error.msg.platform.service.unavailable": "Server je v současné chvíli neschopen zpracovat požadavek. Zkuste to prosím později.",
+  "error.msg.database.type.not.supported": "Datový typ není podporován",
   "errors": {
     "accountingRule": {
       "duplicateName": "Omlouváme se, ale účetní pravidlo s tímto názvem již existuje."

src/assets/translations/de-DE.json

@@ -4,6 +4,8 @@
   "Remember me": "Erinnere dich an mich",
   "error.resource.notImplemented.type": "Nicht implementierter Fehler",
   "error.resource.notImplemented.message": "Nicht implementierte Funktion!",
+  "error.msg.platform.service.unavailable": "Der Server kann die Anfrage derzeit nicht bearbeiten. Bitte versuchen Sie es später erneut.",
+  "error.msg.database.type.not.supported": "Der Datentyp wird nicht unterstützt",
   "errors": {
     "accountingRule": {
       "duplicateName": "Entschuldigung, aber eine Buchungsregel mit diesem Namen existiert bereits."

src/assets/translations/en-US.json

@@ -4,6 +4,8 @@
   "Remember me": "Remember me",
   "error.resource.notImplemented.type": "Not Implemented Error",
   "error.resource.notImplemented.message": "Not implemented functionality!",
+  "error.msg.platform.service.unavailable": "The server is currently unable to handle the request, please try again after some time.",
+  "error.msg.database.type.not.supported": "Data type is not supported",
   "errors": {
     "accountingRule": {
       "duplicateName": "Sorry, but an Accounting Rule with this Name exists already."

src/assets/translations/es-CL.json

@@ -2,6 +2,8 @@
   "APP_NAME": "Mifos® X WebApp",
   "Logged in as": "Conectado como",
   "Remember me": "Recordar me",
+  "error.msg.platform.service.unavailable": "El servidor no puede procesar la solicitud en este momento. Por favor, inténtelo de nuevo más tarde.",
+  "error.msg.database.type.not.supported": "El tipo de dato no es compatible.",
   "errors": {
     "accountingRule": {
       "duplicateName": "Lo sentimos, pero ya existe una regla contable con este nombre."

src/assets/translations/es-MX.json

@@ -2,6 +2,8 @@
   "APP_NAME": "Mifos® X WebApp",
   "Logged in as": "Conectado como",
   "Remember me": "Recordar me",
+  "error.msg.platform.service.unavailable": "El servidor no puede procesar la solicitud en este momento. Por favor, intente más tarde.",
+  "error.msg.database.type.not.supported": "El tipo de datos no es compatible",
   "errors": {
     "accountingRule": {
       "duplicateName": "Lo sentimos, pero ya existe una regla contable con este nombre."

src/assets/translations/fr-FR.json

@@ -2,6 +2,8 @@
   "APP_NAME": "Mifos® X WebApp",
   "Logged in as": "connecté en tant que",
   "Remember me": "Souviens-toi de moi",
+  "error.msg.platform.service.unavailable": "Le serveur est actuellement incapable de traiter la requête, veuillez réessayer ultérieurement.",
+  "error.msg.database.type.not.supported": "Le type de données n'est pas pris en charge",
   "errors": {
     "accountingRule": {
       "duplicateName": "Désolé, mais une règle comptable portant ce nom existe déjà."

src/assets/translations/it-IT.json

@@ -2,6 +2,8 @@
   "APP_NAME": "Mifos® X WebApp",
   "Logged in as": "Collegato come",
   "Remember me": "Ricordati di me",
+  "error.msg.platform.service.unavailable": "Il server non può elaborare la richiesta in questo momento. Si prega di riprovare più tardi.",
+  "error.msg.database.type.not.supported": "Il tipo di dati non è supportato",
   "errors": {
     "accountingRule": {
       "duplicateName": "Spiacenti, ma esiste già una regola contabile con questo nome."

src/assets/translations/ko-KO.json

@@ -2,6 +2,8 @@
   "APP_NAME": "Mifos® X WebApp",
   "Logged in as": "다음 계정으로 로그인됨",
   "Remember me": "날 기억해",
+  "error.msg.platform.service.unavailable": "서버가 현재 요청을 처리할 수 없습니다. 나중에 다시 시도해주세요.",
+  "error.msg.database.type.not.supported": "지원하지 않는 데이터 유형입니다",
   "errors": {
     "accountingRule": {
       "duplicateName": "죄송합니다. 이미 동일한 이름의 회계 규칙이 존재합니다."