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

Merge pull request #3594 from weseek/feat/GW-5580-hide-email-address-of-the-user-created-in-the-invitation-email

Feat/hide email address of the user created in the invitation email
Yuki Takei 5 лет назад
Родитель
Сommit
95b4599681
2 измененных файлов с 3 добавлено и 5 удалено
  1. 1 0
      src/server/models/user.js
  2. 2 5
      src/server/routes/apiv3/app-settings.js

+ 1 - 0
src/server/models/user.js

@@ -268,6 +268,7 @@ module.exports = function(crowi) {
     this.name = name;
     this.username = username;
     this.status = STATUS_ACTIVE;
+    this.isEmailPublished = crowi.configManager.getConfig('crowi', 'customize:isEmailPublishedForNewUser');
 
     this.save((err, userData) => {
       userEvent.emit('activated', userData);

+ 2 - 5
src/server/routes/apiv3/app-settings.js

@@ -260,8 +260,6 @@ module.exports = (crowi) => {
       envGcsUploadNamespace: crowi.configManager.getConfigFromEnvVars('crowi', 'gcs:uploadNamespace'),
 
       isEnabledPlugins: crowi.configManager.getConfig('crowi', 'plugin:isEnabledPlugins'),
-
-      isMailPublished: crowi.configManager.getConfig('crowi', 'app:isMailPublished'),
     };
     return res.apiv3({ appSettingsParams });
 
@@ -291,13 +289,13 @@ module.exports = (crowi) => {
    *                schema:
    *                  $ref: '#/components/schemas/AppSettingParams'
    */
-  router.put('/app-setting', loginRequiredStrictly, adminRequired, csrf, validator.appSetting, apiV3FormValidator, async(req, res) => {    const requestAppSettingParams = {
+  router.put('/app-setting', loginRequiredStrictly, adminRequired, csrf, validator.appSetting, apiV3FormValidator, async(req, res) => {
+    const requestAppSettingParams = {
       'app:title': req.body.title,
       'app:confidential': req.body.confidential,
       'app:globalLang': req.body.globalLang,
       'customize:isEmailPublishedForNewUser': req.body.isEmailPublishedForNewUser,
       'app:fileUpload': req.body.fileUpload,
-      'app:isMailPublished': req.body.isMailPublished
     };
 
     try {
@@ -308,7 +306,6 @@ module.exports = (crowi) => {
         globalLang: crowi.configManager.getConfig('crowi', 'app:globalLang'),
         isEmailPublishedForNewUser: crowi.configManager.getConfig('crowi', 'customize:isEmailPublishedForNewUser'),
         fileUpload: crowi.configManager.getConfig('crowi', 'app:fileUpload'),
-        isMailPublished: crowi.configManager.getConfig('crowi', 'app:isMailPublished'),
       };
       return res.apiv3({ appSettingParams });
     }