Shun Miyazawa 3 лет назад
Родитель
Сommit
9f7d431a6b

+ 16 - 16
packages/app/src/interfaces/activity.ts

@@ -12,14 +12,14 @@ const ACTION_REGISTRATION_SUCCESS = 'REGISTRATION_SUCCESS';
 const ACTION_LOGIN_SUCCESS = 'LOGIN_SUCCESS';
 const ACTION_LOGIN_FAILURE = 'LOGIN_FAILURE';
 const ACTION_LOGOUT = 'LOGOUT';
-const ACTION_PERSONAL_SETTINGS_UPDATE = 'PERSONAL_SETTINGS_UPDATE';
-const ACTION_PASSWORD_UPDATE = 'PASSWORD_UPDATE';
-const ACTION_IMAGE_TYPE_UPDATE = 'IMAGE_TYPE_UPDATE';
-const ACTION_LDAP_ACCOUNT_ASSOCIATE = 'LDAP_ACCOUNT_ASSOCIATE';
-const ACTION_LDAP_ACCOUNT_DISCONNECT = 'LDAP_ACCOUNT_DISCONNECT';
-const ACTION_API_TOKEN_CREATE = 'API_TOKEN_CREATE';
-const ACTION_EDITOR_SETTINGS_UPDATE = 'EDITOR_SETTINGS_UPDATE';
-const ACTION_IN_APP_NOTIFICATION_SETTINGS_UPDATE = 'IN_APP_NOTIFICATION_SETTINGS_UPDATE';
+const ACTION_USER_PERSONAL_SETTINGS_UPDATE = 'USER_PERSONAL_SETTINGS_UPDATE';
+const ACTION_USER_IMAGE_TYPE_UPDATE = 'USER_IMAGE_TYPE_UPDATE';
+const ACTION_USER_LDAP_ACCOUNT_ASSOCIATE = 'USER_LDAP_ACCOUNT_ASSOCIATE';
+const ACTION_USER_LDAP_ACCOUNT_DISCONNECT = 'USER_LDAP_ACCOUNT_DISCONNECT';
+const ACTION_USER_PASSWORD_UPDATE = 'USER_PASSWORD_UPDATE';
+const ACTION_USER_API_TOKEN_UPDATE = 'USER_API_TOKEN_UPDATE';
+const ACTION_USER_EDITOR_SETTINGS_UPDATE = 'USER_EDITOR_SETTINGS_UPDATE';
+const ACTION_USER_IN_APP_NOTIFICATION_SETTINGS_UPDATE = 'USER_IN_APP_NOTIFICATION_SETTINGS_UPDATE';
 const ACTION_PAGE_VIEW = 'PAGE_VIEW';
 const ACTION_PAGE_LIKE = 'PAGE_LIKE';
 const ACTION_PAGE_UNLIKE = 'PAGE_UNLIKE';
@@ -51,14 +51,14 @@ export const SUPPORTED_ACTION_TYPE = {
   ACTION_LOGIN_SUCCESS,
   ACTION_LOGIN_FAILURE,
   ACTION_LOGOUT,
-  ACTION_PERSONAL_SETTINGS_UPDATE,
-  ACTION_IMAGE_TYPE_UPDATE,
-  ACTION_LDAP_ACCOUNT_ASSOCIATE,
-  ACTION_LDAP_ACCOUNT_DISCONNECT,
-  ACTION_PASSWORD_UPDATE,
-  ACTION_API_TOKEN_CREATE,
-  ACTION_EDITOR_SETTINGS_UPDATE,
-  ACTION_IN_APP_NOTIFICATION_SETTINGS_UPDATE,
+  ACTION_USER_PERSONAL_SETTINGS_UPDATE,
+  ACTION_USER_IMAGE_TYPE_UPDATE,
+  ACTION_USER_LDAP_ACCOUNT_ASSOCIATE,
+  ACTION_USER_LDAP_ACCOUNT_DISCONNECT,
+  ACTION_USER_PASSWORD_UPDATE,
+  ACTION_USER_API_TOKEN_UPDATE,
+  ACTION_USER_EDITOR_SETTINGS_UPDATE,
+  ACTION_USER_IN_APP_NOTIFICATION_SETTINGS_UPDATE,
   ACTION_PAGE_VIEW,
   ACTION_PAGE_LIKE,
   ACTION_PAGE_UNLIKE,

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

@@ -244,7 +244,7 @@ module.exports = (crowi) => {
       const updatedUser = await user.save();
       req.i18n.changeLanguage(req.body.lang);
 
-      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_PERSONAL_SETTINGS_UPDATE };
+      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_USER_PERSONAL_SETTINGS_UPDATE };
       activityEvent.emit('update', res.locals.activity._id, parameters);
 
       return res.apiv3({ updatedUser });
@@ -282,7 +282,7 @@ module.exports = (crowi) => {
     try {
       const userData = await req.user.updateIsGravatarEnabled(isGravatarEnabled);
 
-      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_IMAGE_TYPE_UPDATE };
+      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_USER_IMAGE_TYPE_UPDATE };
       activityEvent.emit('update', res.locals.activity._id, parameters);
 
       return res.apiv3({ userData });
@@ -362,7 +362,7 @@ module.exports = (crowi) => {
     }
     try {
       const userData = await user.updatePassword(newPassword);
-      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_PASSWORD_UPDATE };
+      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_USER_PASSWORD_UPDATE };
       activityEvent.emit('update', res.locals.activity._id, parameters);
       return res.apiv3({ userData });
     }
@@ -399,7 +399,7 @@ module.exports = (crowi) => {
     try {
       const userData = await user.updateApiToken();
 
-      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_API_TOKEN_CREATE };
+      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_USER_API_TOKEN_UPDATE };
       activityEvent.emit('update', res.locals.activity._id, parameters);
 
       return res.apiv3({ userData });
@@ -451,7 +451,7 @@ module.exports = (crowi) => {
       await passport.authenticate('ldapauth');
       const associateUser = await ExternalAccount.associate('ldap', username, user);
 
-      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_LDAP_ACCOUNT_ASSOCIATE };
+      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_USER_LDAP_ACCOUNT_ASSOCIATE };
       activityEvent.emit('update', res.locals.activity._id, parameters);
 
       return res.apiv3({ associateUser });
@@ -502,7 +502,7 @@ module.exports = (crowi) => {
       }
       const disassociateUser = await ExternalAccount.findOneAndRemove({ providerType, accountId, user });
 
-      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_LDAP_ACCOUNT_DISCONNECT };
+      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_USER_LDAP_ACCOUNT_DISCONNECT };
       activityEvent.emit('update', res.locals.activity._id, parameters);
 
       return res.apiv3({ disassociateUser });
@@ -562,7 +562,7 @@ module.exports = (crowi) => {
     try {
       const response = await EditorSettings.findOneAndUpdate(query, { $set: document }, options);
 
-      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_EDITOR_SETTINGS_UPDATE };
+      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_USER_EDITOR_SETTINGS_UPDATE };
       activityEvent.emit('update', res.locals.activity._id, parameters);
 
       return res.apiv3(response);
@@ -639,7 +639,7 @@ module.exports = (crowi) => {
     try {
       const response = await InAppNotificationSettings.findOneAndUpdate(query, { $set: { subscribeRules } }, options);
 
-      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_IN_APP_NOTIFICATION_SETTINGS_UPDATE };
+      const parameters = { action: SUPPORTED_ACTION_TYPE.ACTION_USER_IN_APP_NOTIFICATION_SETTINGS_UPDATE };
       activityEvent.emit('update', res.locals.activity._id, parameters);
 
       return res.apiv3(response);