Skip to content
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

Enable Child Org Notification Template Overriding Capability #6187

Merged
merged 1 commit into from
Jan 11, 2025
+86 −8
Merged

Enable Child Org Notification Template Overriding Capability #6187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions ...rg.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,10 +795,16 @@
<APIResource name="Email Template Management API v1/v2"
identifier="/o/api/server/v(.*)/email/template-types" requiresAuthorization="true"
description="API representation of the Email Template Management API"
type="CONSOLE_ORG_LEVEL">
type="ORGANIZATION">
<Scopes>
<Scope displayName="View Email Template" name="internal_org_email_mgt_view"
description="View email templates and types in the organization"/>
<Scope displayName="View Email Template" name="internal_org_email_mgt_view"
description="View email templates and types in the organization"/>
<Scope displayName="Create Email Template" name="internal_org_email_mgt_create"
description="Create new email template and types in the organization"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
description="Create new email template and types in the organization"/>
description="Create new email templates and types in the organization"/>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will fix in a separate PR.

<Scope displayName="Update Email Template" name="internal_org_email_mgt_update"
description="Update email templates and types in the organization"/>
<Scope displayName="Delete Email Template" name="internal_org_email_mgt_delete"
description="Delete email templates and types in the organization"/>
</Scopes>
</APIResource>
<APIResource name="Notification Template Management API"
Expand All @@ -818,10 +824,16 @@
<APIResource name="Notification Template Management API"
identifier="/o/api/server/v(.*)/notification/(?:email|sms)/template-types" requiresAuthorization="true"
description="API representation of the Notification Template Management API"
type="CONSOLE_ORG_LEVEL">
type="ORGANIZATION">
<Scopes>
<Scope displayName="View Notification Template" name="internal_org_template_mgt_view"
description="View notification templates and types in the organization"/>
<Scope displayName="Create Notification Template" name="internal_org_template_mgt_create"
description="Create notification templates and types in the organization"/>
<Scope displayName="Update Notification Template" name="internal_org_template_mgt_update"
description="Update notification templates and types in the organization"/>
<Scope displayName="Delete Notification Template" name="internal_org_template_mgt_delete"
description="Delete notification templates and types in the organization"/>
</Scopes>
</APIResource>
<APIResource name="Entitlement Management API" identifier="/api/identity/entitlement/"
Expand Down
18 changes: 15 additions & 3 deletions ...wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,10 +804,16 @@
<APIResource name="Email Template Management API v1/v2"
identifier="/o/api/server/v(.*)/email/template-types" requiresAuthorization="true"
description="API representation of the Email Template Management API"
type="CONSOLE_ORG_LEVEL">
type="ORGANIZATION">
<Scopes>
<Scope displayName="View Email Template" name="internal_org_email_mgt_view"
<Scope displayName="View Email Template" name="internal_org_email_mgt_view"
description="View email templates and types in the organization"/>
<Scope displayName="Create Email Template" name="internal_org_email_mgt_create"
description="Create new email template and types in the organization"/>
<Scope displayName="Update Email Template" name="internal_org_email_mgt_update"
description="Update email templates and types in the organization"/>
<Scope displayName="Delete Email Template" name="internal_org_email_mgt_delete"
description="Delete email templates and types in the organization"/>
</Scopes>
</APIResource>
<APIResource name="Notification Template Management API"
Expand All @@ -827,10 +833,16 @@
<APIResource name="Notification Template Management API"
identifier="/o/api/server/v(.*)/notification/(?:email|sms)/template-types" requiresAuthorization="true"
description="API representation of the Notification Template Management API"
type="CONSOLE_ORG_LEVEL">
type="ORGANIZATION">
<Scopes>
<Scope displayName="View Notification Template" name="internal_org_template_mgt_view"
description="View notification templates and types in the organization"/>
<Scope displayName="Create Notification Template" name="internal_org_template_mgt_create"
description="Create notification templates and types in the organization"/>
<Scope displayName="Update Notification Template" name="internal_org_template_mgt_update"
description="Update notification templates and types in the organization"/>
<Scope displayName="Delete Notification Template" name="internal_org_template_mgt_delete"
description="Delete notification templates and types in the organization"/>
</Scopes>
</APIResource>
<APIResource name="Entitlement Management API" identifier="/api/identity/entitlement/"
Expand Down
29 changes: 28 additions & 1 deletion ...ore/org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,11 +656,29 @@

<!-- [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/email/template-types(.*)" secured="true" http-method="POST">
<Scopes>internal_org_template_mgt_create</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="PUT">
<Scopes>internal_org_template_mgt_update</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="DELETE">
<Scopes>internal_org_template_mgt_delete</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>
<Resource context="(.*)/o/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="POST">
<Scopes>internal_org_template_mgt_create</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="PUT">
<Scopes>internal_org_template_mgt_update</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="DELETE">
<Scopes>internal_org_template_mgt_delete</Scopes>
</Resource>

<!-- Notification Template Management API -->
<Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
Expand Down Expand Up @@ -695,6 +713,15 @@
<Resource context="(.*)/o/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_org_email_mgt_view</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="POST">
<Scopes>internal_org_email_mgt_create</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="PUT">
<Scopes>internal_org_email_mgt_update</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="DELETE">
<Scopes>internal_org_email_mgt_delete</Scopes>
</Resource>

<!-- Email Template Management API v1/v2 -->
<Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
Expand Down
27 changes: 27 additions & 0 deletions .../org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,9 +707,27 @@
<Resource context="(.*)/o/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_org_template_mgt_view</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="POST">
<Scopes>internal_org_template_mgt_create</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="PUT">
<Scopes>internal_org_template_mgt_update</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="DELETE">
<Scopes>internal_org_template_mgt_delete</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>
<Resource context="(.*)/o/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="POST">
<Scopes>internal_org_template_mgt_create</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="PUT">
<Scopes>internal_org_template_mgt_update</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="DELETE">
<Scopes>internal_org_template_mgt_delete</Scopes>
</Resource>

<!-- Notification Template Management API -->
<Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
Expand Down Expand Up @@ -744,6 +762,15 @@
<Resource context="(.*)/o/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
<Scopes>internal_org_email_mgt_view</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="POST">
<Scopes>internal_org_email_mgt_create</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="PUT">
<Scopes>internal_org_email_mgt_update</Scopes>
</Resource>
<Resource context="(.*)/o/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="DELETE">
<Scopes>internal_org_email_mgt_delete</Scopes>
</Resource>

<!-- Email Template Management API v1/v2 -->
<Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
Expand Down
Loading