diff --git a/src/app/modals/chat-options-features/chat-options-features.page.ts b/src/app/modals/chat-options-features/chat-options-features.page.ts index b384af419..9f2bfb92d 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.ts +++ b/src/app/modals/chat-options-features/chat-options-features.page.ts @@ -48,7 +48,7 @@ export class ChatOptionsFeaturesPage implements OnInit { } ngOnInit() { - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); } notImplemented() { diff --git a/src/app/modals/set-room-owner/set-room-owner.page.ts b/src/app/modals/set-room-owner/set-room-owner.page.ts index f1d0b9e0c..67323632b 100644 --- a/src/app/modals/set-room-owner/set-room-owner.page.ts +++ b/src/app/modals/set-room-owner/set-room-owner.page.ts @@ -33,7 +33,7 @@ export class SetRoomOwnerPage implements OnInit { } ngOnInit() { - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); } async close(){ diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 39e48efc6..57eaf2753 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -131,7 +131,7 @@ export class ChatPage implements OnInit { ngOnInit() { - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); this.segment = "Contactos"; @@ -147,7 +147,6 @@ 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(); } @@ -234,7 +233,7 @@ export class ChatPage implements OnInit { } openMessagesPage(rid) { - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); this.roomId = rid; if (window.innerWidth < 701) { @@ -282,7 +281,7 @@ export class ChatPage implements OnInit { } openGroupMessagesPage(rid) { - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); this.roomId = rid; if (window.innerWidth < 701) { diff --git a/src/app/pages/chat/edit-group/edit-group.page.ts b/src/app/pages/chat/edit-group/edit-group.page.ts index fad5bc5f5..2fa31ecc3 100644 --- a/src/app/pages/chat/edit-group/edit-group.page.ts +++ b/src/app/pages/chat/edit-group/edit-group.page.ts @@ -29,7 +29,7 @@ export class EditGroupPage implements OnInit { } ngOnInit() { - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); this.getRoomInfo(); } diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts index 8c73f3ede..19a22dda3 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts @@ -56,7 +56,7 @@ export class GroupContactsPage implements OnInit { } ngOnInit() { - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); this.loadUsers(); this.getMembers(); diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts index 8d509c919..9785e5ba8 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.ts +++ b/src/app/pages/chat/messages/contacts/contacts.page.ts @@ -41,7 +41,7 @@ export class ContactsPage implements OnInit { } ngOnInit() { - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); this.loadUsers(); } @@ -65,7 +65,7 @@ export class ContactsPage implements OnInit { }); this.showLoader = false; }, (error) =>{ - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); }); } diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index a67ea19d3..74e936021 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -162,7 +162,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { ngOnInit() { this.createDirectoryImage() - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); this.ChatSystemService.getUserOfRoom(this.roomId).then((value) => { }) diff --git a/src/app/pages/chat/new-group/new-group.page.ts b/src/app/pages/chat/new-group/new-group.page.ts index a8041828c..e0b9614ce 100644 --- a/src/app/pages/chat/new-group/new-group.page.ts +++ b/src/app/pages/chat/new-group/new-group.page.ts @@ -43,7 +43,7 @@ export class NewGroupPage implements OnInit { } ngOnInit() { - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); // console.log(this.documents) } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index d619de182..7d38a1aee 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -663,6 +663,7 @@ export class ExpedienteDetailPage implements OnInit { this.dataService.set("task", this.task); this.dataService.set("newGroupName", this.task.Folio); this.dataService.set("documents", this.fulltask.Documents); + this.dataService.set("link", window.location.pathname); setTimeout(()=> { this.router.navigate(['/home/chat']); }, 100) diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 8cf9a15af..31844f0fa 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -135,8 +135,7 @@ export class LoginPage implements OnInit { await this.authService.loginToChatWs(); this.ChatService.setheader() - this.ChatService.refreshtoken(); - this.ChatSystemService.ReLoadChat(); + this.ChatSystemService.loadChat(); } @@ -164,7 +163,6 @@ export class LoginPage implements OnInit { await this.authService.loginChat(attempt.ChatData.data); await this.authService.loginToChatWs(); this.ChatService.setheader(); - this.ChatService.refreshtoken(); this.ChatSystemService.loadChat(); } diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index 13faac5cf..bcfa787ae 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -394,6 +394,7 @@ export class ChatService { } else { this.setheader() + await this.refreshtoken(); } } diff --git a/src/app/shared/chat/edit-group/edit-group.page.ts b/src/app/shared/chat/edit-group/edit-group.page.ts index 498b99b1a..2cc6ccf29 100644 --- a/src/app/shared/chat/edit-group/edit-group.page.ts +++ b/src/app/shared/chat/edit-group/edit-group.page.ts @@ -34,7 +34,7 @@ export class EditGroupPage implements OnInit { } ngOnInit() { - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); this.getRoomInfo(); } diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts index 7932464d4..67558378e 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts @@ -54,7 +54,7 @@ export class GroupContactsPage implements OnInit { } ngOnInit() { - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); //this.getRoomInfo(); this.loadUsers(); diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 490ff08b2..8e8dbad67 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -177,7 +177,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy ngOnInit() { this.ChatSystemService.getAllRooms(); - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); this.scrollToBottom(); this.getChatMembers(); diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts index b009ab5bf..66586a7bc 100644 --- a/src/app/shared/chat/new-group/new-group.page.ts +++ b/src/app/shared/chat/new-group/new-group.page.ts @@ -9,7 +9,7 @@ import { SessionStore } from 'src/app/store/session.service'; import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page'; import { ToastService } from 'src/app/services/toast.service'; import { ThemeService } from 'src/app/services/theme.service'; - +import { RouteService } from 'src/app/services/route.service'; @Component({ selector: 'app-new-group', templateUrl: './new-group.page.html', @@ -25,6 +25,7 @@ export class NewGroupPage implements OnInit{ selectedDuration = ['','','']; countDownTime:any; task:any; + link = '' documents: any; loggedUserChat: any; @@ -42,7 +43,8 @@ export class NewGroupPage implements OnInit{ public ChatSystemService: ChatSystemService, private authService: AuthService, private toastService: ToastService, - public ThemeService: ThemeService + public ThemeService: ThemeService, + private RouteService: RouteService, ) { this.loggedUserChat = authService.ValidatedUserChat['data']; @@ -52,10 +54,11 @@ export class NewGroupPage implements OnInit{ ngOnInit() { this.task = this.dataService.get("task"); if(this.task) { + this.link = this.dataService.get("link"); this.groupName = this.task.Folio; this.documents = this.dataService.get("documents"); - console.log(this.dataService.data); this.dataService.set("newGroup", false); + this.dataService.set("link", false); } } @@ -74,7 +77,12 @@ export class NewGroupPage implements OnInit{ close() { // this.addGroupMessage.emit(); - this.closeAllDesktopComponents.emit(); + if(this.link) { + this.RouteService.goBack(); + this.dataService.set("link", false); + } else { + this.closeAllDesktopComponents.emit(); + } } async createGroup() { diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index 57edd3a53..d0aff2635 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -35,7 +35,7 @@ export class ChatPopoverPage implements OnInit { } ngOnInit() { - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); } close(action:any){ diff --git a/src/app/shared/popover/messages-options/messages-options.page.ts b/src/app/shared/popover/messages-options/messages-options.page.ts index 7b79121bc..0fbc8b648 100644 --- a/src/app/shared/popover/messages-options/messages-options.page.ts +++ b/src/app/shared/popover/messages-options/messages-options.page.ts @@ -25,7 +25,7 @@ export class MessagesOptionsPage implements OnInit { } ngOnInit() { - this.chatService.refreshtoken(); + // this.chatService.refreshtoken(); } close(){