Skip to content
This repository has been archived by the owner on Apr 13, 2022. It is now read-only.

Commit

Permalink
fix(responseInterceptor): missing call
Browse files Browse the repository at this point in the history
  • Loading branch information
rosostolato committed Aug 15, 2018
1 parent 61259d6 commit df2b6fc
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
13 changes: 5 additions & 8 deletions demo/restApi.service.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { RestBase, Restful } from '../src/index';
import { HttpClient, HttpRequest, HttpEvent } from '@angular/common/http';
import { HttpClient, HttpEvent } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Post } from './models/Post';
import { Observable } from 'rxjs';
import { tap } from 'rxjs/operators';

@Injectable()
@Restful({
Expand All @@ -14,13 +15,9 @@ export class RestApi extends RestBase {
}

protected responseInterceptor(res: Observable<HttpEvent<any>>) {
res.subscribe(response => {
debugger;
}, err => {
debugger;
});

return res;
return res.pipe(
tap(response => { this; debugger })
)
}

protected mapModel(route: string, data: any) {
Expand Down
5 changes: 4 additions & 1 deletion src/restModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ export class RestModelBase<T> {
req = this._base.requestInterceptor(req);

// the observable to return
const observable = this._base.http.request<any>(req);
let observable = this._base.http.request<any>(req);

// pass through response interceptor
observable = this._base.responseInterceptor(observable);

return observable.pipe<any>(
filter(response => response.type === HttpEventType.Response),
Expand Down
7 changes: 5 additions & 2 deletions src/restRoute.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@ export class RestRoute {
req = this.base.requestInterceptor(req);

// the observable to return
const observable = this.base.http.request<any>(req);
let observable = this.base.http.request<any>(req);

return observable.pipe<any>(
// pass through response interceptor
observable = this.base.responseInterceptor(observable);

return observable.pipe(
filter(response => response.type === HttpEventType.Response),
map((response: HttpResponse<any>) => response.body)
);
Expand Down

0 comments on commit df2b6fc

Please sign in to comment.