Merge pull request #2734 from abpframework/akin/Created-logout-in-oauth-service-in-ui

Added logout in authService

npm/ng-packs/packages/core/src/lib/services/auth.service.ts

@@ -48,4 +48,18 @@ export class AuthService {
       take(1),
     );
   }
+
+  logout(): Observable<void> {
+    return this.rest
+      .request({
+        method: 'GET',
+        url: '/api/account/logout',
+      })
+      .pipe(
+        switchMap(() => {
+          this.oAuthService.logOut();
+          return this.store.dispatch(new GetAppConfiguration());
+        }),
+      );
+  }
 }

npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts

@@ -25,7 +25,6 @@ import {
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
 import { Navigate, RouterState } from '@ngxs/router-plugin';
 import { Select, Store } from '@ngxs/store';
-import { OAuthService } from 'angular-oauth2-oidc';
 import compare from 'just-compare';
 import { fromEvent, Observable } from 'rxjs';
 import { debounceTime, filter, map } from 'rxjs/operators';
@@ -33,6 +32,7 @@ import snq from 'snq';
 import { AddNavigationElement } from '../../actions';
 import { Layout } from '../../models/layout';
 import { LayoutState } from '../../states';
+import { AuthService } from 'packages/core/src/lib/services/auth.service';
 
 @Component({
   selector: 'abp-layout-application',
@@ -78,7 +78,10 @@ export class ApplicationLayoutComponent implements AfterViewInit, OnDestroy {
   get defaultLanguage$(): Observable<string> {
     return this.languages$.pipe(
       map(
-        languages => snq(() => languages.find(lang => lang.cultureName === this.selectedLangCulture).displayName),
+        languages =>
+          snq(
+            () => languages.find(lang => lang.cultureName === this.selectedLangCulture).displayName,
+          ),
         '',
       ),
     );
@@ -86,7 +89,11 @@ export class ApplicationLayoutComponent implements AfterViewInit, OnDestroy {
 
   get dropdownLanguages$(): Observable<ApplicationConfiguration.Language[]> {
     return this.languages$.pipe(
-      map(languages => snq(() => languages.filter(lang => lang.cultureName !== this.selectedLangCulture)), []),
+      map(
+        languages =>
+          snq(() => languages.filter(lang => lang.cultureName !== this.selectedLangCulture)),
+        [],
+      ),
     );
   }
 
@@ -100,7 +107,11 @@ export class ApplicationLayoutComponent implements AfterViewInit, OnDestroy {
 
   trackElementByFn: TrackByFunction<ABP.FullRoute> = (_, element) => element;
 
-  constructor(private store: Store, private oauthService: OAuthService, private renderer: Renderer2) {}
+  constructor(
+    private store: Store,
+    private renderer: Renderer2,
+    private authService: AuthService,
+  ) {}
 
   private checkWindowWidth() {
     setTimeout(() => {
@@ -121,7 +132,9 @@ export class ApplicationLayoutComponent implements AfterViewInit, OnDestroy {
   }
 
   ngAfterViewInit() {
-    const navigations = this.store.selectSnapshot(LayoutState.getNavigationElements).map(({ name }) => name);
+    const navigations = this.store
+      .selectSnapshot(LayoutState.getNavigationElements)
+      .map(({ name }) => name);
 
     if (navigations.indexOf('LanguageRef') < 0) {
       this.store.dispatch(
@@ -145,10 +158,7 @@ export class ApplicationLayoutComponent implements AfterViewInit, OnDestroy {
     this.checkWindowWidth();
 
     fromEvent(window, 'resize')
-      .pipe(
+      .pipe(takeUntilDestroy(this), debounceTime(150))
-        takeUntilDestroy(this),
-        debounceTime(150),
-      )
       .subscribe(() => {
         this.checkWindowWidth();
       });
@@ -161,13 +171,13 @@ export class ApplicationLayoutComponent implements AfterViewInit, OnDestroy {
   }
 
   logout() {
-    this.oauthService.logOut();
+    this.authService.logout().subscribe(() => {
-    this.store.dispatch(
+      this.store.dispatch(
-      new Navigate(['/'], null, {
+        new Navigate(['/'], null, {
-        state: { redirectUrl: this.store.selectSnapshot(RouterState).state.url },
+          state: { redirectUrl: this.store.selectSnapshot(RouterState).state.url },
-      }),
+        }),
-    );
+      );
-    this.store.dispatch(new GetAppConfiguration());
+    });
   }
 
   openChange(event: boolean, childrenContainer: HTMLDivElement) {