From 887455a0ef16c635ec486d4ac7cd1ced7b9e71aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20Ja=C5=9Bkowski?= <138671284+g-jaskowski@users.noreply.github.com> Date: Thu, 28 Aug 2025 20:35:21 +0200 Subject: [PATCH] [ACS-9768] remove deprecated methods from auth related components (#4688) * [ACS-9768] remove deprecated methods from auth related components [link-adf:ACS-9768-Remove-deprecated-methods-from-auth-related-components] * [ACS-9786] replace deprecated methods --- projects/aca-content/about/src/about.component.ts | 2 +- .../aca-content/ms-office/src/aos-extension.service.spec.ts | 2 +- projects/aca-content/ms-office/src/aos-extension.service.ts | 2 +- .../src/lib/components/view-profile/view-profile.guard.ts | 6 +----- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/projects/aca-content/about/src/about.component.ts b/projects/aca-content/about/src/about.component.ts index 104132b97..b843d3798 100644 --- a/projects/aca-content/about/src/about.component.ts +++ b/projects/aca-content/about/src/about.component.ts @@ -54,7 +54,7 @@ export class AboutComponent implements OnInit { landingPage = this.appSettings.landingPage; ngOnInit(): void { - if (this.authService.isEcmLoggedIn()) { + if (this.authService.isLoggedIn()) { this.setECMInfo(); } } diff --git a/projects/aca-content/ms-office/src/aos-extension.service.spec.ts b/projects/aca-content/ms-office/src/aos-extension.service.spec.ts index 7c3aa799e..0e395b2f6 100644 --- a/projects/aca-content/ms-office/src/aos-extension.service.spec.ts +++ b/projects/aca-content/ms-office/src/aos-extension.service.spec.ts @@ -46,7 +46,7 @@ describe('AosEditOnlineService', () => { authenticationService = TestBed.inject(AuthenticationService); appConfigService = TestBed.inject(AppConfigService); - spyOn(authenticationService, 'getEcmUsername').and.returnValue('user1'); + spyOn(authenticationService, 'getUsername').and.returnValue('user1'); spyOn(appConfigService, 'get').and.returnValue('http://localhost:3000'); userAgent = spyOnProperty(navigator, 'userAgent').and.returnValue('mac'); }); diff --git a/projects/aca-content/ms-office/src/aos-extension.service.ts b/projects/aca-content/ms-office/src/aos-extension.service.ts index 777260916..0973264cf 100644 --- a/projects/aca-content/ms-office/src/aos-extension.service.ts +++ b/projects/aca-content/ms-office/src/aos-extension.service.ts @@ -51,7 +51,7 @@ export class AosEditOnlineService implements IAosEditOnlineService { // ); const checkedOut = node.properties['cm:lockType'] === 'WRITE_LOCK' || node.properties['cm:lockType'] === 'READ_ONLY_LOCK'; const lockOwner = node.properties['cm:lockOwner']; - const differentLockOwner = lockOwner.id !== this.authenticationService.getEcmUsername(); + const differentLockOwner = lockOwner.id !== this.authenticationService.getUsername(); if (checkedOut && differentLockOwner) { this.onAlreadyLockedNotification(node.id, lockOwner.id); diff --git a/projects/aca-content/src/lib/components/view-profile/view-profile.guard.ts b/projects/aca-content/src/lib/components/view-profile/view-profile.guard.ts index f25f8f96e..b9fff044c 100644 --- a/projects/aca-content/src/lib/components/view-profile/view-profile.guard.ts +++ b/projects/aca-content/src/lib/components/view-profile/view-profile.guard.ts @@ -29,9 +29,5 @@ import { AuthenticationService } from '@alfresco/adf-core'; export const ViewProfileRuleGuard: CanActivateFn = () => { const authService = inject(AuthenticationService); - const isEcmLoggedIn = (): boolean => { - return authService.isEcmLoggedIn() || (authService.isECMProvider() && authService.isKerberosEnabled()); - }; - - return isEcmLoggedIn() || authService.isOauth(); + return authService.isLoggedIn() || authService.isOauth(); };