1 files changed, 18 insertions, 20 deletions

diff --git a/client/src/app/shared/auth/auth-interceptor.service.ts b/client/src/app/shared/auth/auth-interceptor.service.ts
index efcfc452b..bb236bf8c 100644
--- a/client/src/app/shared/auth/auth-interceptor.service.ts
+++ b/client/src/app/shared/auth/auth-interceptor.service.ts
@@ -1,14 +1,8 @@
+import { Observable, throwError as observableThrowError } from 'rxjs'
+import { catchError, switchMap } from 'rxjs/operators'
 import { Injectable, Injector } from '@angular/core'
-import {
-  HttpInterceptor,
-  HttpRequest,
-  HttpEvent,
-  HttpHandler, HTTP_INTERCEPTORS
-} from '@angular/common/http'
-import { Observable } from 'rxjs/Observable'
-
+import { HTTP_INTERCEPTORS, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'
 import { AuthService } from '../../core'
-import 'rxjs/add/operator/switchMap'
 
 @Injectable()
 export class AuthInterceptor implements HttpInterceptor {
@@ -27,22 +21,26 @@ export class AuthInterceptor implements HttpInterceptor {
     // Pass on the cloned request instead of the original request
     // Catch 401 errors (refresh token expired)
     return next.handle(authReq)
-               .catch(err => {
-                 if (err.status === 401 && err.error && err.error.code === 'invalid_token') {
-                   return this.handleTokenExpired(req, next)
-                 }
-
-                 return Observable.throw(err)
-               })
+               .pipe(
+                 catchError(err => {
+                   if (err.status === 401 && err.error && err.error.code === 'invalid_token') {
+                     return this.handleTokenExpired(req, next)
+                   }
+
+                   return observableThrowError(err)
+                 })
+               )
   }
 
   private handleTokenExpired (req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     return this.authService.refreshAccessToken()
-                           .switchMap(() => {
-                             const authReq = this.cloneRequestWithAuth(req)
+               .pipe(
+                 switchMap(() => {
+                   const authReq = this.cloneRequestWithAuth(req)
 
-                             return next.handle(authReq)
-                           })
+                   return next.handle(authReq)
+                 })
+               )
   }
 
   private cloneRequestWithAuth (req: HttpRequest<any>) {