Skip to content

feat: adds doesRoleExist_transaction and deleteUserRole_transaction #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 25, 2022
Merged

feat: adds doesRoleExist_transaction and deleteUserRole_transaction #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd15fc7
feat: adds doesRoleExist_transaction and deleteUserRole_transaction
jscyo Apr 18, 2022
c0ce4e6
Merge branch 'user-roles' into remove-user-role-api
jscyo Apr 22, 2022
6a690da
updates doesRoleExist_Transaction with FOR UPDATE
jscyo Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/main/java/io/supertokens/storage/postgresql/Start.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,8 +1535,13 @@ public int deleteAllRolesForUser(String userId) throws StorageQueryException {
@Override
public boolean deleteRoleForUser_Transaction(TransactionConnection con, String userId, String role)
throws StorageQueryException {
// TODO
return false;
Connection sqlCon = (Connection) con.getConnection();

try {
return UserRolesQueries.deleteRoleForUser_Transaction(this, sqlCon, userId, role);
} catch (SQLException e) {
throw new StorageQueryException(e);
}
}

@Override
Expand Down Expand Up @@ -1586,7 +1591,12 @@ public int deleteAllPermissionsForRole_Transaction(TransactionConnection con, St

@Override
public boolean doesRoleExist_Transaction(TransactionConnection con, String role) throws StorageQueryException {
// TODO
return false;
Connection sqlCon = (Connection) con.getConnection();
try {
return UserRolesQueries.doesRoleExist_transaction(this, sqlCon, role);
} catch (SQLException e) {
throw new StorageQueryException(e);
}
}

}
19 changes: 19 additions & 0 deletions src/main/java/io/supertokens/storage/postgresql/queries/UserRolesQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,23 @@ public static String[] getRolesForUser(Start start, String userId) throws SQLExc
return roles.toArray(String[]::new);
});
}

public static boolean deleteRoleForUser_Transaction(Start start, Connection con, String userId, String role)
throws SQLException, StorageQueryException {
String QUERY = "DELETE FROM " + getConfig(start).getUserRolesTable() + " WHERE user_id = ? AND role = ? ;";

// store the number of rows updated
int rowUpdatedCount = update(con, QUERY, pst -> {
pst.setString(1, userId);
pst.setString(2, role);
});
return rowUpdatedCount > 0;
}

public static boolean doesRoleExist_transaction(Start start, Connection con, String role)
throws SQLException, StorageQueryException {
String QUERY = "SELECT 1 FROM " + getConfig(start).getRolesTable() + " WHERE role = ? FOR UPDATE";
return execute(con, QUERY, pst -> pst.setString(1, role), ResultSet::next);
}

}