yusuketk 7 лет назад
Родитель
Сommit
c9d387bad7
2 измененных файлов с 19 добавлено и 8 удалено
  1. 9 6
      lib/util/importer.js
  2. 10 2
      lib/util/restQiitaAPI.js

+ 9 - 6
lib/util/importer.js

@@ -8,10 +8,8 @@ module.exports = crowi => {
   const esa = require('esa-nodejs');
   const config = crowi.getConfig();
   const createGrowiPages = require('./createGrowiPagesFromImports')(crowi);
-  const qiitaTeam = config.crowi['importer:qiita:team_name'];
-  const qiitaToken = config.crowi['importer:qiita:access_token'];
-  const restQiitaAPI = require('./restQiitaAPI')(qiitaTeam, qiitaToken);
-
+  const restQiitaAPI = require('./restQiitaAPI');
+  let qiitaClient;
   let importer = {};
   let esaClient = {};
 
@@ -24,6 +22,11 @@ module.exports = crowi => {
       accessToken: config.crowi['importer:esa:access_token'],
     });
     logger.info('initialize esa importer');
+    qiitaClient = restQiitaAPI(
+      config.crowi['importer:qiita:team_name'],
+      config.crowi['importer:qiita:access_token']
+    );
+    logger.info('initialize qiita importer');
   };
 
   /**
@@ -74,7 +77,7 @@ module.exports = crowi => {
 
   const importPostsFromQiita = (pageNum, user, errors) => {
     return new Promise((resolve, reject) => {
-      restQiitaAPI.getQiitaPages()
+      qiitaClient.getQiitaPages()
       .then(function(res) {
         const postsReceived = res;
         const data = convertQiitaDataForGrowi(postsReceived, user);
@@ -160,7 +163,7 @@ module.exports = crowi => {
   importer.testConnectionToQiita = () => {
     return new Promise(async(resolve, reject) => {
       try {
-        await restQiitaAPI.getQiitaUser();
+        const test = await qiitaClient.getQiitaUser();
         resolve();
       }
       catch (err) {

+ 10 - 2
lib/util/restQiitaAPI.js

@@ -38,8 +38,16 @@ module.exports = function(Team, Token) {
   restQiitaAPI.getQiitaUser = function() {
     return new Promise((resolve, reject) => {
       restAPI('users', options)
-      .then(function(user){
-        resolve(JSON.parse(user.toString()));
+      .then(function(buf){
+        return JSON.parse(buf.toString());
+      })
+      .then(function(user) {
+        if(user.length > 0) {
+          resolve(user);
+        }
+        else {
+          reject('Unauthorized');
+        }
       })
       .catch(function(err){
         reject(err);