migration to HttpClient

generators/client/files-angular.js

@@ -138,7 +138,6 @@ const files = {
                 // interceptors
                 'blocks/interceptor/_errorhandler.interceptor.ts',
                 'blocks/interceptor/_notification.interceptor.ts',
-                'blocks/interceptor/_http.provider.ts',
                 'blocks/interceptor/_auth-expired.interceptor.ts'
             ]
         },
@@ -380,7 +379,6 @@ const files = {
                 'shared/constants/_error.constants.ts',
                 'shared/constants/_pagination.constants.ts',
                 // models
-                'shared/model/_response-wrapper.model.ts',
                 'shared/model/_request-util.ts',
                 'shared/model/_base-entity.ts',
                 'shared/user/_account.model.ts',

generators/client/templates/angular/_package.json

@@ -30,7 +30,6 @@
     "@angular/compiler": "5.1.0",
     "@angular/core": "5.1.0",
     "@angular/forms": "5.1.0",
-    "@angular/http": "5.1.0",
     "@angular/platform-browser": "5.1.0",
     "@angular/platform-browser-dynamic": "5.1.0",
     "@angular/router": "5.1.0",

generators/client/templates/angular/src/main/webapp/app/_app.module.ts

@@ -18,9 +18,20 @@
 -%>
 import './vendor.ts';
 
-import { NgModule } from '@angular/core';
+import { NgModule, Injector } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { Ng2Webstorage } from 'ngx-webstorage';
+import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import { Ng2Webstorage<% if (authenticationType === 'jwt') { %>, LocalStorageService, SessionStorageService <% } %> } from 'ngx-webstorage';
+import { JhiEventManager } from 'ng-jhipster';
+
+<%_ if (authenticationType === 'jwt') { _%>
+import { AuthInterceptor } from './blocks/interceptor/auth.interceptor';
+<%_ } _%>
+<%_ if (authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
+import { AuthExpiredInterceptor } from './blocks/interceptor/auth-expired.interceptor';
+<% } %>
+import { ErrorHandlerInterceptor } from './blocks/interceptor/errorhandler.interceptor';
+import { NotificationInterceptor } from './blocks/interceptor/notification.interceptor';
 
 import { <%=angularXAppName%>SharedModule, UserRouteAccessService } from './shared';
 import { <%=angularXAppName%>AppRoutingModule} from './app-routing.module';
@@ -30,9 +41,15 @@ import { <%=angularXAppName%>AdminModule } from './admin/admin.module';
 import { <%=angularXAppName%>AccountModule } from './account/account.module';
 <%_ } _%>
 import { <%=angularXAppName%>EntityModule } from './entities/entity.module';
-import { customHttpProvider } from './blocks/interceptor/http.provider';
 import { PaginationConfig } from './blocks/config/uib-pagination.config';
 
+<%_ if (authenticationType === 'session' || authenticationType === 'oauth2') { _%>
+    <%_ if (authenticationType === 'session') { _%>
+import { LoginModalService } from './shared/login/login-modal.service';
+    <%_ } _%>
+import { StateStorageService } from './shared/auth/state-storage.service';
+<%_ } _%>
+
 // jhipster-needle-angular-add-module-import JHipster will add new module here
 
 import {
@@ -73,9 +90,66 @@ import {
     ],
     providers: [
         ProfileService,
-        customHttpProvider(),
         PaginationConfig,
-        UserRouteAccessService
+        UserRouteAccessService,
+        <%_ if (authenticationType === 'jwt') { _%>
+        {
+            provide: HTTP_INTERCEPTORS,
+            useFactory: (localStorageService, sessionStorageService) => new AuthInterceptor(localStorageService, sessionStorageService),
+            multi: true,
+            deps: [
+                LocalStorageService,
+                SessionStorageService
+            ]
+        },
+        <%_ } _%>
+        <%_ if (authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
+        {
+            provide: HTTP_INTERCEPTORS,
+            useFactory: (injector) => new AuthExpiredInterceptor(injector),
+            multi: true,
+            deps: [
+                Injector
+            ]
+        },
+        <%_ } else if (authenticationType === 'session') { _%>
+        {
+            provide: HTTP_INTERCEPTORS,
+            useFactory: (injector, stateStorageService, loginModalService) => new AuthExpiredInterceptor(injector, stateStorageService, loginModalService),
+            multi: true,
+            deps: [
+                Injector,
+                StateStorageService,
+                LoginModalService
+            ]
+        },
+        <%_ } else if (authenticationType === 'oauth2') { _%>
+        {
+            provide: HTTP_INTERCEPTORS,
+            useFactory: (injector, stateStorageService) => new AuthExpiredInterceptor(injector, stateStorageService),
+            multi: true,
+            deps: [
+                Injector,
+                StateStorageService,
+            ]
+        },
+        <%_ } _%>
+        {
+            provide: HTTP_INTERCEPTORS,
+            useFactory: (eventManager) => new ErrorHandlerInterceptor(eventManager),
+            multi: true,
+            deps: [
+                JhiEventManager,
+            ]
+        },
+        {
+            provide: HTTP_INTERCEPTORS,
+            useFactory: (injector) => new NotificationInterceptor(injector),
+            multi: true,
+            deps: [
+                Injector
+            ]
+        }
     ],
     bootstrap: [ <%=jhiPrefixCapitalized%>MainComponent ]
 })

