From 8349f0f390037daa2af0ec4291c1ddeb1358c0be Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 14:37:42 +0100
Subject: [PATCH 1/3] remove alert

---
 src/app/pages/login/login.page.ts | 1 -
 1 file changed, 1 deletion(-)

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 });
           }
 

From 05294d304f6293182a42cadcf72e14cd781dcff1 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 14:51:44 +0100
Subject: [PATCH 2/3] rename function

---
 src/app/services/auth.service.ts         | 4 ++--
 src/app/services/chat/ws-chat.service.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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..2871fee3d 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -174,7 +174,7 @@ export class WsChatService {
     });
   }
 
-  temporaryStatus(status: 'online' | 'busy' | 'away' | 'offline') {
+  setStatus(status: 'online' | 'busy' | 'away' | 'offline') {
     
     const requestId =  uuidv4()
 

From cdc46f43f0e74bca0823a7194fea3b540e7fc096 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 13 Jan 2022 17:08:25 +0100
Subject: [PATCH 3/3] fix

---
 src/app/services/chat/ws-chat.service.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 2871fee3d..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)