Merge pull request #6338 from sahandilshan/ai-features

Update identity.xml.j2 with latest AI configs
wso2 · Jan 24, 2025 · 6a18d3e · 6a18d3e
2 parents f9cff45 + 09838a8
commit 6a18d3e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/...mgt/src/main/java/org/wso2/carbon/identity/application/mgt/ai/LoginFlowAIManagerImpl.java b/...mgt/src/main/java/org/wso2/carbon/identity/application/mgt/ai/LoginFlowAIManagerImpl.java
@@ -50,9 +50,12 @@ public class LoginFlowAIManagerImpl implements LoginFlowAIManager {
 
     private static final String LOGINFLOW_AI_ENDPOINT = IdentityUtil.getProperty(
             "AIServices.LoginFlowAI.LoginFlowAIEndpoint");
-    private static final String LOGINFLOW_AI_GENERATE_PATH = "/api/server/v1/applications/loginflow/generate";
-    private static final String LOGINFLOW_AI_STATUS_PATH = "/api/server/v1/applications/loginflow/status";
-    private static final String LOGINFLOW_AI_RESULT_PATH = "/api/server/v1/applications/loginflow/result";
+    private static final String LOGINFLOW_AI_GENERATE_PATH = IdentityUtil.getProperty(
+            "AIServices.LoginFlowAI.LoginFlowAIGenerateRequestPath");
+    private static final String LOGINFLOW_AI_STATUS_PATH = IdentityUtil.getProperty(
+            "AIServices.LoginFlowAI.LoginFlowAIStatusRequestPath");
+    private static final String LOGINFLOW_AI_RESULT_PATH = IdentityUtil.getProperty(
+            "AIServices.LoginFlowAI.LoginFlowAIResultRequestPath");
 
     private static final Log LOG = LogFactory.getLog(LoginFlowAIManagerImpl.class);
 

diff --git a/...org.wso2.carbon.identity.application.authentication.framework.server.feature.default.json b/...org.wso2.carbon.identity.application.authentication.framework.server.feature.default.json
@@ -265,5 +265,15 @@
     "SYSTEM"
   ],
   "authentication.jit_provisioning.associating_to_existing_user": false,
-  "authentication.jit_provisioning.enable_configured_idp_sub_for_federated_user_association": false
+  "authentication.jit_provisioning.enable_configured_idp_sub_for_federated_user_association": false,
+
+  "ai_services.token_endpoint": "https://api.asgardeo.io/t/wso2devtools/oauth2/token",
+  "ai_services.branding_ai.endpoint": "https://e95488c8-8511-4882-967f-ec3ae2a0f86f-prod.e1-us-east-azure.choreoapis.dev/iam-ai-us/branding-ai/v1.0",
+  "ai_services.branding_ai.generate_request_path": "/api/server/v1/branding-preference/generate",
+  "ai_services.branding_ai.status_request_path": "/api/server/v1/branding-preference/status",
+  "ai_services.branding_ai.result_request_path": "/api/server/v1/branding-preference/result",
+  "ai_services.login_flow_ai.endpoint": "https://e95488c8-8511-4882-967f-ec3ae2a0f86f-prod.e1-us-east-azure.choreoapis.dev/iam-ai-us/loginflow-ai/v1.0",
+  "ai_services.login_flow_ai.generate_request_path": "/api/server/v1/applications/loginflow/generate",
+  "ai_services.login_flow_ai.status_request_path": "/api/server/v1/applications/loginflow/status",
+  "ai_services.login_flow_ai.result_request_path": "/api/server/v1/applications/loginflow/result"
 }
diff --git a/...ures/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2 b/...ures/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2
@@ -4493,9 +4493,20 @@
         <TokenConnectionSocketTimeout>{{ai_services.token_connection_socket_timeout}}</TokenConnectionSocketTimeout>
         <HTTPConnectionPoolSize>{{ai_services.http_connection_pool_size}}</HTTPConnectionPoolSize>
         <HTTPConnectionTimeout>{{ai_services.http_connection_timeout}}</HTTPConnectionTimeout>
+        <HTTPConnectionRequestTimeout>{{ai_services.http_connection_request_timeout}}</HTTPConnectionRequestTimeout>
+        <HTTPSocketTimeout>{{ai_services.http_socket_timeout}}</HTTPSocketTimeout>
         <LoginFlowAI>
             <LoginFlowAIEndpoint>{{ai_services.login_flow_ai.endpoint}}</LoginFlowAIEndpoint>
+            <LoginFlowAIGenerateRequestPath>{{ai_services.login_flow_ai.generate_request_path}}</LoginFlowAIGenerateRequestPath>
+            <LoginFlowAIStatusRequestPath>{{ai_services.login_flow_ai.status_request_path}}</LoginFlowAIStatusRequestPath>
+            <LoginFlowAIResultRequestPath>{{ai_services.login_flow_ai.result_request_path}}</LoginFlowAIResultRequestPath>
         </LoginFlowAI>
+        <BrandingAI>
+            <BrandingAIEndpoint>{{ai_services.branding_ai.endpoint}}</BrandingAIEndpoint>
+            <BrandingAIGenerateRequestPath>{{ai_services.branding_ai.generate_request_path}}</BrandingAIGenerateRequestPath>
+            <BrandingAIStatusRequestPath>{{ai_services.branding_ai.status_request_path}}</BrandingAIStatusRequestPath>
+            <BrandingAIResultRequestPath>{{ai_services.branding_ai.result_request_path}}</BrandingAIResultRequestPath>
+        </BrandingAI>
     </AIServices>
 
 </Server>
diff --git a/...y.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json b/...y.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json
@@ -1244,7 +1244,6 @@
   "console.applications.scopes.update": ["internal_application_mgt_update"],
   "console.applications.scopes.delete": ["internal_application_mgt_delete"],
   "console.applications.disabled_features": [
-    "applications.loginFlow.ai",
     "applications.loginFlow.legacyEditor"
   ],
   "console.applications.ui.certificate_alias_enabled": false,
@@ -1276,7 +1275,6 @@
   "console.branding.enabled": true,
   "console.branding.scopes.feature": ["console:branding"],
   "console.branding.disabled_features": [
-    "branding.ai",
     "branding.hostnameUrlBranding"
   ],
   "console.branding.scopes.create": ["internal_branding_preference_update"],