SuiteCRM/SuiteCRM-Core
2
0
Fork 0
mirror of https://github.com/SuiteCRM/SuiteCRM-Core.git synced 2025-09-04 10:14:13 +08:00
Code Issues Projects Packages Activity Actions

Update session expiration logic

Browse source 
- Fix a duplicate session expiry message
- Update application logic to handle request chaining

Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>
This commit is contained in:
Dillon-Brown 2020-05-18 17:19:28 +01:00
parent d9e27111d3
commit 81c1768af8
2 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
core/app/src/app/app.module.ts
View file

@ -10,21 +10,21 @@ import {onError} from 'apollo-link-error';
import {AppRoutingModule} from './app-routing.module';
import {AppComponent} from './app.component';
import {NavbarUiModule} from '../components/navbar/navbar.module';
import {FooterUiModule} from '../components/footer/footer.module';
import {ClassicViewUiModule} from '../components/classic-view/classic-view.module';
import {MessageUiModule} from '../components/message/message.module';
import {FilterUiModule} from '../components/filter/filter.module';
import {ColumnchooserUiModule} from '../components/columnchooser/columnchooser.module';
import {WidgetUiModule} from '../components/widget/widget.module';
import {TableUiModule} from '../components/table/table.module';
import {ModuletitleUiModule} from '../components/module-title/module-title.module';
import {ListheaderUiModule} from '../components/list-header/list-header.module';
import {ListcontainerUiModule} from '../components/list-container/list-container.module';
import {ListModule} from '../../views/list/list.module';
import {NavbarUiModule} from '@components/navbar/navbar.module';
import {FooterUiModule} from '@components/footer/footer.module';
import {ClassicViewUiModule} from '@components/classic-view/classic-view.module';
import {MessageUiModule} from '@components/message/message.module';
import {FilterUiModule} from '@components/filter/filter.module';
import {ColumnchooserUiModule} from '@components/columnchooser/columnchooser.module';
import {WidgetUiModule} from '@components/widget/widget.module';
import {TableUiModule} from '@components/table/table.module';
import {ModuletitleUiModule} from '@components/module-title/module-title.module';
import {ListheaderUiModule} from '@components/list-header/list-header.module';
import {ListcontainerUiModule} from '@components/list-container/list-container.module';
import {ListModule} from '@views/list/list.module';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
import {ErrorInterceptor} from '../services/auth/error.interceptor';
import {ErrorInterceptor} from '@services/auth/error.interceptor';
import {AppManagerModule} from '../app-manager/app-manager.module';
@ -97,10 +97,9 @@ export class AppModule {
});
const logoutLink = onError((err) => {
if (err.graphQLErrors && err.graphQLErrors.length > 0) {
err.graphQLErrors.forEach((value: GraphQLError) => {
if (value.message.includes('Access Denied')) {
if (this.auth.isUserLoggedIn.value === true && value.message.includes('Access Denied')) {
auth.logout('LBL_SESSION_EXPIRED');
}
});

3
core/app/src/services/auth/auth.service.ts
View file

@ -84,9 +84,8 @@ export class AuthService {
this.bnIdle.startWatching(this.defaultTimeout).subscribe((res) => {
if (res) {
this.logout('LBL_SESSION_EXPIRED');
this.message.removeMessages();
this.message.addDangerMessage('Session Expired');
this.logout('LBL_SESSION_EXPIRED');
}
});
}, (error: HttpErrorResponse) => {