Merge pull request #7391 from sahandilshan/ai-features2

Enable AI features for Product-IS
wso2 · Jan 24, 2025 · fb65f7e · fb65f7e
2 parents 767a726 + 501827b
commit fb65f7e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 17 deletions.
diff --git a/.changeset/violet-brooms-warn.md b/.changeset/violet-brooms-warn.md
@@ -0,0 +1,7 @@
+---
+"@wso2is/admin.login-flow.ai.v1": minor
+"@wso2is/admin.branding.ai.v1": minor
+"@wso2is/console": minor
+---
+
+Add LoginFlow AI and Branding AI to the Identity Server
diff --git a/apps/console/src/public/deployment.config.json b/apps/console/src/public/deployment.config.json
@@ -350,7 +350,6 @@
             },
             "applications": {
                 "disabledFeatures": [
-                    "applications.loginFlow.ai",
                     "applications.loginFlow.legacyEditor"
                 ],
                 "enabled": true,
@@ -430,7 +429,6 @@
             },
             "branding": {
                 "disabledFeatures": [
-                    "branding.ai",
                     "branding.hostnameUrlBranding"
                 ],
                 "enabled": true,

diff --git a/features/admin.branding.ai.v1/api/generate-ai-branding-preference.ts b/features/admin.branding.ai.v1/api/generate-ai-branding-preference.ts
@@ -37,13 +37,11 @@ const httpClient: HttpClientInstance = AsgardeoSPAClient.getInstance()
  * @returns generated branding API response.
  */
 const generateBrandingPreference = (
-    websiteUrl: string,
-    tenantDomain: string
+    websiteUrl: string
 ): Promise<GenerateBrandingAPIResponseInterface> => {
 
     const requestConfig: AxiosRequestConfig = {
         data: {
-            tenant_domain: tenantDomain,
             website_url: websiteUrl
         },
         headers: {

diff --git a/features/admin.branding.ai.v1/hooks/use-generate-ai-branding-preference.ts b/features/admin.branding.ai.v1/hooks/use-generate-ai-branding-preference.ts
@@ -16,10 +16,6 @@
  * under the License.
  */
 
-import { AppConstants } from "@wso2is/admin.core.v1";
-import { store } from "@wso2is/admin.core.v1/store";
-import { OrganizationType } from "@wso2is/admin.organizations.v1/constants/organization-constants";
-import { useGetCurrentOrganizationType } from "@wso2is/admin.organizations.v1/hooks/use-get-organization-type";
 import { IdentityAppsApiException } from "@wso2is/core/exceptions";
 import { AlertInterface, AlertLevels } from "@wso2is/core/models";
 import { addAlert } from "@wso2is/core/store";
@@ -37,17 +33,11 @@ const useGenerateAIBrandingPreference = (): GenerateAIBrandingPreferenceFunc =>
     const dispatch: Dispatch = useDispatch();
     const { t } = useTranslation();
 
-    const { organizationType } = useGetCurrentOrganizationType();
-
     const {
         setGeneratingBranding,
         setOperationId
     } = useAIBrandingPreference();
 
-    const tenantDomain: string = organizationType === OrganizationType.SUBORGANIZATION
-        ? store.getState().organization.organization.id
-        : AppConstants.getTenant();
-
     /**
      * Generate AI branding preference API call function.
      *
@@ -58,7 +48,7 @@ const useGenerateAIBrandingPreference = (): GenerateAIBrandingPreferenceFunc =>
         websiteUrl: string
     ): Promise<void> => {
 
-        return generateBrandingPreference(websiteUrl, tenantDomain)
+        return generateBrandingPreference(websiteUrl)
             .then(
                 (data: GenerateBrandingAPIResponseInterface) => {
                     setOperationId(data.operation_id);

diff --git a/features/admin.login-flow.ai.v1/api/generate-ai-login-flow.ts b/features/admin.login-flow.ai.v1/api/generate-ai-login-flow.ts
@@ -70,7 +70,7 @@ const generateLoginFlow = (
 
     return httpClient(requestConfig)
         .then((response: AxiosResponse<GenerateLoginFlowAPIResponseInterface>) => {
-            if (response.status !== 200) {
+            if (response.status !== 200 && response.status !== 202) {
                 throw new Error(`Failed to generate login flow: ${response.statusText}`);
             }