fix: 会话过期退出登录

jumpserver · Dec 29, 2023 · e603e26 · e603e26
1 parent 7f65d2b
commit e603e26
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
@@ -1,5 +1,5 @@
 import {Component, ElementRef, HostListener, OnInit, ViewChild} from '@angular/core';
-import {DataStore, User} from '@app/globals';
+import {DataStore, DEFAULT_ORG_ID, SYSTEM_ORG_ID, User} from '@app/globals';
 import {IOutputData, SplitComponent} from 'angular-split';
 import {LogService, SettingService, ViewService} from '@app/services';
 import * as _ from 'lodash';
@@ -19,6 +19,7 @@ export class PageMainComponent implements OnInit {
   showIframeHider = false;
   showSubMenu: any = false;
   menus: Array<object>;
+  isDirectNavigation: boolean;
   settingLayoutSize = {
     leftWidth: 20,
     rightWidth: 80
@@ -87,6 +88,9 @@ export class PageMainComponent implements OnInit {
 
   ngOnInit(): void {
     console.log('main init');
+    this._settingSvc.isDirectNavigation$.subscribe((state) => {
+      this.isDirectNavigation = state;
+    });
     this.menus = [
       {
         name: 'assets',
@@ -140,9 +144,10 @@ export class PageMainComponent implements OnInit {
 
   @HostListener('window:beforeunload', ['$event'])
   unloadNotification($event: any) {
-    if (!environment.production) {
+    if (!environment.production || this.isDirectNavigation) {
       return;
     }
+
     const notInIframe = window.self === window.top;
     const notInReplay = location.pathname.indexOf('/luna/replay') === -1;
     const returnValue = !(notInIframe && notInReplay);

diff --git a/src/app/services/app.ts b/src/app/services/app.ts
@@ -146,6 +146,7 @@ export class AppService {
         if (currentTimeStamp >= parseInt(sessionExpireTimestamp, 10)) {
           confirm(this._i18n.instant('LoginExpireMsg'));
           if (!this.newLoginHasOpen) {
+            this._settingSvc.isDirectNavigation$.next(true);
             window.location.href = document.location.origin + '/core/auth/logout/';
             this.newLoginHasOpen = true;
           }

diff --git a/src/app/services/setting.ts b/src/app/services/setting.ts
@@ -15,6 +15,7 @@ export class SettingService {
   public isLoadTreeAsync$ = new BehaviorSubject<boolean>(true);
   public appletConnectMethod$ = new BehaviorSubject<string>('');
   public keyboardLayout$ = new BehaviorSubject<string>('');
+  public isDirectNavigation$ = new BehaviorSubject<boolean>(false);
 
 
   constructor(