Update to Angular 2.0.0-alpha.31...Swapped out fetch with Http.

Author: Nathan Walker

package.json

@@ -21,10 +21,10 @@
   },
   "homepage": "https://github.com/auth0/angular2-authentication-sample",
   "dependencies": {
-    "angular2": "2.0.0-alpha.30",
+    "angular2": "2.0.0-alpha.31",
     "raw-loader": "^0.5.1",
     "reflect-metadata": "^0.1.0",
-    "rtts_assert": "2.0.0-alpha.29",
+    "rtts_assert": "2.0.0-alpha.31",
     "rx": "^2.5.3",
     "zone.js": "^0.5.0",
     "bootstrap": "~3.3.4",

src/home/home.ts

@@ -2,7 +2,8 @@
 
 import {Component, View} from 'angular2/angular2';
 import {coreDirectives} from 'angular2/directives';
-import {status, text} from '../utils/fetch'
+import {status, text} from '../utils/fetch';
+import {Http} from 'angular2/http';
 import { Router} from 'angular2/router';
 
 let styles   = require('./home.css');
@@ -23,7 +24,7 @@ export class Home {
   response: string;
   api: string;
 
-  constructor(public router: Router) {
+  constructor(public router: Router, public http: Http) {
     this.jwt = localStorage.getItem('jwt');
     this.decodedJwt = this.jwt && window.jwt_decode(this.jwt);
   }
@@ -43,22 +44,24 @@ export class Home {
   _callApi(type, url) {
     this.response = null;
     this.api = type;
-    window.fetch(url, {
-      method: 'GET',
+    this.http.get(url, {
       headers: {
         'Accept': 'application/json',
         'Content-Type': 'application/json',
         'Authorization': 'bearer ' + this.jwt
       }
     })
-    .then(status)
-    .then(text)
-    .then((response) => {
-      this.response = response;
-    })
-    .catch((error) => {
-      this.response = error.message;
-    });
+    .toRx()
+    .map(status)
+    .map(text)
+    .subscribe(
+      response => {
+          this.response = response;
+      },
+      error => {
+          this.response = error.message;
+      }
+    )
   }
 
 }

src/login/login.ts

@@ -1,7 +1,8 @@
 /// <reference path="../../typings/tsd.d.ts" />
 
 import {Component, View} from 'angular2/angular2';
-import {status, json} from '../utils/fetch'
+import {status, json} from '../utils/fetch';
+import {Http} from 'angular2/http';
 import { Router, RouterLink } from 'angular2/router';
 
 
@@ -18,13 +19,12 @@ let template = require('./login.html');
   directives: [RouterLink]
 })
 export class Login {
-  constructor(public router: Router) {
+  constructor(public router: Router, public http: Http) {
   }
 
   login(event, username, password) {
     event.preventDefault();
-    window.fetch('http://localhost:3001/sessions/create', {
-      method: 'POST',
+    this.http.post('http://localhost:3001/sessions/create', {
       headers: {
         'Accept': 'application/json',
         'Content-Type': 'application/json'
@@ -33,16 +33,19 @@ export class Login {
         username, password
       })
     })
-    .then(status)
-    .then(json)
-    .then((response) => {
-      localStorage.setItem('jwt', response.id_token);
-      this.router.parent.navigate('/home');
-    })
-    .catch((error) => {
-      alert(error.message);
-      console.log(error.message);
-    });
+    .toRx()
+    .map(status)
+    .map(json)
+    .subscribe(
+      response => {
+        localStorage.setItem('jwt', response.id_token);
+        this.router.parent.navigate('/home');
+      },
+      error => {
+        alert(error.message);
+        console.log(error.message);
+      }
+    );
   }
 
   signup(event) {

src/signup/signup.ts

@@ -3,6 +3,7 @@
 import {coreDirectives} from 'angular2/directives';
 import {Component, View} from 'angular2/angular2';
 import {status, json} from '../utils/fetch';
+import {Http} from 'angular2/http';
 import { Router, RouterLink } from 'angular2/router';
 
 let styles   = require('./signup.css');
@@ -17,13 +18,12 @@ let template = require('./signup.html');
   template: template
 })
 export class Signup {
-  constructor(public router: Router) {
+  constructor(public router: Router, public http: Http) {
   }
 
   signup(event, username, password) {
     event.preventDefault();
-    window.fetch('http://localhost:3001/users', {
-      method: 'POST',
+    this.http.post('http://localhost:3001/users', {
       headers: {
         'Accept': 'application/json',
         'Content-Type': 'application/json'
@@ -32,16 +32,19 @@ export class Signup {
         username, password
       })
     })
-    .then(status)
-    .then(json)
-    .then((response) => {
-      localStorage.setItem('jwt', response.id_token);
-      this.router.navigate('/home');
-    })
-    .catch((error) => {
-      alert(error.message);
-      console.log(error.message);
-    });
+    .toRx()
+    .map(status)
+    .map(json)
+    .subscribe(
+      response => {
+        localStorage.setItem('jwt', response.id_token);
+        this.router.navigate('/home');
+      },
+      error => {
+        alert(error.message);
+        console.log(error.message);
+      }
+    );
   }
 
   login(event) {