Skip to content

Commit d88d481

Browse files
author
Dave Kichler
committed
Issue #156: Correcting boolean logic for determining write authorizations for a given document
1 parent 713ee67 commit d88d481

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

etc/sync-function-authorization-module.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,11 @@ function() {
5757
appendToAuthorizationList(requiredAuthorizations, authorizationMap.write);
5858
}
5959

60-
if (doc._deleted && authorizationMap.remove) {
61-
writeAuthorizationFound = true;
62-
appendToAuthorizationList(requiredAuthorizations, authorizationMap.remove);
60+
if (doc._deleted) {
61+
if (authorizationMap.remove) {
62+
writeAuthorizationFound = true;
63+
appendToAuthorizationList(requiredAuthorizations, authorizationMap.remove);
64+
}
6365
} else if (!isDocumentMissingOrDeleted(oldDoc) && authorizationMap.replace) {
6466
writeAuthorizationFound = true;
6567
appendToAuthorizationList(requiredAuthorizations, authorizationMap.replace);

etc/test-helper.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -645,11 +645,11 @@ function verifyAccessDenied(doc, oldDoc, expectedAuthorization) {
645645
} else if (countAuthorizationTypes(expectedAuthorization) > 1) {
646646
assert.equal(ex.forbidden, generalAuthFailedMessage, 'Expected authorization exception not met: ' + ex.forbidden);
647647
} else if (expectedAuthorization.expectedChannels) {
648-
assert.ok(ex instanceof Error && ex.message === channelAccessDenied.message, 'Expected channel authorization error not triggered, got this instead: ' + ex);
648+
assert.equal(ex, channelAccessDenied, 'Expected channel authorization error not triggered, got this instead: ' + ex);
649649
} else if (expectedAuthorization.expectedRoles) {
650-
assert.ok(ex instanceof Error && ex.message === roleAccessDenied.message, 'Expected role authorization error not triggered, got this instead: ' + ex);
650+
assert.equal(ex, roleAccessDenied, 'Expected role authorization error not triggered, got this instead: ' + ex);
651651
} else if (expectedAuthorization.expectedUsers) {
652-
assert.ok(ex instanceof Error && ex.message === userAccessDenied.message, 'Expected user authorization error not triggered, got this instead: ' + ex);
652+
assert.equal(ex, userAccessDenied, 'Expected user authorization error not triggered, got this instead: ' + ex);
653653
}
654654
}
655655

test/authorization-spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ describe('Authorization:', function() {
266266
stringProp: 'foobar'
267267
};
268268

269-
testHelper.verifyAccessDenied(doc, oldDoc, { expectedRoles: [ ] });
269+
testHelper.verifyAccessDenied(doc, oldDoc, []);
270270
});
271271
});
272272

0 commit comments

Comments
 (0)