From 30fcb936d37f6963fe702e0d0bf45a1739472e8a Mon Sep 17 00:00:00 2001
From: Sachin Mamoru <59449070+Sachin-Mamoru@users.noreply.github.com>
Date: Sun, 24 Nov 2024 23:47:12 +0530
Subject: [PATCH] Fix UI Issues with SAML Connection Configurations

---
 .../authenticators/saml-authenticator-form.tsx    | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/features/admin.connections.v1/components/edit/forms/authenticators/saml-authenticator-form.tsx b/features/admin.connections.v1/components/edit/forms/authenticators/saml-authenticator-form.tsx
index af2f50b0a77..5aefa80ebe9 100644
--- a/features/admin.connections.v1/components/edit/forms/authenticators/saml-authenticator-form.tsx
+++ b/features/admin.connections.v1/components/edit/forms/authenticators/saml-authenticator-form.tsx
@@ -112,6 +112,8 @@ export interface SamlPropertiesInterface {
     attributeConsumingServiceIndex?: string;
     AuthnContextComparisonLevel?: string;
     IsAssertionEncrypted?: boolean;
+    IncludeCert?: boolean;
+    IncludeNameIDPolicy?:boolean;
     AuthnContextClassRef?: string;
 }
 
@@ -252,10 +254,15 @@ export const SamlAuthenticatorSettingsForm: FunctionComponent<SamlSettingsFormPr
                 key: "ISArtifactResolveReqSigned" }
             ),
             ISArtifactResponseSigned: findPropVal<string>({ defaultValue: "string", key: "ISArtifactResponseSigned" }),
+            IncludeAuthnContext: findPropVal<string>({ defaultValue: "string", key: "IncludeAuthnContext" }),
+            ForceAuthentication: findPropVal<string>({ defaultValue: "string", key: "ForceAuthentication" }),
+            ResponseAuthnContextClassRef: findPropVal<string>({ defaultValue: "string", key: "ResponseAuthnContextClassRef" }),
             ISAuthnReqSigned: findPropVal<boolean>({ defaultValue: false, key: "ISAuthnReqSigned" }),
             IdPEntityId: findPropVal<string>({ defaultValue: "", key: "IdPEntityId" }),
             IncludeProtocolBinding: findPropVal<boolean>({ defaultValue: false, key: "IncludeProtocolBinding" }),
             IsAssertionEncrypted: findPropVal<boolean>({ defaultValue: false, key: "IsAssertionEncrypted" }),
+            IncludeNameIDPolicy: findPropVal<boolean>({ defaultValue: false, key: "IncludeNameIDPolicy" }),
+            IncludeCert : findPropVal<boolean>({ defaultValue: false, key: "IncludeCert" }),
             /**
              * `IsAuthnRespSigned` is by default set to true when creating the SAML IdP so,
              * always the value will be true. Keeping this here to indicate for the user and
@@ -279,7 +286,8 @@ export const SamlAuthenticatorSettingsForm: FunctionComponent<SamlSettingsFormPr
             SSOUrl: findPropVal<string>({ defaultValue: "", key: "SSOUrl" }),
             SignatureAlgorithm: findPropVal<string>({ defaultValue: "RSA with SHA256", key: "SignatureAlgorithm" }),
             commonAuthQueryParams: findPropVal<string>({ defaultValue: "", key: "commonAuthQueryParams" }),
-            customAuthnContextClassRef: findPropVal<string>({ defaultValue: "", key: "CustomAuthnContextClassRef" }),
+            CustomAuthnContextClassRef: findPropVal<string>({ defaultValue: "", key: "CustomAuthnContextClassRef" }),
+            AttributeConsumingServiceIndex: findPropVal<string>({ defaultValue: "", key: "AttributeConsumingServiceIndex" }),
             /**
              * https://github.com/wso2/product-is/issues/17004
              */
@@ -300,6 +308,8 @@ export const SamlAuthenticatorSettingsForm: FunctionComponent<SamlSettingsFormPr
         setIsArtifactBindingEnabled(initialFormValues.ISArtifactBindingEnabled);
         setFormValues({ ...initialFormValues });
         setIsEnableAssetionEncryption(initialFormValues.IsAssertionEncrypted);
+        setIncludeNameIDPolicy(initialFormValues.IncludeNameIDPolicy);
+        setIncludeCert(initialFormValues.IncludeCert);
 
         const initiallySelectedAuthnContextClasses: DropdownChild[] = initialFormValues.AuthnContextClassRef?.split(",")
             .map(
@@ -844,7 +854,8 @@ export const SamlAuthenticatorSettingsForm: FunctionComponent<SamlSettingsFormPr
                             <Field.Dropdown
                                 required={ false }
                                 name="AuthnContextComparisonLevel"
-                                defaultValue={ initialFormValues?.AuthnContextComparisonLevel }
+                                value={ formValues?.AuthnContextComparisonLevel }
+                                defaultValue={ formValues?.AuthnContextComparisonLevel }
                                 placeholder={ t(`${ I18N_TARGET_KEY }.authContextComparisonLevel.placeholder`) }
                                 ariaLabel={ t(`${ I18N_TARGET_KEY }.authContextComparisonLevel.ariaLabel`) }
                                 data-testid={ `${ testId }-authContextComparisonLevel-field` }