Merge branch 'master' into sort-dynamic-connectors

.changeset/weak-jeans-know.md

@@ -0,0 +1,5 @@
+---
+"@wso2is/console": patch
+---
+
+Remove application sharing from M2M template

apps/console/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @wso2is/console
 
+## 2.3.4
+
+### Patch Changes
+
+- [#4369](https://github.com/wso2/identity-apps/pull/4369) [`1c69ab3264`](https://github.com/wso2/identity-apps/commit/1c69ab3264314565af738362c44152598100ddcc) Thanks [@SujanSanjula96](https://github.com/SujanSanjula96)! - Generalize the i18n strings in API Resource related UIs
+
+* [#4345](https://github.com/wso2/identity-apps/pull/4345) [`c5a5843571`](https://github.com/wso2/identity-apps/commit/c5a58435715958a41ded30dcc772181573126469) Thanks [@DilshanSenarath](https://github.com/DilshanSenarath)! - Include a dependency on user store changes to retrieve the updated user list
+
+- [#4357](https://github.com/wso2/identity-apps/pull/4357) [`04d4995082`](https://github.com/wso2/identity-apps/commit/04d4995082c7b79d2548d7ca8d2fbf1956c4e076) Thanks [@SujanSanjula96](https://github.com/SujanSanjula96)! - Fix API Authorization issue
+
+* [#4349](https://github.com/wso2/identity-apps/pull/4349) [`825f22c6cb`](https://github.com/wso2/identity-apps/commit/825f22c6cbc2d68e5d574e120806ab557fb12e13) Thanks [@NipuniBhagya](https://github.com/NipuniBhagya)! - Fix issue with OIDC scope list search
+
+- [#4367](https://github.com/wso2/identity-apps/pull/4367) [`92fa8e7fc1`](https://github.com/wso2/identity-apps/commit/92fa8e7fc165ce61c8816979af8485169b216c94) Thanks [@NipuniBhagya](https://github.com/NipuniBhagya)! - Fix borken connector icons in the visual editor
+
+* [#4359](https://github.com/wso2/identity-apps/pull/4359) [`72b6c71250`](https://github.com/wso2/identity-apps/commit/72b6c71250161090c90ad46858a068316018e05c) Thanks [@Achintha444](https://github.com/Achintha444)! - fix `tenantDomain` not setting properly.
+
+- [#4363](https://github.com/wso2/identity-apps/pull/4363) [`dfe08df335`](https://github.com/wso2/identity-apps/commit/dfe08df33511f0901d3500e9a130fdded0c7ad23) Thanks [@Rashmini](https://github.com/Rashmini)! - Update icons in side panel
+
+* [#4361](https://github.com/wso2/identity-apps/pull/4361) [`55fb31c9d8`](https://github.com/wso2/identity-apps/commit/55fb31c9d845516de0277dae046ade742a6e38f4) Thanks [@DilshanSenarath](https://github.com/DilshanSenarath)! - Fix the issues in set Password via Email option from Add User form
+
+- [#4355](https://github.com/wso2/identity-apps/pull/4355) [`dd77136f3a`](https://github.com/wso2/identity-apps/commit/dd77136f3a0ab9ab7fbfcbfa336ef83c90628a8d) Thanks [@savindi7](https://github.com/savindi7)! - Move Multi Attribute Login connector to Login & Registration
+
+* [#4368](https://github.com/wso2/identity-apps/pull/4368) [`15f2bb0341`](https://github.com/wso2/identity-apps/commit/15f2bb0341d9f1b52f65a13e2074d220799c825e) Thanks [@Achintha444](https://github.com/Achintha444)! - update hasRequiredScopes function
+
+- [#4313](https://github.com/wso2/identity-apps/pull/4313) [`96662667e2`](https://github.com/wso2/identity-apps/commit/96662667e21c576fe7791a08fc02e8da5311fa44) Thanks [@Shenali-SJ](https://github.com/Shenali-SJ)! - Revamp the breadcrumb
+
+* [#4365](https://github.com/wso2/identity-apps/pull/4365) [`a06dc54272`](https://github.com/wso2/identity-apps/commit/a06dc54272bce7720ee51e49be63f9c175cec4c2) Thanks [@Rashmini](https://github.com/Rashmini)! - Add minor improvement to org-discovery feature
+
+* Updated dependencies [[`825f22c6cb`](https://github.com/wso2/identity-apps/commit/825f22c6cbc2d68e5d574e120806ab557fb12e13), [`72b6c71250`](https://github.com/wso2/identity-apps/commit/72b6c71250161090c90ad46858a068316018e05c), [`15f2bb0341`](https://github.com/wso2/identity-apps/commit/15f2bb0341d9f1b52f65a13e2074d220799c825e), [`905d37424a`](https://github.com/wso2/identity-apps/commit/905d37424a5ad496340332d2acd38cc2afbc2762), [`a06dc54272`](https://github.com/wso2/identity-apps/commit/a06dc54272bce7720ee51e49be63f9c175cec4c2)]:
+  - @wso2is/i18n@2.0.22
+  - @wso2is/core@2.0.8
+  - @wso2is/theme@2.0.25
+
 ## 2.3.3
 
 ### Patch Changes

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

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.identity.apps</groupId>
         <artifactId>identity-apps-console</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

apps/console/java/pom.xml

@@ -24,7 +24,7 @@
     <groupId>org.wso2.identity.apps</groupId>
     <artifactId>identity-apps-console</artifactId>
     <packaging>pom</packaging>
-    <version>2.3.3-SNAPSHOT</version>
+    <version>2.3.5-SNAPSHOT</version>
     <name>WSO2 Identity Server Console - Parent</name>
     <description>WSO2 Identity Server Console Parent</description>
 

apps/console/java/webapp/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.identity.apps</groupId>
         <artifactId>identity-apps-console</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

apps/console/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@wso2is/console",
-    "version": "2.3.3",
+    "version": "2.3.4",
     "description": "WSO2 Identity Server Console",
     "author": "WSO2",
     "license": "Apache-2.0",
@@ -52,12 +52,12 @@
         "@oxygen-ui/react": "^1.6.0",
         "@oxygen-ui/react-icons": "^1.6.0",
         "@wso2is/access-control": "^2.0.2",
-        "@wso2is/core": "^2.0.7",
+        "@wso2is/core": "^2.0.8",
         "@wso2is/form": "^2.0.4",
         "@wso2is/forms": "^2.0.0",
-        "@wso2is/i18n": "^2.0.21",
+        "@wso2is/i18n": "^2.0.22",
         "@wso2is/react-components": "^2.0.10",
-        "@wso2is/theme": "^2.0.24",
+        "@wso2is/theme": "^2.0.25",
         "@wso2is/validation": "^2.0.0",
         "@wso2is/common": "^2.0.3",
         "@wso2is/dynamic-forms": "^2.0.5",

apps/console/src/extensions/components/api-resources/components/wizard/add-api-resource-steps/add-api-resource-authorization.tsx

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2023, 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
@@ -21,6 +21,8 @@ import { Field, Form } from "@wso2is/form";
 import { DocumentationLink, Message, useDocumentation } from "@wso2is/react-components";
 import React, { FunctionComponent, ReactElement } from "react";
 import { Trans, useTranslation } from "react-i18next";
+import { useSelector } from "react-redux";
+import { AppState } from "../../../../../../features/core/store";
 import { ExtendedFeatureConfigInterface } from "../../../../../configs/models";
 import { AuthorizationAPIResourceInterface } from "../../../models";
 
@@ -69,6 +71,7 @@ export const AddAPIResourceAuthorization: FunctionComponent<AddAPIResourceAuthor
 
     const { t } = useTranslation();
     const { getLink } = useDocumentation();
+    const productName: string = useSelector((state: AppState) => state.config.ui.productName);
 
     /**
      * Prepare form values for submitting.
@@ -94,7 +97,7 @@ export const AddAPIResourceAuthorization: FunctionComponent<AddAPIResourceAuthor
                 content={ 
                     (<>
                         { t("extensions:develop.apiResource.wizard.addApiResource.steps.authorization.form." + 
-                            "rbacMessage") }
+                            "rbacMessage", { productName }) }
                         <DocumentationLink
                             link={ getLink("develop.apiResources.addAPIResource.rbacInfoBox.learnMore") }
                         >

apps/console/src/extensions/components/api-resources/components/wizard/add-api-resource-steps/add-api-resource-basic.tsx

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2023, 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
@@ -21,7 +21,9 @@ import { Field, FormField, FormValue, Forms, Validation } from "@wso2is/forms";
 import { Hint } from "@wso2is/react-components";
 import React, { FunctionComponent, MutableRefObject, ReactElement, useRef } from "react";
 import { Trans, useTranslation } from "react-i18next";
+import { useSelector } from "react-redux";
 import { Grid } from "semantic-ui-react";
+import { AppState } from "../../../../../../features/core/store";
 import { ExtendedFeatureConfigInterface } from "../../../../../configs/models";
 import { getAPIResourcesForIdenitifierValidation } from "../../../api";
 import { APIResourcesConstants } from "../../../constants";
@@ -80,6 +82,7 @@ export const AddAPIResourceBasic: FunctionComponent<AddAPIResourceBasicInterface
 
     const { t } = useTranslation();
     const identifierRef: MutableRefObject<FormField> = useRef<FormField>();
+    const productName: string = useSelector((state: AppState) => state.config.ui.productName);
 
     /**
      * Prepare form values for submitting.
@@ -146,7 +149,8 @@ export const AddAPIResourceBasic: FunctionComponent<AddAPIResourceBasicInterface
                         <Hint className="mb-0">
                             <Trans 
                                 i18nKey= { "extensions:develop.apiResource.wizard.addApiResource.steps.basic." +
-                                    "form.fields.identifier.hint" }>
+                                    "form.fields.identifier.hint" }
+                                tOptions={ { productName } }>
                                 We recommend using a URI as the identifier, but you do not need to make the URI 
                                 publicly available since Asgardeo will not access your API. 
                                 Asgardeo will use this identifier value as the audience(aud) claim in the 
@@ -173,7 +177,7 @@ export const AddAPIResourceBasic: FunctionComponent<AddAPIResourceBasicInterface
                         />
                         <Hint className="mb-0">
                             { t("extensions:develop.apiResource.wizard.addApiResource.steps.basic.form.fields." +
-                                "name.hint") }
+                                "name.hint", { productName }) }
                         </Hint>
                     </Grid.Column>
                 </Grid.Row>

apps/console/src/extensions/components/application/components/api-authorization/wizard/authorize-api-resource.tsx

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2023, 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
@@ -35,9 +35,10 @@ import {
 } from "@wso2is/react-components";
 import React, { FunctionComponent, ReactElement, SyntheticEvent, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { Dispatch } from "redux";
 import { Dropdown, DropdownItemProps, DropdownProps, Grid, Header, Modal } from "semantic-ui-react";
+import { AppState } from "../../../../../../features/core/store";
 import { useAPIResources } from "../../../../api-resources/api";
 import { APIResourcesConstants } from "../../../../api-resources/constants";
 import { APIResourceInterface, APIResourcePermissionInterface } from "../../../../api-resources/models";
@@ -78,6 +79,7 @@ export const AuthorizeAPIResource: FunctionComponent<AuthorizeAPIResourcePropsIn
     const dispatch: Dispatch = useDispatch();
     const { getLink } = useDocumentation();
     const [ submitForm, setSubmitForm ] = useTrigger();
+    const productName: string = useSelector((state: AppState) => state.config.ui.productName);
 
     const [ allAPIResourcesListData, setAllAPIResourcesListData ] = useState<APIResourceInterface[]>([]);
     const [ isSubmitting, setIsSubmitting ] = useState<boolean>(false);
@@ -473,7 +475,8 @@ export const AuthorizeAPIResource: FunctionComponent<AuthorizeAPIResourcePropsIn
                                         <Popup
                                             content={ t("extensions:develop.applications.edit.sections." +
                                                 "apiAuthorization.sections.apiSubscriptions.wizards." +
-                                                "authorizeAPIResource.rbacPolicyMessage") }
+                                                "authorizeAPIResource.rbacPolicyMessage", 
+                                            { productName }) }
                                             disabled={ !selectedAPIResource
                                                 || !selectedAPIResourceRequiresAuthorization }
                                             inverted

apps/console/src/extensions/i18n/resources/en-US/extensions.ts

@@ -703,14 +703,14 @@ export const extensions: Extensions = {
                                     name: {
                                         emptyValidate: "Display name cannot be empty",
                                         label: "Display Name",
-                                        hint: "Meaningful name to identify your API resource in Asgardeo.",
+                                        hint: "Meaningful name to identify your API resource in {{ productName }}.",
                                         placeholder: "Bookings API"
                                     },
                                     identifier: {
                                         emptyValidate: "Identifier cannot be empty",
                                         alreadyExistsError: "Identifier already exists in the organization. Please choose a different one.",
                                         invalid: "Identifier cannot contain spaces",
-                                        hint: "We recommend using a URI as the identifier, but you do not need to make the URI publicly available since Asgardeo will not access your API. Asgardeo will use this identifier value as the audience(aud) claim in the issued JWT tokens. <1>This field should be unique; once created, it is not editable.</1>",
+                                        hint: "We recommend using a URI as the identifier, but you do not need to make the URI publicly available since {{ productName }} will not access your API. {{ productName }} will use this identifier value as the audience(aud) claim in the issued JWT tokens. <1>This field should be unique; once created, it is not editable.</1>",
                                         label: "Identifier",
                                         placeholder: "https://api.bookmyhotel.com"
                                     },
@@ -724,7 +724,7 @@ export const extensions: Extensions = {
                         authorization: {
                             stepTitle: "Authorization",
                             form: {
-                                rbacMessage: "At present, Asgardeo exclusively supports Role-Based Access Control (RBAC) for authorization.",
+                                rbacMessage: "At present, {{ productName }} exclusively supports Role-Based Access Control (RBAC) for authorization.",
                                 fields: {
                                     authorize: {
                                         label: "Requires authorization",
@@ -919,7 +919,7 @@ export const extensions: Extensions = {
                                                 hint: "Select the policy to authorize the API for the application."
                                             }
                                         },
-                                        rbacPolicyMessage: "This API resource requires authorization and Asgardeo exclusively supports Role-Based Access Control (RBAC) for authorization.",
+                                        rbacPolicyMessage: "This API resource requires authorization and {{ productName }} exclusively supports Role-Based Access Control (RBAC) for authorization.",
                                         buttons: {
                                             finish: "Finish",
                                             cancel: "Cancel"

apps/console/src/extensions/i18n/resources/fr-FR/extensions.ts

@@ -703,14 +703,14 @@ export const extensions: Extensions = {
                                     name: {
                                         emptyValidate: "Le nom de l'affichage ne peut pas être vide",
                                         label: "Afficher un nom",
-                                        hint: "Nom significatif pour identifier votre ressource API dans Asgardeo.",
+                                        hint: "Nom significatif pour identifier votre ressource API dans {{ productName }}.",
                                         placeholder: "API des réservations"
                                     },
                                     identifier: {
                                         emptyValidate: "L'identifiant ne peut pas être vide",
                                         alreadyExistsError: "L'identifiant existe déjà dans l'organisation.Veuillez en choisir un autre",
                                         invalid: "L'identifiant ne peut pas contenir d'espaces",
-                                        hint: "Nous vous recommandons d'utiliser une URI comme identifiant, mais vous n'avez pas besoin de rendre l'URI accessible au public car Asgardeo n'accèdera pas à votre API. Asgardeo utilisera cette valeur d'identifiant comme la réclamation d'audience(aud) dans les jetons JWT émis. <1>Ce champ devrait être unique;Une fois créé, il n'est pas modifiable.</1>",
+                                        hint: "Nous vous recommandons d'utiliser une URI comme identifiant, mais vous n'avez pas besoin de rendre l'URI accessible au public car {{ productName }} n'accèdera pas à votre API. {{ productName }} utilisera cette valeur d'identifiant comme la réclamation d'audience(aud) dans les jetons JWT émis. <1>Ce champ devrait être unique;Une fois créé, il n'est pas modifiable.</1>",
                                         label: "Identifiant",
                                         placeholder: "https://api.bookmyhotel.com"
                                     },
@@ -724,7 +724,7 @@ export const extensions: Extensions = {
                         authorization: {
                             stepTitle: "Autorisation",
                             form: {
-                                rbacMessage: "À l'heure actuelle, Asgardeo prend en charge exclusivement le contrôle d'accès basé sur les rôles (RBAC) pour l'autorisation.",
+                                rbacMessage: "À l'heure actuelle, {{ productName }} prend en charge exclusivement le contrôle d'accès basé sur les rôles (RBAC) pour l'autorisation.",
                                 fields: {
                                     authorize: {
                                         label: "Nécessite une autorisation",
@@ -920,7 +920,7 @@ export const extensions: Extensions = {
                                                 hint: "Sélectionnez la politique pour autoriser l'API pour l'application."
                                             }
                                         },
-                                        rbacPolicyMessage: "Cette ressource API nécessite l'autorisation et Asgardeo prend en charge exclusivement le contrôle d'accès basé sur les rôles (RBAC) pour l'autorisation.",
+                                        rbacPolicyMessage: "Cette ressource API nécessite l'autorisation et {{ productName }} prend en charge exclusivement le contrôle d'accès basé sur les rôles (RBAC) pour l'autorisation.",
                                         buttons: {
                                             finish: "Finir",
                                             cancel: "Annuler"