reset commits about qiita-importer in feat/esa-importer

lib/form/admin/importer.js

@@ -6,7 +6,5 @@ var form = require('express-form')
 module.exports = form(
   field('settingForm[importer:esa:access_token]').required(),
   field('settingForm[importer:esa:team_name]').required(),
-  field('settingForm[importer:qiita:access_token]').required(),
-  field('settingForm[importer:qiita:team_name]').required()
 );
 

lib/locales/en-US/translation.json

@@ -466,11 +466,6 @@
       "team_name": "Team name",
       "access_token": "Access token"
     },
-    "qiita_settings": {
-      "title": "Settings of qiita:team importer",
-      "team_name": "Team name",
-      "access_token": "Access token"
-    },
     "import": "Import",
     "test_connection": "Test connection to esa"
   }

lib/locales/ja/translation.json

@@ -483,11 +483,6 @@
       "team_name": "チーム名",
       "access_token": "アクセストークン"
     },
-    "qiita_settings": {
-      "title": "qiita:teamインポータ設定",
-      "team_name": "チーム名",
-      "access_token": "アクセストークン"
-    },
     "import": "インポート",
     "test_connection": "接続テスト"
   }

lib/models/config.js

@@ -100,8 +100,6 @@ module.exports = function(crowi) {
 
       'importer:esa:team_name': '',
       'importer:esa:access_token': '',
-      'importer:qiita:team_name': '',
-      'importer:qiita:access_token': '',
     };
     /* eslint-enable */
   }

lib/routes/admin.js

@@ -1247,39 +1247,6 @@ module.exports = function(crowi, app) {
     });
   }
 
-  /**
-   * Import all posts from qiita
-   *
-   * @param {*} req
-   * @param {*} res
-   */
-  actions.api.importAllPostsFromQiita = function(req, res) {
-    var user = req.user;
-    importer.importAllPostsFromQiita(user)
-    .then(function() {
-      return res.json({ status: true });
-    })
-    .catch(function(err) {
-      return res.json({ status: false, message: `${err}` });
-    });
-  }
-
-  /**
-   * Test connection to qiita and response result with json
-   *
-   * @param {*} req
-   * @param {*} res
-   */
-  actions.api.testQiitaAPI = function(req, res) {
-    importer.testConnectionToQiita()
-    .then(function() {
-      return res.json({ status: true });
-    })
-    .catch(function(err) {
-      return res.json({ status: false, message: `${err}` });
-    });
-  }
-
   /**
    * save settings, update config cache, and response json
    *

lib/routes/index.js

@@ -145,8 +145,6 @@ module.exports = function(crowi, app) {
   app.post('/_api/admin/settings/importer' , loginRequired(crowi, app) , middleware.adminRequired() , csrf , form.admin.importer , admin.api.importerSetting);
   app.post('/_api/admin/import/esa'        , loginRequired(crowi, app) , middleware.adminRequired() , csrf , form.admin.importer , admin.api.importAllPostsFromEsa);
   app.post('/_api/admin/import/testEsaAPI' , loginRequired(crowi, app) , middleware.adminRequired() , csrf , form.admin.importer , admin.api.testEsaAPI);
-  // app.post('/_api/admin/import/qiita'        , loginRequired(crowi, app) , middleware.adminRequired() , csrf , form.admin.importer , admin.api.importAllPostsFromQiita);
-  // app.post('/_api/admin/import/testQiitaAPI' , loginRequired(crowi, app) , middleware.adminRequired() , csrf , form.admin.importer , admin.api.testQiitaAPI);
 
   app.get('/me'                       , loginRequired(crowi, app) , me.index);
   app.get('/me/password'              , loginRequired(crowi, app) , me.password);

lib/util/importer.js

@@ -9,8 +9,6 @@ module.exports = function(crowi) {
     , request = require('request')
     , esa = require('esa-nodejs')
     , esaClient = {}
-    , qiita = require('./qiitaClient')
-    , qiitaClient = {}
     , Page = crowi.model('Page')
     , User = crowi.model('User')
     , pageRouter = require('../routes/page')(crowi)
@@ -29,11 +27,7 @@ module.exports = function(crowi) {
     });
     debug('esa client is initialized');
   }
-    qiitaClient = qiita({
-      team:        config.crowi['importer:qiita:team_name'],
-      accessToken: config.crowi['importer:qiita:access_token'],
-    });
-    debug('qiita client is initialized');
+
   /**
    * Get teams from esa (Promise wrapper)
    */
