refactor(auth): friendly processing logical

ng-alain · Jan 11, 2018 · 2798610 · 2798610
1 parent 1062975
commit 2798610
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/core/auth/token/jwt/jwt.interceptor.ts b/src/core/auth/token/jwt/jwt.interceptor.ts
@@ -4,7 +4,7 @@ import { HttpInterceptor, HttpRequest, HttpHandler,
          HttpSentEvent, HttpHeaderResponse, HttpProgressEvent, HttpResponse, HttpUserEvent,
          HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
-import { ErrorObservable } from 'rxjs/observable/ErrorObservable';
+import { of } from 'rxjs/observable/of';
 import { ITokenModel, DA_SERVICE_TOKEN } from '../interface';
 import { JWTTokenModel } from './jwt.model';
 import { DA_OPTIONS_TOKEN } from '../../auth.options';
@@ -37,7 +37,7 @@ export class JWTInterceptor implements HttpInterceptor {
             if (options.token_invalid_redirect === true) {
                 const router = this.injector.get(Router);
                 this.injector.get(Router).navigate([ options.login_url ]);
-                return <any>ErrorObservable.create({ status: 401, _from: 'jwt_intercept' });
+                return of(<any>{ status: 401, _from: 'jwt_intercept' });
             }
         }
         return next.handle(req);

diff --git a/src/core/auth/token/simple/simple.interceptor.ts b/src/core/auth/token/simple/simple.interceptor.ts
@@ -4,7 +4,7 @@ import { HttpInterceptor, HttpRequest, HttpHandler,
          HttpSentEvent, HttpHeaderResponse, HttpProgressEvent, HttpResponse, HttpUserEvent,
          HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
-import { ErrorObservable } from 'rxjs/observable/ErrorObservable';
+import { of } from 'rxjs/observable/of';
 import { ITokenModel, DA_SERVICE_TOKEN } from '../interface';
 import { DA_OPTIONS_TOKEN } from '../../auth.options';
 import { SimpleTokenModel } from './simple.model';
@@ -55,7 +55,7 @@ export class SimpleInterceptor implements HttpInterceptor {
         } else {
             if (options.token_invalid_redirect === true) {
                 this.injector.get(Router).navigate([ options.login_url ]);
-                return <any>ErrorObservable.create({ status: 401, _from: 'simple_intercept' });
+                return of(<any>{ status: 401, _from: 'simple_intercept' });
             }
         }
         return next.handle(req);