Merge pull request #1212 from tchapgouv/1120-pcbutton-login-page

Add PC button on login page
tchapgouv · Jan 13, 2025 · ed8104c · ed8104c
2 parents c79bddd + 2dc3550
commit ed8104c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/res/css/views/sso/TchapSSO.pcss b/res/css/views/sso/TchapSSO.pcss
@@ -30,6 +30,7 @@
         background-color: var(--accent);
         color: white !important;
         text-align: left;
+        font-weight: bold;
     }
 
     .tc_Button_iconPC {

diff --git a/res/themes/tchap-common/css/_tchap_custom.pcss b/res/themes/tchap-common/css/_tchap_custom.pcss
@@ -119,4 +119,10 @@
     .lasuite-header__service-title {
         color: black;
     }
+}
+
+/* login with proconnect style */
+.mx_Login_submit {
+    border-radius: 0px !important;
+    height: 46px !important;
 }
diff --git a/src/components/structures/auth/Login.tsx b/src/components/structures/auth/Login.tsx
@@ -34,6 +34,8 @@ import { Features } from "../../../settings/Settings";
 import { startOidcLogin } from "../../../utils/oidc/authorize";
 import TchapUtils from '~tchap-web/src/tchap/util/TchapUtils'; // :TCHAP: login
 import Tchapi18nUtils from '~tchap-web/src/tchap/i18n/Tchapi18nUtils'; // :TCHAP: login
+import TchapUIFeature from "~tchap-web/src/tchap/util/TchapUIFeature";
+import ProconnectButton from "~tchap-web/src/tchap/components/views/sso/ProconnectButton";
 
 interface IProps {
     serverConfig: ValidatedServerConfig;
@@ -130,8 +132,7 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
             // eslint-disable-next-line @typescript-eslint/naming-convention
             "m.login.cas": () => this.renderSsoStep("cas"),
             // eslint-disable-next-line @typescript-eslint/naming-convention
-            // :TCHAP: sso-agentconnect-flow
-            // "m.login.sso": () => this.renderSsoStep("sso"),
+            "m.login.sso": () => this.renderSsoStep("sso"),
             "oidcNativeFlow": () => this.renderOidcNativeStep(),
         };
     }
@@ -499,8 +500,8 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
     };
 
     private renderSsoStep = (loginType: "cas" | "sso"): JSX.Element => {
+        /** :TCHAP:
         const flow = this.state.flows?.find((flow) => flow.type === "m.login." + loginType) as SSOFlow;
-
         return (
             <SSOButtons
                 matrixClient={this.loginLogic.createTemporaryClient()}
@@ -512,6 +513,16 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
                 disabled={this.isBusy()}
             />
         );
+        */
+
+        if (TchapUIFeature.isSSOFlowActive()) {
+            return <div style={{marginBottom: "25px", position: "relative", top: "-15px"}}>
+                <p style={{textAlign: "center", fontWeight: "bold"}}>{_t("auth|proconnect|or")}</p>
+                <ProconnectButton />
+            </div>;
+        }
+        return <></>;
+        // end :TCHAP:
     };
 
     public render(): React.ReactNode {

diff --git a/src/components/structures/auth/Registration.tsx b/src/components/structures/auth/Registration.tsx
@@ -643,9 +643,9 @@ export default class Registration extends React.Component<IProps, IState> {
             //     );
             if (!this.props.mobileRegister && this.state.ssoFlow && TchapUIFeature.isSSOFlowActive()) {
                 ssoSection = <>
-                    <ProconnectButton/>
+                    <ProconnectButton />
                     <p style={{textAlign: "center", fontWeight: "bold"}}>{_t("auth|proconnect|or")}</p>
-                </>
+                </>;
             }
             // }
             // end :TCHAP: