chore(client): upgade angular

Author: stherrienaspnet

Diff for: templates/app/_package.json

@@ -54,16 +54,16 @@
     "@angularclass/match-control": "^2.0.0",
     "reflect-metadata": "^0.1.3",
     "rxjs": "^5.3.0",
-    "zone.js": "^0.7.2",
-    "@angular/common": "~2.4.9",
-    "@angular/compiler": "~2.4.9",
-    "@angular/core": "~2.4.9",
-    "@angular/forms": "~2.4.9",
-    "@angular/http": "~2.4.9",
+    "zone.js": "^0.8.4",
+    "@angular/common": "^4.3.3",
+    "@angular/compiler": "^4.3.3",
+    "@angular/core": "^4.3.3",
+    "@angular/forms": "^4.3.3",
+    "@angular/http": "^4.3.3",
+    "@angular/platform-browser": "^4.3.3",
+    "@angular/platform-browser-dynamic": "^4.3.3",
+    "@angular/router": "^4.3.3",
     <%#"@angular/material": "^2.0.0-alpha.10",%>
-    "@angular/platform-browser": "~2.4.9",
-    "@angular/platform-browser-dynamic": "~2.4.9",
-    "@angular/router": "^3.4.7",
     "@angularclass/hmr": "^1.2.1",
   <%_ if(filters.ts) { -%>
     "@types/core-js": "^0.9.41",
@@ -82,7 +82,7 @@
     "@types/webpack": "^2.2.15",
   <%_ } -%>
     "angular2-universal": "2.1.0-rc.1",
-    "angular2-jwt": "^0.1.24",
+    "angular2-jwt": "^0.1.28",
     <% if(filters.auth) { %>
     "angular-validation-match": "^1.9.0",<% } %>
     <% if(filters.uirouter) { %>

Diff for: templates/app/client/app/account(auth)/settings/settings.component.js

@@ -40,16 +40,14 @@ export class SettingsComponent {
   changePassword(form) {
     this.submitted = true;
 
-    if(form.$valid) {
-      this.AuthService.changePassword(this.user.oldPassword, this.user.newPassword)
-        .then(() => {
-          this.message = 'Password successfully changed.';
-        })
-        .catch(() => {
-          form.password.$setValidity('mongoose', false);
-          this.errors.other = 'Incorrect password';
-          this.message = '';
-        });
-    }
+    return this.AuthService.changePassword(this.user.oldPassword, this.user.newPassword)
+      .then(() => {
+        this.message = 'Password successfully changed.';
+      })
+      .catch(() => {
+        // form.password.$setValidity('mongoose', false);
+        this.errors.other = 'Incorrect password';
+        this.message = '';
+      });
   }
 }

Diff for: templates/app/client/app/account(auth)/settings/settings.html

@@ -9,33 +9,31 @@ <h1>Change Password</h1>
         <div class="form-group">
           <label>Current Password</label>
 
-          <input type="password" name="password" class="form-control" [(ngModel)]="user.oldPassword" mongoose-error/>
-          <p class="help-block" [hidden]="!form.password.$error.mongoose">
-              {{ errors.other }}
+          <input type="password" name="password" class="form-control" [(ngModel)]="user.oldPassword" required #oldPassword="ngModel"/>
+          <p class="help-block" [hidden]="oldPassword.valid || !submitted">
+            Required
           </p>
         </div>
 
         <div class="form-group">
           <label>New Password</label>
 
-          <input type="password" name="newPassword" class="form-control" [(ngModel)]="user.newPassword"
-                 ng-minlength="3"
-                 required/>
+          <input type="password" name="newPassword" class="form-control" [(ngModel)]="user.newPassword" required #newPassword="ngModel"
+                 minlength="3"/>
           <p class="help-block"
-            [hidden]="!(form.newPassword.$error.minlength || form.newPassword.$error.required) || !(form.newPassword.$dirty || submitted)">
+             [hidden]="newPassword.valid || !submitted">
             Password must be at least 3 characters.
           </p>
         </div>
 
         <div class="form-group">
           <label>Confirm New Password</label>
 
-          <input type="password" name="confirmPassword" class="form-control" [(ngModel)]="user.confirmPassword"
+          <input type="password" name="confirmPassword" class="form-control" [(ngModel)]="user.confirmPassword" required #confirmPassword="ngModel"
                  match="user.newPassword"
-                 ng-minlength="3"
-                 required=""/>
+                 minlength="3"/>
           <p class="help-block"
-            [hidden]="!form.confirmPassword.$error.match || !submitted">
+             [hidden]="confirmPassword.valid || !submitted">
             Passwords must match.
           </p>
 

Diff for: templates/app/client/app/app.module.js

@@ -7,6 +7,7 @@ import {
 } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import {
+  Http,
   HttpModule,
   BaseRequestOptions,
   RequestOptions,
@@ -21,7 +22,7 @@ import {
 import { UIRouterModule } from 'ui-router-ng2';<% } %>
 <%_ if (filters.ngroute) { -%>
 import { RouterModule, Routes } from '@angular/router';<% } %>
-import { provideAuth } from 'angular2-jwt';
+import { provideAuth, AuthHttp, AuthConfig } from 'angular2-jwt';
 
 import { AppComponent } from './app.component';
 import { MainModule } from './main/main.module';
@@ -32,12 +33,19 @@ import { AdminModule } from './admin/admin.module';
 
 import constants from './app.constants';
 
-let providers: Provider[] = [
-  provideAuth({
-    // Allow using AuthHttp while not logged in
+export function getAuthHttp(http) {
+  return new AuthHttp(new AuthConfig({
     noJwtError: true,
-  })
-];
+    globalHeaders: [{'Accept': 'application/json'}],
+    tokenGetter: (() => localStorage.getItem('id_token')),
+  }), http);
+}
+
+let providers: Provider[] = [{
+  provide: AuthHttp,
+  useFactory: getAuthHttp,
+  deps: [Http]
+}];
 
 if(constants.env === 'development') {
   @Injectable()