From 59bea0e3653ee7e026d2e700d4b118b5d92dbda7 Mon Sep 17 00:00:00 2001
From: Steven Zou <szou@vmware.com>
Date: Tue, 21 Feb 2017 14:04:15 +0800
Subject: [PATCH 1/2] implement harbor shell related things with authorization
 support

---
 harbor-app/src/app/account/account.module.ts  | 13 +++--
 .../account/forgot-password.component.html    |  0
 .../app/account/forgot-password.component.ts  | 10 ----
 .../app/account/reset-password.component.html |  0
 .../app/account/reset-password.component.ts   | 10 ----
 .../app/account/sign-in/sign-in.component.ts  | 15 +++---
 .../src/app/account/sign-up.component.html    |  1 -
 .../src/app/account/sign-up.component.ts      | 10 ----
 harbor-app/src/app/app.module.ts              |  8 ++-
 .../account-settings-modal.component.html     |  2 +-
 .../src/app/base/base-routing.module.ts       | 21 ++++++--
 .../harbor-shell/harbor-shell.component.html  |  5 +-
 .../harbor-shell/harbor-shell.component.ts    | 37 +++++++++----
 .../base/navigator/navigator.component.html   | 13 +++--
 .../app/base/navigator/navigator.component.ts | 53 +++++++++++++++++--
 harbor-app/src/app/harbor-routing.module.ts   | 11 +++-
 .../src/app/project/project-routing.module.ts | 31 ++++++++---
 harbor-app/src/app/shared/session.service.ts  | 34 +++++++++---
 harbor-app/src/app/shared/shared.module.ts    |  5 +-
 19 files changed, 190 insertions(+), 89 deletions(-)
 delete mode 100644 harbor-app/src/app/account/forgot-password.component.html
 delete mode 100644 harbor-app/src/app/account/forgot-password.component.ts
 delete mode 100644 harbor-app/src/app/account/reset-password.component.html
 delete mode 100644 harbor-app/src/app/account/reset-password.component.ts
 delete mode 100644 harbor-app/src/app/account/sign-up.component.html
 delete mode 100644 harbor-app/src/app/account/sign-up.component.ts

diff --git a/harbor-app/src/app/account/account.module.ts b/harbor-app/src/app/account/account.module.ts
index 7ace60143..218981c9c 100644
--- a/harbor-app/src/app/account/account.module.ts
+++ b/harbor-app/src/app/account/account.module.ts
@@ -1,15 +1,20 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../shared/shared.module';
 import { RouterModule } from '@angular/router';
+import { CoreModule } from '../core/core.module';
 
 import { SignInComponent } from './sign-in/sign-in.component';
+import { PasswordSettingComponent } from './password/password-setting.component';
+
+import { PasswordSettingService } from './password/password-setting.service';
 
 @NgModule({
   imports: [
-    SharedModule,
+    CoreModule,
     RouterModule
   ],
-  declarations: [SignInComponent],
-  exports: [SignInComponent]
+  declarations: [SignInComponent, PasswordSettingComponent],
+  exports: [SignInComponent, PasswordSettingComponent],
+  
+  providers: [PasswordSettingService]
 })
 export class AccountModule { }