generators/client/templates/angular/src/main/webapp/app/account/activate/_activate.service.ts

@@ -17,21 +17,18 @@
  limitations under the License.
 -%>
 import { Injectable } from '@angular/core';
-import { Http, Response, URLSearchParams } from '@angular/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { SERVER_API_URL } from '../../app.constants';
 
 @Injectable()
 export class ActivateService {
 
-    constructor(private http: Http) {}
+    constructor(private http: HttpClient) {}
 
     get(key: string): Observable<any> {
-        const params: URLSearchParams = new URLSearchParams();
-        params.set('key', key);
-
         return this.http.get(SERVER_API_URL + '<%- apiUaaPath %>api/activate', {
-            search: params
-        }).map((res: Response) => res);
+            params: new HttpParams().set('key', key)
+        });
     }
 }

generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/_password-reset-finish.service.ts

@@ -17,14 +17,14 @@
  limitations under the License.
 -%>
 import { Injectable } from '@angular/core';
-import { Http } from '@angular/http';
+import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { SERVER_API_URL } from '../../../app.constants';
 
 @Injectable()
 export class PasswordResetFinishService {
 
-    constructor(private http: Http) {}
+    constructor(private http: HttpClient) {}
 
     save(keyAndPassword: any): Observable<any> {
         return this.http.post(SERVER_API_URL + '<%- apiUaaPath %>api/account/reset-password/finish', keyAndPassword);

generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/_password-reset-init.service.ts

@@ -17,14 +17,14 @@
  limitations under the License.
 -%>
 import { Injectable } from '@angular/core';
-import { Http } from '@angular/http';
+import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { SERVER_API_URL } from '../../../app.constants';
 
 @Injectable()
 export class PasswordResetInitService {
 
-    constructor(private http: Http) {}
+    constructor(private http: HttpClient) {}
 
     save(mail: string): Observable<any> {
         return this.http.post(SERVER_API_URL + '<%- apiUaaPath %>api/account/reset-password/init', mail);

generators/client/templates/angular/src/main/webapp/app/account/password/_password.service.ts

@@ -17,14 +17,14 @@
  limitations under the License.
 -%>
 import { Injectable } from '@angular/core';
-import { Http } from '@angular/http';
+import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { SERVER_API_URL } from '../../app.constants';
 
 @Injectable()
 export class PasswordService {
 
-    constructor(private http: Http) {}
+    constructor(private http: HttpClient) {}
 
     save(newPassword: string): Observable<any> {
         return this.http.post(SERVER_API_URL + '<%- apiUaaPath %>api/account/change-password', newPassword);

generators/client/templates/angular/src/main/webapp/app/account/register/_register.service.ts

@@ -17,14 +17,14 @@
  limitations under the License.
 -%>
 import { Injectable } from '@angular/core';
-import { Http } from '@angular/http';
+import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { SERVER_API_URL } from '../../app.constants';
 
 @Injectable()
 export class Register {
 
-    constructor(private http: Http) {}
+    constructor(private http: HttpClient) {}
 
     save(account: any): Observable<any> {
         return this.http.post(SERVER_API_URL + '<%- apiUaaPath %>api/register', account);

generators/client/templates/angular/src/main/webapp/app/account/sessions/_sessions.service.ts

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import { Injectable } from '@angular/core';
-import { Http, Response } from '@angular/http';
+import { HttpClient, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 
 import { Session } from './session.model';
@@ -30,10 +30,10 @@ export class SessionsService {
     constructor(private http: Http) { }
 
     findAll(): Observable<Session[]> {
-        return this.http.get(this.resourceUrl).map((res: Response) => res.json());
+        return this.http.get<Session[]>(this.resourceUrl);
     }
 
-    delete(series: string): Observable<Response> {
-        return this.http.delete(`${this.resourceUrl}${series}`);
+    delete(series: string): Observable<HttpResponse<any>> {
+        return this.http.delete(`${this.resourceUrl}${series}`, { observe: 'response' });
     }
 }

generators/client/templates/angular/src/main/webapp/app/admin/audits/_audits.component.ts

@@ -70,7 +70,7 @@ export class AuditsComponent implements OnInit {
         this.auditsService.query({page: this.page - 1, size: this.itemsPerPage,
             fromDate: this.fromDate, toDate: this.toDate}).subscribe((res) => {
 
-            this.audits = res.json();
+            this.audits = res.body;
             this.links = this.parseLinks.parse(res.headers.get('link'));
             this.totalItems = + res.headers.get('X-Total-Count');
         });

generators/client/templates/angular/src/main/webapp/app/admin/audits/_audits.service.ts

@@ -17,26 +17,28 @@
  limitations under the License.
 -%>
 import { Injectable } from '@angular/core';
-import { Http, Response, URLSearchParams } from '@angular/http';
+import { HttpClient, HttpParams, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { SERVER_API_URL } from '../../app.constants';
+import { Audit } from './audit.model';
 
 @Injectable()
 export class AuditsService  {
-    constructor(private http: Http) { }
-
-    query(req: any): Observable<Response> {
-        const params: URLSearchParams = new URLSearchParams();
-        params.set('fromDate', req.fromDate);
-        params.set('toDate', req.toDate);
-        params.set('page', req.page);
-        params.set('size', req.size);
-        params.set('sort', req.sort);
-
-        const options = {
-            search: params
-        };
-
-        return this.http.get(SERVER_API_URL + '<%- apiUaaPath %>management/audits', options);
+    constructor(private http: HttpClient) { }
+
+    query(req: any): Observable<HttpResponse<Audit[]>> {
+        const params: HttpParams = new HttpParams()
+            .set('fromDate', req.fromDate)
+            .set('toDate', req.toDate)
+            .set('page', req.page)
+            .set('size', req.size)
+            .set('sort', req.sort)
+
+        const requestURL = SERVER_API_URL + '<%- apiUaaPath %>management/audits';
+
+        return this.http.get<Audit[]>(requestURL, {
+            params,
+            observe: 'response'
+        });
     }
 }

generators/client/templates/angular/src/main/webapp/app/admin/configuration/_configuration.service.ts

@@ -17,21 +17,21 @@
  limitations under the License.
 -%>
 import { Injectable } from '@angular/core';
-import { Http, Response } from '@angular/http';
+import { HttpClient, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { SERVER_API_URL } from '../../app.constants';
 
 @Injectable()
 export class <%=jhiPrefixCapitalized%>ConfigurationService {
 
-    constructor(private http: Http) {
+    constructor(private http: HttpClient) {
     }
 
     get(): Observable<any> {
-        return this.http.get(SERVER_API_URL + 'management/configprops').map((res: Response) => {
+        return this.http.get(SERVER_API_URL + 'management/configprops', { observe: 'response' }).map((res: HttpResponse<any>) => {
             const properties: any[] = [];
 
-            const propertiesObject = res.json();
+            const propertiesObject = res.body;
 
             for (const key in propertiesObject) {
                 if (propertiesObject.hasOwnProperty(key)) {
@@ -47,10 +47,10 @@ export class <%=jhiPrefixCapitalized%>ConfigurationService {
     }
 
     getEnv(): Observable<any> {
-        return this.http.get(SERVER_API_URL + 'management/env').map((res: Response) => {
+        return this.http.get(SERVER_API_URL + 'management/env', { observe: 'response' }).map((res: HttpResponse<any>) => {
             const properties: any = {};
 
-            const propertiesObject = res.json();
+            const propertiesObject = res.body;
 
             for (const key in propertiesObject) {
                 if (propertiesObject.hasOwnProperty(key)) {

generators/client/templates/angular/src/main/webapp/app/admin/docs/_docs.component.html

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2017 the original author or authors from the JHipster project.
+ Copyright 2013-2018 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see http://www.jhipster.tech/
  for more information.

generators/client/templates/angular/src/main/webapp/app/admin/docs/_docs.component.ts

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2017 the original author or authors from the JHipster project.
+ Copyright 2013-2018 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see http://www.jhipster.tech/
  for more information.

generators/client/templates/angular/src/main/webapp/app/admin/docs/_docs.route.ts

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2017 the original author or authors from the JHipster project.
+ Copyright 2013-2018 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see http://www.jhipster.tech/
  for more information.

generators/client/templates/angular/src/main/webapp/app/admin/gateway/_gateway-routes.service.ts

@@ -17,17 +17,17 @@
  limitations under the License.
 -%>
 import { Injectable } from '@angular/core';
-import { Http, Response } from '@angular/http';
+import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 
 import { SERVER_API_URL } from '../../app.constants';
 import { GatewayRoute } from './gateway-route.model';
 
 @Injectable()
 export class GatewayRoutesService {
-    constructor(private http: Http) { }
+    constructor(private http: HttpClient) { }
 
     findAll(): Observable<GatewayRoute[]> {
-        return this.http.get(SERVER_API_URL + 'api/gateway/routes/').map((res: Response) => res.json());
+        return this.http.get<GatewayRoute[]>(SERVER_API_URL + 'api/gateway/routes/');
     }
 }