inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AAE-12501] Get username with authentication service

Browse Source
This commit is contained in:
Amedeo Lepore
2023-03-31 12:12:03 +02:00
parent 7db91b47af
commit 86d502314a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/content-services/src/lib/common/services/content.service.ts
+1 -1
View File
@@ -87,7 +87,7 @@ export class ContentService {
*/
hasPermissions(node: Node, permission: PermissionsEnum | string, userId?: string): boolean {
let hasPermissions = false;
userId = userId ?? this.apiService.getInstance().getEcmUsername();
userId = userId ?? this.authService.getEcmUsername();
const permissions = [...(node.permissions?.locallySet || []), ...(node.permissions?.inherited || [])]
.filter((currentPermission) => currentPermission.authorityId === userId);
lib/content-services/src/lib/document-list/services/lock.service.ts
+3 -3
View File
@@ -17,7 +17,7 @@
import { Injectable } from '@angular/core';
import { Node } from '@alfresco/js-api';
import { AlfrescoApiService } from '@alfresco/adf-core';
import { AuthenticationService } from '@alfresco/adf-core';
import moment, { Moment } from 'moment';
@Injectable({
@@ -25,7 +25,7 @@ import moment, { Moment } from 'moment';
})
export class LockService {
constructor(private alfrescoApiService: AlfrescoApiService) {
constructor(private authService: AuthenticationService) {
}
isLocked(node: Node): boolean {
@@ -34,7 +34,7 @@ export class LockService {
if (this.isReadOnlyLock(node)) {
isLocked = !this.isLockExpired(node);
} else if (this.isLockOwnerAllowed(node)) {
isLocked = this.alfrescoApiService.getInstance().getEcmUsername() !== node.properties['cm:lockOwner'].id;
isLocked = this.authService.getEcmUsername() !== node.properties['cm:lockOwner'].id;
if (this.isLockExpired(node)) {
isLocked = false;
}