diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 5792e916b..a17cc9c11 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -119,7 +119,8 @@ export class LoginPage implements OnInit { this.changeProfileService.run() await this.authService.loginChat(this.userattempt); this.getToken(); - this.router.navigate(['/pin']); + alert('redirect') + this.router.navigateByUrl('/ping', { replaceUrl: true }); } } diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index e4b0d96da..cd039328f 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -106,40 +106,41 @@ export class AuthService { } //Login to rocketChat server - async loginChat(user: UserForm): Promise { + async loginChat(user: UserForm) { let postData = { "user": user.username, "password": user.password, } - this.WsChatService.connect(); - this.WsChatService.login().then((message) => { - console.log('rocket chat login successfully', message) - this.WsChatService.temporaryStatus('online') - }).catch((message)=>{ - console.log('rocket chat login failed', message) - }) + setTimeout(()=>{ + this.WsChatService.connect(); + this.WsChatService.login().then((message) => { + console.log('rocket chat login successfully', message) + this.WsChatService.temporaryStatus('online') + }).catch((message)=>{ + console.log('rocket chat login failed', message) + }) + }, 1) + // let responseChat = await this.httpService.post('login', postData).toPromise(); - let responseChat = await this.httpService.post('login', postData).toPromise(); - - if(responseChat) { - console.log('Login to Rocket chat OK'); - this.ValidatedUserChat = responseChat; - localStorage.setItem('userChat', JSON.stringify(responseChat)); - localStorage.setItem('Meteor.loginToken', responseChat['data'].authToken); - localStorage.setItem('Meteor.userId',responseChat['data'].userId); - this.cookieService.set('rc_token', responseChat['data'].authToken); - this.cookieService.set('rc_uid', responseChat['data'].userId); - this.storageService.store(AuthConnstants.AUTH, responseChat); - return true; - } - else{ - console.log('Network error'); - this.presentAlert('Network error'); - return false; - } + // if(responseChat) { + // console.log('Login to Rocket chat OK'); + // this.ValidatedUserChat = responseChat; + // localStorage.setItem('userChat', JSON.stringify(responseChat)); + // localStorage.setItem('Meteor.loginToken', responseChat['data'].authToken); + // localStorage.setItem('Meteor.userId',responseChat['data'].userId); + // this.cookieService.set('rc_token', responseChat['data'].authToken); + // this.cookieService.set('rc_uid', responseChat['data'].userId); + // this.storageService.store(AuthConnstants.AUTH, responseChat); + // return true; + // } + // else{ + // console.log('Network error'); + // this.presentAlert('Network error'); + // return false; + // } } //Get user data from RocketChat | global object