Merge remote-tracking branch 'origin/master' into fix/invite-parent

wso2 · Dec 18, 2023 · 6946bc3 · 6946bc3
2 parents 6cf589a + 566d883
commit 6946bc3
Show file tree

Hide file tree

Showing 69 changed files with 519 additions and 519 deletions.
diff --git a/.changeset/old-rings-attack.md b/.changeset/old-rings-attack.md
@@ -0,0 +1,8 @@
+---
+"@wso2is/console": patch
+"@wso2is/myaccount": patch
+"@wso2is/identity-apps-core": patch
+"@wso2is/i18n": patch
+---
+
+Fix typo and exclude back tick from username.
diff --git a/apps/console/CHANGELOG.md b/apps/console/CHANGELOG.md
@@ -1,5 +1,60 @@
 # @wso2is/console
 
+## 2.10.34
+
+### Patch Changes
+
+- [#5043](https://github.com/wso2/identity-apps/pull/5043) [`16d5e3da5a`](https://github.com/wso2/identity-apps/commit/16d5e3da5a8f3691bc32c4a0559e4d4536571fdd) Thanks [@brionmario](https://github.com/brionmario)! - [Legacy Mode] Fix Console/My Account browser path issues
+
+## 2.10.33
+
+### Patch Changes
+
+- [#5083](https://github.com/wso2/identity-apps/pull/5083) [`2653310a5b`](https://github.com/wso2/identity-apps/commit/2653310a5bdd7ec96985b4c2c0b7b2ccbdb4136a) Thanks [@pavinduLakshan](https://github.com/pavinduLakshan)! - Fix UI issues in displaying long usernames in dynamic prompt generic form
+
+- Updated dependencies [[`2653310a5b`](https://github.com/wso2/identity-apps/commit/2653310a5bdd7ec96985b4c2c0b7b2ccbdb4136a)]:
+  - @wso2is/theme@2.0.51
+
+## 2.10.32
+
+### Patch Changes
+
+- [#5078](https://github.com/wso2/identity-apps/pull/5078) [`1ed2dd20c6`](https://github.com/wso2/identity-apps/commit/1ed2dd20c661a8fcdf56b504d3b5a6e88fec9c37) Thanks [@DilshanSenarath](https://github.com/DilshanSenarath)! - Remove custom layout validation
+
+## 2.10.31
+
+### Patch Changes
+
+- [#5079](https://github.com/wso2/identity-apps/pull/5079) [`9629278841`](https://github.com/wso2/identity-apps/commit/96292788415abf16005b23515c17e5abede23a47) Thanks [@pavinduLakshan](https://github.com/pavinduLakshan)! - Decouple quickstart tab content to be provided through extensions
+
+## 2.10.30
+
+### Patch Changes
+
+- [#5075](https://github.com/wso2/identity-apps/pull/5075) [`0256394c2f`](https://github.com/wso2/identity-apps/commit/0256394c2f8c9e5d6d5150cf72ed38a283d9df58) Thanks [@DilshanSenarath](https://github.com/DilshanSenarath)! - Change the connection create error content
+
+- Updated dependencies [[`0256394c2f`](https://github.com/wso2/identity-apps/commit/0256394c2f8c9e5d6d5150cf72ed38a283d9df58)]:
+  - @wso2is/i18n@2.0.81
+
+## 2.10.29
+
+### Patch Changes
+
+- [#5072](https://github.com/wso2/identity-apps/pull/5072) [`d308d7509b`](https://github.com/wso2/identity-apps/commit/d308d7509b0f55ff50dd50ff3ea59dd465fd536a) Thanks [@nipunsampath](https://github.com/nipunsampath)! - Fix a NPE that occurs when assigning email domains in the absence of any created sub organizations.
+
+## 2.10.28
+
+### Patch Changes
+
+- [#5069](https://github.com/wso2/identity-apps/pull/5069) [`645dd00b56`](https://github.com/wso2/identity-apps/commit/645dd00b569c650b74763a56bfe82cad11e14b1c) Thanks [@nipunsampath](https://github.com/nipunsampath)! - Change the ParentOrgUserResultStatus values along with the backend improvement.
+
+* [#5054](https://github.com/wso2/identity-apps/pull/5054) [`9e869ae16a`](https://github.com/wso2/identity-apps/commit/9e869ae16a03daf86cad9fac4e72df66cb2f3ec8) Thanks [@ChanikaRuchini](https://github.com/ChanikaRuchini)! - Improve useRolesList API call
+
+- [#5028](https://github.com/wso2/identity-apps/pull/5028) [`9b4c61b72f`](https://github.com/wso2/identity-apps/commit/9b4c61b72fb370bba7230d3f6d3a18a53a79d70d) Thanks [@jeradrutnam](https://github.com/jeradrutnam)! - Fix logo misalignment
+
+- Updated dependencies [[`9b4c61b72f`](https://github.com/wso2/identity-apps/commit/9b4c61b72fb370bba7230d3f6d3a18a53a79d70d)]:
+  - @wso2is/theme@2.0.50
+
 ## 2.10.27
 
 ### 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
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.identity.apps</groupId>
         <artifactId>identity-apps-console</artifactId>
-        <version>2.10.27-SNAPSHOT</version>
+        <version>2.10.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...le/java/org.wso2.identity.apps.console.server.feature/resources/deployment.config.json.j2 b/...le/java/org.wso2.identity.apps.console.server.feature/resources/deployment.config.json.j2
@@ -77,8 +77,12 @@
     },
     {% endif %}
     "i18nResourcePath": "{{ console.i18n_resource_path }}",
-    {% if console.is_sass is defined %}
-        "isSaas": "{{ console.is_sass }}",
+    {% if console.is_saas is defined %}
+    "isSaas": {{ console.is_saas }},
+    {% elif legacy_mode.enabled is defined %}
+    "isSaas": {{ legacy_mode.enabled }},
+    {% elif legacy_authz_runtime.enable is defined %}
+    "isSaas": {{ legacy_authz_runtime.enable }},
     {% endif %}
     "loginCallbackPath": "{{ console.login_callback_path }}",
     "logoutCallbackPath": "{{ console.logout_callback_path }}",

diff --git a/apps/console/java/pom.xml b/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.10.27-SNAPSHOT</version>
+    <version>2.10.35-SNAPSHOT</version>
     <name>WSO2 Identity Server Console - Parent</name>
     <description>WSO2 Identity Server Console Parent</description>
 

diff --git a/apps/console/java/webapp/pom.xml b/apps/console/java/webapp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.identity.apps</groupId>
         <artifactId>identity-apps-console</artifactId>
-        <version>2.10.27-SNAPSHOT</version>
+        <version>2.10.35-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/apps/console/package.json b/apps/console/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@wso2is/console",
-    "version": "2.10.27",
+    "version": "2.10.34",
     "description": "WSO2 Identity Server Console",
     "author": "WSO2",
     "license": "Apache-2.0",
@@ -55,9 +55,9 @@
         "@wso2is/core": "^2.0.23",
         "@wso2is/form": "^2.0.20",
         "@wso2is/forms": "^2.0.8",
-        "@wso2is/i18n": "^2.0.80",
+        "@wso2is/i18n": "^2.0.81",
         "@wso2is/react-components": "^2.0.28",
-        "@wso2is/theme": "^2.0.49",
+        "@wso2is/theme": "^2.0.51",
         "@wso2is/validation": "^2.0.2",
         "@wso2is/common": "^2.0.15",
         "@wso2is/dynamic-forms": "^2.0.19",

diff --git a/apps/console/src/extensions/application-templates/templates/oidc-web-application/meta.ts b/apps/console/src/extensions/application-templates/templates/oidc-web-application/meta.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2021-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
@@ -16,29 +16,7 @@
  * under the License.
  */
 
-export const SDKMeta = {
-    dotNet: {
-        readme: "https://github.com/asgardeo/asgardeo-dotnet-oidc-sdk/blob/master/README.md",
-        sample: {
-            artifact: "https://github.com/asgardeo/asgardeo-dotnet-oidc-sdk/releases/download/v0.1.1/" +
-                "PickupManagerOIDC-v0.1.1.msi",
-            repository: "https://github.com/asgardeo/asgardeo-dotnet-oidc-sdk/tree/master/Sample"
-        }
-    },
-    tomcatOIDCAgent: {
-        catalog: "https://github.com/asgardeo/asgardeo-tomcat-oidc-agent/blob/master/io.asgardeo.tomcat.oidc." +
-            "sample/src/main/resources/configuration-catalog.md",
-        integrate: {
-            defaultCallbackContext: "/oauth2client"
-        },
-        readme: "https://github.com/asgardeo/asgardeo-tomcat-oidc-agent/blob/master/README.md",
-        sample: {
-            artifact: "https://github.com/asgardeo/asgardeo-tomcat-oidc-agent/releases/latest/download/oidc-sample" +
-                "-app.war",
-            home: "/oidc-sample-app/index.html",
-            repository: "https://github.com/asgardeo/asgardeo-tomcat-oidc-agent/tree/master/io.asgardeo.tomcat." +
-                "oidc.sample",
-            sigInRedirectURL: "/oidc-sample-app/oauth2client"
-        }
-    }
-};
+import { OIDCSDKMeta } from "./models";
+import { applicationConfig } from "../../../configs/application";
+
+export const SDKMeta: OIDCSDKMeta = applicationConfig?.quickstart?.oidcWeb;
diff --git a/apps/console/src/extensions/application-templates/templates/oidc-web-application/models.ts b/apps/console/src/extensions/application-templates/templates/oidc-web-application/models.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2021-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
@@ -36,3 +36,26 @@ export interface OIDCTryoutSampleConfigInterface {
     serverOrigin: string,
 }
 
+export interface OIDCSDKMeta {
+    dotNet: {
+        readme: string,
+        sample: {
+            artifact: string,
+            repository: string
+        }
+    },
+    tomcatOIDCAgent: {
+        catalog: string,
+        integrate: {
+            defaultCallbackContext: string
+        },
+        readme: string,
+        sample: {
+            artifact: string,
+            home: string,
+            repository: string,
+            sigInRedirectURL: string
+        }
+    }
+}
+
diff --git a/apps/console/src/extensions/application-templates/templates/saml-web-application/meta.ts b/apps/console/src/extensions/application-templates/templates/saml-web-application/meta.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2021-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
@@ -16,17 +16,7 @@
  * under the License.
  */
 
-export const SDKMeta = {
-    tomcatSAMLAgent: {
-        catalog: "https://github.com/asgardeo/asgardeo-tomcat-saml-agent/blob/master/" +
-            "io.asgardeo.tomcat.saml.agent.sample/src/main/resources/configuration-catalog.md",
-        readme: "https://github.com/asgardeo/asgardeo-tomcat-saml-agent/blob/master/README.md",
-        sample: {
-            acsURLSuffix: "/sample-app/home.jsp",
-            artifact: "https://github.com/asgardeo/asgardeo-tomcat-saml-agent/releases/download/v0.1.43/sample-app.war",
-            home: "/sample-app/index.html",
-            repository: "https://github.com/asgardeo/asgardeo-tomcat-saml-agent/tree/master/io.asgardeo.tomcat." +
-                "saml.agent.sample"
-        }
-    }
-};
+import { SAMLSDKMeta } from "./models";
+import { applicationConfig } from "../../../configs";
+
+export const SDKMeta: SAMLSDKMeta = applicationConfig?.quickstart?.samlWeb;
diff --git a/apps/console/src/extensions/application-templates/templates/saml-web-application/models.ts b/apps/console/src/extensions/application-templates/templates/saml-web-application/models.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2021-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
@@ -50,3 +50,16 @@ export interface SAMLTryoutSampleConfigInterface {
     ssoUrl: string,
     tomcatHost: string
 }
+
+export interface SAMLSDKMeta {
+    tomcatSAMLAgent: {
+        catalog: string,
+        readme: string,
+        sample: {
+            acsURLSuffix: string,
+            artifact: string,
+            home: string,
+            repository: string
+        }
+    }
+}
diff --git a/apps/console/src/extensions/application-templates/templates/single-page-application/meta.ts b/apps/console/src/extensions/application-templates/templates/single-page-application/meta.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2020-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
@@ -17,54 +17,6 @@
  */
 
 import { SDKMetaInterface } from "./models";
+import { applicationConfig } from "../../../configs";
 
-export const SDKMeta: SDKMetaInterface = {
-    javascript: {
-        apis: "https://github.com/asgardeo/asgardeo-auth-spa-sdk/blob/main/README.md#apis",
-        artifact: "",
-        cdn: "https://unpkg.com/@asgardeo/auth-spa@latest/dist/asgardeo-spa.production.min.js",
-        npmInstallCommand: "npm install @asgardeo/auth-spa --save",
-        readme: "https://github.com/asgardeo/asgardeo-auth-spa-sdk/blob/main/README.md",
-        repository: undefined,
-        samples: {
-            javascript: {
-                artifact:
-                    "https://github.com/asgardeo/asgardeo-auth-spa-sdk/releases/download/v1.0.2/" +
-                    "asgardeo-html-js-app.zip",
-                repository: undefined
-            },
-            react: {
-                artifact:
-                    "https://github.com/asgardeo/asgardeo-auth-spa-sdk/releases/download/v1.0.2/" +
-                    "asgardeo-react-js-app.zip",
-                repository: "https://github.com/asgardeo/asgardeo-auth-spa-sdk/tree/main/samples/asgardeo-react-js-app"
-            },
-            root: "https://github.com/asgardeo/asgardeo-auth-spa-sdk/tree/main/samples"
-        }
-    },
-    react: {
-        links: {
-            authClientConfig: undefined,
-            secureRoute: undefined,
-            useContextDocumentation: undefined
-        },
-        npmInstallCommand: "npm install @asgardeo/auth-react react-router-dom --save",
-        readme: "https://github.com/asgardeo/asgardeo-auth-react-sdk/blob/main/README.md",
-        repository: undefined,
-        samples: {
-            basicUsage: {
-                artifact:
-                    "https://github.com/asgardeo/asgardeo-auth-react-sdk/releases/download/v2.0.5/" +
-                    "asgardeo-react-app.zip",
-                repository: undefined
-            },
-            root: undefined,
-            routing: {
-                artifact:
-                    "https://github.com/asgardeo/asgardeo-auth-react-sdk/releases/download/v2.0.5/" +
-                    "asgardeo-react-app.zip",
-                repository: undefined
-            }
-        }
-    }
-};
+export const SDKMeta: SDKMetaInterface = applicationConfig?.quickstart?.spa;
diff --git a/.../console/src/extensions/application-templates/templates/single-page-application/models.ts b/.../console/src/extensions/application-templates/templates/single-page-application/models.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2020, 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