fix src/server

src/server/form/admin/securityPassportLdap.js

@@ -5,12 +5,12 @@ const field = form.field;
 module.exports = form(
   field('settingForm[security:passport-ldap:isEnabled]').trim().toBooleanStrict().required(),
   field('settingForm[security:passport-ldap:serverUrl]').trim()
-      // https://regex101.com/r/E0UL6D/1
-      .is(/^ldaps?:\/\/([^/\s]+)\/([^/\s]+)$/, 'Server URL is invalid. <small><a href="https://regex101.com/r/E0UL6D/1">&gt;&gt; Regex</a></small>'),
+  // https://regex101.com/r/E0UL6D/1
+    .is(/^ldaps?:\/\/([^/\s]+)\/([^/\s]+)$/, 'Server URL is invalid. <small><a href="https://regex101.com/r/E0UL6D/1">&gt;&gt; Regex</a></small>'),
   field('settingForm[security:passport-ldap:isUserBind]').trim().toBooleanStrict(),
   field('settingForm[security:passport-ldap:bindDN]').trim()
-      // https://regex101.com/r/jK8lpO/1
-      .is(/^(,?[^,=\s]+=[^,=\s]+){1,}$|^[^@\s]+@[^@\s]+$/, 'Bind DN is invalid. <small><a href="https://regex101.com/r/jK8lpO/3">&gt;&gt; Regex</a></small>'),
+  // https://regex101.com/r/jK8lpO/1
+    .is(/^(,?[^,=\s]+=[^,=\s]+){1,}$|^[^@\s]+@[^@\s]+$/, 'Bind DN is invalid. <small><a href="https://regex101.com/r/jK8lpO/3">&gt;&gt; Regex</a></small>'),
   field('settingForm[security:passport-ldap:bindDNPassword]'),
   field('settingForm[security:passport-ldap:searchFilter]'),
   field('settingForm[security:passport-ldap:attrMapUsername]'),

src/server/models/GlobalNotificationSetting/index.js

@@ -91,7 +91,7 @@ class GlobalNotificationSetting {
       triggerEvents: event,
       isEnabled: true,
     })
-    .sort({ triggerPath: 1 });
+      .sort({ triggerPath: 1 });
 
     return settings;
   }

src/server/models/page.js

@@ -537,16 +537,16 @@ module.exports = function(crowi) {
     const self = this;
     const Comment = crowi.model('Comment');
     return Comment.countCommentByPageId(pageId)
-    .then((count) => {
-      self.update({ _id: pageId }, { commentCount: count }, {}, (err, data) => {
-        if (err) {
-          debug('Update commentCount Error', err);
-          throw err;
-        }
+      .then((count) => {
+        self.update({ _id: pageId }, { commentCount: count }, {}, (err, data) => {
+          if (err) {
+            debug('Update commentCount Error', err);
+            throw err;
+          }
 
-        return data;
+          return data;
+        });
       });
-    });
   };
 
   pageSchema.statics.getGrantLabels = function() {

src/server/models/updatePost.js

@@ -69,19 +69,19 @@ module.exports = function(crowi) {
           { patternPrefix: '*', patternPrefix2: prefixes[1] },
         ],
       })
-      .then((settings) => {
-        if (settings.length <= 0) {
-          return resolve(settings);
-        }
+        .then((settings) => {
+          if (settings.length <= 0) {
+            return resolve(settings);
+          }
 
-        // eslint-disable-next-line no-param-reassign
-        settings = settings.filter((setting) => {
-          const patternRegex = UpdatePost.getRegExpByPattern(setting.pathPattern);
-          return patternRegex.test(path);
-        });
+          // eslint-disable-next-line no-param-reassign
+          settings = settings.filter((setting) => {
+            const patternRegex = UpdatePost.getRegExpByPattern(setting.pathPattern);
+            return patternRegex.test(path);
+          });
 
-        return resolve(settings);
-      });
+          return resolve(settings);
+        });
     }));
   };
 

src/server/routes/admin.js

@@ -551,31 +551,31 @@ module.exports = function(crowi, app) {
         return resolve(userData);
       });
     })
