Merge pull request wso2#6751 from ImalshaG/trusted-app-fix

Fix trusted app configs getting cleared issue
savindi7 · Aug 12, 2024 · bc73ba3 · bc73ba3
2 parents 0a5a1b2 + 8d49cc8
commit bc73ba3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/.changeset/chatty-drinks-compete.md b/.changeset/chatty-drinks-compete.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/admin.applications.v1": patch
+---
+
+Fix trusted app configs getting cleared issue
diff --git a/features/admin.applications.v1/components/forms/advanced-configurations-form.tsx b/features/admin.applications.v1/components/forms/advanced-configurations-form.tsx
@@ -171,15 +171,15 @@ export const AdvancedConfigurationsForm: FunctionComponent<AdvancedConfiguration
                 saas: !!values.saas,
                 skipLoginConsent: !!values.skipConsentLogin,
                 skipLogoutConsent: !!values.skipConsentLogout,
-                trustedAppConfiguration: values.enableFIDOTrustedApps ?
-                    {
-                        // androidPackageName and appleAppId is same as clientAttestation.
-                        androidPackageName: values.androidPackageName,
-                        androidThumbprints: isEmpty(thumbprints) ? [] : thumbprints.split(","),
-                        appleAppId: values.appleAppId,
-                        isConsentGranted: isConsentGranted,
-                        isFIDOTrustedApp: values.enableFIDOTrustedApps
-                    } : undefined
+                trustedAppConfiguration: {
+                    // androidPackageName and appleAppId is same as clientAttestation.
+                    androidPackageName: values.enableFIDOTrustedApps ? values.androidPackageName : "",
+                    androidThumbprints: values.enableFIDOTrustedApps ?
+                        (isEmpty(thumbprints) ? [] : thumbprints.split(",")) : [],
+                    appleAppId: values.enableFIDOTrustedApps ? values.appleAppId : "",
+                    isConsentGranted: isConsentGranted,
+                    isFIDOTrustedApp: values.enableFIDOTrustedApps
+                }
             }
         };