improve

src/app/pages/login/login.page.ts

@@ -116,17 +116,19 @@ export class LoginPage implements OnInit {
         loader.remove()
 
         // login to API successfully
+
+        console.log(attempt,'!!::!!');
+
         if (attempt) {
           if (attempt.UserId == SessionStore.user.UserId) {
 
             await this.authService.SetSession(attempt, this.userattempt);
 
-            if(attempt.ChatData){
+            if(attempt.ChatData) {
               await this.authService.loginChat(attempt.ChatData.data); 
-
               //try {
                 await this.authService.loginToChatWs();
-             // } catch(e) {}
+              // } catch(e) {}
               
             }
 
@@ -148,7 +150,7 @@ export class LoginPage implements OnInit {
             this.changeProfileService.run();
 
             
-            if(attempt.ChatData){
+            if(attempt.ChatData) {
               await this.authService.loginChat(attempt.ChatData.data); 
               await this.authService.loginToChatWs();
             }

src/app/services/auth.service.ts

@@ -55,22 +55,17 @@ export class AuthService {
       if (SessionStore.exist) {
         this.ValidatedUser = SessionStore.user
 
-        if(this.p.userPermission(this.p.permissionList.Chat.access) == true ){
+        if(this.p.userPermission(this.p.permissionList.Chat.access) == true ) {
           this.loginToChatWs()
         }
       }
 
-      if (localStorage.getItem("userChat") != null) {
+      if(SessionStore?.user?.ChatData) {
+        this.ValidatedUserChat = SessionStore.user.ChatData
+        console.log('!!!!::!!!!', SessionStore.user)
+      }      
 
-        if(!this.ValidatedUserChat.hasOwnProperty('data')) {
+      
-          this.ValidatedUserChat = {
-            data: JSON.parse(localStorage.getItem('userChat'))
-          };
-        } else {
-          this.ValidatedUserChat = JSON.parse(localStorage.getItem('userChat'))
-        }
-
-      }
 
     }
 
@@ -142,6 +137,8 @@ export class AuthService {
 
         SessionStore.reset(session)
         this.ValidatedUser = SessionStore.user;
+
+        console.log('!!!::!!===', this.ValidatedUser)
         this.storageService.store(AuthConnstants.USER, response);
 
         return true;
@@ -154,9 +151,9 @@ export class AuthService {
     //user: UserForm
     async loginChat(responseChat = this.ValidatedUserChat) {
 
-      this.ValidatedUserChat = responseChat;
+      if(SessionStore?.user?.ChatData) {
-      localStorage.setItem('userChat', JSON.stringify(responseChat));
+        this.ValidatedUserChat = SessionStore.user.ChatData
-      this.storageService.store(AuthConnstants.AUTH, responseChat);
+      }      
 
       /* const expirationMinutes = 30;
       let date = new Date().getTime();

src/app/services/chat.service.ts

@@ -18,9 +18,6 @@ export class ChatService {
   options1:any;
   X_User_Id:any;
   X_Auth_Token:any;
-
-  //SERVER_URL = 'wss://www.tabularium.pt/websocket';
-  //public messages: Subject<any>;
   loggedUserChat:any;
   bindOnMessage: any;
 
@@ -32,20 +29,20 @@ export class ChatService {
     private storageService:StorageService,
     public p: PermissionService) {
 
-      if(this.p.userPermission(this.p.permissionList.Chat.access)){
-      this.loggedUserChat = authService.ValidatedUserChat;
-      this.headers = new HttpHeaders();
-
-
       if(this.p.userPermission(this.p.permissionList.Chat.access)) {
-        // 
+        this.loggedUserChat = authService.ValidatedUserChat;
-        this.headers = this.headers.set('X-User-Id', this.loggedUserChat.userId);
+        this.headers = new HttpHeaders();
-        this.headers = this.headers.set('X-Auth-Token', this.loggedUserChat.authToken);
-        this.options = {
-          headers: this.headers,
-        };
-      }
 
+        console.log('!!!::!!! chat service',this.loggedUserChat)
+
+        if(this.p.userPermission(this.p.permissionList.Chat.access)) {
+          // 
+          this.headers = this.headers.set('X-User-Id', this.loggedUserChat.data.userId);
+          this.headers = this.headers.set('X-Auth-Token', this.loggedUserChat.data.authToken);
+          this.options = {
+            headers: this.headers,
+          };
+        }
     }
 
   }
@@ -65,9 +62,9 @@ export class ChatService {
         headers: headersc,
         withCredentials: true
       };
-      //let fullUrl = "https://www.tabularium.pt/" + url;
+      // let fullUrl = "https://www.tabularium.pt/" + url;
       return this.http.get(url, optionsc).subscribe(()=>{
-        //this.fileService.viewDocumentByUrl(url)
+        // this.fileService.viewDocumentByUrl(url)
       });
     }