From 22a256f09b2290b40f7aecd8ab3c5a14bbdcb8cf Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Wed, 6 Mar 2019 15:58:50 +0000 Subject: [PATCH] revert change for AOS related to lock owners --- .../adf-office-services-ext/src/lib/evaluators.spec.ts | 4 ++-- projects/adf-office-services-ext/src/lib/evaluators.ts | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/adf-office-services-ext/src/lib/evaluators.spec.ts b/projects/adf-office-services-ext/src/lib/evaluators.spec.ts index a16e1b40e..66e5c97da 100644 --- a/projects/adf-office-services-ext/src/lib/evaluators.spec.ts +++ b/projects/adf-office-services-ext/src/lib/evaluators.spec.ts @@ -165,7 +165,7 @@ describe('evaluators', () => { expect(canOpenWithOffice(context)).toBeFalsy(); }); - it('should return [true] if current user is lock owner', () => { + it('should return [false] if current user is lock owner', () => { const context: any = { profile: { id: 'user1' @@ -186,7 +186,7 @@ describe('evaluators', () => { } }; - expect(canOpenWithOffice(context)).toBeTruthy(); + expect(canOpenWithOffice(context)).toBeFalsy(); }); it('should return [true] if all checks succeed', () => { diff --git a/projects/adf-office-services-ext/src/lib/evaluators.ts b/projects/adf-office-services-ext/src/lib/evaluators.ts index eb1f5c62b..ade0db3b0 100644 --- a/projects/adf-office-services-ext/src/lib/evaluators.ts +++ b/projects/adf-office-services-ext/src/lib/evaluators.ts @@ -47,8 +47,12 @@ export function canOpenWithOffice( file.entry.properties['cm:lockType'] === 'WRITE_LOCK' || file.entry.properties['cm:lockType'] === 'READ_ONLY_LOCK' ) { - const lockOwner = file.entry.properties['cm:lockOwner']; - return lockOwner && lockOwner.id === context.profile.id; + return false; + } + + const lockOwner = file.entry.properties['cm:lockOwner']; + if (lockOwner && lockOwner.id !== context.profile.id) { + return false; } return true;