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

Add activity at the timing when the handler is executed

Shun Miyazawa 3 лет назад
Родитель
Сommit
ad59d2d3fb
1 измененных файлов с 2 добавлено и 4 удалено
  1. 2 4
      packages/app/src/server/routes/login.js

+ 2 - 4
packages/app/src/server/routes/login.js

@@ -43,6 +43,8 @@ module.exports = function(crowi, app) {
   }
 
   const registerSuccessHandler = async function(req, res, userData, registrationMode) {
+    const parameters = { action: SupportedAction.ACTION_USER_REGISTRATION_SUCCESS };
+    activityEvent.emit('update', res.locals.activity._id, parameters);
 
     if (registrationMode === aclService.labels.SECURITY_REGISTRATION_MODE_RESTRICTED) {
       await sendEmailToAllAdmins(userData);
@@ -62,7 +64,6 @@ module.exports = function(crowi, app) {
         });
       }
 
-
       // userData.password cann't be empty but, prepare redirect because password property in User Model is optional
       // https://github.com/weseek/growi/pull/6670
       const redirectTo = userData.password ? req.session.redirectTo : '/me#password';
@@ -70,9 +71,6 @@ module.exports = function(crowi, app) {
       // remove session.redirectTo
       delete req.session.redirectTo;
 
-      const parameters = { action: SupportedAction.ACTION_USER_REGISTRATION_SUCCESS };
-      activityEvent.emit('update', res.locals.activity._id, parameters);
-
       return res.apiv3({ redirectTo });
     });
   };