Merge remote-tracking branch 'origin/development' into development

.gitattributes

+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text=auto
+
+#
+# The above will handle all files NOT found below
+#
+# These files are text and should be normalized (Convert crlf => lf)
+*.css           text
+*.df            text
+*.htm           text
+*.html          text
+*.java          text
+*.js            text
+*.json          text
+*.jsp           text
+*.jspf          text
+*.jspx          text
+*.properties    text
+*.sh            text
+*.tld           text
+*.txt           text
+*.tag           text
+*.tagx          text
+*.xml           text
+*.yml           text
+
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.class         binary
+*.dll           binary
+*.ear           binary
+*.gif           binary
+*.ico           binary
+*.jar           binary
+*.jpg           binary
+*.jpeg          binary
+*.png           binary
+*.so            binary
+*.war           binary
+
+# Custom SMP configuration
+*.crt           text            eol=lf
\ No newline at end of file

README.md

 # Service Metadata Publishing
 
-## Continous Integration
+## Continuous Integration
 
 [https://webgate.ec.europa.eu/CITnet/bamboo/browse/EDELIVERY-SMPDEV]
 

smp-angular/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
         <groupId>eu.europa.ec.edelivery</groupId>
         <artifactId>smp-parent-pom</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>4.1.0-RC2-SNAPSHOT</version>
         <relativePath>../smp-parent-pom/pom.xml</relativePath>
     </parent>
   <artifactId>smp-angular</artifactId>

smp-angular/src/app/app.component.html

@@ -10,32 +10,31 @@
     </div>
 
     <button mat-raised-button class="sideNavButton" [routerLink]="['/']" id="sidebar_search_id">
-      <mat-icon matTooltip="Search" matTooltipDisabled="{{fullMenu}}" matTooltipDisabled="right">search</mat-icon>
+      <mat-icon matTooltip="Search" matTooltipDisabled="{{fullMenu}}" [matTooltipPosition]="'right'">search</mat-icon>
       <span>Search</span>
     </button>
-    <button mat-raised-button class="sideNavButton" *ngIf="isCurrentUserSMPAdmin() || isCurrentUserServiceGroupAdmin()"  [routerLink]="['/edit']" id="sidebar_edit_id">
-      <mat-icon matTooltip="Edit" matTooltipDisabled="{{fullMenu}}" matTooltipDisabled="right">edit</mat-icon>
+    <button mat-raised-button class="sideNavButton" *ngIf="isCurrentUserSMPAdmin() || isCurrentUserServiceGroupAdmin()" [routerLink]="['/edit']" id="sidebar_edit_id">
+      <mat-icon matTooltip="Edit" matTooltipDisabled="{{fullMenu}}" [matTooltipPosition]="'right'">edit</mat-icon>
       <span>Edit</span>
     </button>
-    <button mat-raised-button class="sideNavButton" [routerLink]="['/domain']"  *ngIf="isCurrentUserSystemAdmin()" id="sidebar_domain_id">
-      <mat-icon matTooltip="Domain" matTooltipDisabled="{{fullMenu}}" matTooltipDisabled="right">domain</mat-icon>
+    <button mat-raised-button class="sideNavButton" [routerLink]="['/domain']" *ngIf="isCurrentUserSystemAdmin()" id="sidebar_domain_id">
+      <mat-icon matTooltip="Domain" matTooltipDisabled="{{fullMenu}}" [matTooltipPosition]="'right'">domain</mat-icon>
       <span>Domain</span>
     </button>
 
     <!-- button mat-raised-button class="sideNavButton" [routerLink]="['/user']" *ngIf="hasAdmin()" id="user_id" -->
-    <button mat-raised-button class="sideNavButton" [routerLink]="['/user']" *ngIf="isCurrentUserSystemAdmin()"  id="sidebar_user_id">
-      <mat-icon matTooltip="Users" matTooltipDisabled="{{fullMenu}}" matTooltipDisabled="right">people</mat-icon>
+    <button mat-raised-button class="sideNavButton" [routerLink]="['/user']" *ngIf="isCurrentUserSystemAdmin()" id="sidebar_user_id">
+      <mat-icon matTooltip="Users" matTooltipDisabled="{{fullMenu}}" [matTooltipPosition]="'right'">people</mat-icon>
       <span>Users</span>
     </button>
 
-
     <div class="collapse-button">
       <button *ngIf="fullMenu" mat-raised-button id="expand_id" (click)="toggleMenu()">
-        <mat-icon matTooltip="Collapse" matTooltipDisabled="right">chevron_left</mat-icon>
+        <mat-icon matTooltip="Collapse" [matTooltipPosition]="'right'">chevron_left</mat-icon>
       </button>
 
       <button *ngIf="!fullMenu" mat-raised-button id="collapse_id" (click)="toggleMenu()">
-        <mat-icon matTooltip="Esxpand" matTooltipDisabled="right">chevron_right</mat-icon>
+        <mat-icon matTooltip="Expand" [matTooltipPosition]="'right'">chevron_right</mat-icon>
       </button>
     </div>
 
@@ -61,22 +60,19 @@
     <alert style=" left:220px; top:0;right:0;z-index: 500"></alert>
 
     <div  id="sandwichMenuHolder" style="z-index: 500">
-
-
       <div id="sandwichMenu">
 
         <a *ngIf="!currentUser" [routerLink]="['/login']" > Login   </a>
-        <span *ngIf="currentUser" >{{getCurrentUserRoleDescription}}: {{currentUser}}  </span >
+        <span *ngIf="currentUser" >{{currentUserRoleDescription}}: {{currentUser}}  </span >
 
         <button mat-icon-button [mat-menu-trigger-for]="settingsMenu" id="settingsmenu_id" matTooltip="Menu">
           <mat-icon>menu</mat-icon>
         </button>
 
         <mat-menu x-position="before" #settingsMenu="matMenu">
-
           <div *ngIf="currentUser">
 
-            <button mat-menu-item disabled="true" id="currentuser_id">
+            <button mat-menu-item id="currentuser_id" (click)="editCurrentUser()">
               <mat-icon>person</mat-icon>
               <span>{{currentUser}}</span>
             </button>
@@ -96,7 +92,6 @@
               <span>Not logged in</span>
             </button>
           </div>
-
         </mat-menu>
       </div>
     </div>
@@ -104,7 +99,5 @@
     <div fxFill="100" id="routerHolder" style="min-height: 100%" >
         <router-outlet></router-outlet>
     </div>
-
   </div>
-
 </mat-sidenav-container>

smp-angular/src/app/app.component.ts

-import {Component, OnInit, ViewChild} from '@angular/core';
+import {Component, ViewChild} from '@angular/core';
 import {SecurityService} from './security/security.service';
-import {Router, RouterOutlet} from '@angular/router';
-import {SecurityEventService} from './security/security-event.service';
-import {Title} from '@angular/platform-browser';
-import {HttpClient, HttpResponse} from '@angular/common/http';
+import {Router} from '@angular/router';
 import {Authority} from "./security/authority.model";
-
+import {AlertService} from "./alert/alert.service";
+import {MatDialog, MatDialogRef} from "@angular/material";
+import {GlobalLookups} from "./common/global-lookups";
+import {UserController} from "./user/user-controller";
+import {HttpClient} from "@angular/common/http";
+import {SearchTableEntityStatus} from "./common/search-table/search-table-entity-status.model";
+import {SmpConstants} from "./smp.constants";
+import {UserService} from "./user/user.service";
+import {UserDetailsDialogMode} from "./user/user-details-dialog/user-details-dialog.component";
 
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.css']
 })
