diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/Certificates.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/Certificates.js
index 85381beb99..855b0474fc 100644
--- a/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/Certificates.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/Certificates.js
@@ -27,6 +27,7 @@ const Certificates = ({ FormStore, t, provider }) => {
break;
case "ServiceProvider":
prefix = "sp";
+ break;
}
return (
@@ -78,43 +79,52 @@ const Certificates = ({ FormStore, t, provider }) => {
-
-
- {provider === "IdentityProvider" && (
+ {FormStore[`${prefix}_showAdditionalParameters`] && (
<>
-
- >
- )}
-
- {provider === "ServiceProvider" && (
- <>
-
-
+ {provider === "IdentityProvider" && (
+ <>
+
+ >
+ )}
+
+ {provider === "ServiceProvider" && (
+ <>
+
+
+
+ >
+ )}
>
)}
diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/FieldMapping.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/FieldMapping.js
index ef904282d2..b753363d0f 100644
--- a/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/FieldMapping.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/FieldMapping.js
@@ -12,8 +12,14 @@ import SimpleFormField from "./sub-components/SimpleFormField";
const FieldMapping = ({ FormStore, t }) => {
return (
-
-
+
+
{t("AttributeMatching")}
diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/IdpSettings.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/IdpSettings.js
index 9522a683cc..42012adaba 100644
--- a/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/IdpSettings.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/IdpSettings.js
@@ -4,7 +4,6 @@ import { observer } from "mobx-react";
import Box from "@appserver/components/box";
import RadioButtonGroup from "@appserver/components/radio-button-group";
-import HideButton from "./sub-components/HideButton";
import SimpleComboBox from "./sub-components/SimpleComboBox";
import SimpleFormField from "./sub-components/SimpleFormField";
import Text from "@appserver/components/text";
@@ -14,8 +13,6 @@ import { bindingOptions, nameIdOptions } from "./sub-components/constants";
const IdpSettings = ({ FormStore, t }) => {
return (
-
-
{
return (
-
-
-
+ <>
{
tabIndex={28}
/>
-
+ >
);
};
diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/index.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/index.js
index c5a3cc9310..6810be31d4 100644
--- a/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/index.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/index.js
@@ -6,8 +6,9 @@ import Box from "@appserver/components/box";
import Button from "@appserver/components/button";
import FormStore from "@appserver/studio/src/store/SsoFormStore";
-import FieldMapping from "./FieldMapping";
import Certificates from "./Certificates";
+import FieldMapping from "./FieldMapping";
+import HideButton from "./sub-components/HideButton";
import IdpSettings from "./IdpSettings";
import ProviderMetadata from "./ProviderMetadata";
import StyledSsoPage from "./styled-containers/StyledSsoPageContainer";
@@ -17,35 +18,48 @@ const SingleSignOn = () => {
const { t } = useTranslation(["SingleSignOn", "Common"]);
return (
-
+
-
+
-
+
+
-
+
-
+
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
);
};
diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/styled-containers/StyledSsoPageContainer.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/styled-containers/StyledSsoPageContainer.js
index 9147cb5487..9f4c0e552e 100644
--- a/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/styled-containers/StyledSsoPageContainer.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/SingleSignOn/styled-containers/StyledSsoPageContainer.js
@@ -95,6 +95,21 @@ const StyledSsoPage = styled.div`
position: static;
}
}
+
+ .separator {
+ margin: 24px 0;
+ height: 1px;
+ border: none;
+ background-color: #eceef1;
+ }
+
+ .service-provider-settings {
+ display: ${(props) => (!props.hideSettings ? "none" : "block")};
+ }
+
+ .sp-metadata {
+ display: ${(props) => (!props.hideMetadata ? "none" : "block")};
+ }
`;
export default StyledSsoPage;
diff --git a/web/ASC.Web.Client/src/store/SsoFormStore.js b/web/ASC.Web.Client/src/store/SsoFormStore.js
index 7da9bda3ea..3ab4c605f7 100644
--- a/web/ASC.Web.Client/src/store/SsoFormStore.js
+++ b/web/ASC.Web.Client/src/store/SsoFormStore.js
@@ -21,7 +21,7 @@ const regExps = {
class SsoFormStore {
uploadXmlUrl = "";
- enableSso = true;
+ enableSso = false;
spLoginLabel = "";
@@ -79,10 +79,10 @@ class SsoFormStore {
sp_singleLogoutUrl = "";
// hide parts of form
- ServiceProviderSettings = true;
- ShowAdditionalParametersIdp = true;
- ShowAdditionalParametersSp = true;
- SPMetadata = true;
+ ServiceProviderSettings = false;
+ idp_showAdditionalParameters = true;
+ sp_showAdditionalParameters = true;
+ SPMetadata = false;
idp_isModalVisible = false;
sp_isModalVisible = false;