hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 23:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DURACOM-234] Fix merge with main

Browse Source
This commit is contained in:
Giuseppe Digilio
2024-04-04 09:58:10 +02:00
parent 32f1d1096a
commit c327bf744b
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/app/browser-init.service.ts
View File

@@ -18,6 +18,7 @@ import { Store } from '@ngrx/store';
import { TranslateService } from '@ngx-translate/core';
import {
firstValueFrom,
lastValueFrom,
Subscription,
} from 'rxjs';
import {
@@ -124,7 +125,7 @@ export class BrowserInitService extends InitService {
this.initKlaro();
await this.authenticationReady$().toPromise();
await lastValueFrom(this.authenticationReady$());
return true;
};
@@ -141,10 +142,12 @@ export class BrowserInitService extends InitService {
const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
this.transferState.remove(InitService.NGRX_STATE);
this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
return this.store.select(coreSelector).pipe(
find((core: any) => isNotEmpty(core)),
map(() => true),
).toPromise();
return lastValueFrom(
this.store.select(coreSelector).pipe(
find((core: any) => isNotEmpty(core)),
map(() => true),
),
);
}
private trackAuthTokenExpiration(): void {
@@ -190,7 +193,7 @@ export class BrowserInitService extends InitService {
* @private
*/
private closeAuthCheckSubscription() {
firstValueFrom(this.authenticationReady$()).then(() => {
void firstValueFrom(this.authenticationReady$()).then(() => {
this.sub.unsubscribe();
});
}