From f46f954eddd7d99cd4ad9880e542bbb84702c0c7 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 10 Jan 2022 10:54:51 +0100
Subject: [PATCH] Improve login to rocket chat

---
 src/app/services/socket/rocket-chat-client.service.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts
index 4f348393f..868c9d413 100644
--- a/src/app/services/socket/rocket-chat-client.service.ts
+++ b/src/app/services/socket/rocket-chat-client.service.ts
@@ -27,17 +27,13 @@ class _RocketChatClientService {
 
     this.ws.send(connectMessage)
     
-    this.ws.registerCallback({type:'Onmessage',funx:(message: any)=>{
+    this.ws.registerCallback({type:'Onmessage',funx:(message: any) => {
 
       if(message.msg == "ping") {
         this.ws.send({msg:"pong"})
         if(this.hasPing == false) {
           // first ping
           firstPingFunx()
-
-          setTimeout(()=>{
-            this.getRooms()
-          }, 5000)
           this.hasPing = true
         }
       }
@@ -68,11 +64,14 @@ class _RocketChatClientService {
         if(message.result.id == requestId) { // same request send
           if(message.result) {
             if(message.result.token) {
+              this.isLogin = true
               resolve(message)
             } else {
+              this.isLogin = false
               reject(message)
             }
           } else {
+            this.isLogin = false
             reject(message)
           }
         }