diff --git a/src/app/services/attachments.service.ts b/src/app/services/attachments.service.ts index fd67ce1ee..a0671c00d 100644 --- a/src/app/services/attachments.service.ts +++ b/src/app/services/attachments.service.ts @@ -24,22 +24,16 @@ export class AttachmentsService { private changeProfileService: ChangeProfileService) { this.changeProfileService.registerCallback(() => { - this.loggeduser = SessionStore.user - this.headers = new HttpHeaders(); - - this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey); - }) - this.changeProfileService.registerLoginCallback(() => { - this.loggeduser = SessionStore.user - this.headers = new HttpHeaders(); - - this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey); - }) + this.setHeader() + }); + this.setHeader() + } + + setHeader() { this.loggeduser = SessionStore.user this.headers = new HttpHeaders(); this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey); - } uploadFile(formData:any) { diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 8238ca1b8..311c3a700 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -25,7 +25,7 @@ import { ChatSystemService } from 'src/app/services/chat/chat-system.service'; export class AuthService { userData$ = new BehaviorSubject(''); userId$ = new BehaviorSubject(''); - headers: HttpHeaders; + headers: HttpHeaders = new HttpHeaders(); public wsValidatedUserChat:any; public isWsAuthenticated: boolean = false; opts:any; @@ -43,9 +43,7 @@ export class AuthService { private storage: Storage, private initialsService: InitialsService, public p: PermissionService, - public ChatSystemService: ChatSystemService, ) { - - this.headers = new HttpHeaders(); + public ChatSystemService: ChatSystemService) { if (SessionStore.exist) { if(this.p.userPermission(this.p.permissionList.Chat.access) == true ) { diff --git a/src/app/services/contacts.service.ts b/src/app/services/contacts.service.ts index 55ce44b25..f555d9605 100644 --- a/src/app/services/contacts.service.ts +++ b/src/app/services/contacts.service.ts @@ -6,6 +6,7 @@ import { environment } from 'src/environments/environment'; import { AuthService } from '../services/auth.service'; import { LoginUserRespose } from '../models/user.model'; import { SessionStore } from '../store/session.service'; +import { ChangeProfileService } from './change-profile.service'; @Injectable({ providedIn: 'root' @@ -16,7 +17,18 @@ export class ContactsService { loggeduser: LoginUserRespose; headers: HttpHeaders; - constructor(private http: HttpClient, user: AuthService) { + constructor( + private http: HttpClient, + user: AuthService, + private changeProfileService: ChangeProfileService) { + + this.setHeader() + this.changeProfileService.registerCallback(() => { + this.setHeader() + }) + } + + setHeader() { this.loggeduser = SessionStore.user; this.headers = new HttpHeaders(); this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 215590d9c..b4add0860 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -583,8 +583,6 @@ export class EventsService { }); } - - getAllSharedOficialEvents(startdate: string, enddate: string): Observable { let geturl = environment.apiURL + 'calendar/pr'; geturl = geturl.replace('/V4/', '/V5/') diff --git a/src/app/services/organic-entity.service.ts b/src/app/services/organic-entity.service.ts index 30fc583f5..2a5e6c512 100644 --- a/src/app/services/organic-entity.service.ts +++ b/src/app/services/organic-entity.service.ts @@ -7,6 +7,7 @@ import { AuthService } from '../services/auth.service'; import { LoginUserRespose } from '../models/user.model'; import { OrganicEntity } from 'src/app/models/organic-entity.model'; import { SessionStore } from '../store/session.service'; +import { ChangeProfileService } from './change-profile.service'; @Injectable({ providedIn: 'root' @@ -17,7 +18,18 @@ export class OrganicEntityService { loggeduser: LoginUserRespose; headers: HttpHeaders; - constructor(private http: HttpClient, user: AuthService) { + constructor( + private http: HttpClient, + user: AuthService, + private changeProfileService: ChangeProfileService) { + + this.setHeader() + this.changeProfileService.registerCallback(() => { + this.setHeader() + }) + } + + setHeader() { this.loggeduser = SessionStore.user; this.headers = new HttpHeaders(); this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts index c429d3482..55e813247 100644 --- a/src/app/services/publications.service.ts +++ b/src/app/services/publications.service.ts @@ -9,6 +9,7 @@ import { Publication } from '../models/publication'; import { getUrl } from 'ionicons/dist/types/components/icon/utils'; import { ActivatedRoute, Router } from '@angular/router'; import { SessionStore } from '../store/session.service'; +import { ChangeProfileService } from './change-profile.service'; @Injectable({ providedIn: 'root' @@ -23,11 +24,20 @@ export class PublicationsService { constructor(private http: HttpClient, user: AuthService, private activatedRoute: ActivatedRoute, - private router: Router) { + private router: Router, + private changeProfileService: ChangeProfileService,) { + + this.setHeader() + this.changeProfileService.registerCallback(() => { + this.setHeader() + }) + + } + + setHeader () { this.loggeduser = SessionStore.user; this.headers = new HttpHeaders(); this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); - } GetPublicationFolderList(){ diff --git a/src/app/services/search.service.ts b/src/app/services/search.service.ts index 31d198c87..8b6075663 100644 --- a/src/app/services/search.service.ts +++ b/src/app/services/search.service.ts @@ -8,6 +8,7 @@ import { LoginUserRespose } from '../models/user.model'; import { EventSearch } from "src/app/models/event-search"; import { TopSearch } from 'src/app/models/top-search'; import { SessionStore } from '../store/session.service'; +import { ChangeProfileService } from './change-profile.service'; @Injectable({ providedIn: 'root' @@ -21,7 +22,20 @@ export class SearchService { categories= Array; // setup - constructor(private http: HttpClient, user: AuthService) { + constructor( + private http: HttpClient, + user: AuthService, + private changeProfileService: ChangeProfileService) { + + this.setHeader(); + + this.changeProfileService.registerCallback(() => { + this.setHeader() + }) + } + + + setHeader() { this.loggeduser = SessionStore.user; this.headers = new HttpHeaders(); this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey); diff --git a/version/git-version.ts b/version/git-version.ts index 39ef439f5..1a32d86b6 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "711e9fc64", - "SHA": "711e9fc640420029233c0aa0fad0151f26a5fb4a", + "shortSHA": "46296813b", + "SHA": "46296813b849aad1f6037fa09577a2ba04f4d2ca", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Jan 17 17:12:01 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4650", + "lastCommitTime": "'Wed Jan 18 11:38:21 2023 +0100'", + "lastCommitMessage": "clear agenda cache", + "lastCommitNumber": "4651", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/chat/rochet-chat-connector.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tnew file: version/git-static-version.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/services/attachments.service.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/contacts.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/organic-entity.service.ts\n\tmodified: src/app/services/publications.service.ts\n\tmodified: src/app/services/search.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file