Skip to content

Update home.page.ts #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cafnanc wants to merge 2 commits into
base: release-3.1.0
Choose a base branch
from
Open

Update home.page.ts #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ea7bee
Update home.page.ts
Cafnanc Sep 6, 2024
ccb3b15
Update http.service.ts
Cafnanc Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/app/core/services/http/http.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,14 @@ export class HttpService {
await alert.present();
let data = await alert.onDidDismiss();
if (data.role == 'cancel') {
let auth = this.injector.get(AuthService);
auth.logoutAccount(true);
if(environment.isAuthBypassed) {
let auth = this.injector.get(AuthService);
auth.clearLocalData();
location.href = environment.unauthorizedRedirectUrl
} else {
let auth = this.injector.get(AuthService);
auth.logoutAccount(true);
}
}
return false;
} else {
Expand Down
7 changes: 3 additions & 4 deletions src/app/pages/tabs/home/home.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ export class HomePage implements OnInit {

async ngOnInit() {
await this.getUser();
if(this.user && !this.user.profile_mandatory_fields.length){
this.getSessions();
}
this.isMentor = this.profileService.isMentor
App.addListener('appStateChange', (state: AppState) => {
this.localStorage.getLocalData(localKeys.USER_DETAILS).then(data => {
Expand Down Expand Up @@ -98,10 +101,6 @@ export class HomePage implements OnInit {
}

async ionViewWillEnter() {
this.user = await this.localStorage.getLocalData(localKeys.USER_DETAILS);
if(this.user && !this.user.profile_mandatory_fields.length){
this.getSessions();
}
this.gotToTop();
let isRoleRequested = await this.localStorage.getLocalData(localKeys.IS_ROLE_REQUESTED)
let isBecomeMentorTileClosed =await this.localStorage.getLocalData(localKeys.IS_BECOME_MENTOR_TILE_CLOSED)
Expand Down