Skip to content

Commit e21b1af

Browse files
committed
fix(front): use proper permission names
1 parent 18f136e commit e21b1af

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

front/lib/front/auth.ex

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,12 @@ defmodule Front.Auth do
278278
:ManageDeploymentTargets ->
279279
"project.deployment_targets.manage"
280280

281+
:ViewServiceAccounts ->
282+
"organization.service_accounts.view"
283+
284+
:ManageServiceAccounts ->
285+
"organization.service_accounts.manage"
286+
281287
_ ->
282288
Logger.error(
283289
"operation with name id #{inspect(operation)}, which is not supported in mapper"
@@ -313,8 +319,8 @@ defmodule Front.Auth do
313319
"project.secrets.manage" -> :ManageProjectSecrets
314320
"project.deployment_targets.view" -> :ViewDeploymentTargets
315321
"project.deployment_targets.manage" -> :ManageDeploymentTargets
316-
"service_accounts.view" -> :ViewServiceAccounts
317-
"service_accounts.manage" -> :ManageServiceAccounts
322+
"organization.service_accounts.view" -> :ViewServiceAccounts
323+
"organization.service_accounts.manage" -> :ManageServiceAccounts
318324
_ -> :unknown
319325
end
320326
end

front/lib/front_web/controllers/service_account_controller.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ defmodule FrontWeb.ServiceAccountController do
66
alias FrontWeb.Plugs
77

88
plug(Plugs.FetchPermissions, scope: "org")
9-
plug(Plugs.PageAccess, permissions: "service_accounts.view")
9+
plug(Plugs.PageAccess, permissions: "organization.service_accounts.view")
1010

1111
plug(
1212
Plugs.PageAccess,
13-
[permissions: "service_accounts.manage"]
13+
[permissions: "organization.service_accounts.manage"]
1414
when action in [:create, :update, :delete, :regenerate_token]
1515
)
1616

front/test/support/stubs/permission_patrol.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
defmodule Support.Stubs.PermissionPatrol do
22
alias Support.Stubs.DB
33

4-
@all_organization_permissions "organization.custom_roles.view,organization.custom_roles.manage,organization.okta.view,organization.okta.manage,organization.contact_support,organization.delete,organization.view,organization.secrets_policy_settings.manage,organization.secrets_policy_settings.view,organization.activity_monitor.view,organization.projects.create,organization.audit_logs.view,organization.audit_logs.manage,organization.people.view,organization.people.invite,organization.people.manage,organization.groups.view,organization.groups.manage,organization.custom_roles.manage,organization.self_hosted_agents.view,organization.self_hosted_agents.manage,organization.general_settings.view,organization.general_settings.manage,organization.secrets.view,organization.secrets.manage,organization.ip_allow_list.view,organization.ip_allow_list.manage,organization.notifications.view,organization.notifications.manage,organization.pre_flight_checks.view,organization.pre_flight_checks.manage,organization.plans_and_billing.view,organization.plans_and_billing.manage,organization.repo_to_role_mappers.manage,organization.dashboards.view,organization.dashboards.manage,organization.instance_git_integration.manage,service_accounts.view,service_accounts.manage"
4+
@all_organization_permissions "organization.custom_roles.view,organization.custom_roles.manage,organization.okta.view,organization.okta.manage,organization.contact_support,organization.delete,organization.view,organization.secrets_policy_settings.manage,organization.secrets_policy_settings.view,organization.activity_monitor.view,organization.projects.create,organization.audit_logs.view,organization.audit_logs.manage,organization.people.view,organization.people.invite,organization.people.manage,organization.groups.view,organization.groups.manage,organization.custom_roles.manage,organization.self_hosted_agents.view,organization.self_hosted_agents.manage,organization.general_settings.view,organization.general_settings.manage,organization.secrets.view,organization.secrets.manage,organization.ip_allow_list.view,organization.ip_allow_list.manage,organization.notifications.view,organization.notifications.manage,organization.pre_flight_checks.view,organization.pre_flight_checks.manage,organization.plans_and_billing.view,organization.plans_and_billing.manage,organization.repo_to_role_mappers.manage,organization.dashboards.view,organization.dashboards.manage,organization.instance_git_integration.manage,organization.service_accounts.view,organization.service_accounts.manage"
55
@all_project_permissions "project.view,project.delete,project.access.view,project.access.manage,project.debug,project.secrets.view,project.secrets.manage,project.notifications.view,project.notifications.manage,project.insights.view,project.insights.manage,project.artifacts.view,project.artifacts.delete,project.artifacts.view_settings,project.artifacts.modify_settings,project.scheduler.view,project.scheduler.manage,project.scheduler.run_manually,project.general_settings.view,project.general_settings.manage,project.repository_info.view,project.repository_info.manage,project.deployment_targets.view,project.deployment_targets.manage,project.pre_flight_checks.view,project.pre_flight_checks.manage,project.workflow.view,project.workflow.manage,project.job.view,project.job.rerun,project.job.stop,project.job.port_forwarding,project.job.attach"
66

77
def init do

front/test/support/stubs/rbac.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ defmodule Support.Stubs.RBAC do
4747
"organization.repo_to_role_mappers.manage",
4848
"organization.dashboards.view",
4949
"organization.dashboards.manage",
50-
"service_accounts.view",
51-
"service_accounts.manage"
50+
"organization.service_accounts.view",
51+
"organization.service_accounts.manage"
5252
]
5353

5454
@project_permissions [

0 commit comments

Comments
 (0)