ClaytonWWilson/Listify
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/Listify.git synced 2025-12-16 02:38:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
NMerz 2020-11-15 10:39:45 -05:00
commit ce8070cf43
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lambdas/Lists/List/src/ListGetter.java
View File

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

2
Lambdas/Lists/ListShare/src/ListSharer.java
View File

@ -22,8 +22,8 @@ public class ListSharer implements CallHandler {
} }
final private String CHECK_ACCESS = "SELECT * from ListSharee WHERE listID = ? AND userID = ?;"; final private String CHECK_ACCESS = "SELECT * from ListSharee WHERE listID = ? AND userID = ?;";
final private String SHARE_LIST = "INSERT INTO ListSharee(listID, userID, permissionLevel, ) VALUES(?, ?, ?, ?) ON DUPLICATE KEY UPDATE permissionLevel = ?;";
private final String UI_POSITION_CHECK = "SELECT Max(uiPosition) as maxUIPosition FROM ListSharee WHERE userID = ?;"; private final String UI_POSITION_CHECK = "SELECT Max(uiPosition) as maxUIPosition FROM ListSharee WHERE userID = ?;";
final private String SHARE_LIST = "INSERT INTO ListSharee(listID, userID, permissionLevel, uiPosition) VALUES(?, ?, ?, ?) ON DUPLICATE KEY UPDATE permissionLevel = ?;";
public Object conductAction(Map<String, Object> bodyMap, HashMap<String, String> queryString, String cognitoID) throws SQLException { public Object conductAction(Map<String, Object> bodyMap, HashMap<String, String> queryString, String cognitoID) throws SQLException {
PreparedStatement checkAccess = connection.prepareStatement(CHECK_ACCESS); PreparedStatement checkAccess = connection.prepareStatement(CHECK_ACCESS);