itizawa 6 лет назад
Родитель
Сommit
71a52edb38

+ 2 - 2
src/client/js/services/PersonalContainer.js

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

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

@@ -179,7 +179,6 @@ 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'),

+ 21 - 2
src/server/routes/apiv3/personal-setting.js

@@ -26,13 +26,32 @@ module.exports = (crowi) => {
 
   const { ApiV3FormValidator } = crowi.middlewares;
 
-  // TODO swagger
+  /**
+   * @swagger
+   *
+   *    /personal-setting:
+   *      get:
+   *        tags: [PersonalSetting]
+   *        operationId: getPersonalSetting
+   *        summary: /personal-setting
+   *        description: Get personal parameters
+   *        responses:
+   *          200:
+   *            description: params of personal
+   *            content:
+   *              application/json:
+   *                schema:
+   *                  properties:
+   *                    personalParams:
+   *                      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);
+    return res.apiv3({ personalParams });
   });
 
   return router;