熊谷洸介(Kousuke Kumagai) 6 лет назад
Родитель
Сommit
6e47d4bb86

+ 7 - 6
src/client/js/components/Admin/Importer.jsx

@@ -29,8 +29,8 @@ class Importer extends React.Component {
   esaHandleSubmit() {
     try {
       const params = {
-        esaTeamName: this.state.esaTeamName,
-        esaAccessToken: this.state.esaAccessToken,
+        'importer:esa:team_name': this.state.esaTeamName,
+        'importer:esa:access_token': this.state.esaAccessToken,
       };
       this.props.appContainer.apiPost('/admin/import/esa', params);
       toastSuccess('Import posts from esa success.');
@@ -43,10 +43,11 @@ class Importer extends React.Component {
   esaHandleSubmitTest() {
     try {
       const params = {
-        esaTeamName: this.state.esaTeamName,
-        esaAccessToken: this.state.esaAccessToken,
+        'importer:esa:team_name': this.state.esaTeamName,
+        'importer:esa:access_token': this.state.esaAccessToken,
 
       };
+
       this.props.appContainer.apiPost('/admin/import/testEsaAPI', params);
       toastSuccess('Test connection to esa success.');
     }
@@ -58,8 +59,8 @@ class Importer extends React.Component {
   esaHandleSubmitUpdate() {
     try {
       const params = {
-        esaTeamName: this.state.esaTeamName,
-        esaAccessToken: this.state.esaAccessToken,
+        'importer:esa:team_name': this.state.esaTeamName,
+        'importer:esa:access_token': this.state.esaAccessToken,
       };
       this.props.appContainer.apiPost('/admin/settings/importerEsa', params);
       toastSuccess('Update');

+ 1 - 5
src/server/routes/admin.js

@@ -1157,11 +1157,7 @@ module.exports = function(crowi, app) {
    * @param {*} res
    */
   actions.api.importerSettingEsa = async(req, res) => {
-    const form = req.form.settingForm;
-
-    if (!req.form.isValid) {
-      return res.json({ status: false, message: req.form.errors.join('\n') });
-    }
+    const form = req.body;
 
     await configManager.updateConfigsInTheSameNamespace('crowi', form);
     importer.initializeEsaClient(); // let it run in the back aftert res

+ 1 - 1
src/server/util/importer.js

@@ -171,7 +171,7 @@ module.exports = (crowi) => {
    */
   const getTeamNameFromEsa = () => {
     return new Promise((resolve, reject) => {
-      esaClient.api.team((err, res) => {
+       esaClient.api.team((err, res) => {
         if (err) {
           return reject(err);
         }