diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index a17cc9c11..160397e3b 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -119,7 +119,6 @@ export class LoginPage implements OnInit { this.changeProfileService.run() await this.authService.loginChat(this.userattempt); this.getToken(); - 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 cd039328f..ce70a4da4 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -42,7 +42,7 @@ export class AuthService { this.WsChatService.connect(); this.WsChatService.login().then((message) => { console.log('rocket chat login successfully', message) - this.WsChatService.temporaryStatus('online') + this.WsChatService.setStatus('online') }).catch((message)=>{ console.log('rocket chat login failed', message) }) @@ -117,7 +117,7 @@ export class AuthService { this.WsChatService.connect(); this.WsChatService.login().then((message) => { console.log('rocket chat login successfully', message) - this.WsChatService.temporaryStatus('online') + this.WsChatService.setStatus('online') }).catch((message)=>{ console.log('rocket chat login failed', message) }) diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts index 22b7ea55e..710c960b3 100644 --- a/src/app/services/chat/ws-chat.service.ts +++ b/src/app/services/chat/ws-chat.service.ts @@ -61,12 +61,15 @@ export class WsChatService { this.ws.registerCallback({type:'Onmessage', funx:(message)=>{ if(message.id == requestId ) { // same request send - if(message.result.token) { - this.isLogin = true + if(message.result) { + if(message.result.token) { + + this.isLogin = true - this.ws.wsMsgQueue() + this.ws.wsMsgQueue() - resolve(message) + resolve(message) + } } else { this.isLogin = false reject(message) @@ -174,7 +177,7 @@ export class WsChatService { }); } - temporaryStatus(status: 'online' | 'busy' | 'away' | 'offline') { + setStatus(status: 'online' | 'busy' | 'away' | 'offline') { const requestId = uuidv4()