Skip to content

Commit 9f4e27a

Browse files
[DSC-1956] fixed ssr init state
1 parent af5791b commit 9f4e27a

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

src/app/core/data/feature-authorization/authorization-data.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ export class AuthorizationDataService extends BaseDataService<Authorization> imp
174174
*/
175175
searchObjectsAuthorizations(uuidList: string[], type: string, featuresId?: FeatureID[], ePersonUuid?: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<Authorization[]> {
176176
const followLinks = [
177-
followLink<Authorization>('feature', { isOptional: true }),
178-
followLink<Authorization>('object', { isOptional: true }),
177+
followLink<Authorization>('object'),
178+
followLink<Authorization>('feature'),
179179
];
180180

181181
return this.searchByObjects(uuidList, type, featuresId, ePersonUuid, {}, useCachedVersionIfAvailable, reRequestOnStale, ...followLinks).pipe(

src/app/core/data/feature-authorization/authorization.service.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ export class AuthorizationService {
6060
).subscribe(site => this.initStateForObjects([site.uuid], site.uniqueType, featureIDs));
6161
}
6262

63+
initAnonymousStateForSite() {
64+
this.siteService.find().pipe(
65+
take(1)
66+
).subscribe(site => this.initStateForObjects([site.uuid], site.uniqueType, []));
67+
}
68+
6369

6470
getAllAuthorizationsState(): Observable<ObjectAuthorizationsState> {
6571
return this.isLoading().pipe(

src/modules/app/server-init.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ export class ServerInitService extends InitService {
7171
this.initRouteListeners();
7272
this.themeService.listenForThemeChanges(false);
7373

74-
this.authorizationService.initStateForSite(this.appConfig.siteAuthorizationFeaturesConfig);
75-
7674
await this.authenticationReady$().toPromise();
7775

76+
this.authorizationService.initAnonymousStateForSite();
77+
7878
return true;
7979
};
8080
}

0 commit comments

Comments
 (0)