Skip to content

Commit 026ed95

Browse files
pavinduLakshanpavinduLakshan
authored
Merge branch 'master' into bugfix/shared-access-success-toast
2 parents d1b830f + 13153ed commit 026ed95

File tree

694 files changed

+20515
-5926
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

694 files changed

+20515
-5926
lines changed

‎.changeset/clean-clocks-drum.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
"@wso2is/admin.alternative-login-identifier.v1": patch
3+
"@wso2is/admin.ask-password-flow-builder.v1": patch
4+
"@wso2is/admin.organization-discovery.v1": patch
5+
"@wso2is/admin.server-configurations.v1": patch
6+
"@wso2is/admin.identity-providers.v1": patch
7+
"@wso2is/admin.login-flow-builder.v1": patch
8+
"@wso2is/admin.console-settings.v1": patch
9+
"@wso2is/admin.administrators.v1": patch
10+
"@wso2is/admin.extensions.v1": patch
11+
"@wso2is/admin.validation.v1": patch
12+
"@wso2is/admin.claims.v1": patch
13+
"@wso2is/admin.roles.v2": patch
14+
"@wso2is/admin.users.v1": patch
15+
"@wso2is/admin.core.v1": patch
16+
"@wso2is/console": patch
17+
---
18+
19+
fix: Remove index files in `@wso2is/admin.server-configurations.v1` package

‎.changeset/olive-plants-lie.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@wso2is/admin.api-resources.v2": patch
3+
"@wso2is/console": patch
4+
---
5+
6+
Fix scope description overflow issue in the New API Resource modal.

‎.github/workflows/release-workflow.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ on:
2727
- "LICENSE"
2828
workflow_dispatch:
2929

30+
# Prevent multiple concurrent runs of this workflow. New runs will be queued.
31+
concurrency:
32+
group: release
33+
cancel-in-progress: false
34+
3035
env:
3136
GH_TOKEN: ${{ secrets.RELEASE_BOT_TOKEN }}
3237
SHOULD_GENERATE_CHANGESET: 'true'

‎apps/console/CHANGELOG.md‎

Lines changed: 829 additions & 0 deletions
Large diffs are not rendered by default.

‎apps/console/java/org.wso2.identity.apps.console.server.feature/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.wso2.identity.apps</groupId>
2525
<artifactId>identity-apps-console</artifactId>
26-
<version>2.79.12-SNAPSHOT</version>
26+
<version>2.81.10-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

features/admin.roles.v2/api/index.ts renamed to apps/console/java/org.wso2.identity.apps.console.server.feature/resources/config.js.j2

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2020, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
2+
* Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
33
*
44
* WSO2 LLC. licenses this file to you under the Apache License,
55
* Version 2.0 (the "License"); you may not use this file except
@@ -16,4 +16,6 @@
1616
* under the License.
1717
*/
1818

19-
export * from "./roles";
19+
window.__WSO2_IS_RUNTIME_CONFIG__ = {
20+
updates: window.__WSO2_IS_UPDATE_CONFIG__
21+
};

‎apps/console/java/org.wso2.identity.apps.console.server.feature/resources/deployment.config.json.j2‎

