diff --git a/apps/console/java/org.wso2.identity.apps.console.server.feature/resources/deployment.config.json.j2 b/apps/console/java/org.wso2.identity.apps.console.server.feature/resources/deployment.config.json.j2 index 507d06907f2..31b06bd3c40 100644 --- a/apps/console/java/org.wso2.identity.apps.console.server.feature/resources/deployment.config.json.j2 +++ b/apps/console/java/org.wso2.identity.apps.console.server.feature/resources/deployment.config.json.j2 @@ -1411,36 +1411,6 @@ } }, {% endif %} - {% if console.event_publishing is defined %} - "events": { - "disabledFeatures": [ - {% if console.event_publishing.disabled_features is defined %} - {% for feature in console.event_publishing.disabled_features %} - "{{ feature }}"{{ "," if not loop.last }} - {% endfor %} - {% endif %} - ], - "enabled": {% if console.event_publishing.enabled is defined %} {{ console.event_publishing.enabled }}, - {% else %} true, - {% endif %} - "scopes": { - {% if console.event_publishing.scopes is defined %} - {% for operation, scopes in console.event_publishing.scopes.items() %} - "{{ operation }}": [ - {% for scope in scopes %} - "{{ scope }}"{{ "," if not loop.last }} - {% endfor %} - ]{{ "," if not loop.last }} - {% endfor %} - {% else %} - "create": [], - "read": [], - "update": [], - "delete": [] - {% endif %} - } - }, - {% endif %} {% if console.governance_connectors is defined %} "governanceConnectors": { "deprecatedFeaturesToShow": [ diff --git a/apps/console/src/public/deployment.config.json b/apps/console/src/public/deployment.config.json index 8c76d153185..ff0b7402039 100644 --- a/apps/console/src/public/deployment.config.json +++ b/apps/console/src/public/deployment.config.json @@ -580,16 +580,12 @@ }, "applications": { "disabledFeatures": [ + "applications.adaptiveAuth.orgGovernance", "applications.loginFlow.legacyEditor", "applications.sharedAccess.status", - "applications.sharedApp.adaptiveAuth", - "applications.adaptiveAuth.orgGovernance" + "applications.sharedApp.adaptiveAuth" ], "enabled": true, - "properties": { - "maxGracefulRefreshTokenReuseLimit": 5, - "maxGracefulRefreshTokenRotationValidityPeriod": 60 - }, "featureFlags": [ { "feature": "applications", @@ -608,6 +604,10 @@ "flag": "" } ], + "properties": { + "maxGracefulRefreshTokenReuseLimit": 5, + "maxGracefulRefreshTokenRotationValidityPeriod": 60 + }, "scopes": { "create": [ "internal_application_mgt_create" @@ -1112,25 +1112,42 @@ ] } }, - "events": { + "fapi": { "disabledFeatures": [], "enabled": true, "featureFlags": [], + "scopes": { + "create": [], + "delete": [], + "read": [], + "update": [] + } + }, + "flowExtensions": { + "disabledFeatures": [], + "enabled": true, + "featureFlags": [ + { + "feature": "flowExtensions", + "flag": "" + } + ], "scopes": { "create": [ - "internal_event_config_update" + "internal_flow_extension_create" ], "delete": [ - "internal_event_config_update" + "internal_flow_extension_delete" ], "feature": [ - "console:events" + "console:flowExtensions" ], "read": [ - "internal_event_config_view" + "internal_claim_meta_view", + "internal_flow_extension_view" ], "update": [ - "internal_event_config_update" + "internal_flow_extension_update" ] } }, @@ -1164,34 +1181,6 @@ "update": [] } }, - "flowExtensions": { - "disabledFeatures": [], - "enabled": true, - "featureFlags": [ - { - "feature": "flowExtensions", - "flag": "" - } - ], - "scopes": { - "create": [ - "internal_flow_extension_create" - ], - "delete": [ - "internal_flow_extension_delete" - ], - "feature": [ - "console:flowExtensions" - ], - "read": [ - "internal_flow_extension_view", - "internal_claim_meta_view" - ], - "update": [ - "internal_flow_extension_update" - ] - } - }, "gettingStarted": { "disabledFeatures": [], "enabled": true, @@ -2201,17 +2190,6 @@ "read": [], "update": [] } - }, - "fapi": { - "disabledFeatures": [], - "enabled": true, - "featureFlags": [], - "scopes": { - "create": [], - "delete": [], - "read": [], - "update": [] - } } }, "flowExecution": { diff --git a/features/admin.core.v1/constants/app-constants.ts b/features/admin.core.v1/constants/app-constants.ts index 91f1b369130..e85423e85c0 100644 --- a/features/admin.core.v1/constants/app-constants.ts +++ b/features/admin.core.v1/constants/app-constants.ts @@ -358,7 +358,6 @@ export class AppConstants { [ "IDVP_EDIT", `${ AppConstants.getDeveloperViewBasePath() }/identity-verification-providers/:id` ], [ "FLOW_EXTENSION_EDIT", `${ AppConstants.getDeveloperViewBasePath() }/flow-extensions/:id` ], - [ "EVENT_EDIT", `${ AppConstants.getDeveloperViewBasePath() }/event-edit` ], [ "LOCAL_CLAIMS", `${ AppConstants.getAdminViewBasePath() }/attributes` ], [ "LOCAL_CLAIMS_EDIT", `${ AppConstants.getAdminViewBasePath() }/edit-attributes/:id` ], [ "LOGIN", window["AppUtils"]?.getConfig()?.routes.login ], diff --git a/features/admin.core.v1/models/config.ts b/features/admin.core.v1/models/config.ts index 902a85a7390..38d0710e6c1 100644 --- a/features/admin.core.v1/models/config.ts +++ b/features/admin.core.v1/models/config.ts @@ -280,10 +280,6 @@ export interface FeatureConfigInterface { * Try It feature */ tryIt?: FeatureAccessConfigInterface; - /** - * Event Management feature - */ - events?: FeatureAccessConfigInterface; /** * Organization insights feature */ diff --git a/features/admin.core.v1/utils/route-utils.ts b/features/admin.core.v1/utils/route-utils.ts index 0dd395f69a2..5d7f55488ac 100644 --- a/features/admin.core.v1/utils/route-utils.ts +++ b/features/admin.core.v1/utils/route-utils.ts @@ -605,11 +605,6 @@ export class RouteUtils { id: "webhooks", order: 1, selected: history.location.pathname.includes("/webhooks") - }, - { - category: extensions, - id: "events", - order: 2 } ]; diff --git a/modules/access-control/src/constants/access-control-constants.ts b/modules/access-control/src/constants/access-control-constants.ts index e7e23d80ba7..0719ecdd573 100644 --- a/modules/access-control/src/constants/access-control-constants.ts +++ b/modules/access-control/src/constants/access-control-constants.ts @@ -331,24 +331,4 @@ export class AccessControlConstants { */ public static readonly ORGANIZATION_ROLES_READ: string = "organization_roles:read"; - /** - * Event configuration read permission - */ - public static readonly EVENT_CONFIG_READ: string = "internal_event_config_view"; - - /** - * Event configuration write permission - */ - public static readonly EVENT_CONFIG_WRITE: string = "internal_event_config_update"; - - /** - * EventConfig edit permission - */ - public static readonly EVENT_CONFIG_EDIT: string = "internal_event_config_update"; - - /** - * EventConfig delete permission - */ - public static readonly EVENT_CONFIG_DELETE: string = "internal_event_config_update"; - } diff --git a/modules/core/src/helpers/__mocks__/deployment.config.json b/modules/core/src/helpers/__mocks__/deployment.config.json index 7db12d8c5de..22d5fab9af1 100644 --- a/modules/core/src/helpers/__mocks__/deployment.config.json +++ b/modules/core/src/helpers/__mocks__/deployment.config.json @@ -511,27 +511,6 @@ ] } }, - "events": { - "disabledFeatures": [], - "enabled": true, - "scopes": { - "create": [ - "internal_event_config_update" - ], - "delete": [ - "internal_event_config_update" - ], - "feature": [ - "console:events" - ], - "read": [ - "internal_event_config_view" - ], - "update": [ - "internal_event_config_update" - ] - } - }, "gettingStarted": { "disabledFeatures": [], "enabled": true,