Skip to content

Commit b37cfae

Browse files
PasinduYeshanPasinduYeshan
committed
Merge remote-tracking branch 'upstream/master' into fix/login-sec
2 parents 64a1df7 + c9ac81d commit b37cfae

File tree

96 files changed

+1305
-1182
lines changed

Some content is hidden

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

96 files changed

+1305
-1182
lines changed

Diff for: ‎.github/workflows/release-workflow.yml

+1-12
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,7 @@ on:
2525
branches: [ master ]
2626
paths-ignore:
2727
- "LICENSE"
28-
workflow_dispatch:
29-
30-
permissions:
31-
contents: write
32-
issues: write
33-
pull-requests: write
34-
packages: write
28+
workflow_dispatch:
3529

3630
env:
3731
GH_TOKEN: ${{ secrets.RELEASE_BOT_TOKEN }}
@@ -168,11 +162,6 @@ jobs:
168162
restore-keys: |
169163
${{ runner.os }}-maven-
170164
171-
- name: 🔍 Check GitHub API Rate Limit
172-
id: check-rate-limit
173-
run: |
174-
curl -s -H "Authorization: token ${{ env.GH_TOKEN }}" https://api.github.com/rate_limit | jq .
175-
176165
- name: 📣 Create Release Pull Request or Publish to npm
177166
if: ${{ env.SHOULD_GENERATE_CHANGESET == 'true' }}
178167
id: changesets

Diff for: ‎apps/console/CHANGELOG.md

+61
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,66 @@
11
# @wso2is/console
22

