Merge branch 'deploy/stg' into deploy/prod

Author: akirasosa

package.json

@@ -39,33 +39,32 @@
   },
   "homepage": "https://github.com/springboot-angular2-tutorial/angular2-app",
   "dependencies": {
-    "@angular/common": "2.1.0",
-    "@angular/compiler": "2.1.0",
-    "@angular/core": "2.1.0",
-    "@angular/forms": "2.1.0",
-    "@angular/http": "2.1.0",
-    "@angular/platform-browser": "2.1.0",
-    "@angular/platform-browser-dynamic": "2.1.0",
-    "@angular/router": "3.1.0",
+    "@angular/common": "^2.1.0",
+    "@angular/compiler": "^2.1.0",
+    "@angular/core": "^2.1.0",
+    "@angular/forms": "^2.1.0",
+    "@angular/http": "^2.1.0",
+    "@angular/platform-browser": "^2.1.0",
+    "@angular/platform-browser-dynamic": "^2.1.0",
+    "@angular/router": "^3.1.0",
     "bootstrap": "^4.0.0-alpha.4",
     "core-js": "^2.4.1",
     "jquery": "^2.2.4",
     "lodash-es": "^4.16.4",
     "md5-hex": "^1.1.0",
-    "moment": "^2.12.0",
     "pluralize": "~3.0.0",
     "rxjs": "5.0.0-beta.12",
     "time-ago": "^0.1.0",
     "toastr": "^2.1.2",
     "zone.js": "~0.6.17"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "2.1.0",
-    "@angular/platform-server": "2.1.0",
+    "@angular/compiler-cli": "^2.1.0",
+    "@angular/platform-server": "^2.1.0",
     "@types/jasmine": "^2.5.35",
     "@types/lodash": "^4.14.37",
     "@types/node": "^6.0.45",
-    "@types/pluralize": "0.0.27",
+    "@types/pluralize": "^0.0.27",
     "@types/source-map": "^0.1.28",
     "@types/toastr": "^2.1.27",
     "@types/webpack": "^1.12.35",

src/app/app.module.ts

@@ -8,7 +8,7 @@ import {AppComponent} from "./app.component";
 import {HeaderComponent} from "./components";
 import {CoreModule} from "./core";
 import {HomeModule} from "./pages/home/home.module";
-import {LoginModule} from "./pages/login/login.module";
+import {AuthModule} from "./pages/auth/auth.module";
 import {TopModule} from "./pages/top/top.module";
 import {NoContentComponent} from "./pages/no-content/no-content.component";
 
@@ -29,7 +29,7 @@ import {NoContentComponent} from "./pages/no-content/no-content.component";
 
     CoreModule,
     HomeModule,
-    LoginModule,
+    AuthModule,
     TopModule,
   ],
   providers: [

src/app/app.routes.ts

@@ -1,7 +1,7 @@
 import {Routes} from "@angular/router";
 import {HomeComponent} from "./pages/home/home.component";
 import {ProfileDataResolver} from "./core/services/profile-data.resolver";
-import {LoginComponent} from "./pages/login/login.component";
+import {AuthComponent} from "./pages/auth/auth.component";
 import {TopComponent} from "./pages/top/top.component";
 import {PrivatePageGuard} from "./core/services/private-page.guard";
 import {PublicPageGuard} from "./core/services/public-page.guard";
@@ -38,7 +38,7 @@ export const ROUTES: Routes = [
     loadChildren: './pages/+user-list/user-list.module#UserListModule',
     canActivate: [PrivatePageGuard],
   },
-  {path: 'login', component: LoginComponent, canActivate: [PublicPageGuard]},
+  {path: 'login', component: AuthComponent, canActivate: [PublicPageGuard]},
   {
     path: 'signup',
     loadChildren: './pages/+signup/signup.module#SignupModule',

src/app/components/header/header.component.html

@@ -26,7 +26,7 @@
         <a class="nav-link" [routerLink]="['/login']">Sign in</a>
       </li>
     </ul>
-    <ul class="nav navbar-nav pull-sm-right" *ngIf="isSignedIn">
+    <ul class="nav navbar-nav float-sm-right" *ngIf="isSignedIn">
       <li class="nav-item profile" routerLinkActive="active"
           [routerLinkActiveOptions]="{exact: true}">
         <a class="nav-link" [routerLink]="['/users/me']">Profile</a>

src/app/components/header/header.component.spec.ts

@@ -14,7 +14,7 @@ import {HeaderComponent} from "./header.component";
 import {RouterTestingModule} from "@angular/router/testing";
 import {CoreModule} from "../../core";
 import {APP_TEST_HTTP_PROVIDERS, login, advance} from "../../../testing";
-import {LoginService} from "../../core/services/login.service";
+import {AuthService} from "../../core/services/auth.service";
 import {UserService} from "../../core/services/user.service";
 
 describe('HeaderComponent', () => {
@@ -76,9 +76,9 @@ describe('HeaderComponent', () => {
   };
 
   describe('when signed in', () => {
-    let loginService: LoginService;
+    let authService: AuthService;
 
-    beforeEach(inject([LoginService], _ => loginService = _));
+    beforeEach(inject([AuthService], _ => authService = _));
     beforeEach(login());
     beforeEach(initComponent());
 
@@ -142,9 +142,9 @@ describe('HeaderComponent', () => {
     it('shows a nav link to logout', fakeAsync(() => {
       const link = getDOM().querySelector(cmpDebugElement.nativeElement, '.nav-item.logout>a');
       expect(link).toBeTruthy();
-      spyOn(loginService, 'logout');
+      spyOn(authService, 'logout');
       link.click();
-      expect(loginService.logout).toHaveBeenCalled();
+      expect(authService.logout).toHaveBeenCalled();
     }));
   }); // when signed in
 

src/app/components/header/header.component.ts

@@ -1,6 +1,6 @@
 import {Component, OnInit} from "@angular/core";
 import {Router} from "@angular/router";
-import {LoginService} from "../../core/services/login.service";
+import {AuthService} from "../../core/services/auth.service";
 
 @Component({
   selector: 'mpt-header',
@@ -12,18 +12,18 @@ export class HeaderComponent implements OnInit {
   isSignedIn: boolean;
 
   constructor(private router: Router,
-              private loginService: LoginService) {
+              private authService: AuthService) {
   }
 
   ngOnInit(): void {
-    this.isSignedIn = this.loginService.isSignedIn();
-    this.loginService.events.subscribe(() => {
-      this.isSignedIn = this.loginService.isSignedIn();
+    this.isSignedIn = this.authService.isSignedIn();
+    this.authService.events.subscribe(() => {
+      this.isSignedIn = this.authService.isSignedIn();
     });
   }
 
   logout() {
-    this.loginService.logout();
+    this.authService.logout();
     this.router.navigate(['/login']);
   }
 

src/app/core/core.module.ts

@@ -2,7 +2,7 @@ import {CommonModule} from "@angular/common";
 import {NgModule} from "@angular/core/src/metadata/ng_module";
 import {SkipSelf, Optional} from "@angular/core";
 import {HttpErrorHandler} from "./services/http-error-handler";
-import {LoginService} from "./services/login.service";
+import {AuthService} from "./services/auth.service";
 import {MicropostService} from "./services/micropost.service";
 import {UserService} from "./services/user.service";
 import {PrivatePageGuard} from "./services/private-page.guard";
@@ -30,7 +30,7 @@ export function createJsonHttp(xhrBackend: XHRBackend, requestOptions: RequestOp
       deps: [XHRBackend, RequestOptions]
     },
     HttpErrorHandler,
-    LoginService,
+    AuthService,
     MicropostService,
     UserService,
 

src/app/core/domains.ts

@@ -12,6 +12,7 @@ export interface User {
   name?:string;
   userStats?:UserStats;
   isMyself?:boolean;
+  isFollowedByMe?:boolean;
   avatarHash?:string;
 }
 
@@ -23,6 +24,5 @@ export interface UserStats {
   micropostCnt:number;
   followingCnt:number;
   followerCnt:number;
-  followedByMe:boolean;
 }
 

src/app/core/services/login.service.ts renamed to src/app/core/services/auth.service.ts

@@ -5,7 +5,7 @@ import {Subject} from "rxjs/Rx";
 import {JsonHttp} from "./";
 
 @Injectable()
-export class LoginService {
+export class AuthService {
 
   private authEvents: Subject<AuthEvent>;
 
@@ -18,8 +18,8 @@ export class LoginService {
       email: email,
       password: password,
     };
-    return this.http.post('/api/login', body).do(resp => {
-      localStorage.setItem('jwt', resp.headers.get('x-auth-token'));
+    return this.http.post('/api/auth', body).do((resp: Response) => {
+      localStorage.setItem('jwt', resp.json().token);
       this.authEvents.next(new DidLogin());
     });
   }

src/app/core/services/http-error-handler.spec.ts

@@ -1,14 +1,14 @@
 import {inject, TestBed} from "@angular/core/testing";
 import {Router} from "@angular/router";
 import {HttpErrorHandler} from "./http-error-handler";
-import {LoginService} from "./login.service";
+import {AuthService} from "./auth.service";
 import {CoreModule} from "../core.module";
 import {APP_TEST_HTTP_PROVIDERS} from "../../../testing";
 
 describe('HttpErrorHandler', () => {
 
   let errorHandler: HttpErrorHandler;
-  let loginService: LoginService;
+  let authService: AuthService;
   let router: Router;
 
   class MockRouter {
@@ -31,22 +31,22 @@ describe('HttpErrorHandler', () => {
     });
   });
 
-  beforeEach(inject([HttpErrorHandler, LoginService, Router], (..._) => {
-    [errorHandler, loginService, router] = _;
-    spyOn(loginService, 'logout');
+  beforeEach(inject([HttpErrorHandler, AuthService, Router], (..._) => {
+    [errorHandler, authService, router] = _;
+    spyOn(authService, 'logout');
     spyOn(router, 'navigate');
   }));
 
   describe('.handle', () => {
     it('handles 401 response', () => {
       errorHandler.handle({status: 401});
-      expect(loginService.logout).toHaveBeenCalled();
+      expect(authService.logout).toHaveBeenCalled();
       expect(router.navigate).toHaveBeenCalledWith(['login']);
     });
 
     it('does not handle other errors', () => {
       errorHandler.handle({status: 400});
-      expect(loginService.logout).not.toHaveBeenCalled();
+      expect(authService.logout).not.toHaveBeenCalled();
       expect(router.navigate).not.toHaveBeenCalled();
     });
   }); // .handle

src/app/core/services/http-error-handler.ts

@@ -1,19 +1,19 @@
 import {Injectable} from "@angular/core";
 import {Router} from "@angular/router";
 import * as toastr from "toastr";
-import {LoginService} from "./login.service";
+import {AuthService} from "./auth.service";
 
 @Injectable()
 export class HttpErrorHandler {
 
   constructor(private router:Router,
-              private loginService:LoginService) {
+              private authService:AuthService) {
   }
 
   handle(error:any) {
     if (error.status === 401) {
       toastr.error('Please sign in');
-      this.loginService.logout();
+      this.authService.logout();
       this.router.navigate(['login']);
     }
   }

src/app/core/services/login.service.spec.ts

@@ -1,18 +1,17 @@
 import {inject, TestBed} from "@angular/core/testing";
 import {
-  Headers,
   ResponseOptions,
   Response,
   RequestMethod,
   HttpModule
 } from "@angular/http";
 import {MockBackend} from "@angular/http/testing";
-import {LoginService} from "./login.service";
+import {AuthService} from "./auth.service";
 import {APP_TEST_HTTP_PROVIDERS} from "../../../testing";
 
-describe('LoginService', () => {
+describe('AuthService', () => {
 
-  let loginService: LoginService;
+  let authService: AuthService;
   let backend: MockBackend;
 
   beforeEach(() => {
@@ -22,28 +21,28 @@ describe('LoginService', () => {
       ],
       providers: [
         APP_TEST_HTTP_PROVIDERS,
-        LoginService,
+        AuthService,
       ],
     });
   });
-  beforeEach(inject([LoginService, MockBackend], (..._) => {
-    [loginService, backend] = _;
+  beforeEach(inject([AuthService, MockBackend], (..._) => {
+    [authService, backend] = _;
   }));
 
   describe('.login', () => {
     it('can login', (done) => {
       backend.connections.subscribe(conn => {
         conn.mockRespond(new Response(new ResponseOptions({
-          headers: new Headers({'x-auth-token': 'my jwt'}),
+          body: JSON.stringify({token: 'my jwt'}),
         })));
         expect(conn.request.method).toEqual(RequestMethod.Post);
-        expect(conn.request.url).toEqual('/api/login');
+        expect(conn.request.url).toEqual('/api/auth');
         expect(conn.request.json()).toEqual({
           email: 'test@test.com',
           password: 'secret',
         });
       });
-      loginService.login('test@test.com', 'secret').subscribe(() => {
+      authService.login('test@test.com', 'secret').subscribe(() => {
         expect(localStorage.getItem('jwt')).toEqual('my jwt');
         done();
       });
@@ -53,22 +52,22 @@ describe('LoginService', () => {
   describe('.logout', () => {
     it('can logout', () => {
       localStorage.setItem('jwt', 'my jwt');
-      loginService.logout();
+      authService.logout();
       expect(localStorage.getItem('jwt')).toBeFalsy();
     });
   }); // .logout
 
   describe('.isSignedIn', () => {
     describe('when not signed in', () => {
       it('should be false', () => {
-        expect(loginService.isSignedIn()).toBeFalsy();
+        expect(authService.isSignedIn()).toBeFalsy();
       });
     });
 
     describe('when signed in', () => {
       beforeEach(() => localStorage.setItem('jwt', 'dummy'));
       it('should be true', () => {
-        expect(loginService.isSignedIn()).toBeTruthy();
+        expect(authService.isSignedIn()).toBeTruthy();
       });
     });
   }); // .isSignedIn

src/app/core/services/private-page.guard.ts

@@ -1,18 +1,18 @@
 import {Injectable} from "@angular/core";
 import {CanActivate, Router} from "@angular/router";
-import {LoginService} from "./login.service";
+import {AuthService} from "./auth.service";
 
 @Injectable()
 export class PrivatePageGuard implements CanActivate {
 
-  constructor(private router:Router, private loginService:LoginService) {
+  constructor(private router:Router, private authService:AuthService) {
   }
 
   canActivate() {
-    if (!this.loginService.isSignedIn()) {
+    if (!this.authService.isSignedIn()) {
       this.router.navigate(['/login']);
     }
-    return this.loginService.isSignedIn();
+    return this.authService.isSignedIn();
   }
 
 }