Jelajahi Sumber

async await

熊谷洸介(Kousuke Kumagai) 6 tahun lalu
induk
melakukan
8658815ee6
2 mengubah file dengan 12 tambahan dan 16 penghapusan
  1. 8 12
      src/client/js/components/Admin/Importer.jsx
  2. 4 4
      src/server/routes/admin.js

+ 8 - 12
src/client/js/components/Admin/Importer.jsx

@@ -31,13 +31,13 @@ class Importer extends React.Component {
     });
   }
 
-  esaHandleSubmit() {
+  async esaHandleSubmit() {
     try {
       const params = {
         'importer:esa:team_name': this.state.esaTeamName,
         'importer:esa:access_token': this.state.esaAccessToken,
       };
-      this.props.appContainer.apiPost('/admin/import/esa', params);
+      await this.props.appContainer.apiPost('/admin/import/esa', params);
       toastSuccess('Import posts from esa success.');
     }
     catch (error) {
@@ -45,15 +45,13 @@ class Importer extends React.Component {
     }
   }
 
-  esaHandleSubmitTest() {
+  async esaHandleSubmitTest() {
     try {
       const params = {
         'importer:esa:team_name': this.state.esaTeamName,
         'importer:esa:access_token': this.state.esaAccessToken,
-
       };
-
-      this.props.appContainer.apiPost('/admin/import/testEsaAPI', params);
+      await this.props.appContainer.apiPost('/admin/import/testEsaAPI', params);
       toastSuccess('Test connection to esa success.');
     }
     catch (error) {
@@ -76,13 +74,13 @@ class Importer extends React.Component {
     }
   }
 
-  qiitaHandleSubmit() {
+  async qiitaHandleSubmit() {
     try {
       const params = {
         'importer:qiita:team_name': this.state.qiitaTeamName,
         'importer:qiita:access_token': this.state.qiitaAccessToken,
       };
-      this.props.appContainer.apiPost('/admin/import/qiita', params);
+      await this.props.appContainer.apiPost('/admin/import/qiita', params);
       toastSuccess('Import posts from qiita:team success.');
     }
     catch (error) {
@@ -91,15 +89,13 @@ class Importer extends React.Component {
   }
 
 
-  qiitaHandleSubmitTest() {
+  async qiitaHandleSubmitTest() {
     try {
       const params = {
         'importer:qiita:team_name': this.state.qiitaTeamName,
         'importer:qiita:access_token': this.state.qiitaAccessToken,
-
       };
-
-      this.props.appContainer.apiPost('/admin/import/testQiitaAPI', params);
+      await this.props.appContainer.apiPost('/admin/import/testQiitaAPI', params);
       toastSuccess('Test connection to qiita:team success.');
     }
     catch (error) {

+ 4 - 4
src/server/routes/admin.js

@@ -1249,7 +1249,7 @@ module.exports = function(crowi, app) {
     if (errors.length > 0) {
       return res.json({ status: false, message: `<br> - ${errors.join('<br> - ')}` });
     }
-    return res.json({ status: true });
+    return res.json(ApiResponse.success());
   };
 
   /**
@@ -1272,7 +1272,7 @@ module.exports = function(crowi, app) {
     if (errors.length > 0) {
       return res.json({ status: false, message: `<br> - ${errors.join('<br> - ')}` });
     }
-    return res.json({ status: true });
+    return res.json(ApiResponse.success());
   };
 
   /**
@@ -1284,7 +1284,7 @@ module.exports = function(crowi, app) {
   actions.api.testEsaAPI = async(req, res) => {
     try {
       await importer.testConnectionToEsa();
-      return res.json({ status: true });
+      return res.json(ApiResponse.success());
     }
     catch (err) {
       return res.json({ status: false, message: `${err}` });
@@ -1300,7 +1300,7 @@ module.exports = function(crowi, app) {
   actions.api.testQiitaAPI = async(req, res) => {
     try {
       await importer.testConnectionToQiita();
-      return res.json({ status: true });
+      return res.json(ApiResponse.success());
     }
     catch (err) {
       return res.json({ status: false, message: `${err}` });