peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 04:57:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve

Browse Source
This commit is contained in:
Peter Maquiran
2022-05-09 15:01:23 +01:00
parent 578e9eab35
commit 25fec510d9
3 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/auth.service.ts
+11 -14
View File
@@ -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;
localStorage.setItem('userChat', JSON.stringify(responseChat));
this.storageService.store(AuthConnstants.AUTH, responseChat);
if(SessionStore?.user?.ChatData) {
this.ValidatedUserChat = SessionStore.user.ChatData
}
/* const expirationMinutes = 30;
let date = new Date().getTime();
src/app/services/chat.service.ts
+14 -17
View File
@@ -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.headers = this.headers.set('X-User-Id', this.loggedUserChat.userId);
this.headers = this.headers.set('X-Auth-Token', this.loggedUserChat.authToken);
this.options = {
headers: this.headers,
};
}
this.loggedUserChat = authService.ValidatedUserChat;
this.headers = new HttpHeaders();
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)
});
}