3+
## 2.50.8
4+
5+
### Patch Changes
6+
7+
- [#7972](https://github.com/wso2/identity-apps/pull/7972) [`17af8e8d269c5d238e8890d0bddac21f3ec51e11`](https://github.com/wso2/identity-apps/commit/17af8e8d269c5d238e8890d0bddac21f3ec51e11) Thanks [@KD23243](https://github.com/KD23243)! - Update role name validation
8+
9+
## 2.50.7
10+
11+
### Patch Changes
12+
13+
- [#7964](https://github.com/wso2/identity-apps/pull/7964) [`b786b83ec4778f8298997587f89c9de8d5605006`](https://github.com/wso2/identity-apps/commit/b786b83ec4778f8298997587f89c9de8d5605006) Thanks [@savindi7](https://github.com/savindi7)! - Fix null check in Gov Connectors.
14+
15+
* [#7936](https://github.com/wso2/identity-apps/pull/7936) [`8c77be8232c791ea1badaa04ee40ec8b35b5edb6`](https://github.com/wso2/identity-apps/commit/8c77be8232c791ea1badaa04ee40ec8b35b5edb6) Thanks [@KaveeshaPiumini](https://github.com/KaveeshaPiumini)! - Add global configuration and support configurations in authentication and recovery portals to show/hide cookie consent banner
16+
17+
* Updated dependencies [[`b786b83ec4778f8298997587f89c9de8d5605006`](https://github.com/wso2/identity-apps/commit/b786b83ec4778f8298997587f89c9de8d5605006)]:
18+
- @wso2is/[email protected]
19+
20+
## 2.50.6
21+
22+
### Patch Changes
23+
24+
- [#7961](https://github.com/wso2/identity-apps/pull/7961) [`4a3957240722e2be7a22d7aaa1cf167849b43fdb`](https://github.com/wso2/identity-apps/commit/4a3957240722e2be7a22d7aaa1cf167849b43fdb) Thanks [@DonOmalVindula](https://github.com/DonOmalVindula)! - Add data-component ID to console settings radio buttons
25+
26+
- Updated dependencies [[`4a3957240722e2be7a22d7aaa1cf167849b43fdb`](https://github.com/wso2/identity-apps/commit/4a3957240722e2be7a22d7aaa1cf167849b43fdb)]:
27+
- @wso2is/[email protected]
28+
29+
## 2.50.5
30+
31+
### Patch Changes
32+
33+
- [#7956](https://github.com/wso2/identity-apps/pull/7956) [`098e5843006ceb640b421ee1a801d1492ba7df7a`](https://github.com/wso2/identity-apps/commit/098e5843006ceb640b421ee1a801d1492ba7df7a) Thanks [@DonOmalVindula](https://github.com/DonOmalVindula)! - Remove unwanted logic in groups listing UI and fix pagination bug
34+
35+
* [#7953](https://github.com/wso2/identity-apps/pull/7953) [`172423b550da4224d5c71f559b5d81b4bae2b5d6`](https://github.com/wso2/identity-apps/commit/172423b550da4224d5c71f559b5d81b4bae2b5d6) Thanks [@DonOmalVindula](https://github.com/DonOmalVindula)! - Optimize user creation wizard by removing unnecessary states and fix UI bugs in console settings
36+
37+
* Updated dependencies [[`098e5843006ceb640b421ee1a801d1492ba7df7a`](https://github.com/wso2/identity-apps/commit/098e5843006ceb640b421ee1a801d1492ba7df7a), [`172423b550da4224d5c71f559b5d81b4bae2b5d6`](https://github.com/wso2/identity-apps/commit/172423b550da4224d5c71f559b5d81b4bae2b5d6)]:
38+
- @wso2is/[email protected]
39+
- @wso2is/[email protected]
40+
- @wso2is/[email protected]
41+
42+
## 2.50.4
43+
44+
### Patch Changes
45+
46+
- [#7947](https://github.com/wso2/identity-apps/pull/7947) [`8b6bf7c6048b61562bd933051cd35f6c344e7842`](https://github.com/wso2/identity-apps/commit/8b6bf7c6048b61562bd933051cd35f6c344e7842) Thanks [@savindi7](https://github.com/savindi7)! - Update governance connector names.
47+
48+
* [#7946](https://github.com/wso2/identity-apps/pull/7946) [`f7c26d3eff8818c63211d90c91d11b109710aaae`](https://github.com/wso2/identity-apps/commit/f7c26d3eff8818c63211d90c91d11b109710aaae) Thanks [@DonOmalVindula](https://github.com/DonOmalVindula)! - Add BE-based pagination support for groups listing UI
49+
50+
* Updated dependencies [[`8b6bf7c6048b61562bd933051cd35f6c344e7842`](https://github.com/wso2/identity-apps/commit/8b6bf7c6048b61562bd933051cd35f6c344e7842), [`f7c26d3eff8818c63211d90c91d11b109710aaae`](https://github.com/wso2/identity-apps/commit/f7c26d3eff8818c63211d90c91d11b109710aaae)]:
51+
- @wso2is/[email protected]
52+
- @wso2is/[email protected]
53+
- @wso2is/[email protected]
54+
- @wso2is/[email protected]
55+
- @wso2is/[email protected]
56+
- @wso2is/[email protected]
57+
58+
## 2.50.3
59+
60+
### Patch Changes
61+
62+
- [#7944](https://github.com/wso2/identity-apps/pull/7944) [`31a39f054c4ae66f9688ca9fc8fd2446b50b1499`](https://github.com/wso2/identity-apps/commit/31a39f054c4ae66f9688ca9fc8fd2446b50b1499) Thanks [@JayaShakthi97](https://github.com/JayaShakthi97)! - Add functionality to conditionally execute the head-script
63+
364
## 2.50.2
465

566
### Patch Changes

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

+1-1
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.50.3-SNAPSHOT</version>
26+
<version>2.50.9-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@
474474
"enabled": {% if console.ai.enabled is defined %} {{ console.ai.enabled }},
475475
{% else %}
476476
{% if ai_services.key is defined and ai_services.key|length > 0 %} true,
477-
{% else %} false,
477+
{% else %} false,
478478
{% endif %}
479479
{% endif %}
480480
"scopes": {
@@ -2022,8 +2022,10 @@
20222022
{% if console.ui.is_feature_gate_enabled is defined %}
20232023
"isFeatureGateEnabled": {{ console.ui.is_feature_gate_enabled }},
20242024
{% endif %}
2025-
{% if console.ui.is_cookie_consent_banner_enabled is defined %}
2026-
"isCookieConsentBannerEnabled": {{ console.ui.is_cookie_consent_banner_enabled }},
2025+
{% set cookie_consent = console.ui.is_cookie_consent_banner_enabled if console.ui.is_cookie_consent_banner_enabled is defined
2026+
else ui.is_cookie_consent_banner_enabled %}
2027+
{% if cookie_consent is defined %}
2028+
"isCookieConsentBannerEnabled": {{ cookie_consent }},
20272029
{% endif %}
20282030
{% if console.ui.cookie_policy_url is defined %}
20292031
"cookiePolicyUrl": "{{ console.ui.cookie_policy_url }}",

Diff for: ‎apps/console/java/pom.xml

+1-1
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.50.3-SNAPSHOT</version>
27+
<version>2.50.9-SNAPSHOT</version>
2828
<name>WSO2 Identity Server Console - Parent</name>
2929
<description>WSO2 Identity Server Console Parent</description>
3030

Diff for: ‎apps/console/java/webapp/pom.xml

+1-1
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.50.3-SNAPSHOT</version>
26+
<version>2.50.9-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

Diff for: ‎apps/console/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "@wso2is/console",
4-
"version": "2.50.2",
4+
"version": "2.50.8",
55
"description": "WSO2 Identity Server Console",
66
"author": "WSO2",
77
"license": "Apache-2.0",
@@ -59,14 +59,14 @@
5959
"@wso2is/admin.certificates.v1": "^2.25.203",
6060
"@wso2is/admin.claims.v1": "^2.27.114",
6161
"@wso2is/admin.connections.v1": "^2.33.88",
62-
"@wso2is/admin.console-settings.v1": "^2.25.204",
62+
"@wso2is/admin.console-settings.v1": "^2.25.206",
6363
"@wso2is/admin.core.v1": "^2.42.5",
6464
"@wso2is/admin.email-and-sms.v1": "^2.25.203",
6565
"@wso2is/admin.email-management.v1": "^2.25.203",
6666
"@wso2is/admin.email-providers.v1": "^2.25.203",
6767
"@wso2is/admin.extensions.v1": "^2.36.128",
6868
"@wso2is/admin.feature-gate.v1": "^1.4.204",
69-
"@wso2is/admin.groups.v1": "^2.27.113",
69+
"@wso2is/admin.groups.v1": "^2.27.116",
7070
"@wso2is/admin.home.v1": "^1.7.2",
7171
"@wso2is/admin.identity-verification-providers.v1": "^2.27.203",
7272
"@wso2is/admin.logs.v1": "^1.5.204",
@@ -81,18 +81,18 @@
8181
"@wso2is/admin.policy-administration.v1": "^1.0.120",
8282
"@wso2is/admin.remote-userstores.v1": "^1.7.159",
8383
"@wso2is/admin.roles.v1": "^2.25.203",
84-
"@wso2is/admin.roles.v2": "^2.27.148",
85-
"@wso2is/admin.saml2-configuration.v1": "^2.25.203",
84+
"@wso2is/admin.roles.v2": "^2.27.149",
85+
"@wso2is/admin.saml2-configuration.v1": "^2.25.204",
8686
"@wso2is/admin.secrets.v1": "^2.25.203",
87-
"@wso2is/admin.server-configurations.v1": "^2.34.1",
87+
"@wso2is/admin.server-configurations.v1": "^2.34.2",
8888
"@wso2is/admin.session-management.v1": "^2.25.203",
8989
"@wso2is/admin.sms-providers.v1": "^2.25.203",
9090
"@wso2is/admin.sms-templates.v1": "^1.0.202",
9191
"@wso2is/admin.subscription.v1": "^1.5.203",
9292
"@wso2is/admin.tenants.v1": "^2.29.8",
9393
"@wso2is/admin.username-validation.v1": "^1.5.203",
94-
"@wso2is/admin.users.v1": "^2.30.117",
95-
"@wso2is/admin.validation.v1": "^2.27.141",
94+
"@wso2is/admin.users.v1": "^2.30.119",
95+
"@wso2is/admin.validation.v1": "^2.27.142",
9696
"@wso2is/admin.userstores.v1": "^2.27.29",
9797
"@wso2is/admin.workflow-approvals.v1": "^2.25.203",
9898
"@wso2is/admin.wsfed-configuration.v1": "^2.25.203",
@@ -101,7 +101,7 @@
101101
"@wso2is/dynamic-forms": "^2.4.40",
102102
"@wso2is/form": "^2.6.35",
103103
"@wso2is/forms": "^2.3.22",
104-
"@wso2is/i18n": "^2.22.5",
104+
"@wso2is/i18n": "^2.22.6",
105105
"@wso2is/react-components": "^2.9.12",
106106
"@wso2is/theme": "^2.7.2",
107107
"@wso2is/validation": "^2.4.2",

Diff for: ‎apps/console/src/auth.html

+15-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
~ Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com). All Rights Reserved.
2+
~ Copyright (c) 2022-2025, WSO2 Inc. (http://www.wso2.com). All Rights Reserved.
33
~
44
~ This software is the property of WSO2 Inc. and its suppliers, if any.
55
~ Dissemination of any information or reproduction of any material contained
@@ -232,7 +232,7 @@
232232

233233
/**
234234
* Get the deployment unit API path.
235-
*
235+
*
236236
* @param {string} path - Path to be appended to the API path.
237237
* @param {string} tenantDomain - Tenant domain.
238238
* @returns {string} Constructed API path.
@@ -306,19 +306,19 @@
306306

307307
/**
308308
* Construct the sign-in redirect URL for deployment unit.
309-
*
309+
*
310310
* @returns {string} Constructed URL
311311
*/
312312
function deploymentUnitSignInRedirectURL(tenantDomain) {
313-
313+
314314
var contextPath = (!proxyContextPathGlobal || proxyContextPathGlobal === "null") ? "" : "/" + proxyContextPathGlobal;
315315

316316
if (tenantDomain === startupConfig.superTenant) {
317317
return applicationDomain.replace(/\/+$/, '') + contextPath
318318
+ "<%= htmlWebpackPlugin.options.basename ? '/' + htmlWebpackPlugin.options.basename : ''%>";
319319
}
320320

321-
return `${applicationDomain}/${tenantPrefixGlobal}/${tenantDomain}`
321+
return `${applicationDomain}/${tenantPrefixGlobal}/${tenantDomain}`
322322
+ "<%= htmlWebpackPlugin.options.basename ? '/' + htmlWebpackPlugin.options.basename : ''%>";
323323
}
324324

@@ -384,9 +384,9 @@
384384
}
385385

386386
function isSuperTenant() {
387-
return !userTenant ||
387+
return !userTenant ||
388388
userTenant === startupConfig.superTenantProxy ||
389-
userTenant === startupConfig.superTenant;
389+
userTenant === startupConfig.superTenant;
390390
}
391391

392392
function getRegionalAuthConfig(tenantDomain) {
@@ -515,7 +515,7 @@
515515
if (!loginTenantAssociation) {
516516
loginTenant = superTenantGlobal;
517517
}
518-
518+
519519
var regionalAuthConfig = getRegionalAuthConfig(loginTenant);
520520
var authSecondary = AsgardeoAuth.AsgardeoSPAClient.getInstance("secondary");
521521

@@ -558,7 +558,13 @@
558558

559559
<!-- Start of custom scripts added to the head -->
560560

561-
<script defer type="text/javascript" src="<%= htmlWebpackPlugin.options.publicPath %>extensions/head-script.js"></script>
561+
<script
562+
defer
563+
id="head-script"
564+
type="text/javascript"
565+
src="<%= htmlWebpackPlugin.options.publicPath %>extensions/head-script.js"
566+
data-page-id="preauth"
567+
></script>
562568

563569
<!-- End of custom scripts added to the head -->
564570
</head>

Diff for: ‎apps/console/src/home.jsp

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
~ Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com). All Rights Reserved.
2+
~ Copyright (c) 2022-2025, WSO2 Inc. (http://www.wso2.com). All Rights Reserved.
33
~
44
~ This software is the property of WSO2 Inc. and its suppliers, if any.
55
~ Dissemination of any information or reproduction of any material contained
@@ -172,7 +172,12 @@
172172
<!-- End of custom stylesheets -->
173173

174174
<!-- Start of custom scripts added to the head -->
175-
<script type="text/javascript" src="<%= htmlWebpackPlugin.options.publicPath %>extensions/head-script.js"></script>
175+
<script
176+
id="head-script"
177+
type="text/javascript"
178+
src="<%= htmlWebpackPlugin.options.publicPath %>extensions/head-script.js"
179+
data-page-id="home"
180+
></script>
176181
<!-- End of custom scripts added to the head -->
177182
</head>
178183
<body>

Diff for: ‎apps/console/src/index.html

+3-1
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) 2020-2025, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
33
~
44
~ This software is the property of WSO2 LLC. and its suppliers, if any.
55
~ Dissemination of any information or reproduction of any material contained
@@ -41,11 +41,13 @@
4141

4242
<!-- Start of custom scripts added to the head -->
4343
<script
44+
id="head-script"
4445
defer
4546
type="text/javascript"
4647
data-public-path="<%= htmlWebpackPlugin.options.publicPath %>"
4748
data-name="head-extensions"
4849
src="<%= htmlWebpackPlugin.options.publicPath %>extensions/head-script.js"
50+
data-page-id="home"
4951
></script>
5052
<!-- End of custom scripts added to the head -->
5153
</head>

Diff for: ‎apps/console/src/index.jsp

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
~ Copyright (c) 2022, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
2+
~ Copyright (c) 2022-2025, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
33
~
44
~ This software is the property of WSO2 LLC. and its suppliers, if any.
55
~ Dissemination of any information or reproduction of any material contained
@@ -165,7 +165,12 @@
165165
<!-- End of custom stylesheets -->
166166

167167
<!-- Start of custom scripts added to the head -->
168-
<script type="text/javascript" src="<%= htmlWebpackPlugin.options.publicPath %>extensions/head-script.js"></script>
168+
<script
169+
id="head-script"
170+
type="text/javascript"
171+
src="<%= htmlWebpackPlugin.options.publicPath %>extensions/head-script.js"
172+
data-page-id="preauth"
173+
></script>
169174
<!-- End of custom scripts added to the head -->
170175
</head>
171176
<script>

Diff for: ‎apps/myaccount/CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# @wso2is/myaccount
22

3+
## 2.19.3
4+
5+
### Patch Changes
6+
7+
- [#7936](https://github.com/wso2/identity-apps/pull/7936) [`8c77be8232c791ea1badaa04ee40ec8b35b5edb6`](https://github.com/wso2/identity-apps/commit/8c77be8232c791ea1badaa04ee40ec8b35b5edb6) Thanks [@KaveeshaPiumini](https://github.com/KaveeshaPiumini)! - Add global configuration and support configurations in authentication and recovery portals to show/hide cookie consent banner
8+
9+
## 2.19.2
10+
11+
### Patch Changes
12+
13+
- [#7944](https://github.com/wso2/identity-apps/pull/7944) [`31a39f054c4ae66f9688ca9fc8fd2446b50b1499`](https://github.com/wso2/identity-apps/commit/31a39f054c4ae66f9688ca9fc8fd2446b50b1499) Thanks [@JayaShakthi97](https://github.com/JayaShakthi97)! - Add functionality to conditionally execute the head-script
14+
315
## 2.19.1
416

517
### Patch Changes

Diff for: ‎apps/myaccount/java/org.wso2.identity.apps.myaccount.server.feature/pom.xml

+1-1
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-myaccount</artifactId>
26-
<version>2.19.2-SNAPSHOT</version>
26+
<version>2.19.4-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

Diff for: ‎apps/myaccount/java/org.wso2.identity.apps.myaccount.server.feature/resources/deployment.config.json.j2

+4-2
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,10 @@
355355
}
356356
}
357357
},
358-
{% if myaccount.ui.is_cookie_consent_banner_enabled is defined %}
359-
"isCookieConsentBannerEnabled": {{ myaccount.ui.is_cookie_consent_banner_enabled }},
358+
{% set cookie_consent = myaccount.ui.is_cookie_consent_banner_enabled if myaccount.ui.is_cookie_consent_banner_enabled is defined
359+
else ui.is_cookie_consent_banner_enabled %}
360+
{% if cookie_consent is defined %}
361+
"isCookieConsentBannerEnabled": {{ cookie_consent }},
360362
{% endif %}
361363
{% if myaccount.ui.cookie_policy_url is defined %}
362364
"cookiePolicyUrl": "{{ myaccount.ui.cookie_policy_url }}",

Diff for: ‎apps/myaccount/java/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<groupId>org.wso2.identity.apps</groupId>
2525
<artifactId>identity-apps-myaccount</artifactId>
2626
<packaging>pom</packaging>
27-
<version>2.19.2-SNAPSHOT</version>
27+
<version>2.19.4-SNAPSHOT</version>
2828
<name>WSO2 Identity Server MyAccount - Parent</name>
2929
<description>WSO2 Identity Server MyAccount Parent</description>
3030

Diff for: ‎apps/myaccount/java/webapp/pom.xml

+1-1
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-myaccount</artifactId>
26-
<version>2.19.2-SNAPSHOT</version>
26+
<version>2.19.4-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

0 commit comments

Comments
 (0)