Merge pull request #6909 from ImalshaG/remove-ta

Remove trusted app UI from connections pages
wso2 · Sep 24, 2024 · 35be862 · 35be862
2 parents 352e90e + 1bd5448
commit 35be862
Show file tree

Hide file tree

Showing 18 changed files with 14 additions and 1,502 deletions.
diff --git a/.changeset/spotty-apples-cry.md b/.changeset/spotty-apples-cry.md
@@ -0,0 +1,9 @@
+---
+"@wso2is/admin.identity-providers.v1": patch
+"@wso2is/admin.connections.v1": patch
+"@wso2is/admin.extensions.v1": patch
+"@wso2is/admin.core.v1": patch
+"@wso2is/i18n": patch
+---
+
+Remove trusted app related UI from connection pages
diff --git a/features/admin.connections.v1/configs/endpoints.ts b/features/admin.connections.v1/configs/endpoints.ts
@@ -32,7 +32,6 @@ export const getConnectionResourceEndpoints = (serverHost: string): ConnectionRe
         authenticators: `${ serverHost }/api/server/v1/authenticators`,
         extensions: `${ serverHost }/api/server/v1/extensions`,
         fidoConfigs: `${ serverHost }/api/identity/config-mgt/v1.0/resource/fido-config`,
-        fidoTrustedApps: `${ serverHost }/fido/trusted-apps-mgt`,
         identityProviders: `${ serverHost }/api/server/v1/identity-providers`,
         localAuthenticators: `${ serverHost }/api/server/v1/configs/authenticators`,
         multiFactorAuthenticators: `${ serverHost }/api/server/v1/identity-governance/${

diff --git a/features/admin.connections.v1/constants/connection-ui-constants.ts b/features/admin.connections.v1/constants/connection-ui-constants.ts
@@ -215,8 +215,6 @@ export class ConnectionUIConstants {
         CONNECTION_JIT_PROVISIONING_UPDATE_ERROR: string;
         FIDO_AUTHENTICATOR_CONFIG_UPDATE_ERROR: string;
         FIDO_AUTHENTICATOR_CONFIG_UPDATE_INVALID_STATUS_CODE_ERROR: string;
-        FIDO_TRUSTED_APPS_UPDATE_ERROR: string;
-        FIDO_TRUSTED_APPS_UPDATE_INVALID_STATUS_CODE_ERROR: string;
         IDENTITY_PROVIDER_TEMPLATES_LIST_FETCH_ERROR: string;
         IDENTITY_PROVIDER_TEMPLATES_LIST_FETCH_INVALID_STATUS_CODE_ERROR: string;
         LOCAL_AUTHENTICATORS_FETCH_ERROR: string;
@@ -239,8 +237,6 @@ export class ConnectionUIConstants {
             CONNECTION_JIT_PROVISIONING_UPDATE_ERROR: "An error occurred while updating the JIT provisioning configurations of the connection.",
             FIDO_AUTHENTICATOR_CONFIG_UPDATE_ERROR: "An error occurred while updating the Passkey connector configs.",
             FIDO_AUTHENTICATOR_CONFIG_UPDATE_INVALID_STATUS_CODE_ERROR: "Received an invalid status code while updating the Passkey connector configs.",
-            FIDO_TRUSTED_APPS_UPDATE_ERROR: "An error occurred while updating the Passkey trusted apps.",
-            FIDO_TRUSTED_APPS_UPDATE_INVALID_STATUS_CODE_ERROR: "Received an invalid status code while updating the Passkey trusted apps.",
             IDENTITY_PROVIDER_TEMPLATES_LIST_FETCH_ERROR: "An error occurred while fetching the required connection templates list.",
             IDENTITY_PROVIDER_TEMPLATES_LIST_FETCH_INVALID_STATUS_CODE_ERROR: "Received an invalid status code while fetching connection templates list.",
             LOCAL_AUTHENTICATORS_FETCH_ERROR: "An error occurred while fetching the local authenticators.",

diff --git a/features/admin.connections.v1/models/endpoints.ts b/features/admin.connections.v1/models/endpoints.ts
@@ -24,7 +24,6 @@ export interface ConnectionResourceEndpointsInterface {
     authenticatorTags: string;
     extensions: string;
     fidoConfigs: string;
-    fidoTrustedApps: string;
     identityProviders: string;
     localAuthenticators: string;
     multiFactorAuthenticators: string;

diff --git a/features/admin.core.v1/store/reducers/config.ts b/features/admin.core.v1/store/reducers/config.ts
@@ -112,7 +112,6 @@ export const commonConfigReducerInitialState: CommonConfigReducerStateInterface<
             extensions: "",
             externalClaims: "",
             fidoConfigs: "",
-            fidoTrustedApps: "",
             getSecret: "",
             getSecretList: "",
             getSecretType: "",

diff --git a/features/admin.extensions.v1/configs/identity-provider.tsx b/features/admin.extensions.v1/configs/identity-provider.tsx
@@ -38,7 +38,6 @@ import SIWEIdPTemplate from "../identity-provider-templates/templates/swe/swe.js
 
 export const identityProviderConfig: IdentityProviderConfig = {
     editIdentityProvider: {
-        enableFIDOTrustedAppsConfiguration: false,
         getOverriddenAuthenticatorForm: (
             type: string,
             templateId: string,

diff --git a/features/admin.extensions.v1/configs/models/identity-providers.ts b/features/admin.extensions.v1/configs/models/identity-providers.ts
@@ -36,7 +36,6 @@ export interface ExtendedSamlConfigInterface {
 
 export interface IdentityProviderConfig {
     editIdentityProvider: {
-        enableFIDOTrustedAppsConfiguration: boolean;
         showAdvancedSettings: boolean;
         showIssuerSettings: boolean;
         showJitProvisioning: boolean;

diff --git a/features/admin.identity-providers.v1/api/fido-trusted-apps.ts b/features/admin.identity-providers.v1/api/fido-trusted-apps.ts
diff --git a/...ticator-forms/fido-authenticator-form.tsx → ...uthenticators/fido-authenticator-form.tsx b/...ticator-forms/fido-authenticator-form.tsx → ...uthenticators/fido-authenticator-form.tsx
@@ -18,7 +18,7 @@
 
 import { ConnectionUIConstants } from "@wso2is/admin.connections.v1/constants/connection-ui-constants";
 import { LocalAuthenticatorConstants } from "@wso2is/admin.connections.v1/constants/local-authenticator-constants";
-import { identityProviderConfig } from "@wso2is/admin.extensions.v1";
+import { updateFidoConfigs, useFIDOConnectorConfigs } from "@wso2is/admin.identity-providers.v1/api/fido-configs";
 import { useGetCurrentOrganizationType } from "@wso2is/admin.organizations.v1/hooks/use-get-organization-type";
 import { IdentityAppsApiException } from "@wso2is/core/exceptions";
 import { AlertLevels } from "@wso2is/core/models";
@@ -32,8 +32,6 @@ import React, { FunctionComponent, ReactElement, useEffect, useMemo, useState }
 import { Trans, useTranslation } from "react-i18next";
 import { useDispatch } from "react-redux";
 import { Dispatch } from "redux";
-import { FIDOTrustedApps } from "./fido-trusted-apps";
-import { updateFidoConfigs, useFIDOConnectorConfigs } from "../../../../api/fido-configs";
 import {
     CommonAuthenticatorFormFieldMetaInterface,
     CommonAuthenticatorFormInitialValuesInterface,
@@ -44,7 +42,7 @@ import {
     FIDOAuthenticatorFormPropsInterface,
     FIDOConfigsInterface,
     FIDOConnectorConfigsAttributeInterface
-} from "../../../../models";
+} from "../../../models";
 
 const FORM_ID: string = "fido-authenticator-form";
 
@@ -81,7 +79,6 @@ export const FIDOAuthenticatorForm: FunctionComponent<FIDOAuthenticatorFormProps
     ] = useState<boolean>(undefined);
     const [ isReadOnly ] = useState<boolean>(isSubOrganization() || readOnly);
     const [ isFIDOConfigsSubmitting, setIsFIDOConfigsSubmitting ] = useState<boolean>(false);
-    const [ isFIDOTrustedAppsSubmitting, setIsFIDOTrustedAppsSubmitting ] = useState<boolean>(false);
     const [ FIDOTrustedOrigins, setFIDOTrustedOrigins ] = useState<string>("");
 
     const {
@@ -245,8 +242,6 @@ export const FIDOAuthenticatorForm: FunctionComponent<FIDOAuthenticatorFormProps
             .finally(() => setIsFIDOConfigsSubmitting(false));
     };
 
-    let updateTrustedApps: (callback: () => void) => void;
-
     /**
      * Prepare form values for submitting.
      *
@@ -260,11 +255,6 @@ export const FIDOAuthenticatorForm: FunctionComponent<FIDOAuthenticatorFormProps
             updateFIDOConnectorConfigs();
         }
 
-        if (identityProviderConfig?.editIdentityProvider?.enableFIDOTrustedAppsConfiguration) {
-            setIsFIDOTrustedAppsSubmitting(true);
-            updateTrustedApps(() => setIsFIDOTrustedAppsSubmitting(false));
-        }
-
         const properties: CommonPluggableComponentPropertyInterface[] = [];
 
         for (const [ name, value ] of Object.entries(values)) {
@@ -408,28 +398,15 @@ export const FIDOAuthenticatorForm: FunctionComponent<FIDOAuthenticatorFormProps
                     readOnly={ isReadOnly }
                 />)
             }
-
-            {
-                identityProviderConfig?.editIdentityProvider?.enableFIDOTrustedAppsConfiguration && !isSubOrganization()
-                    ? (
-                        <FIDOTrustedApps
-                            readOnly={ isReadOnly }
-                            triggerSubmission={ (submitFunction: (callback: () => void) => void) => {
-                                updateTrustedApps = submitFunction;
-                            } }
-                        />
-                    )
-                    : null
-            }
             <Field.Button
                 form={ FORM_ID }
                 size="small"
                 buttonType="primary_btn"
                 ariaLabel="FIDO authenticator update button"
                 name="update-button"
                 data-testid={ `${ testId }-submit-button` }
-                disabled={ isSubmitting || isFIDOConfigsSubmitting || isFIDOTrustedAppsSubmitting }
-                loading={ isSubmitting || isFIDOConfigsSubmitting || isFIDOTrustedAppsSubmitting }
+                disabled={ isSubmitting || isFIDOConfigsSubmitting }
+                loading={ isSubmitting || isFIDOConfigsSubmitting }
                 label={ t("common:update") }
                 hidden={ isReadOnly }
             />

diff --git a/....v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-app-wizard.scss b/....v1/components/forms/authenticators/fido-authenticator-forms/fido-trusted-app-wizard.scss