adjust promise

lib/util/importer.js

@@ -69,13 +69,10 @@ module.exports = crowi => {
   /**
    * Import page data from qiita to GROWI
    */
-  importer.importDataFromQiita = user => {
-    return new Promise((resolve, reject) => {
+  importer.importDataFromQiita = async(user) => {
       const firstPage = 1;
-      const errors = importPostsFromQiita(firstPage, user, []);
-
-      resolve(errors);
-    });
+      const errors = await importPostsFromQiita(firstPage, user, []);
+      return errors;
   };
 
   /**
@@ -86,8 +83,8 @@ module.exports = crowi => {
       qiitaClient.getQiitaPages(pageNum, `100`)
       .then(function(res) {
         const next = pageNum * 100 + 1;
-        const postsReceived = res[0];
-        const pageTotal = res[1];
+        const postsReceived = res.pages;
+        const pageTotal = res.total;
         const data = convertQiitaDataForGrowi(postsReceived, user);
 
         createGrowiPages(data)
@@ -158,31 +155,23 @@ module.exports = crowi => {
   /**
    * Import page data from esa to GROWI
    */
-  importer.testConnectionToEsa = () => {
-    return new Promise(async(resolve, reject) => {
+  importer.testConnectionToEsa = async() => {
       try {
         await getTeamNameFromEsa();
-        resolve();
-      }
-      catch (err) {
-        reject(err);
+      } catch (err) {
+        throw err;
       }
-    });
   };
 
     /**
    * Import page data from qiita to GROWI
    */
-  importer.testConnectionToQiita = () => {
-    return new Promise(async(resolve, reject) => {
-      try {
-        await qiitaClient.getQiitaUser();
-        resolve();
-      }
-      catch (err) {
-        reject(err);
-      }
-    });
+  importer.testConnectionToQiita = async() => {
+    try {
+      await qiitaClient.getQiitaUser();
+    } catch (err) {
+      throw err;
+    };
   };
 
   /**

lib/util/restQiitaAPI.js

@@ -19,54 +19,40 @@ module.exports = function(qiitaTeam, qiitaToken) {
   });
 
   function restAPI(path) {
-    return new Promise((resolve, reject) => {
-      axios.get(path)
+    return axios.get(path)
       .then(function(res) {
         const data = res.data;
         const total = res.headers['total-count'];
-        resolve([data, total]);
+        return {data, total};
       })
       .catch(function(err) {
-        reject(err);
+        return err;
       });
-    });
   };
 
-  restQiitaAPI.getQiitaUser = function() {
-    return new Promise((resolve, reject) => {
-      restAPI('/users')
-      .then(function(res) {
-        const user = res[0];
-        if(user.length > 0) {
-          resolve(user);
-        }
-        else {
-          reject('Incorrect team name or access token.');
-        }
-      })
-      .catch(function(err){
-        reject(err);
-      })
-    });
+  restQiitaAPI.getQiitaUser = async function() {
+    try {
+      const res = await restAPI('/users');
+      const user = res.data;
+      if(user.length > 0) {
+        return user;
+      }
+    } catch (err) {
+      throw err;
+    }
   };
 
-  restQiitaAPI.getQiitaPages = function(pageNum, per_page) {
-    return new Promise((resolve, reject) => {
-      restAPI(`/items?page=${pageNum}&per_page=${per_page}`)
-      .then(function(res) {
-        const pages = res[0];
-        const total = res[1];
-        if(pages.length > 0) {
-          resolve([pages, total]);
-        }
-        else {
-          reject('page not find.');
-        }
-      })
-      .catch(function(err){
-        reject(err);
-      })
-    });
+  restQiitaAPI.getQiitaPages = async function(pageNum, per_page) {
+    try {
+      const res = await restAPI(`/items?page=${pageNum}&per_page=${per_page}`);
+      const pages = res.data;
+      const total = res.total;
+      if(pages.length > 0) {
+        return {pages, total};
+      }
+    } catch (err) {
+      throw err;
+    }
   };
 
   return restQiitaAPI;