Browse Source

revert code

Shun Miyazawa 1 year ago
parent
commit
628fafff72

+ 1 - 2
apps/app/src/components/LoginForm/LoginForm.tsx

@@ -231,7 +231,6 @@ export const LoginForm = (props: LoginFormProps): JSX.Element => {
               placeholder="Password"
               onChange={(e) => { setPasswordForLogin(e.target.value) }}
               name="passwordForLogin"
-              minLength={minPasswordLength}
             />
           </div>
 
@@ -257,7 +256,7 @@ export const LoginForm = (props: LoginFormProps): JSX.Element => {
     );
   }, [
     props, separateErrorsBasedOnErrorCode, loginErrors, generateDangerouslySetErrors, generateSafelySetErrors,
-    isLdapSetupFailed, t, handleLoginWithLocalSubmit, minPasswordLength, isLoading,
+    isLdapSetupFailed, t, handleLoginWithLocalSubmit, isLoading,
   ]);
 
 

+ 1 - 4
apps/app/src/server/middlewares/login-form-validator.ts

@@ -1,7 +1,6 @@
-import { ErrorV3 } from '@growi/core/dist/models';
 import { body, validationResult, type ValidationChain } from 'express-validator';
 // form rules
-export const loginRules = (minPasswordLength: number): ValidationChain[] => {
+export const loginRules = (): ValidationChain[] => {
 
   return [
     body('loginForm.username')
@@ -13,8 +12,6 @@ export const loginRules = (minPasswordLength: number): ValidationChain[] => {
     body('loginForm.password')
       .matches(/^[\x20-\x7F]*$/)
       .withMessage('message.Password has invalid character')
-      .isLength({ min: minPasswordLength })
-      .withMessage(new ErrorV3('message.Password minimum character should be more than n characters', undefined, undefined, { number: minPasswordLength }))
       .not()
       .isEmpty()
       .withMessage('message.Password field is required'),

+ 1 - 1
apps/app/src/server/routes/apiv3/index.js

@@ -55,7 +55,7 @@ module.exports = (crowi, app) => {
   const login = require('../login')(crowi, app);
   const loginPassport = require('../login-passport')(crowi, app);
 
-  routerForAuth.post('/login', applicationInstalled, loginFormValidator.loginRules(minPasswordLength), loginFormValidator.loginValidation,
+  routerForAuth.post('/login', applicationInstalled, loginFormValidator.loginRules(), loginFormValidator.loginValidation,
     addActivity, loginPassport.injectRedirectTo, loginPassport.isEnableLoginWithLocalOrLdap, loginPassport.loginWithLocal, loginPassport.loginWithLdap,
     loginPassport.cannotLoginErrorHadnler, loginPassport.loginFailure);
 

+ 1 - 3
apps/app/src/server/routes/index.js

@@ -52,8 +52,6 @@ module.exports = function(crowi, app) {
   const unavailableWhenMaintenanceMode = generateUnavailableWhenMaintenanceModeMiddleware(crowi);
   const unavailableWhenMaintenanceModeForApi = generateUnavailableWhenMaintenanceModeMiddlewareForApi(crowi);
 
-  const minPasswordLength = crowi.configManager.getConfig('crowi', 'app:minPasswordLength');
-
 
   /* eslint-disable max-len, comma-spacing, no-multi-spaces */
 
@@ -98,7 +96,7 @@ module.exports = function(crowi, app) {
   app.get('/passport/oidc/callback'               , loginPassport.injectRedirectTo, loginPassport.loginPassportOidcCallback     , loginPassport.loginFailureForExternalAccount);
   app.post('/passport/saml/callback'              , addActivity, loginPassport.injectRedirectTo, loginPassport.loginPassportSamlCallback, loginPassport.loginFailureForExternalAccount);
 
-  app.post('/_api/login/testLdap'    , loginRequiredStrictly , loginFormValidator.loginRules(minPasswordLength) , loginFormValidator.loginValidation , loginPassport.testLdapCredentials);
+  app.post('/_api/login/testLdap'    , loginRequiredStrictly , loginFormValidator.loginRules() , loginFormValidator.loginValidation , loginPassport.testLdapCredentials);
 
   // importer management for admin
   app.post('/_api/admin/settings/importerEsa'   , loginRequiredStrictly , adminRequired , csrfProtection, addActivity, admin.importer.api.validators.importer.esa(),admin.api.importerSettingEsa);