diff --git a/.changeset/lazy-eels-remember.md b/.changeset/lazy-eels-remember.md deleted file mode 100644 index d14f330d946..00000000000 --- a/.changeset/lazy-eels-remember.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@wso2is/identity-apps-core": patch ---- - -Add SSO authenticator logo diff --git a/.eslintrc.js b/.eslintrc.js index d2a58560942..73fb33c47e7 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -138,14 +138,15 @@ module.exports = { rules: { "@typescript-eslint/ban-types": 1, "@typescript-eslint/explicit-function-return-type": 0, - "@typescript-eslint/no-empty-function": [ - "error", - { - allow: [ "constructors" ] - } - ], + // Temporary disable the no-empty-function rule. + // Refer: https://github.com/wso2/product-is/issues/20659 + "@typescript-eslint/no-empty-function": "off", "@typescript-eslint/no-explicit-any": 0, + // Temporary disable the `no-extra-semi` rule. + // Refer: https://github.com/wso2/product-is/issues/20659 + "@typescript-eslint/no-extra-semi": 0, "@typescript-eslint/no-inferrable-types": "off", + "@typescript-eslint/no-unsafe-optional-chaining": "off", "@typescript-eslint/no-unused-vars": [ "warn", { @@ -181,6 +182,9 @@ module.exports = { // In development, error level is set to `warn`. This will be overridden // by the production env linting config. "no-debugger": 1, + // Temporary disable the `no-extra-semi` rule. + // Refer: https://github.com/wso2/product-is/issues/20659 + "no-extra-semi": 0, // `no-undef` is discouraged in Typescript projects. // https://github.com/typescript-eslint/typescript-eslint/issues/2477#issuecomment-686892459 "no-undef": 0, @@ -220,6 +224,7 @@ module.exports = { ], root: true, rules: { + "@typescript-eslint/no-unsafe-optional-chaining": "off", "array-bracket-spacing": [ 1, "always" ], "comma-dangle": [ "warn", "never" ], "eol-last": "error", @@ -262,6 +267,9 @@ module.exports = { "no-alert": 1, "no-console": "warn", "no-duplicate-imports": "warn", + // Temporary disable the `no-extra-semi` rule. + // Refer: https://github.com/wso2/product-is/issues/20659 + "no-extra-semi": 0, "no-restricted-imports": [ "error", { diff --git a/.github/workflows/pr-builder.yml b/.github/workflows/pr-builder.yml index 1c2cca19960..31f1643ebd7 100644 --- a/.github/workflows/pr-builder.yml +++ b/.github/workflows/pr-builder.yml @@ -1,6 +1,6 @@ # This workflow will build PRs submitted to the master branch. -name: PR Builder +name: 👷 PR Builder on: pull_request: diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml index 3b2990ea652..8f5c201b0c1 100644 --- a/.github/workflows/release-workflow.yml +++ b/.github/workflows/release-workflow.yml @@ -18,7 +18,7 @@ # # -------------------------------------------------------------------------------------- -name: Release +name: 🚀 Release on: push: diff --git a/README.md b/README.md index 82283069920..2626b4fc5c4 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,9 @@ End-user apps in WSO2 Identity Server ## Table of Content + + + - [Prerequisite](#prerequisite) * [Setup Development Environment](#setup-development-environment) * [Download WSO2 Identity Server](#download-wso2-identity-server) @@ -20,8 +23,7 @@ End-user apps in WSO2 Identity Server + [Make Applications Editable](#make-applications-editable) + [Configure Callback URLs for System Applications (for WSO2 IS v7.0 and above)](#configure-callback-urls-for-system-applications-for-wso2-is-v70-and-above) + [Start the Identity Server](#start-the-identity-server) - + [Configure Callback URLs for System Applications (for WSO2 IS below v7.0) -](#configure-callback-urls-for-system-applications-for-wso2-is-below-v70) + + [Configure Callback URLs for System Applications (for WSO2 IS below v7.0)](#configure-callback-urls-for-system-applications-for-wso2-is-below-v70) - [Build & Run](#build--run) * [Build](#build) + [For Console & My Account](#for-console--my-account) @@ -38,6 +40,8 @@ End-user apps in WSO2 Identity Server - [Reporting Issues](#reporting-issues) - [License](#license) + + ## Prerequisite ### Setup Development Environment @@ -45,7 +49,7 @@ End-user apps in WSO2 Identity Server 1. Install NodeJS LTS(Latest Stable Version) from [https://nodejs.org/en/download/](https://nodejs.org/en/download/). 2. Install [pnpm](https://pnpm.io/). -> Note: Only PNPM v9 and above are supported. +> Note: Only PNPM v8 is supported at the moment. ```shell corepack prepare pnpm@latest --activate diff --git a/apps/console/CHANGELOG.md b/apps/console/CHANGELOG.md index 139098325ef..559ae2af5e9 100644 --- a/apps/console/CHANGELOG.md +++ b/apps/console/CHANGELOG.md @@ -1,5 +1,354 @@ # @wso2is/console +## 2.20.29 + +### Patch Changes + +- [#6567](https://github.com/wso2/identity-apps/pull/6567) [`c877df930874467071aa7c7a0e5809351c0a922f`](https://github.com/wso2/identity-apps/commit/c877df930874467071aa7c7a0e5809351c0a922f) Thanks [@pavinduLakshan](https://github.com/pavinduLakshan)! - Remove Cookiepro from onprem + +- Updated dependencies [[`7f50838d255ffeea0d8c65e1a696f6a923738146`](https://github.com/wso2/identity-apps/commit/7f50838d255ffeea0d8c65e1a696f6a923738146)]: + - @wso2is/admin.applications.v1@2.21.29 + - @wso2is/react-components@2.2.14 + - @wso2is/i18n@2.5.1 + - @wso2is/admin.connections.v1@2.20.59 + - @wso2is/admin.console-settings.v1@2.20.59 + - @wso2is/admin.core.v1@2.22.1 + - @wso2is/admin.extensions.v1@2.21.29 + - @wso2is/admin.oidc-scopes.v1@2.20.59 + - @wso2is/admin.organizations.v1@2.20.59 + - @wso2is/admin.roles.v2@2.20.59 + - @wso2is/admin.api-resources.v1@2.20.59 + - @wso2is/admin.api-resources.v2@2.20.59 + - @wso2is/admin.authorization.v1@2.20.22 + - @wso2is/admin.branding.v1@2.20.59 + - @wso2is/admin.certificates.v1@2.20.59 + - @wso2is/admin.claims.v1@2.20.59 + - @wso2is/admin.email-and-sms.v1@2.20.59 + - @wso2is/admin.email-management.v1@2.20.59 + - @wso2is/admin.email-providers.v1@2.20.59 + - @wso2is/admin.groups.v1@2.20.59 + - @wso2is/admin.identity-verification-providers.v1@2.20.59 + - @wso2is/admin.impersonation.v1@1.1.1 + - @wso2is/admin.org-insights.v1@2.20.59 + - @wso2is/admin.organization-discovery.v1@2.20.59 + - @wso2is/admin.private-key-jwt.v1@2.20.59 + - @wso2is/admin.remote-repository-configuration.v1@2.20.59 + - @wso2is/admin.roles.v1@2.20.59 + - @wso2is/admin.saml2-configuration.v1@2.20.59 + - @wso2is/admin.secrets.v1@2.20.59 + - @wso2is/admin.server-configurations.v1@2.21.1 + - @wso2is/admin.server.v1@2.20.59 + - @wso2is/admin.session-management.v1@2.20.59 + - @wso2is/admin.sms-providers.v1@2.20.59 + - @wso2is/admin.users.v1@2.20.59 + - @wso2is/admin.validation.v1@2.20.59 + - @wso2is/admin.workflow-approvals.v1@2.20.59 + - @wso2is/admin.wsfed-configuration.v1@2.20.59 + - @wso2is/dynamic-forms@2.0.72 + - @wso2is/form@2.0.73 + - @wso2is/admin.authentication.v1@2.20.59 + +## 2.20.28 + +### Patch Changes + +- [#6543](https://github.com/wso2/identity-apps/pull/6543) [`8a10ec97ca4a6c8243e8830b07b306ac0d01ddf9`](https://github.com/wso2/identity-apps/commit/8a10ec97ca4a6c8243e8830b07b306ac0d01ddf9) Thanks [@Thumimku](https://github.com/Thumimku)! - add impersonation page routes + +- Updated dependencies [[`a7d0c020b04ba382733280407fc202910f4fc8f4`](https://github.com/wso2/identity-apps/commit/a7d0c020b04ba382733280407fc202910f4fc8f4)]: + - @wso2is/admin.server-configurations.v1@2.21.0 + - @wso2is/admin.impersonation.v1@1.1.0 + - @wso2is/admin.core.v1@2.22.0 + - @wso2is/i18n@2.5.0 + - @wso2is/admin.applications.v1@2.21.28 + - @wso2is/admin.branding.v1@2.20.58 + - @wso2is/admin.claims.v1@2.20.58 + - @wso2is/admin.console-settings.v1@2.20.58 + - @wso2is/admin.extensions.v1@2.21.28 + - @wso2is/admin.private-key-jwt.v1@2.20.58 + - @wso2is/admin.roles.v1@2.20.58 + - @wso2is/admin.roles.v2@2.20.58 + - @wso2is/admin.server.v1@2.20.58 + - @wso2is/admin.users.v1@2.20.58 + - @wso2is/admin.validation.v1@2.20.58 + - @wso2is/admin.api-resources.v1@2.20.58 + - @wso2is/admin.api-resources.v2@2.20.58 + - @wso2is/admin.authentication.v1@2.20.58 + - @wso2is/admin.certificates.v1@2.20.58 + - @wso2is/admin.connections.v1@2.20.58 + - @wso2is/admin.email-and-sms.v1@2.20.58 + - @wso2is/admin.email-management.v1@2.20.58 + - @wso2is/admin.email-providers.v1@2.20.58 + - @wso2is/admin.groups.v1@2.20.58 + - @wso2is/admin.identity-verification-providers.v1@2.20.58 + - @wso2is/admin.oidc-scopes.v1@2.20.58 + - @wso2is/admin.org-insights.v1@2.20.58 + - @wso2is/admin.organization-discovery.v1@2.20.58 + - @wso2is/admin.organizations.v1@2.20.58 + - @wso2is/admin.remote-repository-configuration.v1@2.20.58 + - @wso2is/admin.saml2-configuration.v1@2.20.58 + - @wso2is/admin.secrets.v1@2.20.58 + - @wso2is/admin.session-management.v1@2.20.58 + - @wso2is/admin.sms-providers.v1@2.20.58 + - @wso2is/admin.workflow-approvals.v1@2.20.58 + - @wso2is/admin.wsfed-configuration.v1@2.20.58 + - @wso2is/admin.authorization.v1@2.20.21 + +## 2.20.27 + +### Patch Changes + +- Updated dependencies [[`f1d9b7ccbe14f1a42b6d3360da664acf39ba6909`](https://github.com/wso2/identity-apps/commit/f1d9b7ccbe14f1a42b6d3360da664acf39ba6909)]: + - @wso2is/theme@2.0.89 + - @wso2is/admin.authorization.v1@2.20.20 + - @wso2is/admin.branding.v1@2.20.57 + - @wso2is/admin.certificates.v1@2.20.57 + - @wso2is/admin.claims.v1@2.20.57 + - @wso2is/admin.connections.v1@2.20.57 + - @wso2is/admin.console-settings.v1@2.20.57 + - @wso2is/admin.email-and-sms.v1@2.20.57 + - @wso2is/admin.email-management.v1@2.20.57 + - @wso2is/admin.email-providers.v1@2.20.57 + - @wso2is/admin.extensions.v1@2.21.27 + - @wso2is/admin.groups.v1@2.20.57 + - @wso2is/admin.identity-verification-providers.v1@2.20.57 + - @wso2is/admin.oidc-scopes.v1@2.20.57 + - @wso2is/admin.org-insights.v1@2.20.57 + - @wso2is/admin.organization-discovery.v1@2.20.57 + - @wso2is/admin.organizations.v1@2.20.57 + - @wso2is/admin.private-key-jwt.v1@2.20.57 + - @wso2is/admin.remote-repository-configuration.v1@2.20.57 + - @wso2is/admin.roles.v1@2.20.57 + - @wso2is/admin.roles.v2@2.20.57 + - @wso2is/admin.saml2-configuration.v1@2.20.57 + - @wso2is/admin.secrets.v1@2.20.57 + - @wso2is/admin.server-configurations.v1@2.20.57 + - @wso2is/admin.server.v1@2.20.57 + - @wso2is/admin.session-management.v1@2.20.57 + - @wso2is/admin.sms-providers.v1@2.20.57 + - @wso2is/admin.users.v1@2.20.57 + - @wso2is/admin.validation.v1@2.20.57 + - @wso2is/admin.workflow-approvals.v1@2.20.57 + - @wso2is/admin.wsfed-configuration.v1@2.20.57 + - @wso2is/react-components@2.2.13 + - @wso2is/admin.applications.v1@2.21.27 + - @wso2is/admin.authentication.v1@2.20.57 + - @wso2is/admin.core.v1@2.21.27 + - @wso2is/admin.api-resources.v1@2.20.57 + - @wso2is/admin.api-resources.v2@2.20.57 + - @wso2is/dynamic-forms@2.0.71 + - @wso2is/form@2.0.72 + +## 2.20.26 + +### Patch Changes + +- Updated dependencies [[`a0886211dba54c1c0266c24c5626f61657e6c209`](https://github.com/wso2/identity-apps/commit/a0886211dba54c1c0266c24c5626f61657e6c209)]: + - @wso2is/admin.api-resources.v2@2.20.56 + - @wso2is/admin.applications.v1@2.21.26 + - @wso2is/admin.core.v1@2.21.26 + - @wso2is/admin.roles.v2@2.20.56 + - @wso2is/admin.connections.v1@2.20.56 + - @wso2is/admin.console-settings.v1@2.20.56 + - @wso2is/admin.extensions.v1@2.21.26 + - @wso2is/admin.oidc-scopes.v1@2.20.56 + - @wso2is/admin.organizations.v1@2.20.56 + - @wso2is/admin.api-resources.v1@2.20.56 + - @wso2is/admin.authentication.v1@2.20.56 + - @wso2is/admin.branding.v1@2.20.56 + - @wso2is/admin.certificates.v1@2.20.56 + - @wso2is/admin.claims.v1@2.20.56 + - @wso2is/admin.email-and-sms.v1@2.20.56 + - @wso2is/admin.email-management.v1@2.20.56 + - @wso2is/admin.email-providers.v1@2.20.56 + - @wso2is/admin.groups.v1@2.20.56 + - @wso2is/admin.identity-verification-providers.v1@2.20.56 + - @wso2is/admin.org-insights.v1@2.20.56 + - @wso2is/admin.organization-discovery.v1@2.20.56 + - @wso2is/admin.private-key-jwt.v1@2.20.56 + - @wso2is/admin.remote-repository-configuration.v1@2.20.56 + - @wso2is/admin.roles.v1@2.20.56 + - @wso2is/admin.saml2-configuration.v1@2.20.56 + - @wso2is/admin.secrets.v1@2.20.56 + - @wso2is/admin.server-configurations.v1@2.20.56 + - @wso2is/admin.server.v1@2.20.56 + - @wso2is/admin.session-management.v1@2.20.56 + - @wso2is/admin.sms-providers.v1@2.20.56 + - @wso2is/admin.users.v1@2.20.56 + - @wso2is/admin.validation.v1@2.20.56 + - @wso2is/admin.workflow-approvals.v1@2.20.56 + - @wso2is/admin.wsfed-configuration.v1@2.20.56 + +## 2.20.25 + +### Patch Changes + +- [#6570](https://github.com/wso2/identity-apps/pull/6570) [`82bbbf2303853076342ef80ef7d987bed16df01f`](https://github.com/wso2/identity-apps/commit/82bbbf2303853076342ef80ef7d987bed16df01f) Thanks [@ImalshaG](https://github.com/ImalshaG)! - Load trusted app consent required config and handle consent UI according to it + +- Updated dependencies [[`82bbbf2303853076342ef80ef7d987bed16df01f`](https://github.com/wso2/identity-apps/commit/82bbbf2303853076342ef80ef7d987bed16df01f)]: + - @wso2is/admin.applications.v1@2.21.25 + - @wso2is/admin.core.v1@2.21.25 + - @wso2is/i18n@2.4.8 + - @wso2is/admin.connections.v1@2.20.55 + - @wso2is/admin.console-settings.v1@2.20.55 + - @wso2is/admin.extensions.v1@2.21.25 + - @wso2is/admin.oidc-scopes.v1@2.20.55 + - @wso2is/admin.organizations.v1@2.20.55 + - @wso2is/admin.roles.v2@2.20.55 + - @wso2is/admin.api-resources.v1@2.20.55 + - @wso2is/admin.api-resources.v2@2.20.55 + - @wso2is/admin.authentication.v1@2.20.55 + - @wso2is/admin.branding.v1@2.20.55 + - @wso2is/admin.certificates.v1@2.20.55 + - @wso2is/admin.claims.v1@2.20.55 + - @wso2is/admin.email-and-sms.v1@2.20.55 + - @wso2is/admin.email-management.v1@2.20.55 + - @wso2is/admin.email-providers.v1@2.20.55 + - @wso2is/admin.groups.v1@2.20.55 + - @wso2is/admin.identity-verification-providers.v1@2.20.55 + - @wso2is/admin.org-insights.v1@2.20.55 + - @wso2is/admin.organization-discovery.v1@2.20.55 + - @wso2is/admin.private-key-jwt.v1@2.20.55 + - @wso2is/admin.remote-repository-configuration.v1@2.20.55 + - @wso2is/admin.roles.v1@2.20.55 + - @wso2is/admin.saml2-configuration.v1@2.20.55 + - @wso2is/admin.secrets.v1@2.20.55 + - @wso2is/admin.server-configurations.v1@2.20.55 + - @wso2is/admin.server.v1@2.20.55 + - @wso2is/admin.session-management.v1@2.20.55 + - @wso2is/admin.sms-providers.v1@2.20.55 + - @wso2is/admin.users.v1@2.20.55 + - @wso2is/admin.validation.v1@2.20.55 + - @wso2is/admin.workflow-approvals.v1@2.20.55 + - @wso2is/admin.wsfed-configuration.v1@2.20.55 + - @wso2is/admin.authorization.v1@2.20.19 + +## 2.20.24 + +### Patch Changes + +- [#6565](https://github.com/wso2/identity-apps/pull/6565) [`1820d54f7dd5fa826c4747964fd2c1af9b7c3d8c`](https://github.com/wso2/identity-apps/commit/1820d54f7dd5fa826c4747964fd2c1af9b7c3d8c) Thanks [@brionmario](https://github.com/brionmario)! - Move routes & views from features to Console source + +- Updated dependencies [[`1820d54f7dd5fa826c4747964fd2c1af9b7c3d8c`](https://github.com/wso2/identity-apps/commit/1820d54f7dd5fa826c4747964fd2c1af9b7c3d8c)]: + - @wso2is/admin.core.v1@2.21.24 + - @wso2is/admin.api-resources.v1@2.20.54 + - @wso2is/admin.api-resources.v2@2.20.54 + - @wso2is/admin.applications.v1@2.21.24 + - @wso2is/admin.authentication.v1@2.20.54 + - @wso2is/admin.branding.v1@2.20.54 + - @wso2is/admin.certificates.v1@2.20.54 + - @wso2is/admin.claims.v1@2.20.54 + - @wso2is/admin.connections.v1@2.20.54 + - @wso2is/admin.console-settings.v1@2.20.54 + - @wso2is/admin.email-and-sms.v1@2.20.54 + - @wso2is/admin.email-management.v1@2.20.54 + - @wso2is/admin.email-providers.v1@2.20.54 + - @wso2is/admin.extensions.v1@2.21.24 + - @wso2is/admin.groups.v1@2.20.54 + - @wso2is/admin.identity-verification-providers.v1@2.20.54 + - @wso2is/admin.oidc-scopes.v1@2.20.54 + - @wso2is/admin.org-insights.v1@2.20.54 + - @wso2is/admin.organization-discovery.v1@2.20.54 + - @wso2is/admin.organizations.v1@2.20.54 + - @wso2is/admin.private-key-jwt.v1@2.20.54 + - @wso2is/admin.remote-repository-configuration.v1@2.20.54 + - @wso2is/admin.roles.v1@2.20.54 + - @wso2is/admin.roles.v2@2.20.54 + - @wso2is/admin.saml2-configuration.v1@2.20.54 + - @wso2is/admin.secrets.v1@2.20.54 + - @wso2is/admin.server-configurations.v1@2.20.54 + - @wso2is/admin.server.v1@2.20.54 + - @wso2is/admin.session-management.v1@2.20.54 + - @wso2is/admin.sms-providers.v1@2.20.54 + - @wso2is/admin.users.v1@2.20.54 + - @wso2is/admin.validation.v1@2.20.54 + - @wso2is/admin.workflow-approvals.v1@2.20.54 + - @wso2is/admin.wsfed-configuration.v1@2.20.54 + +## 2.20.23 + +### Patch Changes + +- Updated dependencies [[`a533e58d21d759f0a27d804f17b042a2819a8955`](https://github.com/wso2/identity-apps/commit/a533e58d21d759f0a27d804f17b042a2819a8955)]: + - @wso2is/admin.extensions.v1@2.21.23 + - @wso2is/i18n@2.4.7 + - @wso2is/admin.core.v1@2.21.23 + - @wso2is/admin.organizations.v1@2.20.53 + - @wso2is/admin.authentication.v1@2.20.53 + - @wso2is/admin.authorization.v1@2.20.18 + +## 2.20.22 + +### Patch Changes + +- [#6409](https://github.com/wso2/identity-apps/pull/6409) [`1201f1179cda981617c35b6d9839abe768d5a394`](https://github.com/wso2/identity-apps/commit/1201f1179cda981617c35b6d9839abe768d5a394) Thanks [@DonOmalVindula](https://github.com/DonOmalVindula)! - Add app-wise branding feature UI + +- Updated dependencies [[`1201f1179cda981617c35b6d9839abe768d5a394`](https://github.com/wso2/identity-apps/commit/1201f1179cda981617c35b6d9839abe768d5a394)]: + - @wso2is/admin.extensions.v1@2.21.22 + - @wso2is/theme@2.0.88 + - @wso2is/admin.core.v1@2.21.22 + - @wso2is/admin.organizations.v1@2.20.52 + - @wso2is/admin.authentication.v1@2.20.52 + - @wso2is/admin.authorization.v1@2.20.17 + - @wso2is/react-components@2.2.12 + - @wso2is/dynamic-forms@2.0.70 + - @wso2is/form@2.0.71 + +## 2.20.21 + +### Patch Changes + +- Updated dependencies [[`8fa06039e0791823d9de3c290cb4e93557f77f81`](https://github.com/wso2/identity-apps/commit/8fa06039e0791823d9de3c290cb4e93557f77f81)]: + - @wso2is/admin.extensions.v1@2.21.21 + - @wso2is/admin.core.v1@2.21.21 + - @wso2is/admin.organizations.v1@2.20.51 + - @wso2is/admin.authentication.v1@2.20.51 + +## 2.20.20 + +### Patch Changes + +- [#6551](https://github.com/wso2/identity-apps/pull/6551) [`d376f489cceae4ab415dcf6ae1ffd536baa47f9a`](https://github.com/wso2/identity-apps/commit/d376f489cceae4ab415dcf6ae1ffd536baa47f9a) Thanks [@DonOmalVindula](https://github.com/DonOmalVindula)! - Add validations for time selection in logs component + +- Updated dependencies [[`d376f489cceae4ab415dcf6ae1ffd536baa47f9a`](https://github.com/wso2/identity-apps/commit/d376f489cceae4ab415dcf6ae1ffd536baa47f9a)]: + - @wso2is/admin.extensions.v1@2.21.20 + - @wso2is/admin.authentication.v1@2.20.50 + - @wso2is/admin.core.v1@2.21.20 + - @wso2is/admin.organizations.v1@2.20.50 + +## 2.20.19 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.authentication.v1@2.20.49 + - @wso2is/admin.core.v1@2.21.19 + - @wso2is/admin.extensions.v1@2.21.19 + - @wso2is/admin.organizations.v1@2.20.49 + +## 2.20.18 + +### Patch Changes + +- [#6546](https://github.com/wso2/identity-apps/pull/6546) [`1e079568c0ba1f4e158ec9a666df58c2f7c17d02`](https://github.com/wso2/identity-apps/commit/1e079568c0ba1f4e158ec9a666df58c2f7c17d02) Thanks [@JayaShakthi97](https://github.com/JayaShakthi97)! - Clean up identity-providers extension configs + +- Updated dependencies [[`1e079568c0ba1f4e158ec9a666df58c2f7c17d02`](https://github.com/wso2/identity-apps/commit/1e079568c0ba1f4e158ec9a666df58c2f7c17d02)]: + - @wso2is/admin.extensions.v1@2.21.18 + - @wso2is/admin.core.v1@2.21.18 + - @wso2is/admin.organizations.v1@2.20.48 + - @wso2is/admin.authentication.v1@2.20.48 + +## 2.20.17 + +### Patch Changes + +- [#6439](https://github.com/wso2/identity-apps/pull/6439) [`c58df1f13afd6ccc28cc129518ac86bab6419744`](https://github.com/wso2/identity-apps/commit/c58df1f13afd6ccc28cc129518ac86bab6419744) Thanks [@DonOmalVindula](https://github.com/DonOmalVindula)! - Implement assignment of Admin roles to user in the primary userstore + +- Updated dependencies [[`c58df1f13afd6ccc28cc129518ac86bab6419744`](https://github.com/wso2/identity-apps/commit/c58df1f13afd6ccc28cc129518ac86bab6419744)]: + - @wso2is/admin.extensions.v1@2.21.17 + - @wso2is/admin.authentication.v1@2.20.47 + - @wso2is/admin.core.v1@2.21.17 + - @wso2is/admin.organizations.v1@2.20.47 + ## 2.20.16 ### Patch Changes diff --git a/apps/console/java/org.wso2.identity.apps.console.server.feature/pom.xml b/apps/console/java/org.wso2.identity.apps.console.server.feature/pom.xml index 5b87e77a2db..264e77b311f 100644 --- a/apps/console/java/org.wso2.identity.apps.console.server.feature/pom.xml +++ b/apps/console/java/org.wso2.identity.apps.console.server.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.identity.apps identity-apps-console - 2.20.17-SNAPSHOT + 2.20.30-SNAPSHOT ../pom.xml 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 40e0e657a9a..2c767a14522 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 @@ -1824,6 +1824,9 @@ {% if federated.idp.use_idp_role_claim_as_idp_group_claim is defined %} "useRoleClaimAsGroupClaim": {{ federated.idp.use_idp_role_claim_as_idp_group_claim }}, {% endif %} + {% if application_mgt.trusted_app_consent_required is defined %} + "isTrustedAppConsentRequired": {{ application_mgt.trusted_app_consent_required }}, + {% endif %} {% if console.ui.administrator_role_display_name is defined %} "administratorRoleDisplayName": "{{ console.ui.administrator_role_display_name }}", {% endif %} diff --git a/apps/console/java/pom.xml b/apps/console/java/pom.xml index 89574bbdb48..55d123eee40 100644 --- a/apps/console/java/pom.xml +++ b/apps/console/java/pom.xml @@ -24,7 +24,7 @@ org.wso2.identity.apps identity-apps-console pom - 2.20.17-SNAPSHOT + 2.20.30-SNAPSHOT WSO2 Identity Server Console - Parent WSO2 Identity Server Console Parent diff --git a/apps/console/java/webapp/pom.xml b/apps/console/java/webapp/pom.xml index 711b344f67c..7275994570d 100644 --- a/apps/console/java/webapp/pom.xml +++ b/apps/console/java/webapp/pom.xml @@ -23,7 +23,7 @@ org.wso2.identity.apps identity-apps-console - 2.20.17-SNAPSHOT + 2.20.30-SNAPSHOT ../pom.xml diff --git a/apps/console/package.json b/apps/console/package.json index 0851b10168f..6ac9ee3e806 100644 --- a/apps/console/package.json +++ b/apps/console/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@wso2is/console", - "version": "2.20.16", + "version": "2.20.29", "description": "WSO2 Identity Server Console", "author": "WSO2", "license": "Apache-2.0", @@ -46,18 +46,49 @@ "@oxygen-ui/react": "^1.11.0", "@oxygen-ui/react-icons": "^1.11.0", "@wso2is/access-control": "^3.0.11", - "@wso2is/admin.authentication.v1": "^2.20.46", - "@wso2is/admin.authorization.v1": "^2.20.16", - "@wso2is/admin.core.v1": "^2.21.16", - "@wso2is/admin.extensions.v1": "^2.21.16", - "@wso2is/admin.organizations.v1": "^2.20.46", + "@wso2is/admin.api-resources.v1": "^2.20.59", + "@wso2is/admin.api-resources.v2": "^2.20.59", + "@wso2is/admin.applications.v1": "^2.21.29", + "@wso2is/admin.authentication.v1": "^2.20.59", + "@wso2is/admin.authorization.v1": "^2.20.22", + "@wso2is/admin.branding.v1": "^2.20.59", + "@wso2is/admin.certificates.v1": "^2.20.59", + "@wso2is/admin.claims.v1": "^2.20.59", + "@wso2is/admin.connections.v1": "^2.20.59", + "@wso2is/admin.console-settings.v1": "^2.20.59", + "@wso2is/admin.core.v1": "^2.22.1", + "@wso2is/admin.email-and-sms.v1": "^2.20.59", + "@wso2is/admin.email-management.v1": "^2.20.59", + "@wso2is/admin.email-providers.v1": "^2.20.59", + "@wso2is/admin.extensions.v1": "^2.21.29", + "@wso2is/admin.groups.v1": "^2.20.59", + "@wso2is/admin.identity-verification-providers.v1": "^2.20.59", + "@wso2is/admin.oidc-scopes.v1": "^2.20.59", + "@wso2is/admin.org-insights.v1": "^2.20.59", + "@wso2is/admin.organization-discovery.v1": "^2.20.59", + "@wso2is/admin.organizations.v1": "^2.20.59", + "@wso2is/admin.private-key-jwt.v1": "^2.20.59", + "@wso2is/admin.remote-repository-configuration.v1": "^2.20.59", + "@wso2is/admin.impersonation.v1": "^1.1.1", + "@wso2is/admin.roles.v1": "^2.20.59", + "@wso2is/admin.roles.v2": "^2.20.59", + "@wso2is/admin.saml2-configuration.v1": "^2.20.59", + "@wso2is/admin.secrets.v1": "^2.20.59", + "@wso2is/admin.server-configurations.v1": "^2.21.1", + "@wso2is/admin.server.v1": "^2.20.59", + "@wso2is/admin.session-management.v1": "^2.20.59", + "@wso2is/admin.sms-providers.v1": "^2.20.59", + "@wso2is/admin.users.v1": "^2.20.59", + "@wso2is/admin.validation.v1": "^2.20.59", + "@wso2is/admin.workflow-approvals.v1": "^2.20.59", + "@wso2is/admin.wsfed-configuration.v1": "^2.20.59", "@wso2is/core": "^2.0.51", - "@wso2is/dynamic-forms": "^2.0.69", - "@wso2is/form": "^2.0.70", + "@wso2is/dynamic-forms": "^2.0.72", + "@wso2is/form": "^2.0.73", "@wso2is/forms": "^2.0.41", - "@wso2is/i18n": "^2.4.6", - "@wso2is/react-components": "^2.2.11", - "@wso2is/theme": "^2.0.87", + "@wso2is/i18n": "^2.5.1", + "@wso2is/react-components": "^2.2.14", + "@wso2is/theme": "^2.0.89", "@wso2is/validation": "^2.0.6", "axios": "^0.19.2", "codemirror": "^5.52.0", diff --git a/apps/console/src/app.tsx b/apps/console/src/app.tsx index 72e55389981..df3c8f26252 100755 --- a/apps/console/src/app.tsx +++ b/apps/console/src/app.tsx @@ -20,7 +20,7 @@ import { BasicUserInfo, DecodedIDTokenPayload, useAuthContext } from "@asgardeo/ import { AccessControlProvider, AllFeatureInterface, FeatureGateInterface } from "@wso2is/access-control"; import { EventPublisher, PreLoader } from "@wso2is/admin.core.v1"; import { ProtectedRoute } from "@wso2is/admin.core.v1/components"; -import { Config, DocumentationLinks, getBaseRoutes } from "@wso2is/admin.core.v1/configs"; +import { Config, DocumentationLinks } from "@wso2is/admin.core.v1/configs"; import { AppConstants } from "@wso2is/admin.core.v1/constants"; import { history } from "@wso2is/admin.core.v1/helpers"; import useResourceEndpoints from "@wso2is/admin.core.v1/hooks/use-resource-endpoints"; @@ -63,6 +63,7 @@ import { Redirect, Route, RouteComponentProps, Router, Switch } from "react-rout import { Dispatch } from "redux"; import "moment/locale/si"; import "moment/locale/fr"; +import { getBaseRoutes } from "./configs/routes"; /** * Main App component. diff --git a/features/admin.core.v1/configs/routes.tsx b/apps/console/src/configs/routes.tsx similarity index 97% rename from features/admin.core.v1/configs/routes.tsx rename to apps/console/src/configs/routes.tsx index d8806f80709..319a0ae3a26 100644 --- a/features/admin.core.v1/configs/routes.tsx +++ b/apps/console/src/configs/routes.tsx @@ -31,19 +31,23 @@ import { UserGroupIcon } from "@oxygen-ui/react-icons"; import { APIResourcesConstants } from "@wso2is/admin.api-resources.v1/constants"; +import { getSidePanelIcons } from "@wso2is/admin.core.v1/configs/ui"; +import { AppConstants } from "@wso2is/admin.core.v1/constants"; import { commonConfig } from "@wso2is/admin.extensions.v1"; import { FeatureGateConstants } from "@wso2is/admin.extensions.v1/components/feature-gate/constants/feature-gate"; -import { AppLayout, AuthLayout, DefaultLayout, ErrorLayout } from "@wso2is/admin.layouts.v1"; import { ServerConfigurationsConstants } from "@wso2is/admin.server-configurations.v1"; -import { AppView, FullScreenView } from "@wso2is/admin.views.v1"; import { LegacyModeInterface, RouteInterface } from "@wso2is/core/models"; import compact from "lodash-es/compact"; import keyBy from "lodash-es/keyBy"; import merge from "lodash-es/merge"; import values from "lodash-es/values"; import React, { FunctionComponent, lazy } from "react"; -import { getSidePanelIcons } from "./ui"; -import { AppConstants } from "../constants"; +import AppLayout from "../layouts/app-layout"; +import AuthLayout from "../layouts/auth-layout"; +import DashboardLayout from "../layouts/dashboard-layout"; +import DefaultLayout from "../layouts/default-layout"; +import ErrorLayout from "../layouts/error-layout"; +import FullScreenLayout from "../layouts/full-screen-layout"; /** * Get App View Routes. @@ -117,6 +121,15 @@ export const getAppViewRoutes = (): RouteInterface[] => { protected: true, showOnSidePanel: false }, + { + component: lazy(() => import("@wso2is/admin.impersonation.v1/pages/impersonation-configuration")), + exact: true, + id: "impersonationConfiguration", + name: "console:impersonationConfig.title", + path: AppConstants.getPaths().get("IMPERSONATION"), + protected: true, + showOnSidePanel: false + }, { component: lazy(() => import( @@ -240,7 +253,7 @@ export const getAppViewRoutes = (): RouteInterface[] => { showOnSidePanel: false }, { - component: lazy(() => import("../../admin.applications.v1/pages/applications-settings")), + component: lazy(() => import("@wso2is/admin.applications.v1/pages/applications-settings")), exact: true, icon: { icon: getSidePanelIcons().childIcon @@ -1513,7 +1526,7 @@ export const getDefaultLayoutRoutes = (): RouteInterface[] => { const routes: RouteInterface[] = []; routes.push({ - component: lazy(() => import("../pages/privacy")), + component: lazy(() => import("@wso2is/admin.core.v1/pages/privacy")), icon: null, id: "privacy", name: "console:common.sidePanel.privacy", @@ -1533,7 +1546,7 @@ export const getDefaultLayoutRoutes = (): RouteInterface[] => { export const getErrorLayoutRoutes = (): RouteInterface[] => { return [ { - component: lazy(() => import("../pages/errors/unauthorized")), + component: lazy(() => import("@wso2is/admin.core.v1/pages/errors/unauthorized")), exact: true, icon: null, id: "unauthorized", @@ -1543,7 +1556,7 @@ export const getErrorLayoutRoutes = (): RouteInterface[] => { showOnSidePanel: false }, { - component: lazy(() => import("../pages/errors/404")), + component: lazy(() => import("@wso2is/admin.core.v1/pages/errors/404")), exact: true, icon: null, id: "pageNotFound", @@ -1553,7 +1566,7 @@ export const getErrorLayoutRoutes = (): RouteInterface[] => { showOnSidePanel: false }, { - component: lazy(() => import("../pages/errors/storage-disabled")), + component: lazy(() => import("@wso2is/admin.core.v1/pages/errors/storage-disabled")), exact: true, icon: null, id: "storingDataDisabled", @@ -1643,7 +1656,7 @@ export const getAppLayoutRoutes = (): RouteInterface[] => { ...getLayoutAssignedToRoutes(getDefaultLayoutRoutes(), DefaultLayout), ...getLayoutAssignedToRoutes(getErrorLayoutRoutes(), ErrorLayout), { - component: FullScreenView, + component: FullScreenLayout, icon: null, id: "full-screen-view", name: "Full Screen View", @@ -1652,7 +1665,7 @@ export const getAppLayoutRoutes = (): RouteInterface[] => { showOnSidePanel: false }, { - component: AppView, + component: DashboardLayout, icon: null, id: "app", name: "App", diff --git a/apps/console/src/extensions/i18n/models/extensions.ts b/apps/console/src/extensions/i18n/models/extensions.ts index 0eb84867963..9f9e375167d 100755 --- a/apps/console/src/extensions/i18n/models/extensions.ts +++ b/apps/console/src/extensions/i18n/models/extensions.ts @@ -1171,11 +1171,13 @@ export interface Extensions { header: string; revertBranding: { actionTitle: string; + disableHint: string; header: string; subheader: string; }; unpublishBranding: { actionTitle: string; + disableHint: string; header: string; subheader: string; }; @@ -1747,7 +1749,15 @@ export interface Extensions { }; }; pageHeader: { + application: string; + applicationBrandingtitle: string; + applicationBrandingDescription: string; + applicationListWarning: string; + backButtonText: string; description: string; + organization: string; + organizationBrandingtitle: string; + selectApplication: string; title: string; }; pageResolution: { @@ -2497,6 +2507,20 @@ export interface Extensions { }; title: string; }; + startTimeGreaterThanCurrentError: { + subtitle: { + 0: string; + 1: string; + }; + title: string; + }; + endTimeGreaterThanStartTimeError: { + subtitle: { + 0: string; + 1: string; + }; + title: string; + }; }; pageHeader: { description: string; @@ -3399,9 +3423,18 @@ export interface Extensions { } } invite: { + assignAdminUser: { + confirmationModal: { + assertionHint: string; + header: string; + message: string; + }; + }; notifications: { sendInvite: { + inviteAlreadyExistsError: NotificationItem; limitReachError: NotificationItem; + userAlreadyExistsError: NotificationItem; }; }; }; diff --git a/apps/console/src/extensions/i18n/resources/en-US/extensions.ts b/apps/console/src/extensions/i18n/resources/en-US/extensions.ts index 7fa6b3979f0..4a7a79d66f7 100755 --- a/apps/console/src/extensions/i18n/resources/en-US/extensions.ts +++ b/apps/console/src/extensions/i18n/resources/en-US/extensions.ts @@ -1368,12 +1368,14 @@ export const extensions: Extensions = { header: "Danger Zone", revertBranding: { actionTitle: "Revert", + disableHint: "Please select an application from the list above to revert the branding preferences.", header: "Revert to default", subheader: "Once the branding preferences are reverted, they can't be recovered and your " + "users will see {{ productName }}'s default branding." }, unpublishBranding: { actionTitle: "Unpublish", + disableHint: "Please select an application from the list above to unpublish the branding preferences.", header: "Unpublish branding preferences", subheader: "You can temporarily switch to {{ productName }}'s default branding by unpublishing. You can always switch back by saving your branding preferences again." } @@ -1974,7 +1976,15 @@ export const extensions: Extensions = { } }, pageHeader: { + application: "Application", + applicationBrandingtitle: "Application Branding", + applicationBrandingDescription: "Customize consumer-facing user interfaces of applications.", + applicationListWarning: "Please select an application from the list above to customize the branding preferences.", + backButtonText: "Go back to Application Settings", description: "Customize consumer-facing user interfaces of applications in your organization.", + organization: "Organization", + organizationBrandingtitle: "Organization Branding", + selectApplication: "Select Application", title: "Branding" }, pageResolution: { @@ -2786,6 +2796,20 @@ export const extensions: Extensions = { 1: "Please try a different time range." }, title: "No logs available" + }, + startTimeGreaterThanCurrentError: { + subtitle: { + 0: "Couldn't fetch logs.", + 1: "Selected start time should be before the current time." + }, + title: "Invalid time range" + }, + endTimeGreaterThanStartTimeError: { + subtitle: { + 0: "Couldn't fetch logs.", + 1: "Selected start time should be before the end time." + }, + title: "Invalid time range" } }, pageHeader: { @@ -4137,11 +4161,26 @@ export const extensions: Extensions = { } }, invite: { + assignAdminUser: { + confirmationModal: { + assertionHint: "Assign Administrator role to the user.", + header: "Assign Administrator Role", + message: "The user already exists as a collaborator. Do you want to assign them to Administrator role?" + } + }, notifications: { sendInvite: { + inviteAlreadyExistsError: { + description: "The invite for the user {{userName}} already exists.", + message: "Unable to send invite" + }, limitReachError: { description: "Maximum number of allowed collaborator users have been reached.", message: "Error while sending the invitation" + }, + userAlreadyExistsError: { + description: "The user {{userName}} already exists.", + message: "Unable to send invite" } } } diff --git a/features/admin.core.v1/hooks/use-routes.tsx b/apps/console/src/hooks/use-routes.tsx similarity index 92% rename from features/admin.core.v1/hooks/use-routes.tsx rename to apps/console/src/hooks/use-routes.tsx index c53108fdff0..f43b5a25929 100644 --- a/features/admin.core.v1/hooks/use-routes.tsx +++ b/apps/console/src/hooks/use-routes.tsx @@ -17,6 +17,17 @@ */ import { AccessControlUtils } from "@wso2is/access-control"; +import { AppConstants } from "@wso2is/admin.core.v1/constants/app-constants"; +import { history } from "@wso2is/admin.core.v1/helpers/history"; +import useGlobalVariables from "@wso2is/admin.core.v1/hooks/use-global-variables"; +import { FeatureConfigInterface } from "@wso2is/admin.core.v1/models/config"; +import { + AppState, + setDeveloperVisibility, + setFilteredDevelopRoutes, + setSanitizedDevelopRoutes +} from "@wso2is/admin.core.v1/store"; +import { AppUtils } from "@wso2is/admin.core.v1/utils/app-utils"; import { useGetCurrentOrganizationType } from "@wso2is/admin.organizations.v1/hooks/use-get-organization-type"; import { LegacyModeInterface, RouteInterface } from "@wso2is/core/models"; import { RouteUtils as CommonRouteUtils } from "@wso2is/core/utils"; @@ -24,12 +35,6 @@ import isEmpty from "lodash-es/isEmpty"; import { useDispatch, useSelector } from "react-redux"; import { Dispatch } from "redux"; import { getAppViewRoutes } from "../configs/routes"; -import { AppConstants } from "../constants/app-constants"; -import { history } from "../helpers/history"; -import useGlobalVariables from "../hooks/use-global-variables"; -import { FeatureConfigInterface } from "../models/config"; -import { AppState, setDeveloperVisibility, setFilteredDevelopRoutes, setSanitizedDevelopRoutes } from "../store"; -import { AppUtils } from "../utils/app-utils"; /** * Props interface of {@link useOrganizations} diff --git a/apps/console/src/index.html b/apps/console/src/index.html index 62e15929f88..30ee90c43b5 100644 --- a/apps/console/src/index.html +++ b/apps/console/src/index.html @@ -17,113 +17,7 @@ - - - - + diff --git a/features/admin.layouts.v1/app.tsx b/apps/console/src/layouts/app-layout.tsx similarity index 96% rename from features/admin.layouts.v1/app.tsx rename to apps/console/src/layouts/app-layout.tsx index b2d01c9a810..98a166e0eb3 100644 --- a/features/admin.layouts.v1/app.tsx +++ b/apps/console/src/layouts/app-layout.tsx @@ -18,7 +18,7 @@ import { AppState, AppUtils, PreLoader } from "@wso2is/admin.core.v1"; import { ProtectedRoute } from "@wso2is/admin.core.v1/components"; -import { getAppLayoutRoutes, getEmptyPlaceholderIllustrations } from "@wso2is/admin.core.v1/configs"; +import { getEmptyPlaceholderIllustrations } from "@wso2is/admin.core.v1/configs"; import { AppConstants } from "@wso2is/admin.core.v1/constants"; import { store } from "@wso2is/admin.core.v1/store"; import { RouteInterface } from "@wso2is/core/models"; @@ -33,6 +33,7 @@ import React, { FunctionComponent, ReactElement, Suspense, useEffect, useState } import { Trans, useTranslation } from "react-i18next"; import { useSelector } from "react-redux"; import { Redirect, Route, RouteComponentProps, Switch } from "react-router-dom"; +import { getAppLayoutRoutes } from "../configs/routes"; /** * Implementation of the Main app layout skeleton. @@ -40,7 +41,7 @@ import { Redirect, Route, RouteComponentProps, Switch } from "react-router-dom"; * * @returns App Layout. */ -export const AppLayout: FunctionComponent> = (): ReactElement => { +const AppLayout: FunctionComponent> = (): ReactElement => { const { t } = useTranslation(); @@ -140,3 +141,5 @@ export const AppLayout: FunctionComponent> = (): ReactEl ); }; + +export default AppLayout; diff --git a/features/admin.layouts.v1/auth.tsx b/apps/console/src/layouts/auth-layout.tsx similarity index 96% rename from features/admin.layouts.v1/auth.tsx rename to apps/console/src/layouts/auth-layout.tsx index e4584039eee..515d6915424 100644 --- a/features/admin.layouts.v1/auth.tsx +++ b/apps/console/src/layouts/auth-layout.tsx @@ -18,13 +18,13 @@ import { PreLoader } from "@wso2is/admin.core.v1"; import { ProtectedRoute } from "@wso2is/admin.core.v1/components"; -import { getAuthLayoutRoutes } from "@wso2is/admin.core.v1/configs"; import { AppConstants } from "@wso2is/admin.core.v1/constants"; import { RouteInterface } from "@wso2is/core/models"; import { AuthLayout as AuthLayoutSkeleton } from "@wso2is/react-components"; import React, { FunctionComponent, ReactElement, Suspense, useEffect, useState } from "react"; import { StaticContext } from "react-router"; import { Redirect, Route, RouteComponentProps, Switch } from "react-router-dom"; +import { getAuthLayoutRoutes } from "../configs/routes"; /** * Auth layout props interface. @@ -44,7 +44,7 @@ interface AuthLayoutPropsInterface { * * @returns a React.ReactElement. */ -export const AuthLayout: FunctionComponent = ( +const AuthLayout: FunctionComponent = ( props: AuthLayoutPropsInterface ): ReactElement => { @@ -104,3 +104,5 @@ export const AuthLayout: FunctionComponent = ( AuthLayout.defaultProps = { fluid: true }; + +export default AuthLayout; diff --git a/features/admin.views.v1/app.tsx b/apps/console/src/layouts/dashboard-layout.tsx similarity index 98% rename from features/admin.views.v1/app.tsx rename to apps/console/src/layouts/dashboard-layout.tsx index defd315418d..14c2943309c 100644 --- a/features/admin.views.v1/app.tsx +++ b/apps/console/src/layouts/dashboard-layout.tsx @@ -33,7 +33,6 @@ import { RouteUtils, StrictAppViewTypes, UIConstants, - getAppViewRoutes, getEmptyPlaceholderIllustrations, history } from "@wso2is/admin.core.v1"; @@ -81,15 +80,16 @@ import { useDispatch, useSelector } from "react-redux"; import { Redirect, Route, RouteComponentProps, Switch } from "react-router-dom"; import { Action } from "reduce-reducers"; import { ThunkDispatch } from "redux-thunk"; +import { getAppViewRoutes } from "../configs/routes"; /** - * Parent component for Admin features inherited from Dashboard layout skeleton. + * Parent component for features inherited from Dashboard layout skeleton. * * @param props - Props injected to the component. * - * @returns Admin View Wrapper. + * @returns Dashboard Layout Wrapper. */ -export const AppView: FunctionComponent = ( +const DashboardLayout: FunctionComponent = ( props: RouteComponentProps ): ReactElement => { const { location } = props; @@ -463,3 +463,5 @@ export const AppView: FunctionComponent = ( ); }; + +export default DashboardLayout; diff --git a/features/admin.layouts.v1/default.tsx b/apps/console/src/layouts/default-layout.tsx similarity index 98% rename from features/admin.layouts.v1/default.tsx rename to apps/console/src/layouts/default-layout.tsx index 914fc53cc1a..03ab5e80fc7 100644 --- a/features/admin.layouts.v1/default.tsx +++ b/apps/console/src/layouts/default-layout.tsx @@ -22,8 +22,7 @@ import { Footer, Header, ProtectedRoute, - UIConstants, - getDefaultLayoutRoutes + UIConstants } from "@wso2is/admin.core.v1"; import { AlertInterface, RouteInterface } from "@wso2is/core/models"; import { initializeAlertSystem } from "@wso2is/core/store"; @@ -46,6 +45,7 @@ import { useDispatch, useSelector } from "react-redux"; import { StaticContext } from "react-router"; import { Redirect, Route, RouteComponentProps, Switch } from "react-router-dom"; import { Dispatch } from "redux"; +import { getDefaultLayoutRoutes } from "../configs/routes"; /** * Default page layout component Prop types. @@ -171,3 +171,5 @@ export const DefaultLayout: FunctionComponent = ( DefaultLayout.defaultProps = { fluid: true }; + +export default DefaultLayout; diff --git a/features/admin.layouts.v1/error.tsx b/apps/console/src/layouts/error-layout.tsx similarity index 95% rename from features/admin.layouts.v1/error.tsx rename to apps/console/src/layouts/error-layout.tsx index bb80ac0ef44..02d0a15ae88 100644 --- a/features/admin.layouts.v1/error.tsx +++ b/apps/console/src/layouts/error-layout.tsx @@ -17,13 +17,13 @@ */ import { ProtectedRoute } from "@wso2is/admin.core.v1/components"; -import { getErrorLayoutRoutes } from "@wso2is/admin.core.v1/configs"; import { AppConstants } from "@wso2is/admin.core.v1/constants"; import { RouteInterface } from "@wso2is/core/models"; import { ContentLoader, ErrorLayout as ErrorLayoutSkeleton } from "@wso2is/react-components"; import React, { FunctionComponent, PropsWithChildren, ReactElement, Suspense, useEffect, useState } from "react"; import { StaticContext } from "react-router"; import { Redirect, Route, RouteComponentProps, Switch } from "react-router-dom"; +import { getErrorLayoutRoutes } from "../configs/routes"; /** * Error layout Prop types. @@ -43,7 +43,7 @@ export interface ErrorLayoutPropsInterface { * * @returns a React.ReactElement. */ -export const ErrorLayout: FunctionComponent> = ( +const ErrorLayout: FunctionComponent> = ( props: PropsWithChildren ): ReactElement => { @@ -99,3 +99,5 @@ export const ErrorLayout: FunctionComponent = ( - props: FullScreenViewPropsInterface & RouteComponentProps +const FullScreenLayout: FunctionComponent = ( + props: FullScreenLayoutPropsInterface & RouteComponentProps ): ReactElement => { const { @@ -107,7 +107,7 @@ export const FullScreenView: FunctionComponent = ( * @param key - Index of the route. * @returns Resolved route to be rendered. */ - const renderRoute = (route, key): ReactNode => ( + const renderRoute = (route: RouteInterface, key: number): ReactNode => ( route.redirectTo ? : route.protected @@ -122,7 +122,7 @@ export const FullScreenView: FunctionComponent = ( : ( + render={ (renderProps: RouteComponentProps): ReactNode => route.component ? : null @@ -140,11 +140,11 @@ export const FullScreenView: FunctionComponent = ( * * @returns Set of resolved routes. */ - const resolveRoutes = (): RouteInterface[] | ReactNode[]=> { - const resolvedRoutes = []; + const resolveRoutes = (): ReactNode[] => { + const resolvedRoutes: ReactNode[] = []; - const recurse = (routesArr): void => { - routesArr.forEach((route, key) => { + const recurse = (routesArr: RouteInterface[]): void => { + routesArr.forEach((route: RouteInterface, key: number) => { if (route.path) { resolvedRoutes.push(renderRoute(route, key)); } @@ -194,6 +194,8 @@ export const FullScreenView: FunctionComponent = ( /** * Default props for the Full Screen View. */ -FullScreenView.defaultProps = { +FullScreenLayout.defaultProps = { fluid: true }; + +export default FullScreenLayout; diff --git a/apps/console/src/protected-app.tsx b/apps/console/src/protected-app.tsx index 6d18876b6f3..b1d468267cb 100644 --- a/apps/console/src/protected-app.tsx +++ b/apps/console/src/protected-app.tsx @@ -32,7 +32,6 @@ import { HttpUtils, PreLoader, UIConfigInterface, - getAppViewRoutes, setFilteredDevelopRoutes, setSanitizedDevelopRoutes, store @@ -40,7 +39,6 @@ import { import { AppConstants } from "@wso2is/admin.core.v1/constants"; import { MultitenantConstants } from "@wso2is/admin.core.v1/constants/multitenant-constants"; import { history } from "@wso2is/admin.core.v1/helpers"; -import useRoutes from "@wso2is/admin.core.v1/hooks/use-routes"; import useUIConfig from "@wso2is/admin.core.v1/hooks/use-ui-configs"; import { commonConfig } from "@wso2is/admin.extensions.v1"; import { CONSUMER_USERSTORE } from "@wso2is/admin.extensions.v1/components/administrators/constants/users"; @@ -82,6 +80,8 @@ import React, { import { I18nextProvider } from "react-i18next"; import { useDispatch, useSelector } from "react-redux"; import { Dispatch } from "redux"; +import { getAppViewRoutes } from "./configs/routes"; +import useRoutes from "./hooks/use-routes"; const App: LazyExoticComponent = lazy(() => import("./app")); diff --git a/apps/console/src/public/deployment.config.json b/apps/console/src/public/deployment.config.json index 1831e628ca5..ebdf0fa5867 100644 --- a/apps/console/src/public/deployment.config.json +++ b/apps/console/src/public/deployment.config.json @@ -1154,6 +1154,7 @@ "isRequestPathAuthenticationEnabled": false, "isSAASDeployment": false, "isSignatureValidationCertificateAliasEnabled": false, + "isTrustedAppConsentRequired": false, "isXacmlConnectorEnabled": false, "legacyMode": { "apiResourcesV1": false, diff --git a/apps/myaccount/CHANGELOG.md b/apps/myaccount/CHANGELOG.md index 97e2c3194f2..0d9908cf676 100644 --- a/apps/myaccount/CHANGELOG.md +++ b/apps/myaccount/CHANGELOG.md @@ -1,5 +1,120 @@ # @wso2is/myaccount +## 2.7.58 + +### Patch Changes + +- [#6567](https://github.com/wso2/identity-apps/pull/6567) [`c877df930874467071aa7c7a0e5809351c0a922f`](https://github.com/wso2/identity-apps/commit/c877df930874467071aa7c7a0e5809351c0a922f) Thanks [@pavinduLakshan](https://github.com/pavinduLakshan)! - Remove Cookiepro from onprem + +- Updated dependencies [[`7f50838d255ffeea0d8c65e1a696f6a923738146`](https://github.com/wso2/identity-apps/commit/7f50838d255ffeea0d8c65e1a696f6a923738146)]: + - @wso2is/react-components@2.2.14 + - @wso2is/i18n@2.5.1 + - @wso2is/admin.organizations.v1@2.20.59 + - @wso2is/common.branding.v1@2.20.59 + +## 2.7.57 + +### Patch Changes + +- Updated dependencies [[`a7d0c020b04ba382733280407fc202910f4fc8f4`](https://github.com/wso2/identity-apps/commit/a7d0c020b04ba382733280407fc202910f4fc8f4)]: + - @wso2is/i18n@2.5.0 + - @wso2is/admin.organizations.v1@2.20.58 + - @wso2is/common.branding.v1@2.20.58 + +## 2.7.56 + +### Patch Changes + +- Updated dependencies [[`f1d9b7ccbe14f1a42b6d3360da664acf39ba6909`](https://github.com/wso2/identity-apps/commit/f1d9b7ccbe14f1a42b6d3360da664acf39ba6909)]: + - @wso2is/theme@2.0.89 + - @wso2is/admin.organizations.v1@2.20.57 + - @wso2is/react-components@2.2.13 + - @wso2is/common.branding.v1@2.20.57 + +## 2.7.55 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.organizations.v1@2.20.56 + - @wso2is/common.branding.v1@2.20.56 + +## 2.7.54 + +### Patch Changes + +- Updated dependencies [[`82bbbf2303853076342ef80ef7d987bed16df01f`](https://github.com/wso2/identity-apps/commit/82bbbf2303853076342ef80ef7d987bed16df01f)]: + - @wso2is/i18n@2.4.8 + - @wso2is/admin.organizations.v1@2.20.55 + - @wso2is/common.branding.v1@2.20.55 + +## 2.7.53 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.organizations.v1@2.20.54 + - @wso2is/common.branding.v1@2.20.54 + +## 2.7.52 + +### Patch Changes + +- Updated dependencies [[`a533e58d21d759f0a27d804f17b042a2819a8955`](https://github.com/wso2/identity-apps/commit/a533e58d21d759f0a27d804f17b042a2819a8955)]: + - @wso2is/i18n@2.4.7 + - @wso2is/admin.organizations.v1@2.20.53 + - @wso2is/common.branding.v1@2.20.53 + +## 2.7.51 + +### Patch Changes + +- Updated dependencies [[`1201f1179cda981617c35b6d9839abe768d5a394`](https://github.com/wso2/identity-apps/commit/1201f1179cda981617c35b6d9839abe768d5a394)]: + - @wso2is/common.branding.v1@2.20.52 + - @wso2is/theme@2.0.88 + - @wso2is/admin.organizations.v1@2.20.52 + - @wso2is/react-components@2.2.12 + +## 2.7.50 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.organizations.v1@2.20.51 + - @wso2is/common.branding.v1@2.20.51 + +## 2.7.49 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.organizations.v1@2.20.50 + - @wso2is/common.branding.v1@2.20.50 + +## 2.7.48 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.organizations.v1@2.20.49 + - @wso2is/common.branding.v1@2.20.49 + +## 2.7.47 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.organizations.v1@2.20.48 + - @wso2is/common.branding.v1@2.20.48 + +## 2.7.46 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.organizations.v1@2.20.47 + - @wso2is/common.branding.v1@2.20.47 + ## 2.7.45 ### Patch Changes diff --git a/apps/myaccount/java/org.wso2.identity.apps.myaccount.server.feature/pom.xml b/apps/myaccount/java/org.wso2.identity.apps.myaccount.server.feature/pom.xml index a1097174133..a0702fd6b82 100644 --- a/apps/myaccount/java/org.wso2.identity.apps.myaccount.server.feature/pom.xml +++ b/apps/myaccount/java/org.wso2.identity.apps.myaccount.server.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.identity.apps identity-apps-myaccount - 2.7.46-SNAPSHOT + 2.7.59-SNAPSHOT ../pom.xml diff --git a/apps/myaccount/java/pom.xml b/apps/myaccount/java/pom.xml index 600efd7d5fd..937134e6b25 100644 --- a/apps/myaccount/java/pom.xml +++ b/apps/myaccount/java/pom.xml @@ -24,7 +24,7 @@ org.wso2.identity.apps identity-apps-myaccount pom - 2.7.46-SNAPSHOT + 2.7.59-SNAPSHOT WSO2 Identity Server MyAccount - Parent WSO2 Identity Server MyAccount Parent diff --git a/apps/myaccount/java/webapp/pom.xml b/apps/myaccount/java/webapp/pom.xml index 4a9508718bc..4098bf6b07b 100644 --- a/apps/myaccount/java/webapp/pom.xml +++ b/apps/myaccount/java/webapp/pom.xml @@ -23,7 +23,7 @@ org.wso2.identity.apps identity-apps-myaccount - 2.7.46-SNAPSHOT + 2.7.59-SNAPSHOT ../pom.xml diff --git a/apps/myaccount/package.json b/apps/myaccount/package.json index d7d68dedd96..47850afb5b4 100644 --- a/apps/myaccount/package.json +++ b/apps/myaccount/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@wso2is/myaccount", - "version": "2.7.45", + "version": "2.7.58", "description": "WSO2 Identity Server My Account", "author": "WSO2", "license": "Apache-2.0", @@ -41,13 +41,13 @@ "@oxygen-ui/react": "^1.11.0", "@oxygen-ui/react-icons": "^1.11.0", "@wso2is/access-control": "^3.0.11", - "@wso2is/admin.organizations.v1": "^2.20.46", - "@wso2is/common.branding.v1": "^2.20.46", + "@wso2is/admin.organizations.v1": "^2.20.59", + "@wso2is/common.branding.v1": "^2.20.59", "@wso2is/core": "^2.0.51", "@wso2is/forms": "^2.0.41", - "@wso2is/i18n": "^2.4.6", - "@wso2is/react-components": "^2.2.11", - "@wso2is/theme": "^2.0.87", + "@wso2is/i18n": "^2.5.1", + "@wso2is/react-components": "^2.2.14", + "@wso2is/theme": "^2.0.89", "@wso2is/validation": "^2.0.6", "axios": "^0.19.2", "history": "^4.9.0", diff --git a/apps/myaccount/src/index.html b/apps/myaccount/src/index.html index a3f33a9d68d..338d960652e 100644 --- a/apps/myaccount/src/index.html +++ b/apps/myaccount/src/index.html @@ -17,108 +17,7 @@ - - - - + diff --git a/docs/testing/UNIT_TESTING.md b/docs/testing/UNIT_TESTING.md index b6e015ea884..eee098a9d67 100644 --- a/docs/testing/UNIT_TESTING.md +++ b/docs/testing/UNIT_TESTING.md @@ -7,41 +7,20 @@ Make sure to write unit tests when you are working on new or existing features. Tests should be properly structured. Checkout the following examples. -### Example 01 +### Example -Let's say that you have a component called `applications-page.tsx` at the root of `features/applications` that needs to be tested. +Let's say that you have a component called `applications-list.tsx` at the root of `features/admin.applications.v1/components` that needs to be tested. #### Steps -1. Create a `__tests__`(underscore-underscore-tests-underscore-underscore 😉) under `features/applications`. -2. Create a file with the pattern `.test.` inside the `__tests__` folder. (In this case `applications-page.test.tsx`). - ->> Naming the test container folders `__tests__` This pattern seems to be the best when there) - -#### Folder Structure - -``` -features -└── applications - ├── __tests__ - | └── applications-page.test.tsx - └── applications-page.tsx -``` - -### Example 02 - -Let's say that you have a component called `applications-list.tsx` at the root of `features/applications/components` that needs to be tested. - -#### Steps - -1. Create a `__tests__` under `features/applications/components`. +1. Create a `__tests__` under `features/admin.applications.v1/components`. 2. Create a file with the pattern `.test.` inside the `__tests__` folder. (In this case `applications-list.test.tsx`). #### Folder Structure ```bash features -└── applications +└── admin.applications.v1 ├── __tests__ ├── components | └── __tests__ @@ -170,15 +149,15 @@ pnpm test:watch ### Run Tests for a specific test file ```bash -# From console root -pnpm test ./src/features/applications/__tests__/applications-page.test.tsx +# From features root +npx jest features/admin.applications.v1/__tests__/applications-page.test.tsx ``` ### Run Tests for a specific test file in watch mode ```bash -# From console root -pnpm test -- --watch ./src/features/applications/__tests__/applications-page.test.tsx +# From features root +npx jest --watch features/admin.applications.v1/__tests__/applications-page.test.tsx ``` ### Run Tests for an individual module diff --git a/features/CHANGELOG.md b/features/CHANGELOG.md index e580a06dfdd..01114b015c0 100644 --- a/features/CHANGELOG.md +++ b/features/CHANGELOG.md @@ -1,5 +1,56 @@ # @wso2is/features +## 2.21.27 + +### Patch Changes + +- Updated dependencies [[`7f50838d255ffeea0d8c65e1a696f6a923738146`](https://github.com/wso2/identity-apps/commit/7f50838d255ffeea0d8c65e1a696f6a923738146)]: + - @wso2is/react-components@2.2.14 + - @wso2is/i18n@2.5.1 + - @wso2is/dynamic-forms@2.0.72 + - @wso2is/form@2.0.73 + +## 2.21.26 + +### Patch Changes + +- Updated dependencies [[`a7d0c020b04ba382733280407fc202910f4fc8f4`](https://github.com/wso2/identity-apps/commit/a7d0c020b04ba382733280407fc202910f4fc8f4)]: + - @wso2is/i18n@2.5.0 + +## 2.21.25 + +### Patch Changes + +- Updated dependencies [[`f1d9b7ccbe14f1a42b6d3360da664acf39ba6909`](https://github.com/wso2/identity-apps/commit/f1d9b7ccbe14f1a42b6d3360da664acf39ba6909)]: + - @wso2is/theme@2.0.89 + - @wso2is/react-components@2.2.13 + - @wso2is/dynamic-forms@2.0.71 + - @wso2is/form@2.0.72 + +## 2.21.24 + +### Patch Changes + +- Updated dependencies [[`82bbbf2303853076342ef80ef7d987bed16df01f`](https://github.com/wso2/identity-apps/commit/82bbbf2303853076342ef80ef7d987bed16df01f)]: + - @wso2is/i18n@2.4.8 + +## 2.21.23 + +### Patch Changes + +- Updated dependencies [[`a533e58d21d759f0a27d804f17b042a2819a8955`](https://github.com/wso2/identity-apps/commit/a533e58d21d759f0a27d804f17b042a2819a8955)]: + - @wso2is/i18n@2.4.7 + +## 2.21.22 + +### Patch Changes + +- Updated dependencies [[`1201f1179cda981617c35b6d9839abe768d5a394`](https://github.com/wso2/identity-apps/commit/1201f1179cda981617c35b6d9839abe768d5a394)]: + - @wso2is/theme@2.0.88 + - @wso2is/react-components@2.2.12 + - @wso2is/dynamic-forms@2.0.70 + - @wso2is/form@2.0.71 + ## 2.21.21 ### Patch Changes diff --git a/features/admin.api-resources.v1/CHANGELOG.md b/features/admin.api-resources.v1/CHANGELOG.md index f75d387d4a2..427e4403fae 100644 --- a/features/admin.api-resources.v1/CHANGELOG.md +++ b/features/admin.api-resources.v1/CHANGELOG.md @@ -1,5 +1,115 @@ # @wso2is/admin.api-resources.v1 +## 2.20.59 + +### Patch Changes + +- Updated dependencies [[`7f50838d255ffeea0d8c65e1a696f6a923738146`](https://github.com/wso2/identity-apps/commit/7f50838d255ffeea0d8c65e1a696f6a923738146)]: + - @wso2is/react-components@2.2.14 + - @wso2is/admin.core.v1@2.22.1 + - @wso2is/admin.extensions.v1@2.21.29 + - @wso2is/form@2.0.73 + +## 2.20.58 + +### Patch Changes + +- Updated dependencies [[`a7d0c020b04ba382733280407fc202910f4fc8f4`](https://github.com/wso2/identity-apps/commit/a7d0c020b04ba382733280407fc202910f4fc8f4)]: + - @wso2is/admin.core.v1@2.22.0 + - @wso2is/admin.extensions.v1@2.21.28 + +## 2.20.57 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.extensions.v1@2.21.27 + - @wso2is/react-components@2.2.13 + - @wso2is/admin.core.v1@2.21.27 + - @wso2is/form@2.0.72 + +## 2.20.56 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.core.v1@2.21.26 + - @wso2is/admin.extensions.v1@2.21.26 + +## 2.20.55 + +### Patch Changes + +- Updated dependencies [[`82bbbf2303853076342ef80ef7d987bed16df01f`](https://github.com/wso2/identity-apps/commit/82bbbf2303853076342ef80ef7d987bed16df01f)]: + - @wso2is/admin.core.v1@2.21.25 + - @wso2is/admin.extensions.v1@2.21.25 + +## 2.20.54 + +### Patch Changes + +- Updated dependencies [[`1820d54f7dd5fa826c4747964fd2c1af9b7c3d8c`](https://github.com/wso2/identity-apps/commit/1820d54f7dd5fa826c4747964fd2c1af9b7c3d8c)]: + - @wso2is/admin.core.v1@2.21.24 + - @wso2is/admin.extensions.v1@2.21.24 + +## 2.20.53 + +### Patch Changes + +- Updated dependencies [[`a533e58d21d759f0a27d804f17b042a2819a8955`](https://github.com/wso2/identity-apps/commit/a533e58d21d759f0a27d804f17b042a2819a8955)]: + - @wso2is/admin.extensions.v1@2.21.23 + - @wso2is/admin.core.v1@2.21.23 + +## 2.20.52 + +### Patch Changes + +- Updated dependencies [[`1201f1179cda981617c35b6d9839abe768d5a394`](https://github.com/wso2/identity-apps/commit/1201f1179cda981617c35b6d9839abe768d5a394)]: + - @wso2is/admin.extensions.v1@2.21.22 + - @wso2is/admin.core.v1@2.21.22 + - @wso2is/react-components@2.2.12 + - @wso2is/form@2.0.71 + +## 2.20.51 + +### Patch Changes + +- Updated dependencies [[`8fa06039e0791823d9de3c290cb4e93557f77f81`](https://github.com/wso2/identity-apps/commit/8fa06039e0791823d9de3c290cb4e93557f77f81)]: + - @wso2is/admin.extensions.v1@2.21.21 + - @wso2is/admin.core.v1@2.21.21 + +## 2.20.50 + +### Patch Changes + +- Updated dependencies [[`d376f489cceae4ab415dcf6ae1ffd536baa47f9a`](https://github.com/wso2/identity-apps/commit/d376f489cceae4ab415dcf6ae1ffd536baa47f9a)]: + - @wso2is/admin.extensions.v1@2.21.20 + - @wso2is/admin.core.v1@2.21.20 + +## 2.20.49 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.core.v1@2.21.19 + - @wso2is/admin.extensions.v1@2.21.19 + +## 2.20.48 + +### Patch Changes + +- Updated dependencies [[`1e079568c0ba1f4e158ec9a666df58c2f7c17d02`](https://github.com/wso2/identity-apps/commit/1e079568c0ba1f4e158ec9a666df58c2f7c17d02)]: + - @wso2is/admin.extensions.v1@2.21.18 + - @wso2is/admin.core.v1@2.21.18 + +## 2.20.47 + +### Patch Changes + +- Updated dependencies [[`c58df1f13afd6ccc28cc129518ac86bab6419744`](https://github.com/wso2/identity-apps/commit/c58df1f13afd6ccc28cc129518ac86bab6419744)]: + - @wso2is/admin.extensions.v1@2.21.17 + - @wso2is/admin.core.v1@2.21.17 + ## 2.20.46 ### Patch Changes diff --git a/features/admin.api-resources.v1/package.json b/features/admin.api-resources.v1/package.json index fda72081617..c80b5a0aac2 100644 --- a/features/admin.api-resources.v1/package.json +++ b/features/admin.api-resources.v1/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@wso2is/admin.api-resources.v1", - "version": "2.20.46", + "version": "2.20.59", "description": "WSO2 Identity Server Console", "author": "WSO2", "license": "Apache-2.0", @@ -17,11 +17,11 @@ "@oxygen-ui/react": "^1.11.0", "@wso2is/access-control": "^3.0.11", "@wso2is/core": "^2.0.51", - "@wso2is/form": "^2.0.70", + "@wso2is/form": "^2.0.73", "@wso2is/forms": "^2.0.41", - "@wso2is/react-components": "^2.2.11", - "@wso2is/admin.core.v1": "^2.21.16", - "@wso2is/admin.extensions.v1": "^2.21.16", + "@wso2is/react-components": "^2.2.14", + "@wso2is/admin.core.v1": "^2.22.1", + "@wso2is/admin.extensions.v1": "^2.21.29", "axios": "^0.19.2", "i18next": "^21.9.1", "react-helmet": "^5.2.1", diff --git a/features/admin.api-resources.v2/CHANGELOG.md b/features/admin.api-resources.v2/CHANGELOG.md index aff72ad3e67..dd0102734c6 100644 --- a/features/admin.api-resources.v2/CHANGELOG.md +++ b/features/admin.api-resources.v2/CHANGELOG.md @@ -1,5 +1,104 @@ # @wso2is/admin.api-resources.v2 +## 2.20.59 + +### Patch Changes + +- Updated dependencies [[`7f50838d255ffeea0d8c65e1a696f6a923738146`](https://github.com/wso2/identity-apps/commit/7f50838d255ffeea0d8c65e1a696f6a923738146)]: + - @wso2is/react-components@2.2.14 + - @wso2is/admin.core.v1@2.22.1 + - @wso2is/form@2.0.73 + +## 2.20.58 + +### Patch Changes + +- Updated dependencies [[`a7d0c020b04ba382733280407fc202910f4fc8f4`](https://github.com/wso2/identity-apps/commit/a7d0c020b04ba382733280407fc202910f4fc8f4)]: + - @wso2is/admin.core.v1@2.22.0 + +## 2.20.57 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/react-components@2.2.13 + - @wso2is/admin.core.v1@2.21.27 + - @wso2is/form@2.0.72 + +## 2.20.56 + +### Patch Changes + +- [#6545](https://github.com/wso2/identity-apps/pull/6545) [`a0886211dba54c1c0266c24c5626f61657e6c209`](https://github.com/wso2/identity-apps/commit/a0886211dba54c1c0266c24c5626f61657e6c209) Thanks [@pavinduLakshan](https://github.com/pavinduLakshan)! - Fix management api search not working when the current page is greater than 1 + +- Updated dependencies []: + - @wso2is/admin.core.v1@2.21.26 + +## 2.20.55 + +### Patch Changes + +- Updated dependencies [[`82bbbf2303853076342ef80ef7d987bed16df01f`](https://github.com/wso2/identity-apps/commit/82bbbf2303853076342ef80ef7d987bed16df01f)]: + - @wso2is/admin.core.v1@2.21.25 + +## 2.20.54 + +### Patch Changes + +- Updated dependencies [[`1820d54f7dd5fa826c4747964fd2c1af9b7c3d8c`](https://github.com/wso2/identity-apps/commit/1820d54f7dd5fa826c4747964fd2c1af9b7c3d8c)]: + - @wso2is/admin.core.v1@2.21.24 + +## 2.20.53 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.core.v1@2.21.23 + +## 2.20.52 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.core.v1@2.21.22 + - @wso2is/react-components@2.2.12 + - @wso2is/form@2.0.71 + +## 2.20.51 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.core.v1@2.21.21 + +## 2.20.50 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.core.v1@2.21.20 + +## 2.20.49 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.core.v1@2.21.19 + +## 2.20.48 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.core.v1@2.21.18 + +## 2.20.47 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.core.v1@2.21.17 + ## 2.20.46 ### Patch Changes diff --git a/features/admin.api-resources.v2/package.json b/features/admin.api-resources.v2/package.json index 445cf57e7db..1751ba321a3 100644 --- a/features/admin.api-resources.v2/package.json +++ b/features/admin.api-resources.v2/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@wso2is/admin.api-resources.v2", - "version": "2.20.46", + "version": "2.20.59", "description": "WSO2 Identity Server Console", "author": "WSO2", "license": "Apache-2.0", @@ -18,10 +18,10 @@ "@oxygen-ui/react-icons": "^1.11.0", "@wso2is/access-control": "^3.0.11", "@wso2is/core": "^2.0.51", - "@wso2is/form": "^2.0.70", + "@wso2is/form": "^2.0.73", "@wso2is/forms": "^2.0.41", - "@wso2is/react-components": "^2.2.11", - "@wso2is/admin.core.v1": "^2.21.16", + "@wso2is/react-components": "^2.2.14", + "@wso2is/admin.core.v1": "^2.22.1", "axios": "^0.19.2", "i18next": "^21.9.1", "node-forge": "^0.10.0", diff --git a/features/admin.api-resources.v2/pages/api-resources-internal-list.tsx b/features/admin.api-resources.v2/pages/api-resources-internal-list.tsx index 4b657af78dd..ecce1cd2a7f 100644 --- a/features/admin.api-resources.v2/pages/api-resources-internal-list.tsx +++ b/features/admin.api-resources.v2/pages/api-resources-internal-list.tsx @@ -165,11 +165,14 @@ const APIResourcesPage: FunctionComponent = ( ? `type eq ${ APIResourceCategories.TENANT }` : `type eq ${ APIResourceCategories.ORGANIZATION }`; - if (searchQuery) { - setFilter(`${ searchQuery } and ${ typeFilter }`); - } else { - setFilter(typeFilter); - } + const apiResourceFilter: string = searchQuery ? `${ searchQuery } and ${ typeFilter }` : typeFilter; + + // Setting `before` and `after` cursors to undefined before initiating a fresh + // search query, otherwise text search doesn't work when it is initiated from a + // page greater than one. + setBefore(undefined); + setAfter(undefined); + setFilter(apiResourceFilter); }, [ searchQuery ]); /** diff --git a/features/admin.application-roles.v1/CHANGELOG.md b/features/admin.application-roles.v1/CHANGELOG.md index 32e28623dba..e8074375be5 100644 --- a/features/admin.application-roles.v1/CHANGELOG.md +++ b/features/admin.application-roles.v1/CHANGELOG.md @@ -1,5 +1,181 @@ # @wso2is/admin.application-roles.v1 +## 2.21.1 + +### Patch Changes + +- Updated dependencies [[`7f50838d255ffeea0d8c65e1a696f6a923738146`](https://github.com/wso2/identity-apps/commit/7f50838d255ffeea0d8c65e1a696f6a923738146)]: + - @wso2is/admin.applications.v1@2.21.29 + - @wso2is/react-components@2.2.14 + - @wso2is/admin.connections.v1@2.20.59 + - @wso2is/admin.core.v1@2.22.1 + - @wso2is/admin.extensions.v1@2.21.29 + - @wso2is/admin.identity-providers.v1@2.20.59 + - @wso2is/admin.groups.v1@2.20.59 + - @wso2is/admin.userstores.v1@2.20.59 + +## 2.21.0 + +### Minor Changes + +- [#6543](https://github.com/wso2/identity-apps/pull/6543) [`a7d0c020b04ba382733280407fc202910f4fc8f4`](https://github.com/wso2/identity-apps/commit/a7d0c020b04ba382733280407fc202910f4fc8f4) Thanks [@Thumimku](https://github.com/Thumimku)! - Add Impersonation support + +### Patch Changes + +- Updated dependencies [[`a7d0c020b04ba382733280407fc202910f4fc8f4`](https://github.com/wso2/identity-apps/commit/a7d0c020b04ba382733280407fc202910f4fc8f4)]: + - @wso2is/admin.core.v1@2.22.0 + - @wso2is/admin.applications.v1@2.21.28 + - @wso2is/admin.extensions.v1@2.21.28 + - @wso2is/admin.identity-providers.v1@2.20.58 + - @wso2is/admin.connections.v1@2.20.58 + - @wso2is/admin.groups.v1@2.20.58 + - @wso2is/admin.userstores.v1@2.20.58 + +## 2.20.57 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.connections.v1@2.20.57 + - @wso2is/admin.extensions.v1@2.21.27 + - @wso2is/admin.groups.v1@2.20.57 + - @wso2is/admin.identity-providers.v1@2.20.57 + - @wso2is/admin.userstores.v1@2.20.57 + - @wso2is/react-components@2.2.13 + - @wso2is/admin.applications.v1@2.21.27 + - @wso2is/admin.core.v1@2.21.27 + +## 2.20.56 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.applications.v1@2.21.26 + - @wso2is/admin.core.v1@2.21.26 + - @wso2is/admin.connections.v1@2.20.56 + - @wso2is/admin.extensions.v1@2.21.26 + - @wso2is/admin.identity-providers.v1@2.20.56 + - @wso2is/admin.groups.v1@2.20.56 + - @wso2is/admin.userstores.v1@2.20.56 + +## 2.20.55 + +### Patch Changes + +- Updated dependencies [[`82bbbf2303853076342ef80ef7d987bed16df01f`](https://github.com/wso2/identity-apps/commit/82bbbf2303853076342ef80ef7d987bed16df01f)]: + - @wso2is/admin.applications.v1@2.21.25 + - @wso2is/admin.core.v1@2.21.25 + - @wso2is/admin.connections.v1@2.20.55 + - @wso2is/admin.extensions.v1@2.21.25 + - @wso2is/admin.identity-providers.v1@2.20.55 + - @wso2is/admin.groups.v1@2.20.55 + - @wso2is/admin.userstores.v1@2.20.55 + +## 2.20.54 + +### Patch Changes + +- Updated dependencies [[`1820d54f7dd5fa826c4747964fd2c1af9b7c3d8c`](https://github.com/wso2/identity-apps/commit/1820d54f7dd5fa826c4747964fd2c1af9b7c3d8c)]: + - @wso2is/admin.core.v1@2.21.24 + - @wso2is/admin.applications.v1@2.21.24 + - @wso2is/admin.connections.v1@2.20.54 + - @wso2is/admin.extensions.v1@2.21.24 + - @wso2is/admin.groups.v1@2.20.54 + - @wso2is/admin.identity-providers.v1@2.20.54 + - @wso2is/admin.userstores.v1@2.20.54 + +## 2.20.53 + +### Patch Changes + +- Updated dependencies [[`a533e58d21d759f0a27d804f17b042a2819a8955`](https://github.com/wso2/identity-apps/commit/a533e58d21d759f0a27d804f17b042a2819a8955)]: + - @wso2is/admin.applications.v1@2.21.23 + - @wso2is/admin.extensions.v1@2.21.23 + - @wso2is/admin.connections.v1@2.20.53 + - @wso2is/admin.core.v1@2.21.23 + - @wso2is/admin.identity-providers.v1@2.20.53 + - @wso2is/admin.groups.v1@2.20.53 + - @wso2is/admin.userstores.v1@2.20.53 + +## 2.20.52 + +### Patch Changes + +- Updated dependencies [[`1201f1179cda981617c35b6d9839abe768d5a394`](https://github.com/wso2/identity-apps/commit/1201f1179cda981617c35b6d9839abe768d5a394)]: + - @wso2is/admin.applications.v1@2.21.22 + - @wso2is/admin.extensions.v1@2.21.22 + - @wso2is/admin.connections.v1@2.20.52 + - @wso2is/admin.core.v1@2.21.22 + - @wso2is/admin.identity-providers.v1@2.20.52 + - @wso2is/admin.groups.v1@2.20.52 + - @wso2is/admin.userstores.v1@2.20.52 + - @wso2is/react-components@2.2.12 + +## 2.20.51 + +### Patch Changes + +- Updated dependencies [[`8fa06039e0791823d9de3c290cb4e93557f77f81`](https://github.com/wso2/identity-apps/commit/8fa06039e0791823d9de3c290cb4e93557f77f81)]: + - @wso2is/admin.connections.v1@2.20.51 + - @wso2is/admin.extensions.v1@2.21.21 + - @wso2is/admin.applications.v1@2.21.21 + - @wso2is/admin.core.v1@2.21.21 + - @wso2is/admin.identity-providers.v1@2.20.51 + - @wso2is/admin.groups.v1@2.20.51 + - @wso2is/admin.userstores.v1@2.20.51 + +## 2.20.50 + +### Patch Changes + +- Updated dependencies [[`d376f489cceae4ab415dcf6ae1ffd536baa47f9a`](https://github.com/wso2/identity-apps/commit/d376f489cceae4ab415dcf6ae1ffd536baa47f9a), [`55402e8eeb65021310621f0f8c643effbdc805a5`](https://github.com/wso2/identity-apps/commit/55402e8eeb65021310621f0f8c643effbdc805a5)]: + - @wso2is/admin.extensions.v1@2.21.20 + - @wso2is/admin.applications.v1@2.21.20 + - @wso2is/admin.connections.v1@2.20.50 + - @wso2is/admin.core.v1@2.21.20 + - @wso2is/admin.groups.v1@2.20.50 + - @wso2is/admin.identity-providers.v1@2.20.50 + - @wso2is/admin.userstores.v1@2.20.50 + +## 2.20.49 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.core.v1@2.21.19 + - @wso2is/admin.extensions.v1@2.21.19 + - @wso2is/admin.groups.v1@2.20.49 + - @wso2is/admin.applications.v1@2.21.19 + - @wso2is/admin.connections.v1@2.20.49 + - @wso2is/admin.identity-providers.v1@2.20.49 + - @wso2is/admin.userstores.v1@2.20.49 + +## 2.20.48 + +### Patch Changes + +- Updated dependencies [[`1e079568c0ba1f4e158ec9a666df58c2f7c17d02`](https://github.com/wso2/identity-apps/commit/1e079568c0ba1f4e158ec9a666df58c2f7c17d02)]: + - @wso2is/admin.identity-providers.v1@2.20.48 + - @wso2is/admin.connections.v1@2.20.48 + - @wso2is/admin.extensions.v1@2.21.18 + - @wso2is/admin.applications.v1@2.21.18 + - @wso2is/admin.core.v1@2.21.18 + - @wso2is/admin.groups.v1@2.20.48 + - @wso2is/admin.userstores.v1@2.20.48 + +## 2.20.47 + +### Patch Changes + +- Updated dependencies [[`c58df1f13afd6ccc28cc129518ac86bab6419744`](https://github.com/wso2/identity-apps/commit/c58df1f13afd6ccc28cc129518ac86bab6419744)]: + - @wso2is/admin.extensions.v1@2.21.17 + - @wso2is/admin.applications.v1@2.21.17 + - @wso2is/admin.connections.v1@2.20.47 + - @wso2is/admin.core.v1@2.21.17 + - @wso2is/admin.groups.v1@2.20.47 + - @wso2is/admin.identity-providers.v1@2.20.47 + - @wso2is/admin.userstores.v1@2.20.47 + ## 2.20.46 ### Patch Changes diff --git a/features/admin.application-roles.v1/package.json b/features/admin.application-roles.v1/package.json index fcfc31adfd8..4cef1c49329 100644 --- a/features/admin.application-roles.v1/package.json +++ b/features/admin.application-roles.v1/package.json @@ -1,21 +1,21 @@ { "private": true, "name": "@wso2is/admin.application-roles.v1", - "version": "2.20.46", + "version": "2.21.1", "description": "WSO2 Identity Server Console", "author": "WSO2", "license": "Apache-2.0", "dependencies": { "@wso2is/access-control": "^3.0.11", "@wso2is/core": "^2.0.51", - "@wso2is/react-components": "^2.2.11", - "@wso2is/admin.extensions.v1": "^2.21.16", - "@wso2is/admin.core.v1": "^2.21.16", - "@wso2is/admin.applications.v1": "^2.21.16", - "@wso2is/admin.userstores.v1": "^2.20.46", - "@wso2is/admin.groups.v1": "^2.20.46", - "@wso2is/admin.connections.v1": "^2.20.46", - "@wso2is/admin.identity-providers.v1": "^2.20.46", + "@wso2is/react-components": "^2.2.14", + "@wso2is/admin.extensions.v1": "^2.21.29", + "@wso2is/admin.core.v1": "^2.22.1", + "@wso2is/admin.applications.v1": "^2.21.29", + "@wso2is/admin.userstores.v1": "^2.20.59", + "@wso2is/admin.groups.v1": "^2.20.59", + "@wso2is/admin.connections.v1": "^2.20.59", + "@wso2is/admin.identity-providers.v1": "^2.20.59", "axios": "^0.19.2", "i18next": "^21.9.1", "lodash-es": "^4.17.21", diff --git a/features/admin.applications.v1/CHANGELOG.md b/features/admin.applications.v1/CHANGELOG.md index 2c078b2c0b3..323579b6d92 100644 --- a/features/admin.applications.v1/CHANGELOG.md +++ b/features/admin.applications.v1/CHANGELOG.md @@ -1,5 +1,327 @@ # @wso2is/admin.applications.v1 +## 2.21.29 + +### Patch Changes + +- [#6581](https://github.com/wso2/identity-apps/pull/6581) [`7f50838d255ffeea0d8c65e1a696f6a923738146`](https://github.com/wso2/identity-apps/commit/7f50838d255ffeea0d8c65e1a696f6a923738146) Thanks [@ImalshaG](https://github.com/ImalshaG)! - Improve android thumbprint error handling + +- Updated dependencies [[`7f50838d255ffeea0d8c65e1a696f6a923738146`](https://github.com/wso2/identity-apps/commit/7f50838d255ffeea0d8c65e1a696f6a923738146)]: + - @wso2is/react-components@2.2.14 + - @wso2is/i18n@2.5.1 + - @wso2is/admin.authentication-flow-builder.v1@2.20.59 + - @wso2is/admin.connections.v1@2.20.59 + - @wso2is/admin.console-settings.v1@2.20.59 + - @wso2is/admin.core.v1@2.22.1 + - @wso2is/admin.extensions.v1@2.21.29 + - @wso2is/admin.identity-providers.v1@2.20.59 + - @wso2is/admin.login-flow.ai.v1@2.20.59 + - @wso2is/admin.oidc-scopes.v1@2.20.59 + - @wso2is/admin.organizations.v1@2.20.59 + - @wso2is/admin.roles.v2@2.20.59 + - @wso2is/admin.api-resources.v2@2.20.59 + - @wso2is/admin.authorization.v1@2.20.22 + - @wso2is/admin.branding.v1@2.20.59 + - @wso2is/admin.claims.v1@2.20.59 + - @wso2is/admin.impersonation.v1@1.1.1 + - @wso2is/admin.secrets.v1@2.20.59 + - @wso2is/admin.server-configurations.v1@2.21.1 + - @wso2is/admin.userstores.v1@2.20.59 + - @wso2is/admin.wsfed-configuration.v1@2.20.59 + - @wso2is/form@2.0.73 + +## 2.21.28 + +### Patch Changes + +- Updated dependencies [[`a7d0c020b04ba382733280407fc202910f4fc8f4`](https://github.com/wso2/identity-apps/commit/a7d0c020b04ba382733280407fc202910f4fc8f4)]: + - @wso2is/admin.server-configurations.v1@2.21.0 + - @wso2is/admin.impersonation.v1@1.1.0 + - @wso2is/admin.core.v1@2.22.0 + - @wso2is/i18n@2.5.0 + - @wso2is/admin.authentication-flow-builder.v1@2.20.58 + - @wso2is/admin.branding.v1@2.20.58 + - @wso2is/admin.claims.v1@2.20.58 + - @wso2is/admin.console-settings.v1@2.20.58 + - @wso2is/admin.extensions.v1@2.21.28 + - @wso2is/admin.identity-providers.v1@2.20.58 + - @wso2is/admin.roles.v2@2.20.58 + - @wso2is/admin.api-resources.v2@2.20.58 + - @wso2is/admin.connections.v1@2.20.58 + - @wso2is/admin.login-flow.ai.v1@2.20.58 + - @wso2is/admin.oidc-scopes.v1@2.20.58 + - @wso2is/admin.organizations.v1@2.20.58 + - @wso2is/admin.secrets.v1@2.20.58 + - @wso2is/admin.userstores.v1@2.20.58 + - @wso2is/admin.wsfed-configuration.v1@2.20.58 + - @wso2is/admin.authorization.v1@2.20.21 + +## 2.21.27 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.authorization.v1@2.20.20 + - @wso2is/admin.branding.v1@2.20.57 + - @wso2is/admin.claims.v1@2.20.57 + - @wso2is/admin.connections.v1@2.20.57 + - @wso2is/admin.console-settings.v1@2.20.57 + - @wso2is/admin.extensions.v1@2.21.27 + - @wso2is/admin.identity-providers.v1@2.20.57 + - @wso2is/admin.login-flow.ai.v1@2.20.57 + - @wso2is/admin.oidc-scopes.v1@2.20.57 + - @wso2is/admin.organizations.v1@2.20.57 + - @wso2is/admin.roles.v2@2.20.57 + - @wso2is/admin.secrets.v1@2.20.57 + - @wso2is/admin.server-configurations.v1@2.20.57 + - @wso2is/admin.userstores.v1@2.20.57 + - @wso2is/admin.wsfed-configuration.v1@2.20.57 + - @wso2is/react-components@2.2.13 + - @wso2is/admin.core.v1@2.21.27 + - @wso2is/admin.authentication-flow-builder.v1@2.20.57 + - @wso2is/admin.api-resources.v2@2.20.57 + - @wso2is/form@2.0.72 + +## 2.21.26 + +### Patch Changes + +- Updated dependencies [[`a0886211dba54c1c0266c24c5626f61657e6c209`](https://github.com/wso2/identity-apps/commit/a0886211dba54c1c0266c24c5626f61657e6c209)]: + - @wso2is/admin.api-resources.v2@2.20.56 + - @wso2is/admin.core.v1@2.21.26 + - @wso2is/admin.roles.v2@2.20.56 + - @wso2is/admin.authentication-flow-builder.v1@2.20.56 + - @wso2is/admin.connections.v1@2.20.56 + - @wso2is/admin.console-settings.v1@2.20.56 + - @wso2is/admin.extensions.v1@2.21.26 + - @wso2is/admin.identity-providers.v1@2.20.56 + - @wso2is/admin.login-flow.ai.v1@2.20.56 + - @wso2is/admin.oidc-scopes.v1@2.20.56 + - @wso2is/admin.organizations.v1@2.20.56 + - @wso2is/admin.branding.v1@2.20.56 + - @wso2is/admin.claims.v1@2.20.56 + - @wso2is/admin.secrets.v1@2.20.56 + - @wso2is/admin.server-configurations.v1@2.20.56 + - @wso2is/admin.userstores.v1@2.20.56 + - @wso2is/admin.wsfed-configuration.v1@2.20.56 + +## 2.21.25 + +### Patch Changes + +- [#6570](https://github.com/wso2/identity-apps/pull/6570) [`82bbbf2303853076342ef80ef7d987bed16df01f`](https://github.com/wso2/identity-apps/commit/82bbbf2303853076342ef80ef7d987bed16df01f) Thanks [@ImalshaG](https://github.com/ImalshaG)! - Load trusted app consent required config and handle consent UI according to it + +- Updated dependencies [[`82bbbf2303853076342ef80ef7d987bed16df01f`](https://github.com/wso2/identity-apps/commit/82bbbf2303853076342ef80ef7d987bed16df01f)]: + - @wso2is/admin.core.v1@2.21.25 + - @wso2is/i18n@2.4.8 + - @wso2is/admin.authentication-flow-builder.v1@2.20.55 + - @wso2is/admin.connections.v1@2.20.55 + - @wso2is/admin.console-settings.v1@2.20.55 + - @wso2is/admin.extensions.v1@2.21.25 + - @wso2is/admin.identity-providers.v1@2.20.55 + - @wso2is/admin.login-flow.ai.v1@2.20.55 + - @wso2is/admin.oidc-scopes.v1@2.20.55 + - @wso2is/admin.organizations.v1@2.20.55 + - @wso2is/admin.roles.v2@2.20.55 + - @wso2is/admin.api-resources.v2@2.20.55 + - @wso2is/admin.branding.v1@2.20.55 + - @wso2is/admin.claims.v1@2.20.55 + - @wso2is/admin.secrets.v1@2.20.55 + - @wso2is/admin.server-configurations.v1@2.20.55 + - @wso2is/admin.userstores.v1@2.20.55 + - @wso2is/admin.wsfed-configuration.v1@2.20.55 + - @wso2is/admin.authorization.v1@2.20.19 + +## 2.21.24 + +### Patch Changes + +- Updated dependencies [[`1820d54f7dd5fa826c4747964fd2c1af9b7c3d8c`](https://github.com/wso2/identity-apps/commit/1820d54f7dd5fa826c4747964fd2c1af9b7c3d8c)]: + - @wso2is/admin.core.v1@2.21.24 + - @wso2is/admin.api-resources.v2@2.20.54 + - @wso2is/admin.authentication-flow-builder.v1@2.20.54 + - @wso2is/admin.branding.v1@2.20.54 + - @wso2is/admin.claims.v1@2.20.54 + - @wso2is/admin.connections.v1@2.20.54 + - @wso2is/admin.console-settings.v1@2.20.54 + - @wso2is/admin.extensions.v1@2.21.24 + - @wso2is/admin.identity-providers.v1@2.20.54 + - @wso2is/admin.login-flow.ai.v1@2.20.54 + - @wso2is/admin.oidc-scopes.v1@2.20.54 + - @wso2is/admin.organizations.v1@2.20.54 + - @wso2is/admin.roles.v2@2.20.54 + - @wso2is/admin.secrets.v1@2.20.54 + - @wso2is/admin.server-configurations.v1@2.20.54 + - @wso2is/admin.userstores.v1@2.20.54 + - @wso2is/admin.wsfed-configuration.v1@2.20.54 + +## 2.21.23 + +### Patch Changes + +- [#6553](https://github.com/wso2/identity-apps/pull/6553) [`a533e58d21d759f0a27d804f17b042a2819a8955`](https://github.com/wso2/identity-apps/commit/a533e58d21d759f0a27d804f17b042a2819a8955) Thanks [@ImalshaG](https://github.com/ImalshaG)! - Add Trusted Apps UI to application configurations + +- Updated dependencies [[`a533e58d21d759f0a27d804f17b042a2819a8955`](https://github.com/wso2/identity-apps/commit/a533e58d21d759f0a27d804f17b042a2819a8955)]: + - @wso2is/admin.extensions.v1@2.21.23 + - @wso2is/i18n@2.4.7 + - @wso2is/admin.authentication-flow-builder.v1@2.20.53 + - @wso2is/admin.connections.v1@2.20.53 + - @wso2is/admin.console-settings.v1@2.20.53 + - @wso2is/admin.core.v1@2.21.23 + - @wso2is/admin.identity-providers.v1@2.20.53 + - @wso2is/admin.login-flow.ai.v1@2.20.53 + - @wso2is/admin.oidc-scopes.v1@2.20.53 + - @wso2is/admin.organizations.v1@2.20.53 + - @wso2is/admin.roles.v2@2.20.53 + - @wso2is/admin.branding.v1@2.20.53 + - @wso2is/admin.claims.v1@2.20.53 + - @wso2is/admin.server-configurations.v1@2.20.53 + - @wso2is/admin.userstores.v1@2.20.53 + - @wso2is/admin.authorization.v1@2.20.18 + - @wso2is/admin.secrets.v1@2.20.53 + - @wso2is/admin.wsfed-configuration.v1@2.20.53 + - @wso2is/admin.api-resources.v2@2.20.53 + +## 2.21.22 + +### Patch Changes + +- [#6409](https://github.com/wso2/identity-apps/pull/6409) [`1201f1179cda981617c35b6d9839abe768d5a394`](https://github.com/wso2/identity-apps/commit/1201f1179cda981617c35b6d9839abe768d5a394) Thanks [@DonOmalVindula](https://github.com/DonOmalVindula)! - Add app-wise branding feature UI + +- Updated dependencies [[`1201f1179cda981617c35b6d9839abe768d5a394`](https://github.com/wso2/identity-apps/commit/1201f1179cda981617c35b6d9839abe768d5a394)]: + - @wso2is/admin.extensions.v1@2.21.22 + - @wso2is/admin.branding.v1@2.20.52 + - @wso2is/admin.authentication-flow-builder.v1@2.20.52 + - @wso2is/admin.connections.v1@2.20.52 + - @wso2is/admin.console-settings.v1@2.20.52 + - @wso2is/admin.core.v1@2.21.22 + - @wso2is/admin.identity-providers.v1@2.20.52 + - @wso2is/admin.login-flow.ai.v1@2.20.52 + - @wso2is/admin.oidc-scopes.v1@2.20.52 + - @wso2is/admin.organizations.v1@2.20.52 + - @wso2is/admin.roles.v2@2.20.52 + - @wso2is/admin.claims.v1@2.20.52 + - @wso2is/admin.server-configurations.v1@2.20.52 + - @wso2is/admin.userstores.v1@2.20.52 + - @wso2is/admin.authorization.v1@2.20.17 + - @wso2is/admin.secrets.v1@2.20.52 + - @wso2is/admin.wsfed-configuration.v1@2.20.52 + - @wso2is/react-components@2.2.12 + - @wso2is/admin.api-resources.v2@2.20.52 + - @wso2is/form@2.0.71 + +## 2.21.21 + +### Patch Changes + +- Updated dependencies [[`8fa06039e0791823d9de3c290cb4e93557f77f81`](https://github.com/wso2/identity-apps/commit/8fa06039e0791823d9de3c290cb4e93557f77f81)]: + - @wso2is/admin.connections.v1@2.20.51 + - @wso2is/admin.extensions.v1@2.21.21 + - @wso2is/admin.authentication-flow-builder.v1@2.20.51 + - @wso2is/admin.core.v1@2.21.21 + - @wso2is/admin.identity-providers.v1@2.20.51 + - @wso2is/admin.organizations.v1@2.20.51 + - @wso2is/admin.roles.v2@2.20.51 + - @wso2is/admin.claims.v1@2.20.51 + - @wso2is/admin.console-settings.v1@2.20.51 + - @wso2is/admin.server-configurations.v1@2.20.51 + - @wso2is/admin.userstores.v1@2.20.51 + - @wso2is/admin.login-flow.ai.v1@2.20.51 + - @wso2is/admin.oidc-scopes.v1@2.20.51 + - @wso2is/admin.api-resources.v2@2.20.51 + - @wso2is/admin.secrets.v1@2.20.51 + - @wso2is/admin.wsfed-configuration.v1@2.20.51 + +## 2.21.20 + +### Patch Changes + +- [#6554](https://github.com/wso2/identity-apps/pull/6554) [`55402e8eeb65021310621f0f8c643effbdc805a5`](https://github.com/wso2/identity-apps/commit/55402e8eeb65021310621f0f8c643effbdc805a5) Thanks [@DonOmalVindula](https://github.com/DonOmalVindula)! - Fix issue with API resource authorization wizard in application edit + +- Updated dependencies [[`d376f489cceae4ab415dcf6ae1ffd536baa47f9a`](https://github.com/wso2/identity-apps/commit/d376f489cceae4ab415dcf6ae1ffd536baa47f9a)]: + - @wso2is/admin.extensions.v1@2.21.20 + - @wso2is/admin.authentication-flow-builder.v1@2.20.50 + - @wso2is/admin.claims.v1@2.20.50 + - @wso2is/admin.connections.v1@2.20.50 + - @wso2is/admin.console-settings.v1@2.20.50 + - @wso2is/admin.core.v1@2.21.20 + - @wso2is/admin.identity-providers.v1@2.20.50 + - @wso2is/admin.organizations.v1@2.20.50 + - @wso2is/admin.roles.v2@2.20.50 + - @wso2is/admin.server-configurations.v1@2.20.50 + - @wso2is/admin.userstores.v1@2.20.50 + - @wso2is/admin.login-flow.ai.v1@2.20.50 + - @wso2is/admin.oidc-scopes.v1@2.20.50 + - @wso2is/admin.api-resources.v2@2.20.50 + - @wso2is/admin.secrets.v1@2.20.50 + - @wso2is/admin.wsfed-configuration.v1@2.20.50 + +## 2.21.19 + +### Patch Changes + +- Updated dependencies []: + - @wso2is/admin.claims.v1@2.20.49 + - @wso2is/admin.console-settings.v1@2.20.49 + - @wso2is/admin.core.v1@2.21.19 + - @wso2is/admin.extensions.v1@2.21.19 + - @wso2is/admin.organizations.v1@2.20.49 + - @wso2is/admin.roles.v2@2.20.49 + - @wso2is/admin.server-configurations.v1@2.20.49 + - @wso2is/admin.connections.v1@2.20.49 + - @wso2is/admin.identity-providers.v1@2.20.49 + - @wso2is/admin.login-flow.ai.v1@2.20.49 + - @wso2is/admin.oidc-scopes.v1@2.20.49 + - @wso2is/admin.api-resources.v2@2.20.49 + - @wso2is/admin.authentication-flow-builder.v1@2.20.49 + - @wso2is/admin.secrets.v1@2.20.49 + - @wso2is/admin.userstores.v1@2.20.49 + - @wso2is/admin.wsfed-configuration.v1@2.20.49 + +## 2.21.18 + +### Patch Changes + +- Updated dependencies [[`1e079568c0ba1f4e158ec9a666df58c2f7c17d02`](https://github.com/wso2/identity-apps/commit/1e079568c0ba1f4e158ec9a666df58c2f7c17d02)]: + - @wso2is/admin.identity-providers.v1@2.20.48 + - @wso2is/admin.connections.v1@2.20.48 + - @wso2is/admin.extensions.v1@2.21.18 + - @wso2is/admin.authentication-flow-builder.v1@2.20.48 + - @wso2is/admin.console-settings.v1@2.20.48 + - @wso2is/admin.core.v1@2.21.18 + - @wso2is/admin.login-flow.ai.v1@2.20.48 + - @wso2is/admin.organizations.v1@2.20.48 + - @wso2is/admin.roles.v2@2.20.48 + - @wso2is/admin.server-configurations.v1@2.20.48 + - @wso2is/admin.claims.v1@2.20.48 + - @wso2is/admin.userstores.v1@2.20.48 + - @wso2is/admin.oidc-scopes.v1@2.20.48 + - @wso2is/admin.api-resources.v2@2.20.48 + - @wso2is/admin.secrets.v1@2.20.48 + - @wso2is/admin.wsfed-configuration.v1@2.20.48 + +## 2.21.17 + +### Patch Changes + +- Updated dependencies [[`c58df1f13afd6ccc28cc129518ac86bab6419744`](https://github.com/wso2/identity-apps/commit/c58df1f13afd6ccc28cc129518ac86bab6419744)]: + - @wso2is/admin.extensions.v1@2.21.17 + - @wso2is/admin.authentication-flow-builder.v1@2.20.47 + - @wso2is/admin.claims.v1@2.20.47 + - @wso2is/admin.connections.v1@2.20.47 + - @wso2is/admin.console-settings.v1@2.20.47 + - @wso2is/admin.core.v1@2.21.17 + - @wso2is/admin.identity-providers.v1@2.20.47 + - @wso2is/admin.organizations.v1@2.20.47 + - @wso2is/admin.roles.v2@2.20.47 + - @wso2is/admin.server-configurations.v1@2.20.47 + - @wso2is/admin.userstores.v1@2.20.47 + - @wso2is/admin.login-flow.ai.v1@2.20.47 + - @wso2is/admin.oidc-scopes.v1@2.20.47 + - @wso2is/admin.api-resources.v2@2.20.47 + - @wso2is/admin.secrets.v1@2.20.47 + - @wso2is/admin.wsfed-configuration.v1@2.20.47 + ## 2.21.16 ### Patch Changes diff --git a/features/admin.applications.v1/components/api-authorization/wizard/authorize-api-resource.tsx b/features/admin.applications.v1/components/api-authorization/wizard/authorize-api-resource.tsx index e7ae765d3fb..c8eba0d73ae 100644 --- a/features/admin.applications.v1/components/api-authorization/wizard/authorize-api-resource.tsx +++ b/features/admin.applications.v1/components/api-authorization/wizard/authorize-api-resource.tsx @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). + * Copyright (c) 2023-2024, WSO2 LLC. (https://www.wso2.com). * * WSO2 LLC. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -543,8 +543,6 @@ export const AuthorizeAPIResource: FunctionComponent - - { isScopeSelectDropdownReady ? ( @@ -711,6 +709,7 @@ export const AuthorizeAPIResource: FunctionComponent @@ -784,7 +783,7 @@ export const AuthorizeAPIResource: FunctionComponent { t("extensions:develop.applications.edit.sections." + "apiAuthorization.sections.apiSubscriptions.wizards." + diff --git a/features/admin.applications.v1/components/edit-application.tsx b/features/admin.applications.v1/components/edit-application.tsx index 78738abb703..581d88fc70b 100644 --- a/features/admin.applications.v1/components/edit-application.tsx +++ b/features/admin.applications.v1/components/edit-application.tsx @@ -17,6 +17,7 @@ */ import { Show } from "@wso2is/access-control"; +import { BrandingPreferencesConstants } from "@wso2is/admin.branding.v1/constants"; import { AppState, CORSOriginsListInterface, @@ -205,6 +206,8 @@ export const EditApplication: FunctionComponent = const [ isDisableInProgress, setIsDisableInProgress ] = useState(false); const [ enableStatus, setEnableStatus ] = useState(false); const [ showDisableConfirmationModal, setShowDisableConfirmationModal ] = useState(false); + const brandingDisabledFeatures: string[] = useSelector((state: AppState) => + state?.config?.ui?.features?.branding?.disabledFeatures); /** * Called when an application updates. @@ -247,7 +250,9 @@ export const EditApplication: FunctionComponent = if ( isFeatureEnabled(featureConfig?.applications, ApplicationManagementConstants.FEATURE_DICTIONARY.get("APPLICATION_EDIT_GENERAL_SETTINGS")) - && !isSubOrganization() + && (isSubOrganization() ? + !brandingDisabledFeatures.includes( + BrandingPreferencesConstants.APP_WISE_BRANDING_FEATURE_TAG): true) && !isMyAccount ) { if (applicationConfig.editApplication. @@ -1056,6 +1061,8 @@ export const EditApplication: FunctionComponent = onUpdate={ handleApplicationUpdate } featureConfig={ featureConfig } template={ template } + isBrandingSectionHidden={ brandingDisabledFeatures.includes(BrandingPreferencesConstants. + APP_WISE_BRANDING_FEATURE_TAG) } readOnly={ readOnly || applicationConfig.editApplication.getTabPanelReadOnlyStatus( "APPLICATION_EDIT_GENERAL_SETTINGS", application) } data-componentid={ `${ componentId }-general-settings` } diff --git a/features/admin.applications.v1/components/forms/advanced-configurations-form.scss b/features/admin.applications.v1/components/forms/advanced-configurations-form.scss index 3b1c855b4cb..9f658c8b3e0 100644 --- a/features/admin.applications.v1/components/forms/advanced-configurations-form.scss +++ b/features/admin.applications.v1/components/forms/advanced-configurations-form.scss @@ -19,3 +19,7 @@ .client-attestation-info-alert { margin-bottom: 1rem; } + +.fido-enabled-warn-alert { + margin-top: 1rem; +} diff --git a/features/admin.applications.v1/components/forms/advanced-configurations-form.tsx b/features/admin.applications.v1/components/forms/advanced-configurations-form.tsx index 9c0e8dc8165..b44ad538671 100644 --- a/features/admin.applications.v1/components/forms/advanced-configurations-form.tsx +++ b/features/admin.applications.v1/components/forms/advanced-configurations-form.tsx @@ -24,15 +24,19 @@ import { isFeatureEnabled } from "@wso2is/core/helpers"; import { AlertInterface, AlertLevels, + IdentifiableComponentInterface, TestableComponentInterface } from "@wso2is/core/models"; import { Field, Form, FormPropsInterface } from "@wso2is/form"; -import { GenericIcon, Heading } from "@wso2is/react-components"; +import { ConfirmationModal, DocumentationLink, GenericIcon, Heading, URLInput, useDocumentation } + from "@wso2is/react-components"; import isEmpty from "lodash-es/isEmpty"; import React, { + Fragment, FunctionComponent, MutableRefObject, ReactElement, + useCallback, useRef, useState } from "react"; @@ -51,7 +55,7 @@ import "./advanced-configurations-form.scss"; /** * Advanced Configurations for the Application. */ -interface AdvancedConfigurationsFormPropsInterface extends TestableComponentInterface { +interface AdvancedConfigurationsFormPropsInterface extends TestableComponentInterface, IdentifiableComponentInterface { config: AdvancedConfigurationsInterface; onSubmit: (values: any) => void; /** @@ -91,15 +95,19 @@ export const AdvancedConfigurationsForm: FunctionComponent state?.config?.ui?.features); const isApplicationNativeAuthenticationEnabled: boolean = isFeatureEnabled(featureConfig?.applications, ApplicationManagementConstants.FEATURE_DICTIONARY.get("APPLICATION_NATIVE_AUTHENTICATION")); + const isTrustedAppsFeatureEnabled: boolean = isFeatureEnabled(featureConfig?.applications, + ApplicationManagementConstants.FEATURE_DICTIONARY.get("TRUSTED_APPS")); const formRef: MutableRefObject = useRef(null); @@ -111,6 +119,16 @@ export const AdvancedConfigurationsForm: FunctionComponent(false); + const [ isFIDOTrustedAppsEnabled, setIsFIDOTrustedAppsEnabled ] = useState( + config?.trustedAppConfiguration?.isFIDOTrustedApp + ); + const [ isConsentGranted, setIsConsentGranted ] = useState( + config?.trustedAppConfiguration?.isConsentGranted + ); + const [ showFIDOConfirmationModal, setShowFIDOConfirmationModal ] = useState(false); + const [ showThumbprintsError, setShowThumbprinstError ] = useState(false); + const [ clearThumbprintsError, setClearThumbprinstError ] = useState(false); + const [ thumbprints, setThumbprints ] = useState(config?.trustedAppConfiguration?.androidThumbprints?.join(",")); /** * Update configuration. @@ -143,8 +161,8 @@ export const AdvancedConfigurationsForm: FunctionComponent state?.config?.ui?.isTrustedAppConsentRequired); + + /** + * To check if the platform settings UIs should be disabled. + */ + const isPlatformSettingsUiDisabled: boolean = !isEnableClientAttestation && !isFIDOTrustedAppsEnabled; + /** * To handle the enableAPIBasedAuthentication checkbox. * @@ -194,129 +229,179 @@ export const AdvancedConfigurationsForm: FunctionComponent { + const validateForm: (values: AdvancedConfigurationsInterface) => AdvancedConfigurationsInterface = + useCallback((values: AdvancedConfigurationsInterface): AdvancedConfigurationsInterface => { const errors: AdvancedConfigurationsInterface = { androidAttestationServiceCredentials: undefined, - androidPackageName: undefined + androidPackageName: undefined, + androidThumbprints: undefined }; - // Validate the android package name and the android attestation service credentials if one of them is empty for - // the client attestation to be enabled for Android. - if (!values.androidPackageName?.toString().trim() - && values.androidAttestationServiceCredentials?.toString().trim()) { + let androidAttestationServiceCredentialsObject : JSON; + + if (values.enableClientAttestation) { + try { + if(!isEmpty(values.androidAttestationServiceCredentials)) { + androidAttestationServiceCredentialsObject = + JSON.parse(values.androidAttestationServiceCredentials); + } + // Validate the android package name and android attestation service credentials for client attestation. + // If one of them is empty throw an error. + if (!values.androidPackageName?.toString().trim() + && Object.keys(androidAttestationServiceCredentialsObject).length) { - errors.androidPackageName = t("applications:forms.advancedConfig." + - "sections.applicationNativeAuthentication.fields." + - "android.fields.androidPackageName.validations.empty"); - } else if (values.androidPackageName?.toString().trim() - && !values.androidAttestationServiceCredentials?.toString().trim()) { + errors.androidPackageName = t("applications:forms.advancedConfig." + + "sections.platformSettings.fields." + + "android.fields.androidPackageName.validations.emptyForAttestation"); + } else if (values.androidPackageName?.toString().trim() + && !Object.keys(androidAttestationServiceCredentialsObject).length) { - errors.androidAttestationServiceCredentials = t("applications:forms." + - "advancedConfig.sections.applicationNativeAuthentication.fields." + - "android.fields.androidAttestationServiceCredentials.validations.empty"); + errors.androidAttestationServiceCredentials = t("applications:forms." + + "advancedConfig.sections.clientAttestation.fields." + + "androidAttestationServiceCredentials.validations.empty"); + } + } catch (error) { + errors.androidAttestationServiceCredentials = t("applications:forms." + + "advancedConfig.sections.clientAttestation.fields." + + "androidAttestationServiceCredentials.validations.invalid"); + } + } + if (values.enableFIDOTrustedApps) { + // Validate the android package name and android thumbprints for FIDO trusted apps. + // If one of them is empty throw an error. + if (!values.androidPackageName?.toString().trim() + && thumbprints?.toString().trim()) { + + errors.androidPackageName = t("applications:forms.advancedConfig." + + "sections.platformSettings.fields." + + "android.fields.androidPackageName.validations.emptyForFIDO"); + } else if (values.androidPackageName?.toString().trim() + && !thumbprints?.toString().trim()) { + + setShowThumbprinstError(true); + } else { + setClearThumbprinstError(true); + } } return errors; + }, [ thumbprints ]); + + /** + * Handle FIDO activation value with confirmation. Deactivation is not confirmed + */ + const handleFIDOActivation = (shouldActivate: boolean) => { + shouldActivate ? + (isTrustedAppConsentRequired ? setShowFIDOConfirmationModal(true) : setIsFIDOTrustedAppsEnabled(true)) + : setIsFIDOTrustedAppsEnabled(false); }; return ( -
{ - updateConfiguration(values); - } } - > -