-export class AppComponent implements OnInit {
+export class AppComponent {
 
-  _currentUser: string;
   fullMenu: boolean = true;
   menuClass: string = this.fullMenu ? "menu-expanded" : "menu-collapsed";
-
-  @ViewChild(RouterOutlet)
-  outlet: RouterOutlet;
-
-  constructor(private securityService: SecurityService,
-              private router: Router,
-              private securityEventService: SecurityEventService,
-              private http: HttpClient,
-              private titleService: Title) {
-
-  }
-
-  ngOnInit() {
+  userController: UserController;
+
+  constructor(
+    private securityService: SecurityService,
+    private router: Router,
+    private http: HttpClient,
+    private dialog: MatDialog,
+    private lookups: GlobalLookups,
+    private userService: UserService,
+  ) {
+    this.userController = new UserController(this.http, this.lookups, this.dialog);
   }
 
   isCurrentUserSystemAdmin(): boolean {
@@ -39,44 +41,55 @@ export class AppComponent implements OnInit {
   isCurrentUserSMPAdmin(): boolean {
     return this.securityService.isCurrentUserInRole([ Authority.SMP_ADMIN]);
   }
+
   isCurrentUserServiceGroupAdmin(): boolean {
     return this.securityService.isCurrentUserInRole([ Authority.SERVICE_GROUP_ADMIN]);
   }
 
+  editCurrentUser() {
+    const formRef: MatDialogRef<any> = this.userController.newDialog({
+      data: {mode: UserDetailsDialogMode.PREFERENCES_MODE, row: this.securityService.getCurrentUser()}
+    });
+    formRef.afterClosed().subscribe(result => {
+      if (result) {
+        const user = {...formRef.componentInstance.getCurrent(), status: SearchTableEntityStatus.UPDATED};
+        this.userService.updateUser(user);
+      }
+    });
+  }
+
   get currentUser(): string {
     let user = this.securityService.getCurrentUser();
     return user ? user.username : "";
   }
 
-
-  get getCurrentUserRoleDescription(): string {
+  get currentUserRoleDescription(): string {
       if (this.securityService.isCurrentUserSystemAdmin()){
         return "System administrator";
       } else if (this.securityService.isCurrentUserSMPAdmin()){
         return "SMP administrator";
       } else if (this.securityService.isCurrentUserServiceGroupAdmin()){
-        return "Service group administrator"
+        return "Service group administrator";
       }
       return "";
   }
 
-
   logout(event: Event): void {
     event.preventDefault();
     this.router.navigate(['/search']).then((ok) => {
       if (ok) {
         this.securityService.logout();
       }
-    })
+    });
   }
 
   toggleMenu() {
-    this.fullMenu = !this.fullMenu
-    this.menuClass = this.fullMenu ? "menu-expanded" : "menu-collapsed"
+    this.fullMenu = !this.fullMenu;
+    this.menuClass = this.fullMenu ? "menu-expanded" : "menu-collapsed";
     setTimeout(() => {
-      var evt = document.createEvent("HTMLEvents")
-      evt.initEvent('resize', true, false)
-      window.dispatchEvent(evt)
+      var evt = document.createEvent("HTMLEvents");
+      evt.initEvent('resize', true, false);
+      window.dispatchEvent(evt);
     }, 500)
     //ugly hack but otherwise the ng-datatable doesn't resize when collapsing the menu
     //alternatively this can be tried (https://github.com/swimlane/ngx-datatable/issues/193) but one has to implement it on every page

smp-angular/src/app/app.module.ts

@@ -69,13 +69,14 @@ import {ServiceGroupMetadataDialogComponent} from './service-group-edit/service-
 import {DomainDetailsDialogComponent} from './domain/domain-details-dialog/domain-details-dialog.component';
 import {UserDetailsDialogComponent} from './user/user-details-dialog/user-details-dialog.component';
 import {DownloadService} from './download/download.service';
-import {UserService} from './user/user.service';
 import {CertificateService} from './user/certificate.service';
 import {GlobalLookups} from "./common/global-lookups";
 import {ServiceGroupExtensionWizardDialogComponent} from "./service-group-edit/service-group-extension-wizard-dialog/service-group-extension-wizard-dialog.component";
 import {ServiceMetadataWizardDialogComponent} from "./service-group-edit/service-metadata-wizard-dialog/service-metadata-wizard-dialog.component";
 import {ConfirmationDialogComponent} from "./common/confirmation-dialog/confirmation-dialog.component";
 import {SpinnerComponent} from "./common/spinner/spinner.component";
+import {UserService} from "./user/user.service";
+import {UserDetailsService} from "./user/user-details-dialog/user-details.service";
 
 @NgModule({
   declarations: [
@@ -162,10 +163,11 @@ import {SpinnerComponent} from "./common/spinner/spinner.component";
     SmpInfoService,
     AlertService,
     DownloadService,
-    UserService,
     CertificateService,
     GlobalLookups,
     DatePipe,
+    UserService,
+    UserDetailsService,
     {
       provide: ExtendedHttpClient,
       useFactory: extendedHttpClientCreator,

smp-angular/src/app/app.routes.ts

@@ -6,14 +6,15 @@ import {DomainComponent} from './domain/domain.component';
 import {AuthenticatedGuard} from './guards/authenticated.guard';
 import {UserComponent} from './user/user.component';
 import {DirtyGuard} from "./common/dirty.guard";
+import {AuthorizedAdminGuard} from "./guards/authorized-admin.guard";
 
 
 const appRoutes: Routes = [
   {path: '', component: ServiceGroupSearchComponent},
   {path: 'search', redirectTo: ''},
   {path: 'edit', component: ServiceGroupEditComponent,  canActivate: [AuthenticatedGuard],  canDeactivate: [DirtyGuard]},
-  {path: 'domain', component: DomainComponent, canActivate: [AuthenticatedGuard], canDeactivate: [DirtyGuard]},
-  {path: 'user', component: UserComponent, canDeactivate: [DirtyGuard]},
+  {path: 'domain', component: DomainComponent, canActivate: [AuthenticatedGuard, AuthorizedAdminGuard], canDeactivate: [DirtyGuard]},
+  {path: 'user', component: UserComponent, canActivate: [AuthenticatedGuard, AuthorizedAdminGuard], canDeactivate: [DirtyGuard]},
   {path: 'login', component: LoginComponent},
   {path: '**', redirectTo: ''}
 ];

smp-angular/src/app/common/search-table/search-table-controller.ts

@@ -10,4 +10,11 @@ export interface SearchTableController {
   newRow(): SearchTableEntity;
   newDialog(config?: MatDialogConfig): MatDialogRef<any>;
   dataSaved();
+
+  /**
+   * Returns whether the row expander should be shown as disabled even when the actual row is not fully disabled.
+   *
+   * @param row the row for which the row expander should be disabled or not
+   */
+  isRowExpanderDisabled(row: SearchTableEntity): boolean;
 }

smp-angular/src/app/common/search-table/search-table.component.html

@@ -85,8 +85,8 @@
     </ng-template>
 
     <ng-template #rowExpand let-row="row" let-expanded="expanded" let-disabled="disabled" ngx-datatable-cell-template >
-      <span *ngIf="disabled">( )</span>
-      <a *ngIf="!disabled" class="table-button-expand"
+      <span *ngIf="isRowExpanderDisabled(row, disabled)">()</span>
+      <a *ngIf="!isRowExpanderDisabled(row, disabled)" class="table-button-expand"
         href="javascript:void(0)"
         title="Expand/Collapse Row"
         (click)="toggleExpandRow(row)">{{expanded?'(-)':'(+)'}}

smp-angular/src/app/common/search-table/search-table.component.ts

@@ -332,6 +332,10 @@ export class SearchTableComponent implements OnInit {
     return !(!this.submitButtonsEnabled || this.forceRefresh);
   }
 
+  isRowExpanderDisabled(row: any, rowDisabled: boolean): boolean {
+    return rowDisabled || this.searchTableController.isRowExpanderDisabled(row);
+  }
+
   private editSearchTableEntity(rowNumber: number) {
     const row = this.rows[rowNumber];
     const formRef: MatDialogRef<any> = this.searchTableController.newDialog({

smp-angular/src/app/domain/domain-controller.ts

@@ -61,4 +61,8 @@ export class DomainController implements SearchTableController {
       stringMessage: '',
     }
   }
+
+  isRowExpanderDisabled(row: SearchTableEntity): boolean {
+    return false;
+  }
 }

smp-angular/src/app/domain/domain.component.html

@@ -2,7 +2,7 @@
 <smp-search-table
   #searchTable
   page_id= 'domain_id'
-  title= 'Domains'
+  [title]= "'Domains'"
   [columnPicker] = "columnPicker"
   [url]="baseUrl"
   [additionalToolButtons]="additionalToolButtons"

smp-angular/src/app/guards/authenticated.guard.ts

@@ -10,7 +10,6 @@ export class AuthenticatedGuard implements CanActivate {
   }
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
-
     const subject = new ReplaySubject<boolean>();
     this.securityService.isAuthenticated(true).subscribe((isAuthenticated: boolean) => {
       if(isAuthenticated) {

smp-angular/src/app/guards/authorized-admin.guard.ts

@@ -17,7 +17,6 @@ export class AuthorizedAdminGuard extends AuthorizedGuard {
 
 
   getAllowedRoles(route: ActivatedRouteSnapshot): Array<Authority> {
-    // TODO check if we need the SMP admin in here
-    return [Authority.SYSTEM_ADMIN , Authority.SMP_ADMIN];
+    return [Authority.SYSTEM_ADMIN];
   }
 }

smp-angular/src/app/guards/authorized.guard.ts

@@ -11,7 +11,6 @@ export class AuthorizedGuard implements CanActivate {
   }
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
-
     console.debug("AuthorizedGuard");
     let allowedRoles = this.getAllowedRoles(route);
     let subject = new ReplaySubject<boolean>();

smp-angular/src/app/security/security.service.ts

@@ -9,11 +9,12 @@ import {Authority} from "./authority.model";
 @Injectable()
 export class SecurityService {
 
+  readonly LOCAL_STORAGE_KEY_CURRENT_USER = 'currentUser';
+
   constructor (private http: HttpClient, private securityEventService: SecurityEventService) {
   }
 
   login(username: string, password: string) {
-
     let headers: HttpHeaders = new HttpHeaders({'Content-Type': 'application/json'});
     return this.http.post<string>(SmpConstants.REST_SECURITY_AUTHENTICATION,
       JSON.stringify({
@@ -22,21 +23,16 @@ export class SecurityService {
       }),
       { headers })
       .subscribe((response: string) => {
-          console.log('Login success');
-          localStorage.setItem('currentUser', JSON.stringify(response));
-          this.securityEventService.notifyLoginSuccessEvent(response);
+          this.updateUserDetails(response);
         },
         (error: any) => {
-          console.log('Login error');
           this.securityEventService.notifyLoginErrorEvent(error);
         });
   }
 
   logout() {
-    console.log('Logging out');
-   // this.domainService.resetDomain();
     this.http.delete(SmpConstants.REST_SECURITY_AUTHENTICATION).subscribe((res: Response) => {
-        localStorage.removeItem('currentUser');
+        this.clearLocalStorage();
         this.securityEventService.notifyLogoutSuccessEvent(res);
       },
       (error: any) => {
@@ -46,8 +42,7 @@ export class SecurityService {
   }
 
   getCurrentUser(): User {
-    let userObj = localStorage.getItem('currentUser');
-    return JSON.parse(localStorage.getItem('currentUser'));
+    return JSON.parse(this.readLocalStorage());
   }
 
   private getCurrentUsernameFromServer(): Observable<string> {
@@ -66,12 +61,12 @@ export class SecurityService {
     let subject = new ReplaySubject<boolean>();
     if (callServer) {
       //we get the username from the server to trigger the redirection to the login screen in case the user is not authenticated
-      this.getCurrentUsernameFromServer()
-        .subscribe((user: string) => {
-          console.log('isAuthenticated: getCurrentUsernameFromServer [' + user + ']');
+      this.getCurrentUsernameFromServer().subscribe((user: string) => {
+          if(!user) {
+            this.clearLocalStorage();
+          }
           subject.next(user !== null);
         }, (user: string) => {
-          console.log('isAuthenticated error' + user);
           subject.next(false);
         });
 
@@ -89,6 +84,7 @@ export class SecurityService {
   isCurrentUserSMPAdmin(): boolean {
     return this.isCurrentUserInRole([ Authority.SMP_ADMIN]);
   }
+
   isCurrentUserServiceGroupAdmin(): boolean {
     return this.isCurrentUserInRole([ Authority.SERVICE_GROUP_ADMIN]);
   }
@@ -105,7 +101,6 @@ export class SecurityService {
     }
     return hasRole;
   }
-
   isAuthorized(roles: Array<Authority>): Observable<boolean> {
     let subject = new ReplaySubject<boolean>();
 
@@ -117,4 +112,21 @@ export class SecurityService {
     });
     return subject.asObservable();
   }
+
+  updateUserDetails(userDetails) {
+    this.populateLocalStorage(JSON.stringify(userDetails));
+    this.securityEventService.notifyLoginSuccessEvent(userDetails);
+  }
+
+  private populateLocalStorage(userDetails: string) {
+    localStorage.setItem(this.LOCAL_STORAGE_KEY_CURRENT_USER, userDetails);
+  }
+
+  private readLocalStorage(): string {
+    return localStorage.getItem(this.LOCAL_STORAGE_KEY_CURRENT_USER);
+  }
+
+  private clearLocalStorage() {
+    localStorage.removeItem(this.LOCAL_STORAGE_KEY_CURRENT_USER);
+  }
 }

smp-angular/src/app/service-group-edit/service-group-edit-controller.ts

@@ -8,6 +8,7 @@ import {ServiceGroupMetadataDialogComponent} from "./service-group-metadata-dial
 import {of} from "rxjs/internal/observable/of";
 import {SearchTableValidationResult} from "../common/search-table/search-table-validation-result.model";
 import {SearchTableEntity} from "../common/search-table/search-table-entity.model";
+import {ServiceGroupSearchRo} from "../service-group-search/service-group-search-ro.model";
 
 export class ServiceGroupEditController implements SearchTableController {
 
@@ -84,4 +85,8 @@ export class ServiceGroupEditController implements SearchTableController {
     }
   }
 
+  isRowExpanderDisabled(row: ServiceGroupEditRo): boolean {
+    const serviceGroup = <ServiceGroupEditRo>row;
+    return !(serviceGroup.serviceMetadata && serviceGroup.serviceMetadata.length);
+  }
 }

smp-angular/src/app/service-group-edit/service-group-edit.component.html

 <smp-search-table #searchTable
   page_id='edit_id'
-  title='Edit'
+  [title]="'Edit'"
   [columnPicker]="columnPicker"
   [url]="baseUrl"
   [additionalToolButtons]="additionalToolButtons"

smp-angular/src/app/service-group-edit/service-group-metadata-dialog/service-group-metadata-dialog.component.html

@@ -28,7 +28,7 @@
 
           <mat-form-field  style="width:30%">
             <input matInput placeholder="Document identifier scheme" name="documentScheme"  id="documentScheme_id"
-                   [formControl]="dialogForm.controls['documentIdentifierScheme']"  maxlength="255" required>
+                   [formControl]="dialogForm.controls['documentIdentifierScheme']"  maxlength="255" >
           </mat-form-field>
             <mat-form-field style="width:55%">
               <input matInput placeholder="Document identifier" name="documentIdentifier"  id="documentIdentifier_id"