fix(ts): fix TypeScript errors

Author: Awk34

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

@@ -34,7 +34,8 @@ export class LoginComponent {
   errors = {login: undefined};
   submitted = false;
   AuthService;
-  <%_ if(filters.ngroute) { -%><% } %>
+  <%_ if(filters.ngroute) { -%>
+  Router;<% } %>
   <%_ if(filters.uirouter) { -%>
   StateService;<% } %>
 

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

@@ -2,9 +2,9 @@
 import { Component } from '@angular/core';
 <%_ if(filters.uirouter) { -%>
 import { StateService } from 'ui-router-ng2';<% } %>
-<%_ if(filters.ngroute) { -%><% } %>
+<%_ if(filters.ngroute) { -%>
+import { Router } from '@angular/router';<% } %>
 import { AuthService } from '../../../components/auth/auth.service';
-import {ANGULARCLASS_MATCH_CONTROL_DIRECTIVES} from '@angularclass/match-control';
 
 <%_ if(filters.flow) { -%>
 type User = {
@@ -21,8 +21,7 @@ interface User {
 
 @Component({
   selector: 'signup',
-  template: require('./signup.<%=templateExt%>'),
-  directives: [...ANGULARCLASS_MATCH_CONTROL_DIRECTIVES]
+  template: require('./signup.<%=templateExt%>')
 })
 export class SignupComponent {
   user: User = {
@@ -33,14 +32,16 @@ export class SignupComponent {
   errors = {};
   submitted = false;
   AuthService;
-  <%_ if(filters.ngroute) { -%><% } %>
+  <%_ if(filters.ngroute) { -%>
+  Router;<% } %>
   <%_ if(filters.uirouter) { -%>
   StateService;<% } %>
 
-  static parameters = [AuthService, <% if(filters.ngroute) { %><% } else { %>StateService<% } %>];
-  constructor(_AuthService_: AuthService, <% if(filters.ngroute) { %><% } else { %>_StateService_: StateService<% } %>) {
+  static parameters = [AuthService, <% if(filters.ngroute) { %>Router<% } else { %>StateService<% } %>];
+  constructor(_AuthService_: AuthService, <% if(filters.ngroute) { %>router: Router<% } else { %>_StateService_: StateService<% } %>) {
     this.AuthService = _AuthService_;
-    <%_ if(filters.ngroute) { -%><% } -%>
+    <%_ if(filters.ngroute) { -%>
+    this.Router = router;<% } -%>
     <%_ if(filters.uirouter) { -%>
     this.StateService = _StateService_;<% } -%>
   }

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

@@ -12,7 +12,7 @@ export class AdminComponent {
 
   <%_ } _%>
   static parameters = [UserService];
-  constructor(userService: UserService) {
+  constructor(<%= private() %>userService: UserService) {
     this.userService = userService;
     // Use the user service to fetch all users
     this.userService.query().subscribe(users => {

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

@@ -1,6 +1,6 @@
 <%_ if(filters.babel) { -%>
 export default from '../../server/config/environment/shared';<% } %>
 <%_ if(filters.ts) { -%>
-import shared from '../../server/config/environment/shared';
+import shared from '../../server/config/environment/shared.js';
 
 export default shared;<% } %>

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

@@ -1,54 +1,9 @@
-// import angular from 'angular';
-// // import ngAnimate from 'angular-animate';
-// import ngCookies from 'angular-cookies';
-// import ngResource from 'angular-resource';
-// import ngSanitize from 'angular-sanitize';
-// <%_ if(filters.socketio) { _%>
-// import 'angular-socket-io';<% } %>
-// <%_ if(filters.ngroute) { _%>
-// const ngRoute = require('angular-route');<% } %>
-// <%_ if(filters.uirouter) { _%>
-// import uiRouter from 'angular-ui-router';<% } %>
-// <%_ if(filters.uibootstrap) { _%>
-// import uiBootstrap from 'angular-ui-bootstrap';<% } %>
-// // import ngMessages from 'angular-messages';
-// <%_ if(filters.auth) { _%>
-// // import ngValidationMatch from 'angular-validation-match';<% } %>
-
-// import {routeConfig} from './app.config';
-
-// <%_ if(filters.auth) { _%>
-// import _Auth from '../components/auth/auth.module';
-// import account from './account';
-// import admin from './admin';<% } %>
-// import navbar from '../components/navbar/navbar.component';
-// import footer from '../components/footer/footer.component';
-// import main from './main/main.component';
-// import constants from './app.constants';
-// import util from '../components/util/util.module';
-// <%_ if(filters.socketio) { _%>
-// import socket from '../components/socket/socket.service';<% } %>
-
-//   .config(routeConfig)
-//   <%_ if(filters.auth) { _%>
-//   .run(function($rootScope, $location, Auth) {
-//     'ngInject';
-//     // Redirect to login if route requires auth and you're not logged in
-//     $rootScope.$on('$stateChangeStart', function(event, next) {
-//       Auth.isLoggedIn(function(loggedIn) {
-//         if(next.authenticate && !loggedIn) {
-//           $location.path('/login');
-//         }
-//       });
-//     });
-//   })<% } %>;
-
-
 import {
   NgModule,
   ErrorHandler,
   Injectable,
   ApplicationRef,
+  Provider,
 } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import {
@@ -60,9 +15,7 @@ import {
 import {
   removeNgStyles,
   createNewHosts,
-  disposeOldHosts,
   createInputTransfer,
-  restoreInputValues,
 } from '@angularclass/hmr';
 <%_ if (filters.uirouter) { -%>
 import { UIRouterModule } from 'ui-router-ng2';<% } %>
@@ -79,7 +32,7 @@ import { AdminModule } from './admin/admin.module';
 
 import constants from './app.constants';
 
-let providers = [
+let providers: Provider[] = [
   provideAuth({
     // Allow using AuthHttp while not logged in
     noJwtError: true,
@@ -134,7 +87,7 @@ const appRoutes: Routes = [
 })
 export class AppModule {
   static parameters = [ApplicationRef];
-  constructor(appRef/*: ApplicationRef*/) {
+  constructor(<%= private() %>appRef: ApplicationRef) {
     this.appRef = appRef;
   }
 

Diff for: templates/app/client/app/main/main.component.js

@@ -15,8 +15,7 @@ export class MainComponent implements OnInit<% if(filters.ws) { %>, OnDestroy<%
   <%_ if(filters.models) { -%>
   newThing = '';<% } %>
 
-  <%_ if(filters.babel) { -%>
-  static parameters = [Http, SocketService];<% } %>
+  static parameters = [Http, SocketService];
   constructor(<%= private() %>http: Http<% if(filters.ws) { %>, <%= private() %>socketService: SocketService<% } %>) {
     this.Http = http;
     <%_ if(filters.ws) { -%>

Diff for: templates/app/client/components/auth(auth)/auth.service.js

@@ -6,7 +6,7 @@ import { Http } from '@angular/http';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/toPromise';
 import { safeCb, extractData } from '../util';
-import { userRoles } from '../../app/app.constants';
+import constants from '../../app/app.constants';
 
 // @flow
 class User {
@@ -19,19 +19,19 @@ class User {
 
 @Injectable()
 export class AuthService {
-  _currentUser: User = {};
+  _currentUser: User = new User();
   @Output() currentUserChanged = new EventEmitter(true);
-  userRoles = userRoles || [];
+  userRoles = constants.userRoles || [];
 
   static parameters = [Http, AuthHttp, UserService];
-  constructor(_Http_: Http, _AuthHttp_: AuthHttp, _UserService_: UserService) {
-    this.Http = _Http_;
-    this.AuthHttp = _AuthHttp_;
-    this.UserService = _UserService_;
+  constructor(<%= private() %>http: Http, <%= private() %>authHttp: AuthHttp, <%= private() %>userService: UserService) {
+    this.Http = http;
+    this.AuthHttp = authHttp;
+    this.UserService = userService;
 
     if(localStorage.getItem('id_token')) {
       this.UserService.get().toPromise()
-        .then(user => {
+        .then((user: User) => {
           this.currentUser = user;
         })
         .catch(err => {
@@ -48,7 +48,7 @@ export class AuthService {
    * @param {String} role - role to check against
    */
   static hasRole(userRole, role) {
-    return userRoles.indexOf(userRole) >= userRoles.indexOf(role);
+    return constants.userRoles.indexOf(userRole) >= constants.userRoles.indexOf(role);
   }
 
   get currentUser() {
@@ -78,7 +78,7 @@ export class AuthService {
         localStorage.setItem('id_token', res.token);
         return this.UserService.get().toPromise();
       })
-      .then(user => {
+      .then((user: User) => {
         this.currentUser = user;
         localStorage.setItem('user', JSON.stringify(user));
         safeCb(callback)(null, user);
@@ -98,7 +98,7 @@ export class AuthService {
   logout() {
     localStorage.removeItem('user');
     localStorage.removeItem('id_token');
-    this.currentUser = {};
+    this.currentUser = new User();
     return Promise.resolve();
   }
 
@@ -115,7 +115,7 @@ export class AuthService {
         localStorage.setItem('id_token', data.token);
         return this.UserService.get().toPromise();
       })
-      .then(_user => {
+      .then((_user: User) => {
         this.currentUser = _user;
         return safeCb(callback)(null, _user);
       })
@@ -135,6 +135,7 @@ export class AuthService {
    */
   changePassword(oldPassword, newPassword, callback) {
     return this.UserService.changePassword({id: this.currentUser._id}, oldPassword, newPassword)
+      .toPromise()
       .then(() => safeCb(callback)(null))
       .catch(err => safeCb(callback)(err));
   }
@@ -145,7 +146,7 @@ export class AuthService {
    * @param  {Function} [callback] - function(user)
    * @return {Promise}
    */
-  getCurrentUser(callback) {
+  getCurrentUser(callback?) {
     safeCb(callback)(this.currentUser);
     return Promise.resolve(this.currentUser);
   }
@@ -161,9 +162,10 @@ export class AuthService {
 
   /**
    * Checks if user is logged in
+   * @param {function} [callback]
    * @returns {Promise}
    */
-  isLoggedIn(callback) {
+  isLoggedIn(callback<% if(filters.ts) { %>?<% } %>) {
     let is = !!this.currentUser._id;
     safeCb(callback)(is);
     return Promise.resolve(is);
@@ -180,10 +182,10 @@ export class AuthService {
   /**
    * Check if a user is an admin
    *
-   * @param  {Function|*} callback - optional, function(is)
+   * @param  {Function|*} [callback] - optional, function(is)
    * @return {Promise}
    */
-  isAdmin(callback) {
+  isAdmin(callback?) {
     return this.getCurrentUser().then(user => {
       var is = user.role === 'admin';
       safeCb(callback)(is);

Diff for: templates/app/client/components/auth(auth)/user.service.js

@@ -10,44 +10,46 @@ import 'rxjs/add/operator/toPromise';
 // @flow
 type UserType = {
   // TODO: use Mongoose model
-  name: string;
-  email: string;
+  id?: string;
+  _id?: string;
+  name?: string;
+  email?: string;
+}
+
+function handleError(err) {
+  return Observable.throw(err.json().error || 'Server error');
 }
 
 @Injectable()
 export class UserService {
   static parameters = [AuthHttp];
-  constructor(authHttp: AuthHttp) {
+  constructor(<%= private() %>authHttp: AuthHttp) {
     this.AuthHttp = authHttp;
   }
 
-  handleError(err) {
-    Observable.throw(err.json().error || 'Server error');
-  }
-
   query(): Observable<UserType[]> {
     return this.AuthHttp.get('/api/users/')
       .map((res:Response) => res.json())
-      .catch(this.handleError);
+      .catch(handleError);
   }
-  get(user = {id: 'me'}): Observable<UserType> {
+  get(user: UserType = {id: 'me'}): Observable<UserType> {
     return this.AuthHttp.get(`/api/users/${user.id || user._id}`)
       .map((res:Response) => res.json())
-      .catch(this.handleError);
+      .catch(handleError);
   }
   create(user: UserType) {
     return this.AuthHttp.post('/api/users/', user)
       .map((res:Response) => res.json())
-      .catch(this.handleError);
+      .catch(handleError);
   }
   changePassword(user, oldPassword, newPassword) {
     return this.AuthHttp.put(`/api/users/${user.id || user._id}/password`, {oldPassword, newPassword})
       .map((res:Response) => res.json())
-      .catch(this.handleError);
+      .catch(handleError);
   }
   remove(user) {
     return this.AuthHttp.delete(`/api/users/${user.id || user._id}`)
       .map(() => user)
-      .catch(this.handleError);
+      .catch(handleError);
   }
 }

Diff for: templates/app/client/components/navbar/navbar.component.js

@@ -22,7 +22,7 @@ export class NavbarComponent {
   <%_ if(filters.auth) { -%>
 
   static parameters = [AuthService<% if(filters.uirouter) { %>, StateService<% } else { %>, Router<% } %>];
-  constructor(authService: AuthService<% if(filters.uirouter) { %>, stateService: StateService<% } else { %>, router: Router<% } %>) {
+  constructor(<%= private() %>authService: AuthService<% if(filters.uirouter) { %>, <%= private() %>stateService: StateService<% } else { %>, <%= private() %>router: Router<% } %>) {
     this.AuthService = authService;
     <%_ if(filters.uirouter) { -%>
     this.StateService = stateService;<% } %>
@@ -32,7 +32,7 @@ export class NavbarComponent {
     this.reset();
 
     this.AuthService.currentUserChanged.subscribe(user => {
-      this.currentuser = user;
+      this.currentUser = user;
       this.reset();
     });
   }

Diff for: templates/app/client/components/util.js

@@ -44,9 +44,9 @@ export function urlParse(url) {
  * @return {Boolean}                    - true if url is same origin
  */
 export function isSameOrigin(url, origins) {
-  url = Util.urlParse(url);
+  url = urlParse(url);
   origins = (origins && [].concat(origins)) || [];
-  origins = origins.map(Util.urlParse);
+  origins = origins.map(urlParse);
   origins.push(window.location);
   origins = origins.filter(function(o) {
     let hostnameCheck = url.hostname === o.hostname;

Diff for: templates/app/server/api/user(auth)/user.controller.js

@@ -47,7 +47,7 @@ export function create(req, res) {
   <% if (filters.mongooseModels) { %>var newUser = new User(req.body);
   newUser.provider = 'local';
   newUser.role = 'user';
-  newUser.save()<% }
+  return newUser.save()<% }
      if (filters.sequelizeModels) { %>var newUser = User.build(req.body);
   newUser.setDataValue('provider', 'local');
   newUser.setDataValue('role', 'user');