From 67ed6552b831df66713bac9e672738796128d33f Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 23 Jun 2020 14:10:17 +0200
Subject: Reorganize client shared modules

---
 .../app/shared/auth/auth-interceptor.service.ts    | 60 ----------------------
 client/src/app/shared/auth/index.ts                |  1 -
 2 files changed, 61 deletions(-)
 delete mode 100644 client/src/app/shared/auth/auth-interceptor.service.ts
 delete mode 100644 client/src/app/shared/auth/index.ts

(limited to 'client/src/app/shared/auth')

diff --git a/client/src/app/shared/auth/auth-interceptor.service.ts b/client/src/app/shared/auth/auth-interceptor.service.ts
deleted file mode 100644
index bb236bf8c..000000000
--- a/client/src/app/shared/auth/auth-interceptor.service.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Observable, throwError as observableThrowError } from 'rxjs'
-import { catchError, switchMap } from 'rxjs/operators'
-import { Injectable, Injector } from '@angular/core'
-import { HTTP_INTERCEPTORS, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'
-import { AuthService } from '../../core'
-
-@Injectable()
-export class AuthInterceptor implements HttpInterceptor {
-  private authService: AuthService
-
-  // https://github.com/angular/angular/issues/18224#issuecomment-316957213
-  constructor (private injector: Injector) {}
-
-  intercept (req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-    if (this.authService === undefined) {
-      this.authService = this.injector.get(AuthService)
-    }
-
-    const authReq = this.cloneRequestWithAuth(req)
-
-    // Pass on the cloned request instead of the original request
-    // Catch 401 errors (refresh token expired)
-    return next.handle(authReq)
-               .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()
-               .pipe(
-                 switchMap(() => {
-                   const authReq = this.cloneRequestWithAuth(req)
-
-                   return next.handle(authReq)
-                 })
-               )
-  }
-
-  private cloneRequestWithAuth (req: HttpRequest<any>) {
-    const authHeaderValue = this.authService.getRequestHeaderValue()
-
-    if (authHeaderValue === null) return req
-
-    // Clone the request to add the new header
-    return req.clone({ headers: req.headers.set('Authorization', authHeaderValue) })
-  }
-}
-
-export const AUTH_INTERCEPTOR_PROVIDER = {
-  provide: HTTP_INTERCEPTORS,
-  useClass: AuthInterceptor,
-  multi: true
-}
diff --git a/client/src/app/shared/auth/index.ts b/client/src/app/shared/auth/index.ts
deleted file mode 100644
index 84a07196f..000000000
--- a/client/src/app/shared/auth/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './auth-interceptor.service'
-- 
cgit v1.2.3