Merge pull request #4825 from sadilchamishka/onboard-b2b-configs

Enable event listeners, event handlers and organization switch grant
wso2 · Aug 8, 2023 · 1a003b7 · 1a003b7
2 parents 0f1ad52 + 8433f50
commit 1a003b7
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 0 deletions.
diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml
@@ -1233,6 +1233,16 @@
         <EventListener type="org.wso2.carbon.user.core.listener.UserManagementErrorEventListener"
                        name="org.wso2.carbon.identity.provisioning.listener.ProvisioningErrorListener"
                        orderId="1" enable="false"/>
+
+        <!-- B2B organization management Event Listeners -->
+        <EventListener id="fragment_app_mgt_listener"
+                       type="org.wso2.carbon.identity.application.mgt.listener.ApplicationMgtListener"
+                       name="org.wso2.carbon.identity.organization.management.application.listener.FragmentApplicationMgtListener"
+                       orderId="50" enable="true"/>
+        <EventListener id="organization_user_operation_listener"
+                       type="org.wso2.carbon.user.core.listener.UserOperationEventListener"
+                       name="org.wso2.carbon.identity.organization.management.role.management.service.listener.OrganizationUserOperationEventListener"
+                       orderId="115" enable="true"/>
     </EventListeners>
 
     <!-- These recorders are used to write user delete information to specific sources. Default event recorder is CSV

diff --git a/...ures/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2 b/...ures/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2
@@ -478,6 +478,14 @@
                 <IdTokenAllowed>true</IdTokenAllowed>
             </SupportedGrantType>
             {% endif %}
+            {% if oauth.grant_type.organization_switch.enable is sameas true %}
+            <SupportedGrantType>
+                <GrantTypeName>organization_switch</GrantTypeName>
+                <GrantTypeHandlerImplClass>{{oauth.grant_type.organization_switch.grant_handler}}</GrantTypeHandlerImplClass>
+                <GrantTypeValidatorImplClass>{{oauth.grant_type.organization_switch.grant_validator}}</GrantTypeValidatorImplClass>
+                <IdTokenAllowed>true</IdTokenAllowed>
+            </SupportedGrantType>
+            {% endif %}
             {% if oauth.grant_type.token_exchange.enable is sameas true %}
             <SupportedGrantType>
                 <GrantTypeName>urn:ietf:params:oauth:grant-type:token-exchange</GrantTypeName>
@@ -1758,6 +1766,18 @@
                        orderId="{{event.default_listener.client_certificate_authentication_handler.priority}}"
                        enable="{{event.default_listener.client_certificate_authentication_handler.enable}}"/>
 
+        <!-- B2B organization management Event Listeners -->
+        <EventListener id="fragment_app_mgt_listener"
+                       type="org.wso2.carbon.identity.application.mgt.listener.ApplicationMgtListener"
+                       name="org.wso2.carbon.identity.organization.management.application.listener.FragmentApplicationMgtListener"
+                       orderId="{{event.default_listener.fragment_app_mgt_listener.priority}}"
+                       enable="{{event.default_listener.fragment_app_mgt_listener.enable}}"/>
+
+        <EventListener id="organization_user_operation_listener"
+                       type="org.wso2.carbon.user.core.listener.UserOperationEventListener"
+                       name="org.wso2.carbon.identity.organization.management.role.management.service.listener.OrganizationUserOperationEventListener"
+                       orderId="{{event.default_listener.organization_user_operation_listener.priority}}"
+                       enable="{{event.default_listener.organization_user_operation_listener.enable}}"/>
         <!-- Introspection Data Providers -->
         <EventListener id="is_introspection_data_provider" type="org.wso2.carbon.identity.core.handler.AbstractIdentityHandler"
                 name="org.wso2.carbon.identity.oauth2.token.handler.clientauth.mutualtls.introspection.ISIntrospectionDataProvider"

diff --git a/...y.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json b/...y.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json
@@ -159,6 +159,9 @@
   "oauth.grant_type.device_code.expiry_time": "10m",
   "oauth.grant_type.device_code.polling_interval": "5s",
   "oauth.grant_type.device_code.key_set": "BCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz23456789",
+  "oauth.grant_type.organization_switch.enable": true,
+  "oauth.grant_type.organization_switch.grant_handler": "org.wso2.carbon.identity.oauth2.grant.organizationswitch.OrganizationSwitchGrant",
+  "oauth.grant_type.organization_switch.grant_validator": "org.wso2.carbon.identity.oauth2.grant.organizationswitch.OrganizationSwitchGrantValidator",
   "oauth.par.expiry_time": "60s",
   "oauth.grant_type.token_exchange.grant_handler": "org.wso2.carbon.identity.oauth2.grant.token.exchange.TokenExchangeGrantHandler",
   "oauth.grant_type.token_exchange.grant_validator": "org.wso2.carbon.identity.oauth2.grant.token.exchange.TokenExchangeGrantValidator",
@@ -484,6 +487,10 @@
   "event.default_listener.is_introspection_data_provider.enable": false,
   "event.default_listener.outbound_provisioning_error_handler.priority": "1",
   "event.default_listener.outbound_provisioning_error_handler.enable": true,
+  "event.default_listener.fragment_app_mgt_listener.priority": "50",
+  "event.default_listener.fragment_app_mgt_listener.enable": true,
+  "event.default_listener.organization_user_operation_listener.priority": "115",
+  "event.default_listener.organization_user_operation_listener.enable": true,
 
   "event.default_listener.unique_claim_user_operation_event_listener.priority": "101",
   "event.default_listener.unique_claim_user_operation_event_listener.enable": false,

diff --git a/...event.server.feature/resources/org.wso2.carbon.identity.event.server.feature.default.json b/...event.server.feature/resources/org.wso2.carbon.identity.event.server.feature.default.json
@@ -228,6 +228,14 @@
   "identity_mgt.events.schemes.WorkflowPendingUserAuthnHandler.subscriptions": [
     "PRE_AUTHENTICATION"
   ],
+  "identity_mgt.events.schemes.OrganizationCreationHandler.module_index": "36",
+  "identity_mgt.events.schemes.OrganizationCreationHandler.subscriptions": [
+    "POST_ADD_ORGANIZATION"
+  ],
+  "identity_mgt.events.schemes.GovernanceConfigUpdateHandler.module_index": "37",
+  "identity_mgt.events.schemes.GovernanceConfigUpdateHandler.subscriptions": [
+    "POST_ADD_ORGANIZATION"
+  ],
   "identity_mgt.events.schemes.enforcePasswordResetEventHandler.module_index": "36",
   "identity_mgt.events.schemes.enforcePasswordResetEventHandler.subscriptions": [
     "POST_UPDATE_CREDENTIAL",