-    .then((userData) => {
-      return new Promise((resolve, reject) => {
-        userData.statusDelete((err, userData) => {
-          if (err) {
-            reject(err);
-          }
-          resolve(userData);
+      .then((userData) => {
+        return new Promise((resolve, reject) => {
+          userData.statusDelete((err, userData) => {
+            if (err) {
+              reject(err);
+            }
+            resolve(userData);
+          });
         });
-      });
-    })
-    .then((userData) => {
+      })
+      .then((userData) => {
       // remove all External Accounts
-      return ExternalAccount.remove({ user: userData }).then(() => { return userData });
-    })
-    .then((userData) => {
-      return Page.removeByPath(`/user/${username}`).then(() => { return userData });
-    })
-    .then((userData) => {
-      req.flash('successMessage', `${username} さんのアカウントを削除しました`);
-      return res.redirect('/admin/users');
-    })
-    .catch((err) => {
-      req.flash('errorMessage', '削除に失敗しました。');
-      return res.redirect('/admin/users');
-    });
+        return ExternalAccount.remove({ user: userData }).then(() => { return userData });
+      })
+      .then((userData) => {
+        return Page.removeByPath(`/user/${username}`).then(() => { return userData });
+      })
+      .then((userData) => {
+        req.flash('successMessage', `${username} さんのアカウントを削除しました`);
+        return res.redirect('/admin/users');
+      })
+      .catch((err) => {
+        req.flash('errorMessage', '削除に失敗しました。');
+        return res.redirect('/admin/users');
+      });
   };
 
   // これやったときの relation の挙動未確認
@@ -601,14 +601,14 @@ module.exports = function(crowi, app) {
     const User = crowi.model('User');
 
     User.resetPasswordByRandomString(id)
-    .then((data) => {
-      data.user = User.filterToPublicFields(data.user);
-      return res.json(ApiResponse.success(data));
-    })
-.catch((err) => {
-  debug('Error on reseting password', err);
-  return res.json(ApiResponse.error('Error'));
-});
+      .then((data) => {
+        data.user = User.filterToPublicFields(data.user);
+        return res.json(ApiResponse.success(data));
+      })
+      .catch((err) => {
+        debug('Error on reseting password', err);
+        return res.json(ApiResponse.error('Error'));
+      });
   };
 
   actions.externalAccount = {};
@@ -666,9 +666,9 @@ module.exports = function(crowi, app) {
         return userGroups.map((userGroup) => {
           return new Promise((resolve, reject) => {
             UserGroupRelation.findAllRelationForUserGroup(userGroup)
-            .then((relations) => {
-              return resolve([userGroup, relations]);
-            });
+              .then((relations) => {
+                return resolve([userGroup, relations]);
+              });
           });
         });
       })
@@ -749,33 +749,33 @@ module.exports = function(crowi, app) {
     const name = crowi.xss.process(req.body.name);
 
     UserGroup.findById(userGroupId)
-    .then((userGroupData) => {
-      if (userGroupData == null) {
-        req.flash('errorMessage', 'グループの検索に失敗しました。');
-        return new Promise();
-      }
+      .then((userGroupData) => {
+        if (userGroupData == null) {
+          req.flash('errorMessage', 'グループの検索に失敗しました。');
+          return new Promise();
+        }
 
-      // 名前存在チェック
-      return UserGroup.isRegisterableName(name)
-        .then((isRegisterableName) => {
+        // 名前存在チェック
+        return UserGroup.isRegisterableName(name)
+          .then((isRegisterableName) => {
           // 既に存在するグループ名に更新しようとした場合はエラー
-          if (!isRegisterableName) {
-            req.flash('errorMessage', 'グループ名が既に存在します。');
-          }
-          else {
-            return userGroupData.updateName(name)
-            .then(() => {
-              req.flash('successMessage', 'グループ名を更新しました。');
-            })
-            .catch((err) => {
-              req.flash('errorMessage', 'グループ名の更新に失敗しました。');
-            });
-          }
-        });
-    })
-    .then(() => {
-      return res.redirect(`/admin/user-group-detail/${userGroupId}`);
-    });
+            if (!isRegisterableName) {
+              req.flash('errorMessage', 'グループ名が既に存在します。');
+            }
+            else {
+              return userGroupData.updateName(name)
+                .then(() => {
+                  req.flash('successMessage', 'グループ名を更新しました。');
+                })
+                .catch((err) => {
+                  req.flash('errorMessage', 'グループ名の更新に失敗しました。');
+                });
+            }
+          });
+      })
+      .then(() => {
+        return res.redirect(`/admin/user-group-detail/${userGroupId}`);
+      });
   };
 
 
