From 72eb873ddbafff6a344288c023810b64ac0e0f62 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 14 Oct 2021 11:59:57 +0100 Subject: [PATCH] refactor: :recycle: Upgraded to Angular 12 --- src/Ombi/ClientApp/package.json | 3 +- .../src/app/auth/unauthorized.interceptor.ts | 7 +- .../src/app/my-nav/my-nav.component.html | 2 +- .../src/app/my-nav/my-nav.component.scss | 6 + src/Ombi/ClientApp/src/index.html | 4 - src/Ombi/ClientApp/yarn.lock | 3506 +++++------------ 6 files changed, 1074 insertions(+), 2454 deletions(-) diff --git a/src/Ombi/ClientApp/package.json b/src/Ombi/ClientApp/package.json index c1b55a2dc..8bbb2f141 100644 --- a/src/Ombi/ClientApp/package.json +++ b/src/Ombi/ClientApp/package.json @@ -71,10 +71,9 @@ "@types/jasminewd2": "~2.0.8", "@types/node": "^16.10.9", "codelyzer": "^6.0.1", - "typescript": "~4.4.4" + "typescript": "~4.3.4" }, "optionalDependencies": { - "node-sass": "^4.12.0", "protractor": "~5.4.0", "ts-node": "~5.0.1", "tslint": "^5.12.0" diff --git a/src/Ombi/ClientApp/src/app/auth/unauthorized.interceptor.ts b/src/Ombi/ClientApp/src/app/auth/unauthorized.interceptor.ts index c70b649be..86c212ad6 100644 --- a/src/Ombi/ClientApp/src/app/auth/unauthorized.interceptor.ts +++ b/src/Ombi/ClientApp/src/app/auth/unauthorized.interceptor.ts @@ -1,8 +1,9 @@ -import { Injectable } from '@angular/core'; -import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor, HttpErrorResponse } from '@angular/common/http'; +import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'; import { Observable, Subject, throwError } from 'rxjs'; import { catchError, throttleTime } from 'rxjs/operators'; + import { AuthService } from './auth.service'; +import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; @Injectable() @@ -20,7 +21,7 @@ export class UnauthorizedInterceptor implements HttpInterceptor { return next.handle(request).pipe( catchError((response: HttpErrorResponse) => { if (response.status === 401) { - this.throttleLogout.next(); + this.throttleLogout.next(request.url); } return throwError(response); } diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html index 7a59be582..85abdbf0a 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html +++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html @@ -57,7 +57,7 @@ - +