Upgrade to HttpClient over old Http

Author: fmalcher

angular-oauth2-oidc/src/index.ts

@@ -1,5 +1,7 @@
 import { NgModule, ModuleWithProviders } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { HttpClientModule } from '@angular/common/http';
+
 import { OAuthService } from './oauth-service';
 import { UrlHelperService } from './url-helper.service';
 
@@ -26,7 +28,7 @@ export * from './tokens';
 @NgModule({
   imports: [
     CommonModule,
-    //HttpModule
+    HttpClientModule
   ],
   declarations: [
   ],

angular-oauth2-oidc/src/oauth-service.ts

@@ -1,10 +1,11 @@
-import { Http, URLSearchParams, Headers } from '@angular/http';
 import { Injectable, Optional } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { Subject } from 'rxjs/Subject';
+import { Subscription } from 'rxjs/Subscription';
+
 import { ValidationHandler, ValidationParams } from './token-validation/validation-handler';
 import { UrlHelperService } from './url-helper.service';
-import { Subscription } from 'rxjs/Subscription';
 import { OAuthEvent, OAuthInfoEvent, OAuthErrorEvent, OAuthSuccessEvent } from './events';
 import { OAuthStorage, LoginOptions, ParsedIdToken } from './types';
 import { b64DecodeUnicode } from './base64-helper';
@@ -65,7 +66,7 @@ export class OAuthService
     private silentRefreshSubject: string;
 
     constructor(
-        private http: Http,
+        private http: HttpClient,
         @Optional() storage: OAuthStorage,
         @Optional() tokenValidationHandler: ValidationHandler,
         @Optional() private config: AuthConfig,
@@ -92,7 +93,6 @@ export class OAuthService
 
         this.setupRefreshTimer();
 
-        
     }
 
     /**
@@ -140,14 +140,13 @@ export class OAuthService
      * @param params Additional parameter to pass
      */
     public setupAutomaticSilentRefresh(params: object = {}) {
-        this
-        .events
-        .filter(e => e.type === 'token_expires')
-        .subscribe(e => {
-          this.silentRefresh(params).catch(_ => {
-              this.debug('automatic silent refresh did not work');
-          })
-        });
+        this.events
+            .filter(e => e.type === 'token_expires')
+            .subscribe(e => {
+                this.silentRefresh(params).catch(_ => {
+                    this.debug('automatic silent refresh did not work');
+                });
+            });
 
         this.restartRefreshTimerIfStillLoggedIn();
     }
@@ -306,7 +305,7 @@ export class OAuthService
                 fullUrl = this.issuer || '';
                 if (!fullUrl.endsWith('/')) {
                     fullUrl += '/';
-                }               
+                }
                 fullUrl += '.well-known/openid-configuration';
             }
 
@@ -315,7 +314,7 @@ export class OAuthService
                 return;
             }
 
