Skip to content

Commit

Permalink
Merge pull request #6058 from RushanNanayakkara/ft_notification_templ…
Browse files Browse the repository at this point in the history 
…ate_api

Remove dual scopes from Notification template api access controls
  • Loading branch information
@RushanNanayakkara
RushanNanayakkara authored Oct 24, 2024
2 parents d58f6c2 + 4e1fdd3 commit 49d3018
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 43 deletions.
38 changes: 19 additions & 19 deletions ...ore/org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,25 +626,6 @@
<Scopes>internal_claim_meta_delete</Scopes>
</Resource>

<!-- [Organization] Email Template Management API v1/v2 -->
<Resource context="(.*)/o/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_org_email_mgt_view</Scopes>
</Resource>

<!-- Email Template Management API v1/v2 -->
<Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_email_mgt_view</Scopes>
</Resource>
<Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="POST">
<Scopes>internal_email_mgt_create</Scopes>
</Resource>
<Resource context="(.*)/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="PUT">
<Scopes>internal_email_mgt_update</Scopes>
</Resource>
<Resource context="(.*)/api/server/v1(.*)/email/template-types/(.*)" secured="true" http-method="DELETE">
<Scopes>internal_email_mgt_delete</Scopes>
</Resource>

<!-- [Organization] Notification Template Management API -->
<Resource context="(.*)/o/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_org_email_mgt_view,internal_org_template_mgt_view</Scopes>
Expand Down Expand Up @@ -682,6 +663,25 @@
<Scopes>internal_template_mgt_delete</Scopes>
</Resource>

<!-- [Organization] Email Template Management API v1/v2 -->
<Resource context="(.*)/o/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_org_email_mgt_view</Scopes>
</Resource>

<!-- Email Template Management API v1/v2 -->
<Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_email_mgt_view</Scopes>
</Resource>
<Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="POST">
<Scopes>internal_email_mgt_create</Scopes>
</Resource>
<Resource context="(.*)/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="PUT">
<Scopes>internal_email_mgt_update</Scopes>
</Resource>
<Resource context="(.*)/api/server/v1(.*)/email/template-types/(.*)" secured="true" http-method="DELETE">
<Scopes>internal_email_mgt_delete</Scopes>
</Resource>

<!-- Keystore Management API -->
<Resource context="(.*)/api/server/v1/keystores/certs/public(.*)" secured="false" http-method="GET"/>
<Resource context="(.*)/api/server/v1/keystores/(.*)" secured="true" http-method="GET">
Expand Down
48 changes: 24 additions & 24 deletions .../org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -675,45 +675,26 @@
<Scopes>internal_claim_meta_delete</Scopes>
</Resource>

<!-- [Organization] Email Template Management API v1/v2 -->
<Resource context="(.*)/o/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_org_email_mgt_view</Scopes>
</Resource>

<!-- Email Template Management API v1/v2 -->
<Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_email_mgt_view</Scopes>
</Resource>
<Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="POST">
<Scopes>internal_email_mgt_create</Scopes>
</Resource>
<Resource context="(.*)/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="PUT">
<Scopes>internal_email_mgt_update</Scopes>
</Resource>
<Resource context="(.*)/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="DELETE">
<Scopes>internal_email_mgt_delete</Scopes>
</Resource>

<!-- [Organization] Notification Template Management API -->
<Resource context="(.*)/o/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_org_email_mgt_view,internal_org_template_mgt_view</Scopes>
<Scopes>internal_org_template_mgt_view</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_org_template_mgt_view</Scopes>
</Resource>

<!-- Notification Template Management API -->
<Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_email_mgt_view,internal_template_mgt_view</Scopes>
<Scopes>internal_template_mgt_view</Scopes>
</Resource>
<Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="POST">
<Scopes>internal_email_mgt_create,internal_template_mgt_create</Scopes>
<Scopes>internal_template_mgt_create</Scopes>
</Resource>
<Resource context="(.*)/api/server/v(.*)/notification/email/template-types/(.*)" secured="true" http-method="PUT">
<Scopes>internal_email_mgt_update,internal_template_mgt_update</Scopes>
<Scopes>internal_template_mgt_update</Scopes>
</Resource>
<Resource context="(.*)/api/server/v(.*)/notification/email/template-types/(.*)" secured="true" http-method="DELETE">
<Scopes>internal_email_mgt_delete,internal_template_mgt_delete</Scopes>
<Scopes>internal_template_mgt_delete</Scopes>
</Resource>
<Resource context="(.*)/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_template_mgt_view</Scopes>
Expand All @@ -731,6 +712,25 @@
<Scopes>internal_template_mgt_delete</Scopes>
</Resource>

<!-- [Organization] Email Template Management API v1/v2 -->
<Resource context="(.*)/o/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_org_email_mgt_view</Scopes>
</Resource>

<!-- Email Template Management API v1/v2 -->
<Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_email_mgt_view</Scopes>
</Resource>
<Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="POST">
<Scopes>internal_email_mgt_create</Scopes>
</Resource>
<Resource context="(.*)/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="PUT">
<Scopes>internal_email_mgt_update</Scopes>
</Resource>
<Resource context="(.*)/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="DELETE">
<Scopes>internal_email_mgt_delete</Scopes>
</Resource>

<!-- Keystore Management API -->
<Resource context="(.*)/api/server/v1/keystores/certs/public(.*)" secured="false" http-method="GET"/>
<Resource context="(.*)/api/server/v1/keystores/(.*)" secured="true" http-method="GET">
Expand Down

0 comments on commit 49d3018

Please sign in to comment.