@@ -120,80 +114,8 @@ module.exports = function(crowi) {
     });
   }
 
-  /**
-   * Get posts from qiita (Promise wrapper)
-   */
-  function getPostsFromQiita() {
-    return new Promise(function(resolve, reject) {
-      qiitaClient.api.posts(function(err, res) {
-        if (err) {
-          debug(err);
-          reject(err);
-        }
-        resolve(res);
-      });
-    });
-  }
-
-  /**
-   * Import post data from qiita to GROWI
-   */
-  importer.importAllPostsFromQiita = function(user) {
-    /* Get posts from qiita */
-    return new Promise(function(resolve, reject) {
-      getPostsFromQiita()
-      .then(function(res) {
-        /* Import to GROWI */
-        var basePage = '/';
-        var ignoreNotFound = true;
-        res.body.posts.forEach(function(post) {
-          var pagePath = basePage + [post.category, post.name].filter(v => v).join('/')
-          Page.findPage(pagePath, user, null, ignoreNotFound)
-          .then(function(data) {
-            if (data !== null) {
-              reject('Page exists');
-            }
-            return Page.create(pagePath, post.body_md, user, { grant: Page.GRANT_PUBLIC, grantUserGroupId: null });
-          })
-          .then(function(createdPage) {
-            if (!createdPage) {
-              reject('Page exists');
-            }
-            debug('Crete page: ' + createdPage);
-            resolve();
-          })
-          .catch(function(err) {
-            debug(err);
-            reject(err);
-          })
-        });
-      })
-      .catch(function(err) {
-        debug(err);
-        reject(err);
-      });
-    });
-  }
-
-  /**
-   * Import post data from esa to GROWI
-   */
-  importer.testConnectionToQiita = function() {
-    return new Promise(function(resolve, reject) {
-      getTeamsFromQiita()
-      .then(function(res) {
-        resolve();
-      })
-      .catch(function(err) {
-        debug(err);
-        reject(err);
-      });
-    });
-  }
-
   initialize();
   importer.esaClient = esaClient;
-  importer.qiitaClient = qiitaClient;
 
   return importer;
 };

lib/util/qiitaClient.js

@@ -1,4 +0,0 @@
-module.exports = function(){
-
-};
-

lib/views/admin/importer.html

@@ -80,46 +80,6 @@
           </div>
         </fieldset>
       </form>
-      <form action="/_api/admin/settings/importer" method="post" class="form-horizontal" id="importerSettingForm" role="form"
-          data-success-messaage="更新しました">
-        <fieldset>
-          <!-- qiita:team importer -->
-          <div class="form-group">
-            <legend>{{ t('importer_management.qiita_settings.title') }}</legend>
-            <div class="form-group">
-              <label for="settingForm[importer:qiita:team_name]" class="col-xs-3 control-label">{{ t('importer_management.qiita_settings.team_name') }}</label>
-              <div class="col-xs-6">
-                <input class="form-control" type="text" name="settingForm[importer:qiita:team_name]" value="{{ settingForm['importer:qiita:team_name'] | default('') }}">
-              </div>
-            </div>
-            <div class="form-group">
-              <label for="settingForm[importer:qiita:access_token]" class="col-xs-3 control-label">{{ t('importer_management.qiita_settings.access_token') }}</label>
-              <div class="col-xs-6">
-                <input class="form-control" type="text" name="settingForm[importer:qiita:access_token]" value="{{ settingForm['importer:qiita:access_token'] | default('') }}">
-              </div>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <input type="hidden" name="_csrf" value="{{ csrf() }}" />
-            <div class="col-xs-offset-3 col-xs-6">
-              <button id="testConnectionToEsa" type="button" class="btn btn-primary" data-action="/_api/admin/import/qiita"
-                  data-success-message="Import posts from qiita:team success." data-error-message="Import posts from qiita:team failed.">
-                {{ t("importer_management.import") }}
-              </button>
-              <button type="submit" class="btn btn-secondary">{# the first element is the default button to submit #}
-                {{ t('Update') }}
-              </button>
-              <span class="col-xs-offset-1">
-                <button id="importFromQiita" type="button" class="btn btn-default" data-action="/_api/admin/import/testQiitaAPI"
-                    data-success-message="Test connection to qiita:team success." data-error-message="Test connection to qiita:team failed.">
-                  {{ t("importer_management.test_connection") }}
-                </button>
-              </span>
-            </div>
-          </div>
-        </fieldset>
-      </form>
     </div>
   </div>