Shunm634-source 3 лет назад
Родитель
Сommit
0f3c90a596
2 измененных файлов с 11 добавлено и 19 удалено
  1. 5 5
      packages/app/src/components/LoginForm.jsx
  2. 6 14
      packages/app/src/pages/login.page.tsx

+ 5 - 5
packages/app/src/components/LoginForm.jsx

@@ -290,7 +290,8 @@ class LoginForm extends React.Component {
 
 
 
 
     const isLocalOrLdapStrategiesEnabled = isLocalStrategySetup || isLdapStrategySetup;
     const isLocalOrLdapStrategiesEnabled = isLocalStrategySetup || isLdapStrategySetup;
-    const isSomeExternalAuthEnabled = Object.values(objOfIsExternalAuthEnableds).some(elem => elem);
+    // const isSomeExternalAuthEnabled = Object.values(objOfIsExternalAuthEnableds).some(elem => elem);
+    const isSomeExternalAuthEnabled = true;
 
 
     return (
     return (
       <div className="login-dialog mx-auto" id="login-dialog">
       <div className="login-dialog mx-auto" id="login-dialog">
@@ -355,8 +356,7 @@ const LoginFormWrapperFC = (props) => {
   const { t } = useTranslation();
   const { t } = useTranslation();
   const { data: csrfToken } = useCsrfToken();
   const { data: csrfToken } = useCsrfToken();
 
 
-  // return <LoginForm t={t} csrfToken={csrfToken} {...props} />;
-  return <div>あああ</div>;
+  return <LoginForm t={t} csrfToken={csrfToken} {...props} />;
 };
 };
 
 
 /**
 /**
@@ -364,5 +364,5 @@ const LoginFormWrapperFC = (props) => {
  */
  */
 // const LoginFormWrapper = withUnstatedContainers(LoginFormWrapperFC, [AppContainer]);
 // const LoginFormWrapper = withUnstatedContainers(LoginFormWrapperFC, [AppContainer]);
 
 
-export default LoginForm;
-// export default LoginFormWrapperFC;
+// export default LoginForm;
+export default LoginFormWrapperFC;

+ 6 - 14
packages/app/src/pages/login.page.tsx

@@ -50,9 +50,11 @@ async function injectServerConfigurations(context: GetServerSidePropsContext, pr
   const { crowi } = req;
   const { crowi } = req;
   const {
   const {
     mailService,
     mailService,
+    configManager,
   } = crowi;
   } = crowi;
 
 
   props.isMailerSetup = mailService.isMailerSetup;
   props.isMailerSetup = mailService.isMailerSetup;
+  props.registrationWhiteList = configManager.getConfig('crowi', 'security:registrationWhiteList');
 }
 }
 
 
 type Props = CommonProps & {
 type Props = CommonProps & {
@@ -60,6 +62,7 @@ type Props = CommonProps & {
   pageWithMetaStr: string,
   pageWithMetaStr: string,
   isMailerSetup: boolean,
   isMailerSetup: boolean,
   enabledStrategies: unknown,
   enabledStrategies: unknown,
+  registrationWhiteList: string[],
 };
 };
 
 
 const LoginPage: NextPage<Props> = (props: Props) => {
 const LoginPage: NextPage<Props> = (props: Props) => {
@@ -84,21 +87,10 @@ const LoginPage: NextPage<Props> = (props: Props) => {
     <>
     <>
       <RawLayout title={useCustomTitle(props, 'GROWI')} className={classNames.join(' ')}>
       <RawLayout title={useCustomTitle(props, 'GROWI')} className={classNames.join(' ')}>
         <div className='nologin'>
         <div className='nologin'>
-          <div className='wrapper'>
+          <div id='wrapper'>
             <div id="page-wrapper">
             <div id="page-wrapper">
-              <div className="main container-fluid">
-
-                <div className="row">
-                  <div className="col-md-12">
-                    <div className="login-header mx-auto">
-                      <h1 className="my-3">GROWI</h1>
-                    </div>
-                  </div>
-                  <div className="col-md-12">
-                    <LoginForm objOfIsExternalAuthEnableds={props.enabledStrategies} />
-                  </div>
-                </div>
-              </div>
+              <LoginForm objOfIsExternalAuthEnableds={props.enabledStrategies} isLocalStrategySetup={true} isLdapStrategySetup={true}
+                isRegistrationEnabled={true} registrationWhiteList={props.registrationWhiteList} isPasswordResetEnabled={true} />
             </div>
             </div>
           </div>
           </div>
         </div>
         </div>