Merge branch 'reactify/personal-settings' into reactify/create-component-for-manage-external-account

src/client/js/services/PersonalContainer.js

@@ -22,7 +22,7 @@ export default class PersonalContainer extends Container {
       retrieveError: null,
       name: '',
       email: '',
-      registrationWhiteList: [],
+      registrationWhiteList: this.appContainer.getConfig().registrationWhiteList,
       isEmailPublished: false,
       lang: 'en-US',
       externalAccounts: [],
@@ -43,12 +43,11 @@ export default class PersonalContainer extends Container {
   async retrievePersonalData() {
     try {
       const response = await this.appContainer.apiv3.get('/personal-setting/');
-      const { currentUser, registrationWhiteList } = response.data.personalParams;
+      const { currentUser } = response.data;
 
       this.setState({
         name: currentUser.name,
         email: currentUser.email,
-        registrationWhiteList,
         isEmailPublished: currentUser.isEmailPublished,
         lang: currentUser.lang,
       });

src/server/models/config.js

@@ -179,6 +179,7 @@ module.exports = function(crowi) {
         image: crowi.fileUploadService.getIsUploadable(),
         file: crowi.fileUploadService.getFileUploadEnabled(),
       },
+      registrationWhiteList: crowi.configManager.getConfig('crowi', 'security:registrationWhiteList'),
       behaviorType: crowi.configManager.getConfig('crowi', 'customize:behavior'),
       layoutType: crowi.configManager.getConfig('crowi', 'customize:layout'),
       themeType: crowi.configManager.getConfig('crowi', 'customize:theme'),

src/server/routes/apiv3/personal-setting.js

@@ -42,16 +42,13 @@ module.exports = (crowi) => {
    *              application/json:
    *                schema:
    *                  properties:
-   *                    personalParams:
+   *                    currentUser:
    *                      type: object
    *                      description: personal params
    */
   router.get('/', loginRequiredStrictly, async(req, res) => {
-    const personalParams = {
-      currentUser: await User.findUserByUsername(req.user.username),
-      registrationWhiteList: await crowi.configManager.getConfig('crowi', 'security:registrationWhiteList'),
-    };
-    return res.apiv3({ personalParams });
+    const currentUser = await User.findUserByUsername(req.user.username);
+    return res.apiv3({ currentUser });
   });
 
   // TODO swagger