This commit is contained in:
tiago.kayaya
2022-02-08 16:37:32 +01:00
parent 0c01cb1ebc
commit b169ff5687
4 changed files with 18 additions and 18 deletions
+2 -2
View File
@@ -29,8 +29,8 @@ export class AuthGuard implements CanActivate {
this.router.navigate(['/']); this.router.navigate(['/']);
return false return false
} else { } else {
this.authService.loginChat(SessionStore.user) this.authService.loginChat();
return true return true;
} }
} }
+1 -1
View File
@@ -118,7 +118,7 @@ export class InactivityPage implements OnInit {
// if current attemp is equal to the current user // if current attemp is equal to the current user
if (attempt.UserId == SessionStore.user.UserId) { if (attempt.UserId == SessionStore.user.UserId) {
await this.authService.SetSession(attempt, this.userattempt); await this.authService.SetSession(attempt, this.userattempt);
this.authService.loginChat(this.userattempt); this.authService.loginChat();
this.getToken(); this.getToken();
SessionStore.setInativity(true) SessionStore.setInativity(true)
+2 -2
View File
@@ -102,7 +102,7 @@ export class LoginPage implements OnInit {
if (attempt) { if (attempt) {
if (attempt.UserId == SessionStore.user.UserId) { if (attempt.UserId == SessionStore.user.UserId) {
await this.authService.SetSession(attempt, this.userattempt); await this.authService.SetSession(attempt, this.userattempt);
await this.authService.loginChat(this.userattempt); await this.authService.loginChat();
this.getToken(); this.getToken();
SessionStore.setInativity(true); SessionStore.setInativity(true);
@@ -116,7 +116,7 @@ export class LoginPage implements OnInit {
await this.authService.SetSession(attempt, this.userattempt); await this.authService.SetSession(attempt, this.userattempt);
this.changeProfileService.run() this.changeProfileService.run()
await this.authService.loginChat(this.userattempt); await this.authService.loginChat();
this.getToken(); this.getToken();
this.router.navigateByUrl('/pin', { replaceUrl: true }); this.router.navigateByUrl('/pin', { replaceUrl: true });
} }
+4 -4
View File
@@ -109,7 +109,7 @@ export class AuthService {
//Login to rocketChat server2 //Login to rocketChat server2
//user: UserForm //user: UserForm
async loginChat(user: any) { async loginChat() {
const expirationMinutes = 60; const expirationMinutes = 60;
let date = new Date().getTime(); let date = new Date().getTime();
@@ -136,12 +136,12 @@ export class AuthService {
this.presentAlert('Network error'); this.presentAlert('Network error');
} }
this.autoLoginChat(expirationDate.getTime() - date, user); this.autoLoginChat(expirationDate.getTime() - date);
} }
async autoLoginChat(expirationDate:number, user:any){ async autoLoginChat(expirationDate:number){
setTimeout(()=>{ setTimeout(()=>{
this.loginChat(user); this.loginChat();
}, expirationDate) }, expirationDate)
} }