Refresh token done

src/app/modals/chat-options-features/chat-options-features.page.ts

@@ -48,7 +48,7 @@ export class ChatOptionsFeaturesPage implements OnInit {
   }
 
   ngOnInit() {
-
+    this.chatService.refreshtoken();
   }
 
   notImplemented() {
@@ -118,12 +118,6 @@ export class ChatOptionsFeaturesPage implements OnInit {
 
       this.chatService.sendMessage(body).subscribe(res=> {
         // 
-      },(error: HttpErrorResponse) => {
-        if(error.status === 401){
-          this.chatService.refreshtoken()
-          this.chatService.sendMessage(body);
-        }
-        
       });
       //
     };
@@ -149,12 +143,6 @@ export class ChatOptionsFeaturesPage implements OnInit {
     this.chatService.sendMessage(body).subscribe(res=> {
 
 
-    },(error: HttpErrorResponse) => {
-      if(error.status === 401){
-        this.chatService.refreshtoken()
-        this.chatService.sendMessage(body);
-      }
-      
     });
   }
 

src/app/modals/set-room-owner/set-room-owner.page.ts

@@ -33,7 +33,7 @@ export class SetRoomOwnerPage implements OnInit {
   }
 
   ngOnInit() {
-
+    this.chatService.refreshtoken();
   }
 
   async close(){

src/app/pages/chat/chat.page.ts

@@ -142,6 +142,8 @@ export class ChatPage implements OnInit {
     }
     SessionStore.user.ChatData = data
     SessionStore.save() */
+    console.log(SessionStore.user.ChatData.data.authToken)
+    this.chatService.refreshtoken();
 
     this.segment = "Contactos";
 
@@ -517,12 +519,6 @@ export class ChatPage implements OnInit {
       //
       }*/
 
-    },(error: HttpErrorResponse) => {
-      if(error.status === 401){
-        this.chatService.refreshtoken()
-        //this.getChatMembers();
-      }
-      
     });
   }
 

src/app/pages/chat/edit-group/edit-group.page.ts

@@ -29,6 +29,7 @@ export class EditGroupPage implements OnInit {
    }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
     this.getRoomInfo();
   }
 
@@ -37,11 +38,6 @@ export class EditGroupPage implements OnInit {
       this.room = room['room'];
       
       this.groupName = this.room.name.split('-').join(' ');
-    },(error: HttpErrorResponse) => {
-      if(error.status === 401) {
-        this.chatService.refreshtoken();
-        this.getRoomInfo()
-      }
     });
   }
 

src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts

@@ -56,6 +56,7 @@ export class GroupContactsPage implements OnInit {
   }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
     this.loadUsers();
     this.getMembers();
     
@@ -85,12 +86,6 @@ export class GroupContactsPage implements OnInit {
       
 
       this.showLoader = false;
-    },(error: HttpErrorResponse) => {
-      if(error.status === 401){
-        this.chatService.refreshtoken()
-        this.loadUsers();
-      }
-      
     });
   }
 

src/app/pages/chat/group-messages/group-messages.page.ts

@@ -133,6 +133,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
     
     this.loggedUser = this.loggedUserChat;
     this.getRoomInfo();
@@ -381,12 +382,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
       this.allUsers = res['users'].filter(data => data.username != SessionStore.user.UserName);
       
-    },(error: HttpErrorResponse) => {
-      if(error.status === 401){
-        this.chatService.refreshtoken()
-        this.getChatMembers();
-      }
-      
     });
   }
 

src/app/pages/chat/messages/contacts/contacts.page.ts

@@ -43,6 +43,7 @@ export class ContactsPage implements OnInit {
   }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
     this.loadUsers();
 
   }
@@ -67,12 +68,6 @@ export class ContactsPage implements OnInit {
         return 0;
       });
       this.showLoader = false;
-    },(error: HttpErrorResponse) => {
-      if(error.status === 401){
-        this.chatService.refreshtoken()
-        this.loadUsers();
-      }
-      
     });
   }
 

src/app/pages/chat/messages/messages.page.ts

@@ -157,6 +157,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
     this.wsChatMethodsService.getUserOfRoom(this.roomId).then((value) => {
       
     })
@@ -520,12 +521,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       this.members = res['members'];
       this.dmUsers = res['members'].filter(data => data.username != this.sessionStore.user.UserName)
       this.showLoader = false;
