[TECH] Fix theme default logo

ui/ui-frontend-common/src/app/modules/components/navbar/navbar.component.html

 <nav class="vitamui-navbar">
   <a href="{{portalUrl}}" class="vitamui-navbar-logo">
-    <img [src]="trustedAppLogoUrl">
+    <img [src]="trustedAppLogoUrl ? trustedAppLogoUrl : '/assets/logo.png'">
   </a>
 
   <ul class="menu">

ui/ui-frontend-common/src/app/modules/components/navbar/navbar.component.spec.ts

@@ -108,7 +108,7 @@ describe('NavbarComponent', () => {
 
   beforeEach(async(() => {
     const authServiceStub = { logout: () => { } };
-    const startupServiceStub = { getPortalUrl: () => { }, getLogo: () => { } };
+    const startupServiceStub = { getPortalUrl: () => { }, getLogo: () => { }, getAppLogoURL: () => { } , getCustomerLogoURL: () => { }  };
 
     TestBed.configureTestingModule({
       imports: [

ui/ui-frontend-common/src/app/modules/components/navbar/navbar.component.ts

@@ -82,16 +82,13 @@ export class NavbarComponent {
     this.portalUrl = startupService.getPortalUrl();
     this.base64Logo = startupService.getLogo();
 
-    if (this.base64Logo) {
-      this.trustedAppLogoUrl = this.domSanitizer.bypassSecurityTrustUrl('data:image/*;base64,' + this.base64Logo);
-    }
+    this.trustedAppLogoUrl = startupService.getAppLogoURL() ?
+    this.domSanitizer.bypassSecurityTrustUrl('data:image/*;base64,' + startupService.getAppLogoURL()) : null;
 
     if (this.authService.user) {
       this.currentUser = this.authService.user;
-      if (this.currentUser.basicCustomer) {
-        this.trustedInlineLogoUrl = this.domSanitizer.bypassSecurityTrustUrl('data:image/*;base64,' +
-                                                                        this.currentUser.basicCustomer.graphicIdentity.logoDataBase64);
-      }
+      this.trustedInlineLogoUrl = startupService.getCustomerLogoURL() ?
+      this.domSanitizer.bypassSecurityTrustUrl('data:image/*;base64,' + startupService.getCustomerLogoURL()) : null;
       this.hasAccountProfile = this.authService.user.profileGroup.profiles.find((profile) =>
                                                                   profile.applicationName === ApplicationId.ACCOUNTS_APP) !== undefined;
     }

ui/ui-frontend-common/src/app/modules/error-dialog/error-dialog.component.html

 <div class="error-message">
-  <img class="vitamui-logo" src="/assets/vitamui-logo.png">
+  <img class="vitamui-logo" [src]="trustedAppLogoUrl ? trustedAppLogoUrl : '/assets/logo.png'">
+
   <h2 i18n="@@serverErrorTitle">Erreur serveur interne (500)</h2>
   <p i18n="@@serverErrorMessage">Une erreur interne s'est produite. Veuillez contacter un administrateur si le problème persiste.</p>
 

ui/ui-frontend-common/src/app/modules/error-dialog/error-dialog.component.spec.ts

@@ -36,6 +36,8 @@
  */
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatDialogRef } from '@angular/material/dialog';
+import { LoggerModule } from './../logger/logger.module';
+import { StartupService } from './../startup.service';
 
 import { ErrorDialogComponent } from './error-dialog.component';
 
@@ -44,10 +46,16 @@ describe('ErrorDialogComponent', () => {
   let fixture: ComponentFixture<ErrorDialogComponent>;
 
   beforeEach(async(() => {
+    const startupServiceStub = { getPortalUrl: () => { }, getLogo: () => { }, getAppLogoURL: () => { } , getCustomerLogoURL: () => { }  };
+
     TestBed.configureTestingModule({
+      imports: [
+        LoggerModule.forRoot()
+      ],
       declarations: [ ErrorDialogComponent ],
       providers: [
         { provide: MatDialogRef, useValue: {} },
+        { provide: StartupService, useValue: startupServiceStub },
       ]
     })
     .compileComponents();

ui/ui-frontend-common/src/app/modules/error-dialog/error-dialog.component.ts

@@ -36,6 +36,9 @@
  */
 import { Component, OnInit } from '@angular/core';
 import { MatDialogRef } from '@angular/material/dialog';
+import { DomSanitizer } from '@angular/platform-browser';
+import { SafeUrl } from '@angular/platform-browser';
+import { StartupService } from './../startup.service';
 
 @Component({
   selector: 'vitamui-common-error-dialog',
@@ -44,7 +47,15 @@ import { MatDialogRef } from '@angular/material/dialog';
 })
 export class ErrorDialogComponent implements OnInit {
 
-  constructor(private matDialogRef: MatDialogRef<ErrorDialogComponent>) { }
+  trustedAppLogoUrl: SafeUrl;
+
+  constructor(private matDialogRef: MatDialogRef<ErrorDialogComponent>,
+              startupService: StartupService,
+              private domSanitizer: DomSanitizer) {
+
+    this.trustedAppLogoUrl = startupService.getAppLogoURL() ?
+    this.domSanitizer.bypassSecurityTrustUrl('data:image/*;base64,' + startupService.getAppLogoURL()) : null;
+  }
 
   ngOnInit() {
   }

ui/ui-frontend-common/src/app/modules/startup.service.ts

@@ -153,6 +153,30 @@ export class StartupService {
     }
   }
 
+  getAppLogoURL(): string {
+    let trustedAppLogoUrl = null;
+    const base64Logo = this.getLogo();
+
+    if (base64Logo) {
+      trustedAppLogoUrl = base64Logo;
+    }
+
+    return trustedAppLogoUrl;
+  }
+
+  getCustomerLogoURL(): string {
+    let trustedInlineLogoUrl = null;
+
+    if (this.authService.user) {
+      const currentUser = this.authService.user;
+      if (currentUser.basicCustomer) {
+        trustedInlineLogoUrl = currentUser.basicCustomer.graphicIdentity.logoDataBase64;
+      }
+    }
+
+    return trustedInlineLogoUrl;
+  }
+
   getPortalUrl(): string {
     if (this.configurationLoaded()) {
       return this.configurationData.PORTAL_URL;