Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Configuration] Fix client cert mode switch bug #7938

Closed
wants to merge 2 commits into from
Closed

[Configuration] Fix client cert mode switch bug #7938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92be2da
fix bugs on client cert mode
Jan 23, 2025
34df0ad
fix client cert mode bug
Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions client-react/src/pages/app/app-settings/AppSettingsFormData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,19 @@ export const convertFormToState = (
initialValues: AppSettingsFormValues,
oldSlotConfigNames: ArmObj<SlotConfigNames>
): ApiSetupReturn => {
const site = { ...values.site };
const { clientCertMode, ClientCertEnabled } = getClientCertValues(
const { clientCertMode, clientCertEnabled } = getClientCertValues(
initialValues.site.properties.clientCertMode,
values.site.properties.clientCertMode
);
site.properties.clientCertMode = clientCertMode;
site.properties.clientCertEnabled = ClientCertEnabled;

const site = {
...values.site,
properties: {
...values.site.properties,
clientCertMode: clientCertMode,
clientCertEnabled: clientCertEnabled,
},
};

const slotConfigNames = getStickySettings(values.appSettings, values.connectionStrings, values.azureStorageMounts, oldSlotConfigNames);
const slotConfigNamesModified = isSlotConfigNamesModified(oldSlotConfigNames, slotConfigNames);
Expand Down Expand Up @@ -268,7 +274,7 @@ export function getClientCertValues(initialClientCertMode: string, currentClient

return {
clientCertMode: isClientCertModeIgnore ? initialClientCertMode : currentClientCertMode,
ClientCertEnabled: !isClientCertModeIgnore,
clientCertEnabled: !isClientCertModeIgnore,
};
}

Expand Down
2 changes: 1 addition & 1 deletion client-react/src/pages/app/app-settings/GeneralSettings/ClientCert/ClientCert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Field, FormikProps } from 'formik';
import { useTranslation } from 'react-i18next';
import { PermissionsContext, SiteContext } from '../../Contexts';
import TextField from '../../../../../components/form-controls/TextField';
import { Stack, PanelType, IChoiceGroupOption, MessageBarType } from '@fluentui/react';
import { Stack, PanelType, MessageBarType } from '@fluentui/react';
import IconButton from '../../../../../components/IconButton/IconButton';
import EditClientExclusionPaths from './EditClientExclusionPaths';
import { AppSettingsFormValues } from '../../AppSettings.types';
Expand Down
2 changes: 1 addition & 1 deletion client-react/src/pages/app/app-settings/GeneralSettings/Platform.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { ScenarioService } from '../../../../utils/scenario-checker/scenario.ser
import { AppSettingsFormValues } from '../AppSettings.types';
import { PermissionsContext, SiteContext } from '../Contexts';
import { Links } from '../../../../utils/FwLinks';
import { ClientCertMode, IPMode, MinTlsVersion, SslState, VnetPrivatePortsCount } from '../../../../models/site/site';
import { IPMode, MinTlsVersion, SslState, VnetPrivatePortsCount } from '../../../../models/site/site';
import CustomBanner from '../../../../components/CustomBanner/CustomBanner';
import { IDropdownOption, MessageBar, MessageBarType, mergeStyles } from '@fluentui/react';
import { CommonConstants, ScmHosts } from '../../../../utils/CommonConstants';
Expand Down
Loading