Skip to content

Commit

Permalink
Merge pull request #6187 from dhaura/DP-enable-b2b-org-template-overr…
Browse files Browse the repository at this point in the history 
…iding

Enable Child Org Notification Template Overriding Capability
  • Loading branch information
@SujanSanjula96
SujanSanjula96 authored Jan 11, 2025
2 parents 3061294 + 3f863e9 commit d43e61d
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 8 deletions.
20 changes: 16 additions & 4 deletions ...rg.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -799,10 +799,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"/>
<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 @@ -822,10 +828,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
Original file line number Diff line number Diff line change
Expand Up @@ -808,10 +808,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 @@ -831,10 +837,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
Original file line number Diff line number Diff line change
Expand Up @@ -662,11 +662,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 @@ -701,6 +719,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
Original file line number Diff line number Diff line change
Expand Up @@ -713,9 +713,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 @@ -750,6 +768,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

0 comments on commit d43e61d

Please sign in to comment.