Merge branch 'sharing-permissions' into intra-list-ordering

This commit is contained in:
NMerz
2020-11-15 10:39:45 -05:00
2 changed files with 6 additions and 3 deletions

View File

@@ -44,14 +44,17 @@ public class ListGetter implements CallHandler{
boolean verifiedAccess = false;
int uiPosition = 1;
while ((sharees < 2 && accessResults.next()) || !verifiedAccess) {
int permissionLevel = accessResults.getInt("permissionLevel");
if (accessResults.getString("userID").equals(cognitoID)) {
verifiedAccess = true;
if (!ListPermissions.hasPermission(accessResults.getInt("permissionLevel"), "Read")) {
if (!ListPermissions.hasPermission(permissionLevel, "Read")) {
throw new AccessControlException("User " + cognitoID + " does not have permission to read list " + id);
}
uiPosition = accessResults.getInt("uiPosition");
}
sharees++;
if (permissionLevel > 0) {
sharees++;
}
}
boolean shared = false;
if (sharees > 1) {