From 3b9d1ace1b5cad9b1ea9c3d7dcf36bd1faffdc3d Mon Sep 17 00:00:00 2001 From: eromano Date: Thu, 16 Mar 2023 13:00:32 +0100 Subject: [PATCH] remove unneeded JS-API dep move auth in the right place --- lib/content-services/src/lib/common/services/content.service.ts | 2 +- lib/core/src/lib/auth/services/base-authentication.service.ts | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/content-services/src/lib/common/services/content.service.ts b/lib/content-services/src/lib/common/services/content.service.ts index 08cbdf4459..bf89426165 100644 --- a/lib/content-services/src/lib/common/services/content.service.ts +++ b/lib/content-services/src/lib/common/services/content.service.ts @@ -83,7 +83,7 @@ export class ContentService { */ hasPermissions(node: Node, permission: PermissionsEnum | string, userId?: string): boolean { let hasPermissions = false; - userId = userId ?? this.authService.getEcmUsername(); + userId = userId ?? this.apiService.getInstance().getEcmUsername(); const permissions = [...(node.permissions?.locallySet || []), ...(node.permissions?.inherited || [])].filter( (currentPermission) => currentPermission.authorityId === userId diff --git a/lib/core/src/lib/auth/services/base-authentication.service.ts b/lib/core/src/lib/auth/services/base-authentication.service.ts index b79b60c36c..6e94a2bd26 100644 --- a/lib/core/src/lib/auth/services/base-authentication.service.ts +++ b/lib/core/src/lib/auth/services/base-authentication.service.ts @@ -62,8 +62,6 @@ export abstract class BaseAuthenticationService { abstract logout(): Observable; abstract isEcmLoggedIn(): boolean; abstract isBpmLoggedIn(): boolean; - abstract getEcmUsername(): string; - abstract getBpmUsername(): string; abstract reset(): void; abstract once(event: string): Observable;