Lines changed: 192 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,26 @@
184184
{% endfor %}
185185
{% endif %}
186186
],
187+
"actions": {
188+
{% if actions is defined %}
189+
{% for key, value in actions.items() %}
190+
{% if key != 'types' %}
191+
"{{ key }}": {% if value is mapping %}{{ value | tojson }}{% elif value is number %}{{ value }}{% elif value is boolean %}{{ value }}{% else %}"{{ value }}"{% endif %},
192+
{% endif %}
193+
{% endfor %}
194+
{% endif %}
195+
"types": {
196+
{% if actions.types is defined %}
197+
{% for type_name, type_config in actions.types.items() %}
198+
"{{ type_name }}": {
199+
{% for config_key, config_value in type_config.items() %}
200+
"{{ config_key }}": {% if config_value is mapping %}{{ config_value | tojson }}{% elif config_value is number %}{{ config_value }}{% elif config_value is boolean %}{{ config_value }}{% else %}"{{ config_value }}"{% endif %}{{ "," if not loop.last }}
201+
{% endfor %}
202+
}{{ "," if not loop.last }}
203+
{% endfor %}
204+
{% endif %}
205+
}
206+
},
187207
"appCopyright": "{{ console.ui.app_copyright }}",
188208
"appTitle": "{{ console.ui.app_title }}",
189209
"appName": "{{ console.ui.app_name }}",
@@ -592,18 +612,44 @@
592612
{% if console.applications is defined %}
593613
"applications": {
594614
"disabledFeatures": [
595-
{% if authentication.adaptive.shared_applications.enable is not defined or authentication.adaptive.shared_applications.enable != true %}
596-
"applications.sharedApp.adaptiveAuth"{{ "," if console.applications.disabled_features is defined }}
597-
{% endif %}
598-
{% if console.applications.disabled_features is defined %}
599-
{% for feature in console.applications.disabled_features %}
600-
"{{ feature }}"{{ "," if not loop.last }}
601-
{% endfor %}
602-
{% endif %}
615+
{%- set disabled_features = [] -%}
616+
{%- if authentication.adaptive.shared_applications.enable is not defined or authentication.adaptive.shared_applications.enable != true -%}
617+
{%- set _ = disabled_features.append('"applications.sharedApp.adaptiveAuth"') -%}
618+
{%- endif -%}
619+
{%- if operation_permission_enforcement.skip_enforce_authorized_api_update_permission is defined and operation_permission_enforcement.skip_enforce_authorized_api_update_permission == true -%}
620+
{%- set _ = disabled_features.append('"applications.enforceAuthorizedAPIUpdatePermission"') -%}
621+
{%- endif -%}
622+
{%- if operation_permission_enforcement.skip_enforce_client_secret_permission is defined and operation_permission_enforcement.skip_enforce_client_secret_permission == true -%}
623+
{%- set _ = disabled_features.append('"applications.enforceClientSecretPermission"') -%}
624+
{%- endif -%}
625+
{%- if operation_permission_enforcement.skip_enforce_script_update_permission is defined and operation_permission_enforcement.skip_enforce_script_update_permission == true -%}
626+
{%- set _ = disabled_features.append('"applications.enforceScriptUpdatePermission"') -%}
627+
{%- endif -%}
628+
{%- if console.applications.disabled_features is defined -%}
629+
{%- for feature in console.applications.disabled_features -%}
630+
{%- set _ = disabled_features.append('"' + feature + '"') -%}
631+
{%- endfor -%}
632+
{%- endif -%}
633+
{{ disabled_features | join(', ') }}
603634
],
604635
"enabled": {% if console.applications.enabled is defined %} {{ console.applications.enabled }},
605636
{% else %} true,
606637
{% endif %}
638+
"featureFlags": [
639+
{% if console.applications.feature_flags is defined %}
640+
{% for flag in console.applications.feature_flags %}
641+
{
642+
{% for key, value in flag.items() %}
643+
{% if value is string %}
644+
"{{ key }}": "{{ value }}"{{ "," if not loop.last }}
645+
{% else %}
646+
"{{ key }}": {{ value }}{{ "," if not loop.last }}
647+
{% endif %}
648+
{% endfor %}
649+
}{{ "," if not loop.last }}
650+
{% endfor %}
651+
{% endif %}
652+
],
607653
"scopes": {
608654
{% if console.applications.scopes is defined %}
609655
{% for operation, scopes in console.applications.scopes.items() %}
@@ -619,7 +665,55 @@
619665
"update": [],
620666
"delete": []
621667
{% endif %}
622-
}
668+
}{% if console.applications.sub_features is defined %},
669+
"subFeatures": {
670+
{% for sub_feature_name, sub_feature in console.applications.sub_features.items() %}
671+
"{{ sub_feature_name }}": {
672+
"disabledFeatures": [
673+
{% if sub_feature.disabled_features is defined %}
674+
{% for disabled_feature in sub_feature.disabled_features %}
675+
"{{ disabled_feature }}"{{ "," if not loop.last }}
676+
{% endfor %}
677+
{% endif %}
678+
],
679+
"enabled": {% if sub_feature.enabled is defined %} {{ sub_feature.enabled }},
680+
{% else %} true,
681+
{% endif %}
682+
"featureFlags": [
683+
{% if sub_feature.feature_flags is defined %}
684+
{% for flag in sub_feature.feature_flags %}
685+
{
686+
{% for key, value in flag.items() %}
687+
{% if value is string %}
688+
"{{ key }}": "{{ value }}"{{ "," if not loop.last }}
689+
{% else %}
690+
"{{ key }}": {{ value }}{{ "," if not loop.last }}
691+
{% endif %}
692+
{% endfor %}
693+
}{{ "," if not loop.last }}
694+
{% endfor %}
695+
{% endif %}
696+
],
697+
"scopes": {
698+
{% if sub_feature.scopes is defined %}
699+
{% for operation, scopes in sub_feature.scopes.items() %}
700+
"{{ operation }}": [
701+
{% for scope in scopes %}
702+
"{{ scope }}"{{ "," if not loop.last }}
703+
{% endfor %}
704+
]{{ "," if not loop.last }}
705+
{% endfor %}
706+
{% else %}
707+
"create": [],
708+
"delete": [],
709+
"feature": [],
710+
"read": [],
711+
"update": []
712+
{% endif %}
713+
}
714+
}{{ "," if not loop.last }}
715+
{% endfor %}
716+
}{% endif %}
623717
},
624718
{% endif %}
625719
{% if console.application_roles is defined %}
@@ -926,6 +1020,36 @@
9261020
}
9271021
},
9281022
{% endif %}
1023+
{% if console.dynamic_client_registration is defined %}
1024+
"dynamicClientRegistration": {
1025+
"disabledFeatures": [
1026+
{% if console.dynamic_client_registration.disabled_features is defined %}
1027+
{% for feature in console.dynamic_client_registration.disabled_features %}
1028+
"{{ feature }}"{{ "," if not loop.last }}
1029+
{% endfor %}
1030+
{% endif %}
1031+
],
1032+
"enabled": {% if console.dynamic_client_registration.enabled is defined %} {{ console.dynamic_client_registration.enabled }},
1033+
{% else %} true,
1034+
{% endif %}
1035+
"scopes": {
1036+
{% if console.dynamic_client_registration.scopes is defined %}
1037+
{% for operation, scopes in console.dynamic_client_registration.scopes.items() %}
1038+
"{{ operation }}": [
1039+
{% for scope in scopes %}
1040+
"{{ scope }}"{{ "," if not loop.last }}
1041+
{% endfor %}
1042+
]{{ "," if not loop.last }}
1043+
{% endfor %}
1044+
{% else %}
1045+
"create": [],
1046+
"delete": [],
1047+
"read": [],
1048+
"update": []
1049+
{% endif %}
1050+
}
1051+
},
1052+
{% endif %}
9291053
{% if console.notification_channels is defined %}
9301054
"notificationChannels": {
9311055
"disabledFeatures": [
@@ -2006,11 +2130,16 @@
20062130
{% if console.user_roles is defined %}
20072131
"userRoles": {
20082132
"disabledFeatures": [
2009-
{% if console.user_roles.disabled_features is defined %}
2010-
{% for feature in console.user_roles.disabled_features %}
2011-
"{{ feature }}"{{ "," if not loop.last }}
2012-
{% endfor %}
2013-
{% endif %}
2133+
{%- set disabled_features = [] -%}
2134+
{%- if operation_permission_enforcement.skip_enforce_role_operation_permission is defined and operation_permission_enforcement.skip_enforce_role_operation_permission == true -%}
2135+
{%- set _ = disabled_features.append('"roles.enforceRoleOperationPermission"') -%}
2136+
{%- endif -%}
2137+
{%- if console.user_roles.disabled_features is defined -%}
2138+
{%- for feature in console.user_roles.disabled_features -%}
2139+
{%- set _ = disabled_features.append('"' + feature + '"') -%}
2140+
{%- endfor -%}
2141+
{%- endif -%}
2142+
{{ disabled_features | join(', ') }}
20142143
],
20152144
"enabled": {% if console.user_roles.enabled is defined %} {{ console.user_roles.enabled }},
20162145
{% else %} true,
@@ -2030,7 +2159,55 @@
20302159
"update": [],
20312160
"delete": []
20322161
{% endif %}
2033-
}
2162+
}{% if console.user_roles.sub_features is defined %},
2163+
"subFeatures": {
2164+
{% for sub_feature_name, sub_feature in console.user_roles.sub_features.items() %}
2165+
"{{ sub_feature_name }}": {
2166+
"disabledFeatures": [
2167+
{% if sub_feature.disabled_features is defined %}
2168+
{% for disabled_feature in sub_feature.disabled_features %}
2169+
"{{ disabled_feature }}"{{ "," if not loop.last }}
2170+
{% endfor %}
2171+
{% endif %}
2172+
],
2173+
"enabled": {% if sub_feature.enabled is defined %} {{ sub_feature.enabled }},
2174+
{% else %} true,
2175+
{% endif %}
2176+
"featureFlags": [
2177+
{% if sub_feature.feature_flags is defined %}
2178+
{% for flag in sub_feature.feature_flags %}
2179+
{
2180+
{% for key, value in flag.items() %}
2181+
{% if value is string %}
2182+
"{{ key }}": "{{ value }}"{{ "," if not loop.last }}
2183+
{% else %}
2184+
"{{ key }}": {{ value }}{{ "," if not loop.last }}
2185+
{% endif %}
2186+
{% endfor %}
2187+
}{{ "," if not loop.last }}
2188+
{% endfor %}
2189+
{% endif %}
2190+
],
2191+
"scopes": {
2192+
{% if sub_feature.scopes is defined %}
2193+
{% for operation, scopes in sub_feature.scopes.items() %}
2194+
"{{ operation }}": [
2195+
{% for scope in scopes %}
2196+
"{{ scope }}"{{ "," if not loop.last }}
2197+
{% endfor %}
2198+
]{{ "," if not loop.last }}
2199+
{% endfor %}
2200+
{% else %}
2201+
"create": [],
2202+
"delete": [],
2203+
"feature": [],
2204+
"read": [],
2205+
"update": []
2206+
{% endif %}
2207+
}
2208+
}{{ "," if not loop.last }}
2209+
{% endfor %}
2210+
}{% endif %}
20342211
},
20352212
{% endif %}
20362213
{% if console.user_roles_v3 is defined && scim2.enable_scim2_roles_v3_api is defined %}

