diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index aa68b0713..9ceffc36b 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -147,6 +147,7 @@ export class ChatPage implements OnInit { if (event instanceof NavigationEnd && event.url == '/home/chat' || event instanceof NavigationEnd && event.url == "/home/chat?gbCreateGroup=true") { + this.chatService.refreshtoken(); this.checkCreateGroup(); } diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts index b462ca7f0..b6d3fdb24 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.ts +++ b/src/app/pages/chat/messages/contacts/contacts.page.ts @@ -18,8 +18,6 @@ export class ContactsPage implements OnInit { loggedUser: any; users = []; - headers: HttpHeaders; - options:any; contacts:any; textSearch:string; room:any; @@ -52,10 +50,8 @@ export class ContactsPage implements OnInit { } loadUsers(){ - this.options = { - headers: this.headers, - }; - this.chatService.getAllUsers().subscribe((res:any)=>{ + + this.chatService.getAllUsers().subscribe((res:any) => { this.contacts = res.users.filter(data => data.username != this.sessionStore.user.UserName); this.users = this.contacts.sort((a,b) => { @@ -68,6 +64,8 @@ export class ContactsPage implements OnInit { return 0; }); this.showLoader = false; + }, (error) =>{ + this.chatService.refreshtoken(); }); } diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index ec6d1397b..37c82e3c6 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -133,6 +133,7 @@ export class LoginPage implements OnInit { await this.authService.loginToChatWs(); this.ChatService.setheader() + this.ChatService.refreshtoken(); }