-            this.http.get(fullUrl).map(r => r.json()).subscribe(
+            this.http.get<any>(fullUrl).subscribe(
                 (doc) => {
 
                     if (!this.validateDiscoveryDocument(doc)) {
@@ -368,7 +367,7 @@ export class OAuthService
     private loadJwks(): Promise<object> {
         return new Promise<object>((resolve, reject) => {
             if (this.jwksUri) {
-                this.http.get(this.jwksUri).map(r => r.json()).subscribe(
+                this.http.get(this.jwksUri).subscribe(
                     jwks => {
                         this.jwks = jwks;
                         this.eventsSubject.next(new OAuthSuccessEvent('discovery_document_loaded'));
@@ -458,7 +457,7 @@ export class OAuthService
     public fetchTokenUsingPasswordFlowAndLoadUserProfile(
         userName: string,
         password: string,
-        headers: Headers = new Headers()): Promise<object> {
+        headers: HttpHeaders = new HttpHeaders()): Promise<object> {
         return this
                 .fetchTokenUsingPasswordFlow(userName, password, headers)
                 .then(() => this.loadUserProfile());
@@ -481,15 +480,15 @@ export class OAuthService
 
         return new Promise((resolve, reject) => {
 
-            let headers = new Headers();
-            headers.set('Authorization', 'Bearer ' + this.getAccessToken());
+            const headers = new HttpHeaders()
+                .set('Authorization', 'Bearer ' + this.getAccessToken());
 
-            this.http.get(this.userinfoEndpoint, { headers }).map(r => r.json()).subscribe(
+            this.http.get<any>(this.userinfoEndpoint, { headers }).subscribe(
                 (doc) => {
                     this.debug('userinfo received', doc);
 
                     let existingClaims = this.getIdentityClaims() || {};
-                    
+
                     if (!this.skipSubjectCheck) {
                         if (this.oidc && (!existingClaims['sub'] || doc.sub !== existingClaims['sub'])) {
                             let err = 'if property oidc is true, the received user-id (sub) has to be the user-id '
@@ -522,7 +521,7 @@ export class OAuthService
      * @param password
      * @param headers Optional additional http-headers.
      */
-    public fetchTokenUsingPasswordFlow(userName: string, password: string, headers: Headers = new Headers()): Promise<object> {
+    public fetchTokenUsingPasswordFlow(userName: string, password: string, headers: HttpHeaders = new HttpHeaders()): Promise<object> {
 
         if (!this.validateUrlForHttps(this.tokenEndpoint)) {
             throw new Error('tokenEndpoint must use Http. Also check property requireHttps.');
@@ -544,7 +543,7 @@ export class OAuthService
 
             let params = search.toString();
 
-            this.http.post(this.tokenEndpoint, params, { headers }).map(r => r.json()).subscribe(
+            this.http.post<any>(this.tokenEndpoint, params, { headers }).subscribe(
                 (tokenResponse) => {
                     this.debug('tokenResponse', tokenResponse);
                     this.storeAccessTokenResponse(tokenResponse.access_token, tokenResponse.refresh_token, tokenResponse.expires_in);
@@ -586,12 +585,12 @@ export class OAuthService
                 search.set('client_secret', this.dummyClientSecret);
             }
 
-            let headers = new Headers();
-            headers.set('Content-Type', 'application/x-www-form-urlencoded');
+            const headers = new HttpHeaders()
+                .set('Content-Type', 'application/x-www-form-urlencoded');
 
             let params = search.toString();
 
-            this.http.post(this.tokenEndpoint, params, { headers }).map(r => r.json()).subscribe(
+            this.http.post<any>(this.tokenEndpoint, params, { headers }).subscribe(
                 (tokenResponse) => {
                     this.debug('refresh tokenResponse', tokenResponse);
                     this.storeAccessTokenResponse(tokenResponse.access_token, tokenResponse.refresh_token, tokenResponse.expires_in);
@@ -785,8 +784,7 @@ export class OAuthService
     }
 
     private waitForSilentRefreshAfterSessionChange() {
-        this
-            .events
+        this.events
             .filter((e: OAuthEvent) =>
                 e.type === 'silently_refreshed'
                 || e.type === 'silent_refresh_timeout'
@@ -1396,7 +1394,7 @@ export class OAuthService
         this._storage.removeItem('id_token_expires_at');
         this._storage.removeItem('id_token_stored_at');
         this._storage.removeItem('access_token_stored_at');
-        
+
         this.silentRefreshSubject = null;
 
         if (!this.logoutUrl) return;
@@ -1406,7 +1404,7 @@ export class OAuthService
         let logoutUrl: string;
 
         if (!this.validateUrlForHttps(this.logoutUrl)) throw new Error('logoutUrl must use Http. Also check property requireHttps.');
-        
+
         // For backward compatibility
         if (this.logoutUrl.indexOf('{{') > -1) {
             logoutUrl = this.logoutUrl.replace(/\{\{id_token\}\}/, id_token);