Remove deprecated RouterState.queryParam

Author: neroniaky

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## v0.1.3
+**Bugfixes:**
+- Removes deprecated RouterState.queryParam for ActivatedRoute.params (fixes [#5](https://github.com/neroniaky/angular2-token/issues/5))
+
 ## v0.1.2
 **Features:**
 - Added `requestOptions` to parameter to all HTTP wrapper methods

README.md

@@ -14,6 +14,8 @@ Angular2-Token is currently in Alpha. Any contribution is much appreciated.
 ## Live Demo
 You can try out Angular2-Token [here](https://angular2-token.herokuapp.com/).
 
+The repository can be found [here](https://github.com/neroniaky/angular2-token-example).
+
 ## Content
 - [Installation](#installation)
 - [Configuration](#configuration)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular2-token",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Angular2 service for token based authentication",
   "main": "./angular2-token.js",
   "typings": "./angular2-token.d.ts",

src/angular2-token.service.ts

@@ -7,7 +7,7 @@ import {
     RequestMethod,
     RequestOptions
 } from '@angular/http';
-import { Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/share';
 
@@ -38,7 +38,7 @@ export class Angular2TokenService {
 
     constructor(
         private _http: Http,
-        private _router: Router
+        private _activatedRoute: ActivatedRoute
     ) { }
 
     // Inital configuration
@@ -284,20 +284,20 @@ export class Angular2TokenService {
     // Try to get auth data from url parameters.
     private _getAuthDataFromParams() {
 
-        if (this._router.routerState != null) { // Fix for Testing, has to be removed later
-            this._router.routerState.queryParams.subscribe(params => {
+        if (this._activatedRoute.params != null) { // Fix for Testing, has to be removed later
 
-                let authData: AuthData = {
-                    accessToken: params['token'],
-                    client: params['client_id'],
-                    expiry: params['expiry'],
-                    tokenType: 'Bearer',
-                    uid: params['uid']
-                };
+            let params = this._activatedRoute.params;
 
-                if (this._checkIfComplete(authData))
-                    this._currentAuthData = authData;
-            });
+            let authData: AuthData = {
+                accessToken: params['token'],
+                client: params['client_id'],
+                expiry: params['expiry'],
+                tokenType: 'Bearer',
+                uid: params['uid']
+            };
+
+            if (this._checkIfComplete(authData))
+                this._currentAuthData = authData;
         }
     }
 

src/angular2-token.spec.ts

@@ -2,7 +2,7 @@ import { Http, BaseRequestOptions, Response, ResponseOptions, Headers, RequestMe
 import { MockBackend } from '@angular/http/testing';
 import { provide } from '@angular/core';
 import { inject, addProviders } from '@angular/core/testing';
-import { Router, ActivatedRoute, RouterOutletMap, RouterState } from '@angular/router';
+import { ActivatedRoute, RouterOutletMap, RouterState } from '@angular/router';
 
 import { Angular2TokenService } from './';
 
@@ -46,7 +46,7 @@ describe('Angular2TokenService', () => {
 		addProviders([
 			BaseRequestOptions,
 			MockBackend,
-			{ provide: Router, useClass: Mock },
+			{ provide: ActivatedRoute, useClass: Mock },
 			{
 				provide: Http,
 				useFactory: (backend, defaultOptions) => { return new Http(backend, defaultOptions) },