\ No newline at end of file
diff --git a/harbor-app/src/app/account/forgot-password.component.html b/harbor-app/src/app/account/forgot-password.component.html
deleted file mode 100644
index e69de29bb..000000000
diff --git a/harbor-app/src/app/account/forgot-password.component.ts b/harbor-app/src/app/account/forgot-password.component.ts
deleted file mode 100644
index 307b4ec3e..000000000
--- a/harbor-app/src/app/account/forgot-password.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-
-@Component({
-    selector: 'forgot-password',
-    templateUrl: "forgot-password.component.html"
-})
-export class ForgotPasswordComponent {
-    // constructor(private router: Router){}
-}
\ No newline at end of file
diff --git a/harbor-app/src/app/account/reset-password.component.html b/harbor-app/src/app/account/reset-password.component.html
deleted file mode 100644
index e69de29bb..000000000
diff --git a/harbor-app/src/app/account/reset-password.component.ts b/harbor-app/src/app/account/reset-password.component.ts
deleted file mode 100644
index 868dcd35a..000000000
--- a/harbor-app/src/app/account/reset-password.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-
-@Component({
-    selector: 'reset-password',
-    templateUrl: "reset-password.component.html"
-})
-export class ResetPasswordComponent {
-    // constructor(private router: Router){}
-}
\ No newline at end of file
diff --git a/harbor-app/src/app/account/sign-in/sign-in.component.ts b/harbor-app/src/app/account/sign-in/sign-in.component.ts
index 8c33029d4..848a75337 100644
--- a/harbor-app/src/app/account/sign-in/sign-in.component.ts
+++ b/harbor-app/src/app/account/sign-in/sign-in.component.ts
@@ -97,8 +97,7 @@ export class SignInComponent implements AfterViewChecked {
     //Trigger the signin action
     signIn(): void {
         //Should validate input firstly
-        if (!this.validate()) {
-            console.info("return");
+        if (!this.validate() || this.signInStatus === signInStatusOnGoing) {
             return;
         }
 
@@ -113,14 +112,18 @@ export class SignInComponent implements AfterViewChecked {
 
                 //Validate the sign-in session
                 this.session.retrieveUser()
-                    .then(() => {
+                    .then(user => {
                         //Routing to the right location
-                        let nextRoute = ["/harbor", "dashboard"];
+                        let nextRoute = ["/harbor", "projects"];
                         this.router.navigate(nextRoute);
                     })
-                    .catch(this.handleError);
+                    .catch(error => {
+                        this.handleError(error);
+                    });
             })
-            .catch(this.handleError);
+            .catch(error => {
+                this.handleError(error);
+            });
     }
 
     //Help user navigate to the sign up
diff --git a/harbor-app/src/app/account/sign-up.component.html b/harbor-app/src/app/account/sign-up.component.html
deleted file mode 100644
index fae4c1f44..000000000
--- a/harbor-app/src/app/account/sign-up.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>Placeholder for signup</p>
\ No newline at end of file
diff --git a/harbor-app/src/app/account/sign-up.component.ts b/harbor-app/src/app/account/sign-up.component.ts
deleted file mode 100644
index 3d97950fa..000000000
--- a/harbor-app/src/app/account/sign-up.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-import { Router } from '@angular/router';
-
-@Component({
-    selector: 'sign-up',
-    templateUrl: "sign-up.component.html"
-})
-export class SignUpComponent {
-    // constructor(private router: Router){}
-}
\ No newline at end of file
diff --git a/harbor-app/src/app/app.module.ts b/harbor-app/src/app/app.module.ts
index c7991e8d2..71f96e112 100644
--- a/harbor-app/src/app/app.module.ts
+++ b/harbor-app/src/app/app.module.ts
@@ -4,25 +4,23 @@ import { FormsModule } from '@angular/forms';
 import { HttpModule } from '@angular/http';
 import { ClarityModule } from 'clarity-angular';
 import { AppComponent } from './app.component';
-import { AccountModule } from './account/account.module';
 
 import { BaseModule } from './base/base.module';
 
 import { HarborRoutingModule } from './harbor-routing.module';
-import { CoreModule } from './core/core.module';
+import { SharedModule } from './shared/shared.module';
 
 @NgModule({
     declarations: [
         AppComponent,
     ],
     imports: [
-        CoreModule,
-        AccountModule,
+        SharedModule,
         BaseModule,
         HarborRoutingModule
     ],
     providers: [],
-    bootstrap: [ AppComponent ]
+    bootstrap: [AppComponent]
 })
 export class AppModule {
 }
diff --git a/harbor-app/src/app/base/account-settings/account-settings-modal.component.html b/harbor-app/src/app/base/account-settings/account-settings-modal.component.html
index fff3ba84e..de47a471b 100644
--- a/harbor-app/src/app/base/account-settings/account-settings-modal.component.html
+++ b/harbor-app/src/app/base/account-settings/account-settings-modal.component.html
@@ -1,4 +1,4 @@
-<clr-modal [(clrModalOpen)]="opened" [clrModalStaticBackdrop]="staticBackdrop">
+<clr-modal [(clrModalOpen)]="opened" [clrModalStaticBackdrop]="staticBackdrop" [clrModalSize]="'lg'">
     <h3 class="modal-title">Accout Settings</h3>
     <div class="modal-body">
         <form>
diff --git a/harbor-app/src/app/base/base-routing.module.ts b/harbor-app/src/app/base/base-routing.module.ts
index 657811938..58ac2a505 100644
--- a/harbor-app/src/app/base/base-routing.module.ts
+++ b/harbor-app/src/app/base/base-routing.module.ts
@@ -5,12 +5,21 @@ import { HarborShellComponent } from './harbor-shell/harbor-shell.component';
 import { DashboardComponent } from '../dashboard/dashboard.component';
 import { ProjectComponent } from '../project/project.component';
 
+import { BaseRoutingResolver } from './base-routing-resolver.service';
+
 const baseRoutes: Routes = [
-  { 
-    path: 'harbor', component: HarborShellComponent,
+  {
+    path: 'harbor',
+    component: HarborShellComponent,
     children: [
-      { path: 'dashboard', component: DashboardComponent },
-      { path: 'projects', component: ProjectComponent }
+      {
+        path: 'dashboard',
+        component: DashboardComponent
+      },
+      {
+        path: 'projects',
+        component: ProjectComponent
+      }
     ]
   }];
 
@@ -18,7 +27,9 @@ const baseRoutes: Routes = [
   imports: [
     RouterModule.forChild(baseRoutes)
   ],
-  exports: [ RouterModule ]
+  exports: [RouterModule],
+
+  providers: [BaseRoutingResolver]
 })
 export class BaseRoutingModule {
 
diff --git a/harbor-app/src/app/base/harbor-shell/harbor-shell.component.html b/harbor-app/src/app/base/harbor-shell/harbor-shell.component.html
index 76db97357..3b095af38 100644
--- a/harbor-app/src/app/base/harbor-shell/harbor-shell.component.html
+++ b/harbor-app/src/app/base/harbor-shell/harbor-shell.component.html
@@ -1,5 +1,5 @@
 <clr-main-container>
-    <navigator (showAccountSettingsModal)="openModal($event)" (searchEvt)="doSearch($event)"></navigator>
+    <navigator (showAccountSettingsModal)="openModal($event)" (searchEvt)="doSearch($event)" (showPwdChangeModal)="openModal($event)"></navigator>
     <global-message></global-message>
     <div class="content-container">
         <div class="content-area" [class.container-override]="showSearch">
@@ -26,4 +26,5 @@
         </nav>
     </div>
 </clr-main-container>
-<account-settings-modal></account-settings-modal>
\ No newline at end of file
+<account-settings-modal></account-settings-modal>
+<password-setting (pwdChange)="watchPwdChange($event)"></password-setting>
\ No newline at end of file
diff --git a/harbor-app/src/app/base/harbor-shell/harbor-shell.component.ts b/harbor-app/src/app/base/harbor-shell/harbor-shell.component.ts
index bda52c738..049053729 100644
--- a/harbor-app/src/app/base/harbor-shell/harbor-shell.component.ts
+++ b/harbor-app/src/app/base/harbor-shell/harbor-shell.component.ts
@@ -1,12 +1,14 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
+import { Router, ActivatedRoute } from '@angular/router';
 
-import { SessionService } from '../../shared/session.service';
 import { ModalEvent } from '../modal-event';
 import { SearchEvent } from '../search-event';
+import { modalAccountSettings, modalPasswordSetting } from '../modal-events.const';
 
 import { AccountSettingsModalComponent } from '../account-settings/account-settings-modal.component';
 import { SearchResultComponent } from '../global-search/search-result.component';
+import { PasswordSettingComponent } from '../../account/password/password-setting.component';
+import { NavigatorComponent } from '../navigator/navigator.component';
 
 @Component({
     selector: 'harbor-shell',
@@ -22,18 +24,22 @@ export class HarborShellComponent implements OnInit {
     @ViewChild(SearchResultComponent)
     private searchResultComponet: SearchResultComponent;
 
+    @ViewChild(PasswordSettingComponent)
+    private pwdSetting: PasswordSettingComponent;
+
+    @ViewChild(NavigatorComponent)
+    private navigator: NavigatorComponent;
+
     //To indicator whwther or not the search results page is displayed
     //We need to use this property to do some overriding work
     private isSearchResultsOpened: boolean = false;
 
-    constructor(private session: SessionService) { }
+    constructor(private route: ActivatedRoute) { }
 
     ngOnInit() {
-        let cUser = this.session.getCurrentUser();
-        if (!cUser) {
-            //Try to update the session
-            this.session.retrieveUser();
-        }
+        this.route.data.subscribe(data => {
+            //dummy
+        });
     }
 
     public get showSearch(): boolean {
@@ -43,8 +49,12 @@ export class HarborShellComponent implements OnInit {
     //Open modal dialog
     openModal(event: ModalEvent): void {
         switch (event.modalName) {
-            case "account-settings":
+            case modalAccountSettings:
                 this.accountSettingsModal.open();
+                break;
+            case modalPasswordSetting:
+                this.pwdSetting.open();
+                break;
             default:
                 break;
         }
@@ -63,8 +73,15 @@ export class HarborShellComponent implements OnInit {
     //Search results page closed
     //remove the related ovevriding things
     searchClose(event: boolean): void {
-        if(event){
+        if (event) {
             this.isSearchResultsOpened = false;
         }
     }
+
+    //Watch password whether changed
+    watchPwdChange(event: any): void {
+        if (event) {
+            this.navigator.logOut(true);
+        }
+    }
 }
\ No newline at end of file
diff --git a/harbor-app/src/app/base/navigator/navigator.component.html b/harbor-app/src/app/base/navigator/navigator.component.html
index 5ce0a4070..ecd7688e8 100644
--- a/harbor-app/src/app/base/navigator/navigator.component.html
+++ b/harbor-app/src/app/base/navigator/navigator.component.html
@@ -7,15 +7,22 @@
     </div>
     <global-search (searchEvt)="transferSearchEvent($event)"></global-search>
     <div class="header-actions">
-        <clr-dropdown [clrMenuPosition]="'bottom-left'" class="dropdown">
+        <div *ngIf="!isSessionValid">
+            <a href="javascript:void(0)" class="nav-link nav-text sign-in-override" routerLink="/sign-in" routerLinkActive="active">Sign In</a>
+            <span class="custom-divider"></span>
+            <a href="javascript:void(0)" class="nav-link nav-text sign-up-override" routerLink="/sign-up" routerLinkActive="active">Sign Up</a>
+        </div>
+        <clr-dropdown [clrMenuPosition]="'bottom-left'" class="dropdown" *ngIf="isSessionValid">
             <button class="nav-text" clrDropdownToggle>
               <clr-icon shape="user" class="is-inverse" size="24" style="left: -2px;"></clr-icon>
               <span>Administrator</span>
               <clr-icon shape="caret down"></clr-icon>
             </button>
             <div class="dropdown-menu">
-                <a href="javascript:void(0)" clrDropdownItem (click)="open()">Account Setting</a>
-                <a href="javascript:void(0)" clrDropdownItem>Log out</a>
+                <a href="javascript:void(0)" clrDropdownItem (click)="openAccountSettingsModal()">Account Settings</a>
+                <a href="javascript:void(0)" clrDropdownItem (click)="openChangePwdModal()">Change Password</a>
+                <div class="dropdown-divider"></div>
+                <a href="javascript:void(0)" clrDropdownItem (click)="logOut(false)">Log out</a>
             </div>
         </clr-dropdown>
         <clr-dropdown class="dropdown bottom-left">
diff --git a/harbor-app/src/app/base/navigator/navigator.component.ts b/harbor-app/src/app/base/navigator/navigator.component.ts
index 822f8f183..72661a469 100644
--- a/harbor-app/src/app/base/navigator/navigator.component.ts
+++ b/harbor-app/src/app/base/navigator/navigator.component.ts
@@ -1,22 +1,49 @@
-import { Component, Output, EventEmitter } from '@angular/core';
+import { Component, Output, EventEmitter, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { ModalEvent } from '../modal-event';
 import { SearchEvent } from '../search-event';
+import { modalAccountSettings, modalPasswordSetting } from '../modal-events.const';
+
+import { SessionUser } from '../../shared/session-user';
+import { SessionService } from '../../shared/session.service';
 
 @Component({
     selector: 'navigator',
-    templateUrl: "navigator.component.html"
+    templateUrl: "navigator.component.html",
+    styleUrls: ["navigator.component.css"]
 })
-export class NavigatorComponent {
+
+export class NavigatorComponent implements OnInit {
     // constructor(private router: Router){}
     @Output() showAccountSettingsModal = new EventEmitter<ModalEvent>();
     @Output() searchEvt = new EventEmitter<SearchEvent>();
+    @Output() showPwdChangeModal = new EventEmitter<ModalEvent>();
+
+    private sessionUser: SessionUser = null;
+
+    constructor(private session: SessionService, private router: Router) { }
+
+    ngOnInit(): void {
+        this.sessionUser = this.session.getCurrentUser();
+    }
+
+    public get isSessionValid(): boolean {
+        return this.sessionUser != null;
+    }
 
     //Open the account setting dialog
-    open():void {
+    openAccountSettingsModal(): void {
         this.showAccountSettingsModal.emit({
-            modalName:"account-settings",
+            modalName: modalAccountSettings,
+            modalFlag: true
+        });
+    }
+
+    //Open change password dialog
+    openChangePwdModal(): void {
+        this.showPwdChangeModal.emit({
+            modalName: modalPasswordSetting,
             modalFlag: true
         });
     }
@@ -25,4 +52,20 @@ export class NavigatorComponent {
     transferSearchEvent(evt: SearchEvent): void {
         this.searchEvt.emit(evt);
     }
+
+    //Log out system
+    logOut(reSignIn: boolean): void {
+        this.session.signOff()
+            .then(() => {
+                this.sessionUser = null;
+                if (reSignIn) {
+                    //Naviagte to the sign in route
+                    this.router.navigate(["/sign-in"]);
+                } else {
+                    //Naviagte to the default route
+                    this.router.navigate(["/harbor"]);
+                }
+            })
+            .catch()//TODO:
+    }
 }
\ No newline at end of file
diff --git a/harbor-app/src/app/harbor-routing.module.ts b/harbor-app/src/app/harbor-routing.module.ts
index 8a6e95e96..1282b5c29 100644
--- a/harbor-app/src/app/harbor-routing.module.ts
+++ b/harbor-app/src/app/harbor-routing.module.ts
@@ -3,9 +3,16 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import { SignInComponent } from './account/sign-in/sign-in.component';
+import { HarborShellComponent } from './base/harbor-shell/harbor-shell.component';
+
+import { BaseRoutingResolver } from './base/base-routing-resolver.service';
 
 const harborRoutes: Routes = [
-  { path: '', redirectTo: '/sign-in', pathMatch: 'full' },
+  {
+    path: 'harbor',
+    component: HarborShellComponent
+  },
+  { path: '', redirectTo: '/harbor', pathMatch: 'full' },
   { path: 'sign-in', component: SignInComponent }
 ];
 
@@ -13,7 +20,7 @@ const harborRoutes: Routes = [
   imports: [
     RouterModule.forRoot(harborRoutes)
   ],
-  exports: [ RouterModule ]
+  exports: [RouterModule]
 })
 export class HarborRoutingModule {
 
diff --git a/harbor-app/src/app/project/project-routing.module.ts b/harbor-app/src/app/project/project-routing.module.ts
index 99230cfb4..22b5c3eb4 100644
--- a/harbor-app/src/app/project/project-routing.module.ts
+++ b/harbor-app/src/app/project/project-routing.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
-import { HarborShellComponent} from '../base/harbor-shell/harbor-shell.component';
+import { HarborShellComponent } from '../base/harbor-shell/harbor-shell.component';
 import { ProjectComponent } from './project.component';
 import { ProjectDetailComponent } from './project-detail/project-detail.component';
 
@@ -10,14 +10,29 @@ import { ReplicationComponent } from '../replication/replication.component';
 import { MemberComponent } from './member/member.component';
 import { AuditLogComponent } from '../log/audit-log.component';
 
+import { BaseRoutingResolver } from '../base/base-routing-resolver.service';
+
 const projectRoutes: Routes = [
-  { path: 'harbor', 
-    component: HarborShellComponent, 
+  {
+    path: 'harbor',
+    component: HarborShellComponent,
+    resolve: {
+      harborResolver: BaseRoutingResolver
+    },
     children: [
-      { path: 'projects', component: ProjectComponent },
-      { 
-        path: 'projects/:id', 
+      {
+        path: 'projects',
+        component: ProjectComponent,
+        resolve: {
+          projectsResolver: BaseRoutingResolver
+        }
+      },
+      {
+        path: 'projects/:id',
         component: ProjectDetailComponent,
+        resolve: {
+          projectResolver: BaseRoutingResolver
+        },
         children: [
           { path: 'repository', component: RepositoryComponent },
           { path: 'replication', component: ReplicationComponent },
@@ -33,6 +48,6 @@ const projectRoutes: Routes = [
   imports: [
     RouterModule.forChild(projectRoutes)
   ],
-  exports: [ RouterModule ]
+  exports: [RouterModule]
 })
-export class ProjectRoutingModule {}
\ No newline at end of file
+export class ProjectRoutingModule { }
\ No newline at end of file
diff --git a/harbor-app/src/app/shared/session.service.ts b/harbor-app/src/app/shared/session.service.ts
index 3f4c322fe..a27ab791a 100644
--- a/harbor-app/src/app/shared/session.service.ts
+++ b/harbor-app/src/app/shared/session.service.ts
@@ -2,7 +2,10 @@ import { Injectable } from '@angular/core';
 import { Headers, Http } from '@angular/http';
 import 'rxjs/add/operator/toPromise';
 
+import { SessionUser } from './session-user';
+
 const currentUserEndpint = "/api/users/current";
+const signOffEndpoint = "/log_out";
 /**
  * Define related methods to handle account and session corresponding things
  * 
@@ -11,7 +14,7 @@ const currentUserEndpint = "/api/users/current";
  */
 @Injectable()
 export class SessionService {
-    currentUser: any = null;
+    currentUser: SessionUser = null;
 
     private headers = new Headers({
         "Content-Type": 'application/json'
@@ -22,22 +25,41 @@ export class SessionService {
     /**
      * Get the related information of current signed in user from backend
      * 
-     * @returns {Promise<any>}
+     * @returns {Promise<SessionUser>}
      * 
      * @memberOf SessionService
      */
-    retrieveUser(): Promise<any> {
+    retrieveUser(): Promise<SessionUser> {
         return this.http.get(currentUserEndpint, { headers: this.headers }).toPromise()
-            .then(response => this.currentUser = response.json())
+            .then(response => {
+                this.currentUser = response.json() as SessionUser;
+                return this.currentUser;
+            })
             .catch(error => {
-                console.log("An error occurred when getting current user ", error);//TODO: Will replaced with general error handler
+                console.log("An error occurred when getting current user ", error);//TODO
+                return Promise.reject(error);
             })
     }
 
     /**
      * For getting info
      */
-    getCurrentUser(): any {
+    getCurrentUser(): SessionUser {
         return this.currentUser;
     }
+
+    /**
+     * Log out the system
+     */
+    signOff(): Promise<any> {
+        return this.http.get(signOffEndpoint, { headers: this.headers }).toPromise()
+        .then(() => {
+            //Destroy current session cache
+            this.currentUser = null;
+        }) //Nothing returned
+        .catch(error => {
+            console.log("An error occurred when signing off ", error);//TODO
+            return Promise.reject(error);
+        })
+    }
 }
\ No newline at end of file
diff --git a/harbor-app/src/app/shared/shared.module.ts b/harbor-app/src/app/shared/shared.module.ts
index 1609b5fc8..66d8732df 100644
--- a/harbor-app/src/app/shared/shared.module.ts
+++ b/harbor-app/src/app/shared/shared.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CoreModule } from '../core/core.module';
+import { AccountModule } from '../account/account.module';
 
 import { SessionService } from '../shared/session.service';
 import { MessageComponent } from '../global-message/message.component';
@@ -7,13 +8,15 @@ import { MessageService } from '../global-message/message.service';
 
 @NgModule({
   imports: [
-    CoreModule
+    CoreModule,
+    AccountModule
   ],
   declarations: [
     MessageComponent
   ],
   exports: [
     CoreModule,
+    AccountModule,
     MessageComponent
   ],
   providers: [SessionService, MessageService]

From b92e3b2e7e4db7a8a444d3908b95021dff54096a Mon Sep 17 00:00:00 2001
From: Steven Zou <szou@vmware.com>
Date: Tue, 21 Feb 2017 14:05:36 +0800
Subject: [PATCH 2/2] implement password settings

---
 .../password/forgot-password.component.html   |   0
 .../password/forgot-password.component.ts     |  10 ++
 .../password/password-setting.component.html  |  55 +++++++++
 .../password/password-setting.component.ts    | 104 ++++++++++++++++++
 .../password/password-setting.service.ts      |  35 ++++++
 .../app/account/password/password-setting.ts  |  11 ++
 .../account/sign-up/sign-up.component.html    |   1 +
 .../app/account/sign-up/sign-up.component.ts  |  10 ++
 .../app/base/base-routing-resolver.service.ts |  23 ++++
 harbor-app/src/app/base/modal-events.const.ts |   2 +
 .../base/navigator/navigator.component.css    |  16 +++
 harbor-app/src/app/shared/session-user.ts     |   9 ++
 12 files changed, 276 insertions(+)
 create mode 100644 harbor-app/src/app/account/password/forgot-password.component.html
 create mode 100644 harbor-app/src/app/account/password/forgot-password.component.ts
 create mode 100644 harbor-app/src/app/account/password/password-setting.component.html
 create mode 100644 harbor-app/src/app/account/password/password-setting.component.ts
 create mode 100644 harbor-app/src/app/account/password/password-setting.service.ts
 create mode 100644 harbor-app/src/app/account/password/password-setting.ts
 create mode 100644 harbor-app/src/app/account/sign-up/sign-up.component.html
 create mode 100644 harbor-app/src/app/account/sign-up/sign-up.component.ts
 create mode 100644 harbor-app/src/app/base/base-routing-resolver.service.ts
 create mode 100644 harbor-app/src/app/base/modal-events.const.ts
 create mode 100644 harbor-app/src/app/base/navigator/navigator.component.css
 create mode 100644 harbor-app/src/app/shared/session-user.ts

diff --git a/harbor-app/src/app/account/password/forgot-password.component.html b/harbor-app/src/app/account/password/forgot-password.component.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/harbor-app/src/app/account/password/forgot-password.component.ts b/harbor-app/src/app/account/password/forgot-password.component.ts
new file mode 100644
index 000000000..307b4ec3e
--- /dev/null
+++ b/harbor-app/src/app/account/password/forgot-password.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+
+@Component({
+    selector: 'forgot-password',
+    templateUrl: "forgot-password.component.html"
+})
+export class ForgotPasswordComponent {
+    // constructor(private router: Router){}
+}
\ No newline at end of file
diff --git a/harbor-app/src/app/account/password/password-setting.component.html b/harbor-app/src/app/account/password/password-setting.component.html
new file mode 100644
index 000000000..6f86779d0
--- /dev/null
+++ b/harbor-app/src/app/account/password/password-setting.component.html
@@ -0,0 +1,55 @@
+<clr-modal [(clrModalOpen)]="opened" [clrModalStaticBackdrop]="true">
+    <h3 class="modal-title">Change Password</h3>
+    <div class="modal-body" style="min-height: 250px; overflow-y: hidden;">
+        <form #changepwdForm="ngForm" class="form">
+            <section class="form-block">
+                <div class="form-group">
+                    <label for="oldPassword">Current Password</label>
+                    <label for="oldPassword" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-bottom-left" [class.invalid]="oldPassInput.invalid && (oldPassInput.dirty || oldPassInput.touched)">
+                <input type="password" id="oldPassword" placeholder="Enter current password"
+                    required
+                    name="oldPassword"
+                    [(ngModel)]="oldPwd"
+                    #oldPassInput="ngModel" size="25">
+                <span class="tooltip-content">
+                    Current password is Required.
+                </span>
+            </label>
+                </div>
+                <div class="form-group">
+                    <label for="newPassword">New Password</label>
+                    <label for="newPassword" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-bottom-left" [class.invalid]="newPassInput.invalid && (newPassInput.dirty || newPassInput.touched)">
+                <input type="password" id="newPassword" placeholder="Enter new password"
+                    required
+                    pattern="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{7,}$"
+                    name="newPassword"
+                    [(ngModel)]="newPwd"
+                    #newPassInput="ngModel" size="25">
+                <span class="tooltip-content">
+                    Password should be at least 7 characters with 1 uppercase,lowercase letetr and 1 number
+                </span>
+            </label>
+                </div>
+                <div class="form-group">
+                    <label for="reNewPassword">Confirm Password</label>
+                    <label for="reNewPassword" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-bottom-left" [class.invalid]="(reNewPassInput.invalid && (reNewPassInput.dirty || reNewPassInput.touched)) || (!newPassInput.invalid && reNewPassInput.value != newPassInput.value)">
+                <input type="password" id="reNewPassword" placeholder="Confirm new password"
+                    required
+                    pattern="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{7,}$"
+                    name="reNewPassword"
+                    [(ngModel)]="reNewPwd"
+                    #reNewPassInput="ngModel" size="25">
+                <span class="tooltip-content">
+                    Password should be at least 7 characters with 1 uppercase,lowercase letetr and 1 number and consisted with new password
+                </span>
+            </label>
+                </div>
+            </section>
+        </form>
+    </div>
+    <div class="modal-footer">
+        <span class="spinner spinner-inline" style="top:8px;" [hidden]="showProgress === false"></span>
+        <button type="button" class="btn btn-outline" (click)="close()">Cancel</button>
+        <button type="button" class="btn btn-primary" [disabled]="!isValid || showProgress" (click)="doOk()">Ok</button>
+    </div>
+</clr-modal>
\ No newline at end of file
diff --git a/harbor-app/src/app/account/password/password-setting.component.ts b/harbor-app/src/app/account/password/password-setting.component.ts
new file mode 100644
index 000000000..80986a67e
--- /dev/null
+++ b/harbor-app/src/app/account/password/password-setting.component.ts
@@ -0,0 +1,104 @@
+import { Component, ViewChild, AfterViewChecked, Output, EventEmitter } from '@angular/core';
+import { Router } from '@angular/router';
+import { NgForm } from '@angular/forms';
+
+import { PasswordSettingService } from './password-setting.service';
+import { SessionService } from '../../shared/session.service';
+
+@Component({
+    selector: 'password-setting',
+    templateUrl: "password-setting.component.html"
+})
+export class PasswordSettingComponent implements AfterViewChecked {
+    opened: boolean = false;
+    oldPwd: string = "";
+    newPwd: string = "";
+    reNewPwd: string = "";
+
+    private formValueChanged: boolean = false;
+    private onCalling: boolean = false;
+
+    pwdFormRef: NgForm;
+    @ViewChild("changepwdForm") pwdForm: NgForm;
+
+    @Output() private pwdChange = new EventEmitter<any>();
+
+    constructor(private passwordService: PasswordSettingService, private session: SessionService){}
+
+    //If form is valid
+    public get isValid(): boolean {
+        if (this.pwdForm && this.pwdForm.form.get("newPassword")) {
+            return this.pwdForm.valid &&
+                this.pwdForm.form.get("newPassword").value === this.pwdForm.form.get("reNewPassword").value;
+        }
+        return false;
+    }
+
+    public get valueChanged(): boolean {
+        return this.formValueChanged;
+    }
+
+    public get showProgress(): boolean {
+        return this.onCalling;
+    }
+
+    ngAfterViewChecked() {
+        if (this.pwdFormRef != this.pwdForm) {
+            this.pwdFormRef = this.pwdForm;
+            if (this.pwdFormRef) {
+                this.pwdFormRef.valueChanges.subscribe(data => {
+                    this.formValueChanged = true;
+                });
+            }
+        }
+    }
+
+    //Open modal dialog
+    open(): void {
+        this.opened = true;
+        this.pwdForm.reset();
+    }
+
+    //Close the moal dialog
+    close(): void {
+        this.opened = false;
+    }
+
+    //handle the ok action
+    doOk(): void {
+        if (this.onCalling) {
+            return;//To avoid duplicate click events
+        }
+
+        if (!this.isValid) {
+            return;//Double confirm
+        }
+
+        //Double confirm session is valid
+        let cUser = this.session.getCurrentUser();
+        if(!cUser){
+            return;
+        }
+
+        //Call service
+        this.onCalling = true;
+
+        this.passwordService.changePassword(cUser.user_id, 
+        {
+            new_password: this.pwdForm.value.newPassword,
+            old_password: this.pwdForm.value.oldPassword
+        })
+        .then(() => {
+            this.onCalling = false;
+            //Tell shell to reset current view
+            this.pwdChange.emit(true);
+
+            this.close();
+        })
+        .catch(error => {
+            this.onCalling = false;
+            console.error(error);//TODO:
+        });
+        //TODO:publish the successful message to general messae box
+    }
+}
\ No newline at end of file
diff --git a/harbor-app/src/app/account/password/password-setting.service.ts b/harbor-app/src/app/account/password/password-setting.service.ts
new file mode 100644
index 000000000..94b2af793
--- /dev/null
+++ b/harbor-app/src/app/account/password/password-setting.service.ts
@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { Headers, Http, RequestOptions } from '@angular/http';
+import 'rxjs/add/operator/toPromise';
+
+import { PasswordSetting } from './password-setting';
+
+const passwordChangeEndpoint = "/api/users/:user_id/password";
+
+@Injectable()
+export class PasswordSettingService {
+    private headers: Headers = new Headers({
+        "Accept": 'application/json',
+        "Content-Type": 'application/json'
+    });
+    private options: RequestOptions = new RequestOptions({
+        'headers': this.headers
+    });
+
+    constructor(private http: Http) { }
+
+    changePassword(userId: number, setting: PasswordSetting): Promise<any> {
+        if(!setting || setting.new_password.trim()==="" || setting.old_password.trim()===""){
+            return Promise.reject("Invalid data");
+        }
+
+        let putUrl = passwordChangeEndpoint.replace(":user_id", userId+"");
+        return this.http.put(putUrl, JSON.stringify(setting), this.options)
+        .toPromise()
+        .then(() => null)
+        .catch(error=>{
+            return Promise.reject(error);
+        });
+    }
+
+}
diff --git a/harbor-app/src/app/account/password/password-setting.ts b/harbor-app/src/app/account/password/password-setting.ts
new file mode 100644
index 000000000..c06e26a49
--- /dev/null
+++ b/harbor-app/src/app/account/password/password-setting.ts
@@ -0,0 +1,11 @@
+/**
+ * 
+ * Struct for password change
+ * 
+ * @export
+ * @class PasswordSetting
+ */
+export class PasswordSetting {
+    old_password: string;
+    new_password: string;
+}
\ No newline at end of file
diff --git a/harbor-app/src/app/account/sign-up/sign-up.component.html b/harbor-app/src/app/account/sign-up/sign-up.component.html
new file mode 100644
index 000000000..fae4c1f44
--- /dev/null
+++ b/harbor-app/src/app/account/sign-up/sign-up.component.html
@@ -0,0 +1 @@
+<p>Placeholder for signup</p>
\ No newline at end of file
diff --git a/harbor-app/src/app/account/sign-up/sign-up.component.ts b/harbor-app/src/app/account/sign-up/sign-up.component.ts
new file mode 100644
index 000000000..3d97950fa
--- /dev/null
+++ b/harbor-app/src/app/account/sign-up/sign-up.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+
+@Component({
+    selector: 'sign-up',
+    templateUrl: "sign-up.component.html"
+})
+export class SignUpComponent {
+    // constructor(private router: Router){}
+}
\ No newline at end of file
diff --git a/harbor-app/src/app/base/base-routing-resolver.service.ts b/harbor-app/src/app/base/base-routing-resolver.service.ts
new file mode 100644
index 000000000..47c04fa2c
--- /dev/null
+++ b/harbor-app/src/app/base/base-routing-resolver.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import {
+    Router, Resolve, ActivatedRouteSnapshot, RouterStateSnapshot
+} from '@angular/router';
+
+import { SessionService } from '../shared/session.service';
+import { SessionUser } from '../shared/session-user';
+
+@Injectable()
+export class BaseRoutingResolver implements Resolve<SessionUser> {
+
+    constructor(private session: SessionService, private router: Router) { }
+
+    resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<SessionUser> {
+        return this.session.retrieveUser()
+            .then(sessionUser => {
+                return sessionUser;
+            })
+            .catch(error => {
+                console.info("Anonymous user");
+            });
+    }
+}
\ No newline at end of file
diff --git a/harbor-app/src/app/base/modal-events.const.ts b/harbor-app/src/app/base/modal-events.const.ts
new file mode 100644
index 000000000..6a8dca0ad
--- /dev/null
+++ b/harbor-app/src/app/base/modal-events.const.ts
@@ -0,0 +1,2 @@
+export const modalAccountSettings= "account-settings";
+export const modalPasswordSetting = "password-setting";
\ No newline at end of file
diff --git a/harbor-app/src/app/base/navigator/navigator.component.css b/harbor-app/src/app/base/navigator/navigator.component.css
new file mode 100644
index 000000000..f567136a5
--- /dev/null
+++ b/harbor-app/src/app/base/navigator/navigator.component.css
@@ -0,0 +1,16 @@
+.sign-in-override {
+    padding-left: 0px !important;
+    padding-right: 5px !important;
+}
+
+.sign-up-override {
+    padding-left: 5px !important;
+}
+
+.custom-divider {
+    display: inline-block;
+    border-right: 2px inset snow;
+    padding: 2px 0px 2px 0px;
+    vertical-align: middle;
+    height: 24px;
+}
\ No newline at end of file
diff --git a/harbor-app/src/app/shared/session-user.ts b/harbor-app/src/app/shared/session-user.ts
new file mode 100644
index 000000000..47e20b658
--- /dev/null
+++ b/harbor-app/src/app/shared/session-user.ts
@@ -0,0 +1,9 @@
+//Define the session user
+export class SessionUser {
+    user_id: number;
+    username: string;
+    email: string;
+    role_name: string;
+    role_id: number;
+    has_admin_role: number;
+}
\ No newline at end of file