-    },(error: HttpErrorResponse) => {
-      if(error.status === 401){
-        this.chatService.refreshtoken()
-        this.getChatMembers();
-      }
-      
     });
   }
 

src/app/pages/chat/new-group/new-group.page.ts

@@ -43,6 +43,7 @@ export class NewGroupPage implements OnInit {
   }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
     console.log(this.documents)
     
   }

src/app/shared/chat/edit-group/edit-group.page.ts

@@ -34,6 +34,7 @@ export class EditGroupPage implements OnInit {
    }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
     this.getRoomInfo();
   }
 
@@ -42,12 +43,6 @@ export class EditGroupPage implements OnInit {
       this.room = room['room'];
       
       this.groupName = this.room.name.split('-').join(' ');
-    },(error: HttpErrorResponse) => {
-      if(error.status === 401){
-        this.chatService.refreshtoken()
-        this.getRoomInfo();
-      }
-      
     });
   }
 

src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts

@@ -57,6 +57,7 @@ export class GroupContactsPage implements OnInit {
   }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
     //this.getRoomInfo();
     this.loadUsers();
     
@@ -203,12 +204,6 @@ export class GroupContactsPage implements OnInit {
       
 
       this.showLoader = false;
-    },(error: HttpErrorResponse) => {
-      if(error.status === 401){
-        this.chatService.refreshtoken()
-        this.loadUsers();
-      }
-      
     });
   }
 

src/app/shared/chat/group-messages/group-messages.page.ts

@@ -160,6 +160,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
     console.log(this.roomId)
     this.loggedUser = this.loggedUserChat;
     //setTimeout(() => {
@@ -367,12 +368,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
       this.allUsers = res['users'].filter(data => data.username != SessionStore.user.UserName);
       //
-    },(error: HttpErrorResponse) => {
-      if(error.status === 401){
-        this.chatService.refreshtoken()
-        this.getChatMembers();
-      }
-      
     });
   }
 

src/app/shared/chat/messages/contacts/contacts.page.ts

@@ -42,7 +42,9 @@ export class ContactsPage implements OnInit {
   }
 
   ngOnInit() {
+    
     this.loadUsers();
+    this.chatService.refreshtoken();
   }
 
   onChange(event){
@@ -83,12 +85,6 @@ export class ContactsPage implements OnInit {
         return 0;
       });
       this.showLoader = false;
-    },(error: HttpErrorResponse) => {
-      if(error.status === 401){
-        this.chatService.refreshtoken()
-        this.loadUsers();
-      }
-      
     });
   }
 

src/app/shared/chat/messages/messages.page.ts

@@ -155,6 +155,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
     this.scrollToBottom();
 
     this.getChatMembers();
@@ -525,12 +526,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       this.members = res['members'];
       this.dmUsers = res['members'].filter(data => data.username != this.sessionStore.user.UserName)
       this.showLoader = false;
-    },(error: HttpErrorResponse) => {
-      if(error.status === 401){
-        this.chatService.refreshtoken()
-        this.getChatMembers();
-      }
-      
     });
   }
 

src/app/shared/popover/chat-popover/chat-popover.page.ts

@@ -32,7 +32,7 @@ export class ChatPopoverPage implements OnInit {
   }
 
   ngOnInit() {
-    
+    this.chatService.refreshtoken();
   }
 
   close(action:any){
@@ -169,12 +169,6 @@ export class ChatPopoverPage implements OnInit {
           
         });
       }
-    },(error: HttpErrorResponse) => {
-      if(error.status === 401){
-        this.chatService.refreshtoken()
-        this.deleteGroup();
-      }
-      
     });
     this.popoverController.dismiss('delete');
     this.modalController.dismiss('delete');

src/app/shared/popover/messages-options/messages-options.page.ts

@@ -25,6 +25,7 @@ export class MessagesOptionsPage implements OnInit {
   }
 
   ngOnInit() {
+    this.chatService.refreshtoken();
   }
 
   close(){
@@ -42,12 +43,6 @@ export class MessagesOptionsPage implements OnInit {
     let body = { "roomId": this.roomId }
     this.chatService.removeChatRoom(body).subscribe(res=>{
       
-    },(error: HttpErrorResponse) => {
-      if(error.status === 401){
-        this.chatService.refreshtoken()
-        this.closeChatRoom();
-      }
-      
     });
     this.close();
   }