jwt is returned as json in body

Author: akirasosa

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

@@ -1,6 +1,5 @@
 import {inject, TestBed} from "@angular/core/testing";
 import {
-  Headers,
   ResponseOptions,
   Response,
   RequestMethod,
@@ -34,7 +33,7 @@ describe('LoginService', () => {
     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');

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

@@ -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/login', body).do((resp: Response) => {
+      localStorage.setItem('jwt', resp.json().token);
       this.authEvents.next(new DidLogin());
     });
   }

src/app/core/services/user.service.ts

@@ -32,10 +32,7 @@ export class UserService {
   }
 
   updateMe(userParam: UserParams): Observable<Response> {
-    return this.http.patch(`${url}/me`, userParam)
-      .do(resp => {
-        localStorage.setItem('jwt', resp.headers.get('x-auth-token'));
-      });
+    return this.http.patch(`${url}/me`, userParam);
   }
 
   listFollowings(userId: string,

src/app/pages/+signup/signup.component.spec.ts

@@ -7,7 +7,7 @@ import {
   TestBed,
   ComponentFixture
 } from "@angular/core/testing";
-import {BaseResponseOptions, Response} from "@angular/http";
+import {BaseResponseOptions, Response, ResponseOptions} from "@angular/http";
 import {MockBackend} from "@angular/http/testing";
 import {Router} from "@angular/router";
 import {SignupComponent} from "./signup.component";
@@ -93,7 +93,9 @@ describe('SignupComponent', () => {
     const page: SignupComponent = cmpDebugElement.componentInstance;
     spyOn(loginService, 'login').and.callThrough();
     backend.connections.subscribe(conn => {
-      conn.mockRespond(new Response(new BaseResponseOptions()));
+      conn.mockRespond(new Response(new ResponseOptions({
+        body: JSON.stringify({token: 'my jwt'}),
+      })));
     });
     page.onSubmit({
       email: 'test@test.com',

src/app/pages/login/login.component.spec.ts

@@ -7,7 +7,7 @@ import {
   ComponentFixture,
   inject
 } from "@angular/core/testing";
-import {BaseResponseOptions, Response} from "@angular/http";
+import {BaseResponseOptions, Response, ResponseOptions} from "@angular/http";
 import {Location} from "@angular/common";
 import {MockBackend} from "@angular/http/testing";
 import {Router} from "@angular/router";
@@ -77,7 +77,9 @@ describe('LoginComponent', () => {
     const cmp: LoginComponent = cmpDebugElement.componentInstance;
     spyOn(loginService, 'login').and.callThrough();
     backend.connections.subscribe(conn => {
-      conn.mockRespond(new Response(new BaseResponseOptions()));
+      conn.mockRespond(new Response(new ResponseOptions({
+        body: JSON.stringify({token: 'my jwt'}),
+      })));
     });
     cmp.login('test@test.com', 'secret');
     expect(loginService.login).toHaveBeenCalledWith('test@test.com', 'secret');