diff --git a/.changeset/fuzzy-spoons-carry.md b/.changeset/fuzzy-spoons-carry.md new file mode 100644 index 00000000000..b3145db0d45 --- /dev/null +++ b/.changeset/fuzzy-spoons-carry.md @@ -0,0 +1,6 @@ +--- +"@wso2is/admin.applications.v1": patch +"@wso2is/admin.extensions.v1": patch +--- + +Remove `isLinkedAccountsEnabled` extension config diff --git a/features/admin.applications.v1/components/settings/attribute-management/advance-attribute-settings.tsx b/features/admin.applications.v1/components/settings/attribute-management/advance-attribute-settings.tsx index 0b4e9b0b684..09ba78a0a18 100644 --- a/features/admin.applications.v1/components/settings/attribute-management/advance-attribute-settings.tsx +++ b/features/admin.applications.v1/components/settings/attribute-management/advance-attribute-settings.tsx @@ -648,30 +648,26 @@ export const AdvanceAttributeSettings: FunctionComponent ) } - { applicationConfig?.attributeSettings?.advancedAttributeSettings - ?.isLinkedAccountsEnabled(applicationTemplateId) && - ( - - - - { t("applications:forms.advancedAttributeSettings." + + + + + + { t("applications:forms.advancedAttributeSettings." + "sections.linkedAccounts.heading") } - - - { t("applications:forms.advancedAttributeSettings." + + + + { t("applications:forms.advancedAttributeSettings." + "sections.linkedAccounts.descriptionFederated") } - - - ) - } + + + + { - applicationConfig?.attributeSettings?.advancedAttributeSettings - ?.isLinkedAccountsEnabled(applicationTemplateId) && applicationConfig?.attributeSettings?.advancedAttributeSettings ?.showValidateLinkedLocalAccount && ( ) } - { applicationConfig?.attributeSettings?.advancedAttributeSettings - ?.isLinkedAccountsEnabled(applicationTemplateId) && + { applicationConfig?.attributeSettings?.advancedAttributeSettings ?.showMandateLinkedLocalAccount ? (
- - - + + - - -
) - : null + /> + +
+ ) + : null } { applicationConfig?.attributeSettings?.advancedAttributeSettings diff --git a/features/admin.extensions.v1/configs/application.tsx b/features/admin.extensions.v1/configs/application.tsx index ee5480ebc7c..d350e151c68 100644 --- a/features/admin.extensions.v1/configs/application.tsx +++ b/features/admin.extensions.v1/configs/application.tsx @@ -153,19 +153,6 @@ export const applicationConfig: ApplicationConfig = { }, attributeSettings: { advancedAttributeSettings: { - isLinkedAccountsEnabled: (templateId: string): boolean => { - const allowedTemplates: string[] = [ - ApplicationManagementConstants.CUSTOM_APPLICATION_PASSIVE_STS, - ApplicationManagementConstants.CUSTOM_APPLICATION_SAML, - ApplicationManagementConstants.TRADITIONAL_WEB_APPLICATION_SAML, - ApplicationManagementConstants.MOBILE, - ApplicationManagementConstants.CUSTOM_APPLICATION_OIDC, - ApplicationManagementConstants.TRADITIONAL_WEB_APPLICATION_OIDC, - ApplicationManagementConstants.SPA_APP_TEMPLATE_ID - ]; - - return allowedTemplates.includes(templateId); - }, showIncludeTenantDomain: true, showIncludeUserstoreDomainRole: true, showIncludeUserstoreDomainSubject: true, diff --git a/features/admin.extensions.v1/configs/models/application.ts b/features/admin.extensions.v1/configs/models/application.ts index 029f22c9044..0c4fcdc0313 100644 --- a/features/admin.extensions.v1/configs/models/application.ts +++ b/features/admin.extensions.v1/configs/models/application.ts @@ -54,7 +54,6 @@ export interface ApplicationConfig { hiddenGrantTypes: string[], attributeSettings: { advancedAttributeSettings: { - isLinkedAccountsEnabled: (templateId: string) => boolean; showIncludeTenantDomain: boolean; showIncludeUserstoreDomainRole: boolean; showIncludeUserstoreDomainSubject: boolean; diff --git a/modules/i18n/src/translations/en-US/portals/applications.ts b/modules/i18n/src/translations/en-US/portals/applications.ts index 60bc2fa1a64..4e03f124d17 100644 --- a/modules/i18n/src/translations/en-US/portals/applications.ts +++ b/modules/i18n/src/translations/en-US/portals/applications.ts @@ -953,17 +953,16 @@ export const applications: ApplicationsNS = { message: "Invalid configuration", description: "Linked local account validation should be enabled to mandate a linked local account" }, - heading: "Linked Accounts", - descriptionFederated: "Enable to retrieve user attributes of the linked local account during federated authentication.", + heading: "Attribute Resolution for Linked Accounts", + descriptionFederated: "Manage how user attributes are resolved when a local account is linked to a federated identity.", fields: { validateLocalAccount: { - label: "Prioritize local account attributes", - hint: "If a linked local account exists, its attributes are returned. Otherwise, " + - "attributes of the federated identity are returned." + label: "Use linked local account attributes", + hint: "If a linked local account exists, its attributes will be used. If no linked account is found,attributes of the federated user account will be used instead." }, mandateLocalAccount: { - label: "Mandate linked local account", - hint: "Authentication will fail in token exchange grant if there is no linked local account with the federated identity." + label: "Require linked local account", + hint: "Authentication will fail if no linked local account is found during token exchange." } } },