From 68d8753abdb5e1bcd9fb2f0bc2f5b7f3fc023696 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 29 Sep 2022 14:44:21 +0100
Subject: [PATCH] save

---
 src/app/pages/chat/chat.page.html             |  4 +-
 src/app/services/chat.service.ts              | 26 ++++-----
 .../services/chat/ws-chat-methods.service.ts  | 53 +++++++++++++++++--
 .../shared/chat/messages/messages.page.html   |  2 +-
 4 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index aeeafaa66..854ac1986 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -18,9 +18,9 @@
             </div>
             <div class="div-icon">
 
-              <!-- <button (click)="openChatDebuggingPageModal()" title="Nova Conversa Individual" class="btn-no-color font-12">
+              <button (click)="openChatDebuggingPageModal()" title="Nova Conversa Individual" class="btn-no-color font-12">
                 Dev
-              </button> -->
+              </button>
               <button title="Nova Conversa Individual" class="btn-no-color" (click)="openContactsPage()">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src="assets/images/icons-chat-new-conversation.svg"></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src="assets/images/theme/gov/icons-chat-new-conversation.svg"></ion-icon>
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 51a3c5a54..939f42d2d 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -366,20 +366,20 @@ export class ChatService {
       let options = {
         headers: this.headers
       };
-      return await this.http.get(environment.apiURL + 'UserAuthentication/RegenereChatToken', options).subscribe(async res => {
-        let data = {
-          status: res['status'],
-          data: {
-            userId: res['data'].userId,
-            authToken: res['data'].authToken
-          }
+      
+      let res = await this.http.get(environment.apiURL + 'UserAuthentication/RegenereChatToken', options).toPromise();
+
+      let data = {
+        status: res['status'],
+        data: {
+          userId: res['data'].userId,
+          authToken: res['data'].authToken
         }
-        SessionStore.user.ChatData = data
-        SessionStore.save()
-        this.setheader()
-        // console.log(res)
-        // console.log(SessionStore.user.ChatData)
-      });
+      }
+      SessionStore.user.ChatData = data
+      SessionStore.save()
+      this.setheader()
+
     } else {
       this.setheader()
     }
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 65f39bace..2020d040a 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -98,6 +98,7 @@ export class WsChatMethodsService {
   }
 
   async ReLoadChat() {
+    await this.chatService.refreshtoken();
     await this.restoreRooms();
     await this.getAllRooms();
     this.subscribeToRoom();
@@ -183,9 +184,22 @@ export class WsChatMethodsService {
         const roomId = this.getRoomId(roomData);
   
         if(roomData.t == 'd') {
-  
-          const res = await this.chatService.getMembers(roomId).toPromise();
-  
+          
+          let error = false
+          let res;
+
+          try {
+            res = await this.chatService.getMembers(roomId).toPromise();
+          } catch (e) {
+            await this.chatService.refreshtoken();
+            error = true
+          }
+
+          if(error) {
+            res = await this.chatService.getMembers(roomId).toPromise();
+          }
+          
+          
           const members = res['members'];
           const users = members.filter(data => data.username != this.sessionStore.user.UserName);
           rooms.result.update[index]['members'] = users
@@ -193,7 +207,20 @@ export class WsChatMethodsService {
           await this.prepareRoom(roomData);
         } else {
           if (roomData.t === 'p') {
-            const res = await this.chatService.getGroupMembers(roomId).toPromise()
+            let error = false
+            let res;
+
+            try {
+              res = await this.chatService.getGroupMembers(roomId).toPromise()
+            } catch (e) {
+              await this.chatService.refreshtoken();
+              error = true
+            }
+  
+            if(error) {
+              res = await this.chatService.getGroupMembers(roomId).toPromise()
+            }
+
             const members = res['members'];
             const users = members.filter(data => data.username != this.sessionStore.user.UserName);
   
@@ -203,7 +230,23 @@ export class WsChatMethodsService {
   
           }
           else {
-            const res = await this.chatService.getChannelMembers(roomId).toPromise()
+
+            let error = false
+            let res;
+
+            try {
+              res = await this.chatService.getChannelMembers(roomId).toPromise()
+
+            } catch (e) {
+              await this.chatService.refreshtoken();
+              error = true
+            }
+  
+            if(error) {
+              res = await this.chatService.getChannelMembers(roomId).toPromise()
+            }
+
+
             const members = res['members'];
             const users = members.filter(data => data.username != this.sessionStore.user.UserName);
   
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index bcae8f672..107f816a8 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -4,7 +4,7 @@
       <div class="header-top">
         <div class="middle">
           <ion-label class="title">{{ this.wsChatMethodsService.getDmRoom(this.roomId).name }}</ion-label>
-          <!-- <button (click)="ChatMessageDebuggingPage()">Dev</button> -->
+          <button (click)="ChatMessageDebuggingPage()">Dev</button>
           <!-- <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span> -->
         </div>
         <div hidden class="right">