‎apps/console/java/org.wso2.identity.apps.console.server.feature/resources/p2.inf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../r
1515
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/conf/templates/repository/deployment/server/webapps); \
1616
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/conf/templates/repository/deployment/server/webapps/console); \
1717
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.identity.apps.console.server_${feature.version}/deployment.config.json.j2,target:${installFolder}/../../resources/conf/templates/repository/deployment/server/webapps/console/deployment.config.json.j2,overwrite:true);\
18+
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.identity.apps.console.server_${feature.version}/config.js.j2,target:${installFolder}/../../resources/conf/templates/repository/deployment/server/webapps/console/config.js.j2,overwrite:true);\

‎apps/console/java/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<groupId>org.wso2.identity.apps</groupId>
2525
<artifactId>identity-apps-console</artifactId>
2626
<packaging>pom</packaging>
27-
<version>2.79.12-SNAPSHOT</version>
27+
<version>2.81.10-SNAPSHOT</version>
2828
<name>WSO2 Identity Server Console - Parent</name>
2929
<description>WSO2 Identity Server Console Parent</description>
3030

‎apps/console/java/webapp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.wso2.identity.apps</groupId>
2525
<artifactId>identity-apps-console</artifactId>
26-
<version>2.79.12-SNAPSHOT</version>
26+
<version>2.81.10-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

0 commit comments

Comments
 (0)