@@ -818,20 +818,20 @@ module.exports = function(crowi, app) {
       // ユーザを名前で検索
       User.findUserByUsername(userName),
     ])
-    .then((resolves) => {
-      userGroup = resolves[0];
-      user = resolves[1];
-      // Relation を作成
-      UserGroupRelation.createRelation(userGroup, user);
-    })
-    .then((result) => {
-      return res.redirect(`/admin/user-group-detail/${userGroup.id}`);
-    })
-.catch((err) => {
-  debug('Error on create user-group relation', err);
-  req.flash('errorMessage', 'Error on create user-group relation');
-  return res.redirect(`/admin/user-group-detail/${userGroup.id}`);
-});
+      .then((resolves) => {
+        userGroup = resolves[0];
+        user = resolves[1];
+        // Relation を作成
+        UserGroupRelation.createRelation(userGroup, user);
+      })
+      .then((result) => {
+        return res.redirect(`/admin/user-group-detail/${userGroup.id}`);
+      })
+      .catch((err) => {
+        debug('Error on create user-group relation', err);
+        req.flash('errorMessage', 'Error on create user-group relation');
+        return res.redirect(`/admin/user-group-detail/${userGroup.id}`);
+      });
   };
 
   actions.userGroupRelation.remove = function(req, res) {
@@ -840,13 +840,13 @@ module.exports = function(crowi, app) {
     const relationId = req.params.relationId;
 
     UserGroupRelation.removeById(relationId)
-    .then(() => {
-      return res.redirect(`/admin/user-group-detail/${userGroupId}`);
-    })
-    .catch((err) => {
-      debug('Error on remove user-group-relation', err);
-      req.flash('errorMessage', 'グループのユーザ削除に失敗しました。');
-    });
+      .then(() => {
+        return res.redirect(`/admin/user-group-detail/${userGroupId}`);
+      })
+      .catch((err) => {
+        debug('Error on remove user-group-relation', err);
+        req.flash('errorMessage', 'グループのユーザ削除に失敗しました。');
+      });
   };
 
   // Importer management

src/server/routes/me.js

@@ -157,34 +157,34 @@ module.exports = function(crowi, app) {
           });
       }
     })
