diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 658c2dac67..0951ad2d1c 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -51,7 +51,7 @@ "@fortawesome/fontawesome-free": "^5.13.0", "@ng-bootstrap/ng-bootstrap": "^6.1.0", "@ngneat/spectator": "^5.11.0", - "@ngx-validate/core": "^0.0.10", + "@ngx-validate/core": "^0.0.11", "@ngxs/devtools-plugin": "^3.6.2", "@ngxs/logger-plugin": "^3.6.2", "@ngxs/router-plugin": "^3.6.2", diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.ts index 6969de8ced..6f362b0ee8 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.ts @@ -1,5 +1,5 @@ -import { ApplicationConfiguration, OAUTH_STRATEGY, ConfigState } from '@abp/ng.core'; -import { Component, OnInit, Injector } from '@angular/core'; +import { ApplicationConfiguration, ConfigState, AuthService } from '@abp/ng.core'; +import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { Select } from '@ngxs/store'; import { Observable } from 'rxjs'; @@ -55,12 +55,12 @@ export class CurrentUserComponent implements OnInit { return window.innerWidth < 992; } - constructor(private injector: Injector, private router: Router) {} + constructor(private authService: AuthService, private router: Router) {} ngOnInit() {} logout() { - OAUTH_STRATEGY.LogOut(this.injector).subscribe(() => { + this.authService.logout().subscribe(() => { this.router.navigate(['/'], { state: { redirectUrl: this.router.url } }); }); } diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 1558f1c824..ee2b5d7ffa 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -10,7 +10,7 @@ "@abp/ng.core": "~3.0.5", "@fortawesome/fontawesome-free": "^5.13.1", "@ng-bootstrap/ng-bootstrap": "^6.1.0", - "@ngx-validate/core": "^0.0.10", + "@ngx-validate/core": "^0.0.11", "@swimlane/ngx-datatable": "^17.0.0", "bootstrap": "^4.5.0", "chart.js": "^2.9.3",