Просмотр исходного кода

Corrected the code based on the first feedback

Shunm634-source 3 лет назад
Родитель
Сommit
fb985b8395

+ 3 - 3
packages/app/src/components/Me/PasswordSettings.jsx

@@ -32,9 +32,9 @@ class PasswordSettings extends React.Component {
   async componentDidMount() {
     try {
       const res = await apiv3Get('/personal-setting/is-password-set');
-      const { passwordParams } = res.data;
-      this.setState({ isPasswordSet: passwordParams.isPasswordSet });
-      this.setState({ minPasswordLength: passwordParams.minPasswordLength });
+      const { isPasswordSet, minPasswordLength } = res.data;
+      this.setState({ isPasswordSet });
+      this.setState({ minPasswordLength });
     }
     catch (err) {
       toastError(err);

+ 0 - 1
packages/app/src/server/routes/apiv3/forgot-password.js

@@ -27,7 +27,6 @@ module.exports = (crowi) => {
   const csrf = require('../../middlewares/csrf')(crowi);
 
   const minPasswordLength = crowi.configManager.getConfig('crowi', 'app:minPasswordLength');
-  // console.log('minPassword Length is: ', minPasswordLength);
 
   const validator = {
     password: [

+ 3 - 5
packages/app/src/server/routes/apiv3/personal-setting.js

@@ -189,11 +189,9 @@ module.exports = (crowi) => {
 
     try {
       const user = await User.findUserByUsername(username);
-      const passwordParams = {
-        isPasswordSet: user.isPasswordSet(),
-        minPasswordLength: crowi.configManager.getConfig('crowi', 'app:minPasswordLength'),
-      };
-      return res.apiv3({ passwordParams });
+      const isPasswordSet = user.isPasswordSet();
+      const minPasswordLength = crowi.configManager.getConfig('crowi', 'app:minPasswordLength');
+      return res.apiv3({ isPasswordSet, minPasswordLength });
     }
     catch (err) {
       logger.error(err);

+ 1 - 1
packages/app/src/server/service/config-loader.ts

@@ -614,7 +614,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     ns: 'crowi',
     key: 'app:minPasswordLength',
     type: ValueType.NUMBER,
-    default: null,
+    default: 8,
   },
 };