diff --git a/src/Ombi/ClientApp/package.json b/src/Ombi/ClientApp/package.json index 9d3715eaf..8bbb2f141 100644 --- a/src/Ombi/ClientApp/package.json +++ b/src/Ombi/ClientApp/package.json @@ -9,28 +9,28 @@ }, "private": true, "dependencies": { - "@angular/animations": "^11.2.6", - "@angular/cdk": "^11.2.5", - "@angular/common": "^11.2.6", - "@angular/compiler": "^11.2.6", - "@angular/core": "^11.2.6", - "@angular/forms": "^11.2.6", - "@angular/localize": "^11.2.6", - "@angular/material": "^11.2.5", - "@angular/platform-browser": "^11.2.6", - "@angular/platform-browser-dynamic": "^11.2.6", - "@angular/platform-server": "^11.2.6", - "@angular/router": "^11.2.6", - "@angularclass/hmr": "^2.1.3", + "@angular/animations": "^12.2.10", + "@angular/cdk": "^12.2.9", + "@angular/common": "^12.2.10", + "@angular/compiler": "^12.2.10", + "@angular/core": "^12.2.10", + "@angular/forms": "^12.2.10", + "@angular/localize": "^12.2.10", + "@angular/material": "^12.2.9", + "@angular/platform-browser": "^12.2.10", + "@angular/platform-browser-dynamic": "^12.2.10", + "@angular/platform-server": "^12.2.10", + "@angular/router": "^12.2.10", + "@angularclass/hmr": "^3.0.0", "@aspnet/signalr": "^1.1.0", - "@auth0/angular-jwt": "^2.1.0", - "@fortawesome/fontawesome-free": "^5.15.3", + "@auth0/angular-jwt": "^5.0.2", + "@fortawesome/fontawesome-free": "^5.15.4", "@fullcalendar/core": "^4.2.0", "@fullcalendar/daygrid": "^4.4.0", "@fullcalendar/interaction": "^4.2.0", - "@ngu/carousel": "^1.4.9-beta-2", - "@ngx-translate/core": "^11.0.1", - "@ngx-translate/http-loader": "^4.0.0", + "@ngu/carousel": "^3.0.2", + "@ngx-translate/core": "^13.0.0", + "@ngx-translate/http-loader": "^6.0.0", "@types/jquery": "^3.3.29", "@yellowspot/ng-truncate": "^1.4.0", "angular-bootstrap-md": "^7.5.4", @@ -42,18 +42,18 @@ "eventemitter2": "^5.0.1", "fullcalendar": "^4.0.0-alpha.4", "jquery": "3.3.1", - "lodash": "^4.17.20", - "moment": "^2.23.0", + "lodash": "^4.17.21", + "moment": "^2.29.1", "ng2-cookies": "^1.0.12", "ngx-clipboard": "^12.1.0", "ngx-infinite-scroll": "^9.0.0", "ngx-moment": "^3.0.1", - "ngx-order-pipe": "^2.0.1", + "ngx-order-pipe": "^2.1.1", "please-wait": "^0.0.5", "popper.js": "^1.14.3", - "primeicons": "^4.0.0", - "primeng": "^11.3.1", - "rxjs": "^6.6.6", + "primeicons": "^4.1.0", + "primeng": "^12.2.0", + "rxjs": "^7.4.0", "sass-recursive-map-merge": "^1.0.1", "spinkit": "^1.2.5", "store": "^2.0.12", @@ -63,18 +63,17 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.1102.5", - "@angular/cli": "~11.2.5", - "@angular/compiler-cli": "^11.2.6", - "@angular/language-service": "^11.2.6", + "@angular-devkit/build-angular": "~12.2.10", + "@angular/cli": "~12.2.10", + "@angular/compiler-cli": "^12.2.10", + "@angular/language-service": "^12.2.10", "@types/jasmine": "~3.6.7", "@types/jasminewd2": "~2.0.8", - "@types/node": "^14.14.35", + "@types/node": "^16.10.9", "codelyzer": "^6.0.1", - "typescript": "~4.1.5" + "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 @@ - +