Преглед изворни кода

send params from login.html

yusuketk пре 6 година
родитељ
комит
36aadf5975
2 измењених фајлова са 27 додато и 10 уклоњено
  1. 8 9
      src/client/js/components/LoginForm.jsx
  2. 19 1
      src/client/js/nologin.jsx

+ 8 - 9
src/client/js/components/LoginForm.jsx

@@ -102,11 +102,11 @@ class LoginForm extends React.Component {
         <div id="external-auth" className={`external-auth ${collapsibleClass}`}>
           <div className="spacer"></div>
           <div className="d-flex flex-row justify-content-between flex-wrap">
-            {isExternalAuthEnabledMap.keys().map((auth) => {
-              if (!isExternalAuthEnabledMap(auth)) {
+            {Object.keys(isExternalAuthEnabledMap).map((auth) => {
+              if (!isExternalAuthEnabledMap[auth]) {
                 return;
               }
-              return this.renderExternalAuthInput(auth);
+              return this.renderExternalAuthInput([auth]);
             })}
           </div>
           <div className="spacer"></div>
@@ -129,7 +129,6 @@ class LoginForm extends React.Component {
   }
 
   render() {
-
     const {
       t,
       isRegistrationEnabled,
@@ -152,15 +151,15 @@ class LoginForm extends React.Component {
             </div>
           </div>
         </div>
-        <div className="row">
-          <div className="col-12 text-right py-2">
-            {isRegistrationEnabled && (
+        {isRegistrationEnabled && (
+          <div className="row">
+            <div className="col-12 text-right py-2">
               <a href="#register" id="register" className="link-switch">
                 <i className="ti-check-box"></i> { t('Sign up is here') }
               </a>
-            )}
+            </div>
           </div>
-        </div>
+        )}
       </div>
     );
   }

+ 19 - 1
src/client/js/nologin.jsx

@@ -27,9 +27,27 @@ if (installerFormElem) {
 // render loginForm
 const loginFormElem = document.getElementById('login-form');
 if (loginFormElem) {
+  const isRegistrationEnabled = loginFormElem.dataset.isRegistrationEnabled === 'true';
+  const isLdapStrategySetup = loginFormElem.dataset.isLdapStrategySetup === 'true';
+  const isLocalStrategySetup = loginFormElem.dataset.isLocalStrategySetup === 'true';
+  const isExternalAuthEnabledMap = {
+    google: loginFormElem.dataset.isGoogleAuthEnabled,
+    github: loginFormElem.dataset.isGithubAuthEnabled,
+    facebook: loginFormElem.dataset.isFacebookAuthEnabled,
+    twitter: loginFormElem.dataset.isTwitterAuthEnabled,
+    oidc: loginFormElem.dataset.isOidcAuthEnabled,
+    saml: loginFormElem.dataset.isSamlAuthEnabled,
+    basic: loginFormElem.dataset.isBasicAuthEnabled,
+  };
+
   ReactDOM.render(
     <I18nextProvider i18n={i18n}>
-      <LoginForm />
+      <LoginForm
+        isRegistrationEnabled={isRegistrationEnabled}
+        isLdapStrategySetup={isLdapStrategySetup}
+        isLocalStrategySetup={isLocalStrategySetup}
+        isExternalAuthEnabledMap={isExternalAuthEnabledMap}
+      />
     </I18nextProvider>,
     loginFormElem,
   );