Skip to content

Update SetupPermissions.java (adding support for site roles) #43

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
ktor merged 3 commits into from
Oct 28, 2024
Merged

Update SetupPermissions.java (adding support for site roles) #43

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0652d8
Update SetupPermissions.java (adding support for site roles)
bimki Oct 28, 2024
70c193e
Update SetupPermissions.java
bimki Oct 28, 2024
7b6d3ba
Update SetupPermissions.java
bimki Oct 28, 2024
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
58 changes: 34 additions & 24 deletions src/main/java/com/ableneo/liferay/portal/setup/core/SetupPermissions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@
import com.liferay.portal.kernel.exception.SystemException;
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.model.Layout;
import com.liferay.portal.kernel.model.Resource;
import com.liferay.portal.kernel.model.ResourceConstants;
import com.liferay.portal.kernel.model.ResourcePermission;
import com.liferay.portal.kernel.model.*;
import com.liferay.portal.kernel.model.role.RoleConstants;
import com.liferay.portal.kernel.security.permission.ActionKeys;
import com.liferay.portal.kernel.service.ResourceLocalServiceUtil;
import com.liferay.portal.kernel.service.ResourcePermissionLocalServiceUtil;
Expand Down Expand Up @@ -43,29 +41,41 @@ public static void setupPortletPermissions(final ResourcePermissions resourcePer
String roleName = actionsPerRoleEntry.getKey();
try {
long companyId = SetupConfigurationThreadLocal.getRunInCompanyId();
long roleId = RoleLocalServiceUtil.getRole(companyId, roleName).getRoleId();
com.liferay.portal.kernel.model.Role role = RoleLocalServiceUtil.getRole(companyId, roleName);
long roleId = role.getRoleId();
final Set<String> actionStrings = actionsPerRoleEntry.getValue();
final String[] actionIds = actionStrings.toArray(new String[actionStrings.size()]);

/**
* Individual permission is needed even though we set
*/
ResourcePermissionLocalServiceUtil.setResourcePermissions(
companyId,
resource.getResourceId(),
ResourceConstants.SCOPE_INDIVIDUAL,
String.valueOf(companyId),
roleId,
actionIds
);
ResourcePermissionLocalServiceUtil.setResourcePermissions(
companyId,
resource.getResourceId(),
ResourceConstants.SCOPE_COMPANY,
String.valueOf(companyId),
roleId,
actionIds
);
if (role.getType() == RoleConstants.TYPE_SITE || role.getType() == RoleConstants.TYPE_ORGANIZATION) {
ResourcePermissionLocalServiceUtil.setResourcePermissions(
companyId,
resource.getResourceId(),
ResourceConstants.SCOPE_GROUP_TEMPLATE,
String.valueOf(companyId),
roleId,
actionIds
);
} else {
/**
* Individual permission is needed even though we set
*/
ResourcePermissionLocalServiceUtil.setResourcePermissions(
companyId,
resource.getResourceId(),
ResourceConstants.SCOPE_INDIVIDUAL,
String.valueOf(companyId),
roleId,
actionIds
);
ResourcePermissionLocalServiceUtil.setResourcePermissions(
companyId,
resource.getResourceId(),
ResourceConstants.SCOPE_COMPANY,
String.valueOf(companyId),
roleId,
actionIds
);
}
LOG.info(String.format("Set permission for role: %1$s for action ids: %2$s", roleName, actionIds));
} catch (NestableException e) {
LOG.error(String.format("Could not set permission to resource :%1$s", resource.getResourceId()), e);
Expand Down
Loading