NEDS-188: Merge upstream Domibus version '5.1.6' into AP '2.5.0'

Core/Domibus-MSH-angular/angular.json

@@ -30,7 +30,8 @@
             "buildOptimizer": false,
             "sourceMap": true,
             "optimization": false,
-            "namedChunks": true
+            "namedChunks": true,
+            "baseHref": "/"
           },
           "configurations": {
             "production": {
@@ -48,6 +49,7 @@
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
+              "baseHref": "./",
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,

Core/Domibus-MSH-angular/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.niis</groupId>
     <artifactId>core</artifactId>
-    <version>2.4.0</version>
+    <version>2.5.0</version>
   </parent>
   <artifactId>harmony-msh-angular</artifactId>
   <packaging>jar</packaging>

Core/Domibus-MSH-angular/src/app/app.component.ts

@@ -127,7 +127,16 @@ export class AppComponent implements OnInit {
     console.log('onHttpEventService in app component error=', error)
     if (error && (error.status === Server.HTTP_UNAUTHORIZED || error.status === Server.HTTP_FORBIDDEN)) {
       this.securityService.clearAppData(SessionState.EXPIRED_INACTIVITY_OR_ERROR);
-      this.router.navigate(['/login']);
+
+      // don't go to login page if we are in the login page already
+      let currentRoute = this.router.url;
+      if (currentRoute === '/login' || currentRoute === '/logout') {
+        console.debug('no redirect, staying on current page: ' + currentRoute);
+        return;
+      }
+
+      // don't go to login page if we're using external authentication, go to logout instead
+      this.router.navigate([this.isExtAuthProviderEnabled() ? '/logout' : '/login']);
     }
   }
 

Core/Domibus-MSH-angular/src/app/app.module.ts

@@ -126,6 +126,7 @@ import {NgxMatMomentModule} from '@angular-material-components/moment-adapter';
 import {MatDatepickerModule} from '@angular/material/datepicker';
 import {ManageBackendsComponent} from './messagefilter/manageBackends-form/manageBackends-form.component';
 import {DateService} from './common/customDate/date.service';
+import {HelperService} from './common/helper.service';
 
 const CUSTOM_MOMENT_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -268,6 +269,7 @@ const CUSTOM_MOMENT_FORMATS: NgxMatDateFormats = {
     PluginUserValidatorService,
     DialogsService,
     PropertiesService,
+    HelperService,
     FileUploadValidatorService,
     ApplicationContextService,
     DatePipe,

Core/Domibus-MSH-angular/src/app/common/guards/authenticated-authorized.guard.ts

@@ -19,6 +19,7 @@ export class AuthenticatedAuthorizedGuard {
   async canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
     const isAuthenticated = await this.securityService.isAuthenticated();
     if (!isAuthenticated) {
+      console.log(`[${this.securityService.getCurrentUser()?.username}] not authenticated`);
       this.handleNotAuthenticated();
       return this.getNotAuthenticatedRoute(state);
     }
@@ -42,7 +43,7 @@ export class AuthenticatedAuthorizedGuard {
     } else {
       allowedRoles = routeData.checkRoles
     }
-    return this.securityService.isCurrentUserInRole(allowedRoles);
+    return this.securityService.isCurrentUserInRole(allowedRoles, true /* logWarning */);
   }
 
   private getNotAuthorizedRoute(): UrlTree {
@@ -56,11 +57,12 @@ export class AuthenticatedAuthorizedGuard {
 
   private async getNotAuthenticatedRoute(state: RouterStateSnapshot): Promise<UrlTree> {
     let isExtAuthProvider = await this.domibusInfoService.isExtAuthProviderEnabled();
-    // not logged in so redirect to login page with the return url
     if (!isExtAuthProvider) {
+      // Domibus Login: not logged in so redirect to login page with the return url
       return this.router.createUrlTree(['/login'], {queryParams: {returnUrl: state.url}});
+    } else {
+      // EU Login: redirect to logout
+      return this.router.createUrlTree(['/logout']);
     }
-    // EU Login redirect to logout
-    return this.router.createUrlTree(['/logout']);
   }
 }

Core/Domibus-MSH-angular/src/app/common/helper.service.ts

@@ -0,0 +1,42 @@
+import {Injectable} from '@angular/core';
+import {PropertiesService} from '../properties/support/properties.service';
+
+@Injectable()
+export class HelperService {
+
+  constructor() {
+  }
+
+  arrayBufferToBase64(buffer) {
+    let binary = '';
+    const bytes = new Uint8Array(buffer);
+    const len = bytes.byteLength;
+    for (let i = 0; i < len; i++) {
+      binary += String.fromCharCode(bytes[i]);
+    }
+    return window.btoa(binary);
+  }
+
+  base64ToArrayBuffer(base64) {
+    const binaryString = window.atob(base64);
+    const len = binaryString.length;
+    const bytes = new Uint8Array(len);
+    for (let i = 0; i < len; i++) {
+      bytes[i] = binaryString.charCodeAt(i);
+    }
+    return bytes.buffer;
+  }
+
+  arrayBufferToPem(buffer: ArrayBuffer): string {
+    let binary = '';
+    const bytes = new Uint8Array(buffer);
+    const len = bytes.byteLength;
+    for (let i = 0; i < len; i++) {
+      binary += String.fromCharCode(bytes[i]);
+    }
+    const base64 = window.btoa(binary);
+    return `-----BEGIN PUBLIC KEY-----\n${base64}\n-----END PUBLIC KEY-----`;
+  }
+
+}
+

Core/Domibus-MSH-angular/src/app/common/page-grid/datatable-pager.comonent.ts

@@ -6,28 +6,28 @@ import {PageGridComponent} from './page-grid.component';
   template: `
     <ul class="pager">
       <li [class.disabled]="!canPrevious()">
-        <a role="button" aria-label="go to first page" href="javascript:void(0)" (click)="selectPage(1)">
+        <a role="button" aria-label="go to first page" (click)="selectPage(1)">
           <i class="{{ pagerPreviousIcon }}"></i>
         </a>
       </li>
       <li [class.disabled]="!canPrevious()">
-        <a role="button" aria-label="go to previous page" href="javascript:void(0)" (click)="prevPage()">
+        <a role="button" aria-label="go to previous page" (click)="prevPage()">
           <i class="{{ pagerLeftArrowIcon }}"></i>
         </a>
       </li>
       <li role="button" [attr.aria-label]="'page ' + pg.number" class="pages"
           *ngFor="let pg of pages" [class.active]="pg.number === page">
-        <a href="javascript:void(0)" (click)="selectPage(pg.number)">
+        <a (click)="selectPage(pg.number)">
           {{ pg.text }}
         </a>
       </li>
       <li [class.disabled]="!canNext()">
-        <a role="button" aria-label="go to next page" href="javascript:void(0)" (click)="nextPage()">
+        <a role="button" aria-label="go to next page" (click)="nextPage()">
           <i class="{{ pagerRightArrowIcon }}"></i>
         </a>
       </li>
       <li [class.disabled]="!canNext()">
-        <a role="button" aria-label="go to last page" href="javascript:void(0)" (click)="selectPage(totalPages)">
+        <a role="button" aria-label="go to last page" (click)="selectPage(totalPages)">
           <i class="{{ pagerNextIcon }}"></i>
         </a>
       </li>

Core/Domibus-MSH-angular/src/app/domains/domains.component.ts

@@ -17,6 +17,7 @@ import {DomainService} from '../security/domain.service';
 import {Domain} from '../security/domain';
 import { UserService } from 'app/user/support/user.service';
 import { SecurityService } from 'app/security/security.service';
+import {DomibusInfoService} from "../common/appinfo/domibusinfo.service";
 
 /**
  * @author Ion Perpegel
@@ -37,7 +38,7 @@ export class DomainsComponent extends mix(BaseListComponent).with(ClientPageable
   @ViewChild('monitorStatus') statusTemplate: TemplateRef<any>;
 
   constructor(private alertService: AlertService, private domainService: DomainService, private changeDetector: ChangeDetectorRef,
-              private userService: UserService, private securityService: SecurityService) {
+              private userService: UserService, private securityService: SecurityService, private domibusInfoService: DomibusInfoService) {
     super();
   }
 
@@ -96,11 +97,18 @@ export class DomainsComponent extends mix(BaseListComponent).with(ClientPageable
         if (currentDomain && currentDomain.code == domain.code) {
           throw `Cannot disable the current domain`;
         }
-        let currentUserName: string = (await this.securityService.getCurrentUserFromServer()).username;
-        let users = await this.userService.getUsers();
-        let currentUser = users.find(u => u.userName == currentUserName);
-        if (currentUser.domain == domain.code) {
-          throw `Cannot disable the domain of the current user`;
+
+        const isUserFromExternalAuthProvider = await this.domibusInfoService.isExtAuthProviderEnabled();
+        if (isUserFromExternalAuthProvider) {
+          // don't check the domain of the current user if external auth provider is used, 
+          // as the notion of 'preferred domain' is not the same in this case
+        } else {
+          let currentUserName: string = (await this.securityService.getCurrentUserFromServer()).username;
+          let users = await this.userService.getUsers();
+          let currentUser = users.find(u => u.userName == currentUserName);
+          if (currentUser.domain == domain.code) {
+            throw `Cannot disable the domain of the current user`;
+          }
         }
       }
 

Core/Domibus-MSH-angular/src/app/messagelog/messagelog-details/messagelog-details.component.html

@@ -37,6 +37,10 @@ <h2 mat-dialog-title>Message details</h2>
         <input matInput  value="{{message.downloaded | domibusDate}}" readonly/>
       </mat-form-field>
 
+      <mat-form-field style="width:100%">
+        <mat-label>Acknowledged</mat-label>
+        <input matInput  value="{{message.acknowledged | domibusDate}}" readonly/>
+      </mat-form-field>
 
       <mat-form-field style="width:100%">
         <mat-label>AP Role</mat-label>
@@ -68,6 +72,16 @@ <h2 mat-dialog-title>Message details</h2>
         <input matInput  value="{{message.messageType}}" readonly/>
       </mat-form-field>
 
+      <mat-form-field style="width:100%">
+        <mat-label>Exported</mat-label>
+        <input matInput  value="{{message.exported | domibusDate}}" readonly/>
+      </mat-form-field>
+
+      <mat-form-field style="width:100%">
+        <mat-label>Archived</mat-label>
+        <input matInput  value="{{message.archived | domibusDate}}" readonly/>
+      </mat-form-field>
+
       <mat-form-field style="width:100%">
         <mat-label>Deleted</mat-label>
         <input matInput  value="{{message.deleted | domibusDate }}" readonly/>

Core/Domibus-MSH-angular/src/app/messagelog/messagelog-details/messagelog-details.component.ts

@@ -1,17 +1,37 @@
 import {Component, OnInit, Inject} from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import {HttpClient, HttpParams} from '@angular/common/http';
+import {CustomURLEncoder} from '../../common/custom-url-encoder';
+import {MessageLogComponent} from '../messagelog.component';
+import {MessageLogResult} from '../support/messagelogresult';
 
 @Component({
   selector: 'app-messagelog-details',
-  templateUrl: './messagelog-details.component.html',
-  styleUrls: ['./messagelog-details.component.css']
+  templateUrl: './messagelog-details.component.html'
 })
-export class MessagelogDetailsComponent {
+export class MessagelogDetailsComponent implements OnInit {
 
   message;
 
-  constructor(public dialogRef: MatDialogRef<MessagelogDetailsComponent>, @Inject(MAT_DIALOG_DATA) public data: any) {
+  constructor(public dialogRef: MatDialogRef<MessagelogDetailsComponent>,
+              @Inject(MAT_DIALOG_DATA) public data: any,
+              private http: HttpClient) {
     this.message = data.message;
   }
 
+  async ngOnInit() {
+    if (!this.data.fetchData) {
+      return;
+    }
+    let filterParams = new HttpParams({encoder: new CustomURLEncoder()});
+    filterParams = filterParams.append('messageType', this.message['messageType'])
+    filterParams = filterParams.append('messageId', this.message['messageId'])
+    filterParams = filterParams.append('mshRole', this.message['mshRole'])
+    filterParams = filterParams.append('applyDefaultFilters', 'false')
+    this.data.fields.forEach(field => filterParams = filterParams.append('fields', field));
+    const res = <MessageLogResult>await this.http.get<any>(MessageLogComponent.MESSAGE_LOG_URL, {params: filterParams}).toPromise();
+    if (res && res.count == 1) {
+      this.message = res.messageLogEntries[0];
+    }
+  }
 }

Core/Domibus-MSH-angular/src/app/messagelog/messagelog.component.ts

@@ -257,6 +257,12 @@ export class MessageLogComponent extends mix(BaseListComponent)
         width: 200,
         minWidth: 190
       },
+      {
+        cellTemplate: this.rowWithDateFormatTpl,
+        name: 'Downloaded',
+        width: 200,
+        minWidth: 190
+      },
       {
         name: 'AP Role',
         prop: 'mshRole',
@@ -348,6 +354,12 @@ export class MessageLogComponent extends mix(BaseListComponent)
         width: 100,
         minWidth: 90
       },
+      {
+        cellTemplate: this.rowWithDateFormatTpl,
+        name: 'Acknowledged',
+        width: 200,
+        minWidth: 190
+      },
       {
         cellTemplate: this.rowWithDateFormatTpl,
         name: 'Failed',
@@ -360,6 +372,12 @@ export class MessageLogComponent extends mix(BaseListComponent)
         width: 200,
         minWidth: 190
       },
+      {
+        cellTemplate: this.rowWithDateFormatTpl,
+        name: 'Exported',
+        width: 200,
+        minWidth: 190
+      },
       {
         cellTemplate: this.rowWithDateFormatTpl,
         name: 'Archived',
@@ -653,8 +671,11 @@ export class MessageLogComponent extends mix(BaseListComponent)
   }
 
   showDetails(selectedRow: any) {
+    let allColumns = <any[]>this.columnPicker.allColumns;
+    const allFields = allColumns.map(col => col.prop);
+    let fetchData = allColumns.some(col => !col.isSelected);
     this.dialogsService.open(MessagelogDetailsComponent, {
-      data: {message: selectedRow}
+      data: {message: selectedRow, fields: allFields, fetchData}
     });
   }
 

Core/Domibus-MSH-angular/src/app/properties/properties.component.css

@@ -1,4 +1,3 @@
-
 /* TODO(mdc-migration): The following rule targets internal classes of input that may no longer apply for the MDC version. */
 .panel mat-input-container, .panel mat-select, .panel md2-datepicker, .panel mat-select {
   width: 100% !important;
@@ -7,7 +6,7 @@
 .property-value {
   border: solid 1px transparent;
   padding: 0 4px;
-  width: calc(100% - 84px);
+  width: calc(100% - 100px);
 }
 
 .property-value:focus, .property-value:hover {
@@ -23,12 +22,6 @@
   position: relative;
 }
 
-.property-edit-buttons {
-  position: absolute;
-  top: -6px;
-  right: 0;
-}
-
 .property-edit-buttons.disabled button {
   color: silver;
 }
@@ -49,3 +42,20 @@
   border: solid 0.5px red;
   color: red;
 }
+
+.property-edit-buttons {
+  /*margin-top: -4px;*/
+  position: absolute;
+  top: -6px;
+  right: 0;
+}
+.property-edit-buttons mat-icon {
+  padding-top: 3px;
+}
+
+::ng-deep .ngx-datatable.material .datatable-body .datatable-body-row .datatable-body-cell .mat-mdc-icon-button {
+  /*height: inherit !important;*/
+  margin-top: 0px !important;
+  padding-bottom: 0;
+  padding-top: 0px;
+}