-    .then((isDisassociatable) => {
-      if (!isDisassociatable) {
-        const e = new Error();
-        e.name = 'couldntDisassociateError';
-        throw e;
-      }
-
-      const providerType = req.body.providerType;
-      const accountId = req.body.accountId;
+      .then((isDisassociatable) => {
+        if (!isDisassociatable) {
+          const e = new Error();
+          e.name = 'couldntDisassociateError';
+          throw e;
+        }
 
-      return ExternalAccount.findOneAndRemove({ providerType, accountId, user: userData });
-    })
-    .then((account) => {
-      if (account == null) {
-        return redirectWithFlash('errorMessage', 'ExternalAccount not found.');
-      }
+        const providerType = req.body.providerType;
+        const accountId = req.body.accountId;
 
-      return redirectWithFlash('successMessage', 'Successfully disassociated.');
-    })
-    .catch((err) => {
-      if (err) {
-        if (err.name === 'couldntDisassociateError') {
-          return redirectWithFlash('couldntDisassociateError', true);
+        return ExternalAccount.findOneAndRemove({ providerType, accountId, user: userData });
+      })
+      .then((account) => {
+        if (account == null) {
+          return redirectWithFlash('errorMessage', 'ExternalAccount not found.');
         }
 
-        return redirectWithFlash('errorMessage', err.message);
-      }
-    });
+        return redirectWithFlash('successMessage', 'Successfully disassociated.');
+      })
+      .catch((err) => {
+        if (err) {
+          if (err.name === 'couldntDisassociateError') {
+            return redirectWithFlash('couldntDisassociateError', true);
+          }
+
+          return redirectWithFlash('errorMessage', err.message);
+        }
+      });
   };
 
   actions.externalAccounts.associateLdap = function(req, res) {
@@ -287,16 +287,16 @@ module.exports = function(crowi, app) {
 
     if (req.method === 'POST' && req.form.isValid) {
       userData.updateApiToken()
-      .then((userData) => {
-        req.flash('successMessage', 'API Token updated');
-        return res.redirect('/me/apiToken');
-      })
-      .catch((err) => {
+        .then((userData) => {
+          req.flash('successMessage', 'API Token updated');
+          return res.redirect('/me/apiToken');
+        })
+        .catch((err) => {
         // req.flash('successMessage',);
-        req.form.errors.push('Failed to update API Token');
-        return res.render('me/api_token', {
+          req.form.errors.push('Failed to update API Token');
+          return res.render('me/api_token', {
+          });
         });
-      });
     }
     else {
       return res.render('me/api_token', {

src/server/routes/page.js

@@ -99,9 +99,9 @@ module.exports = function(crowi, app) {
       });
 
       Promise.all(promises)
-      .catch((err) => {
-        logger.error('Error occured in sending slack notification: ', err);
-      });
+        .catch((err) => {
+          logger.error('Error occured in sending slack notification: ', err);
+        });
     }
   }
 

src/server/routes/revision.js

@@ -53,16 +53,16 @@ module.exports = function(crowi, app) {
 
     if (pageId && crowi.isPageId(pageId)) {
       Page.findByIdAndViewer(pageId, req.user)
-      .then((pageData) => {
-        debug('Page found', pageData._id, pageData.path);
-        return Revision.findRevisionIdList(pageData.path);
-      })
-      .then((revisions) => {
-        return res.json(ApiResponse.success({ revisions }));
-      })
-      .catch((err) => {
-        return res.json(ApiResponse.error(err));
-      });
+        .then((pageData) => {
+          debug('Page found', pageData._id, pageData.path);
+          return Revision.findRevisionIdList(pageData.path);
+        })
+        .then((revisions) => {
+          return res.json(ApiResponse.success({ revisions }));
+        })
+        .catch((err) => {
+          return res.json(ApiResponse.error(err));
+        });
     }
     else {
       return res.json(ApiResponse.error('Parameter error.'));
@@ -83,25 +83,25 @@ module.exports = function(crowi, app) {
 
     if (pageId) {
       Page.findByIdAndViewer(pageId, req.user)
-      .then((pageData) => {
-        debug('Page found', pageData._id, pageData.path);
-        return Revision.findRevisionList(pageData.path, {});
-      })
-      .then((revisions) => {
-        return res.json(ApiResponse.success(revisions));
-      })
-      .catch((err) => {
-        return res.json(ApiResponse.error(err));
-      });
+        .then((pageData) => {
+          debug('Page found', pageData._id, pageData.path);
+          return Revision.findRevisionList(pageData.path, {});
+        })
+        .then((revisions) => {
+          return res.json(ApiResponse.success(revisions));
+        })
+        .catch((err) => {
+          return res.json(ApiResponse.error(err));
+        });
     }
     else if (revisionIds.length > 0) {
       Revision.findRevisions(revisionIds)
-      .then((revisions) => {
-        return res.json(ApiResponse.success(revisions));
-      })
-      .catch((err) => {
-        return res.json(ApiResponse.error(err));
-      });
+        .then((revisions) => {
+          return res.json(ApiResponse.success(revisions));
+        })
+        .catch((err) => {
+          return res.json(ApiResponse.error(err));
+        });
     }
     else {
       return res.json(ApiResponse.error('Parameter error.'));

src/server/util/middlewares.js

@@ -265,15 +265,16 @@ exports.accessTokenParser = function(crowi, app) {
 
     debug('accessToken is', accessToken);
     User.findUserByApiToken(accessToken)
-    .then((userData) => {
-      req.user = userData;
-      req.skipCsrfVerify = true;
-      debug('Access token parsed: skipCsrfVerify');
+      .then((userData) => {
+        req.user = userData;
+        req.skipCsrfVerify = true;
+        debug('Access token parsed: skipCsrfVerify');
 
-      next();
-    }).catch((err) => {
-      next();
-    });
+        next();
+      })
+      .catch((err) => {
+        next();
+      });
   };
 };