|
@@ -4,38 +4,39 @@
|
|
|
|
|
|
|
|
module.exports = function(qiitaTeam, qiitaToken) {
|
|
module.exports = function(qiitaTeam, qiitaToken) {
|
|
|
var restQiitaAPI = {};
|
|
var restQiitaAPI = {};
|
|
|
- const request = require('request');
|
|
|
|
|
const team = qiitaTeam;
|
|
const team = qiitaTeam;
|
|
|
const token = qiitaToken;
|
|
const token = qiitaToken;
|
|
|
|
|
|
|
|
- var options = {
|
|
|
|
|
- method: 'GET',
|
|
|
|
|
|
|
+ const axiosBase = require('axios');
|
|
|
|
|
+ const axios = axiosBase.create({
|
|
|
|
|
+ baseURL: `https://${team}.qiita.com/api/v2`,
|
|
|
headers: {
|
|
headers: {
|
|
|
'Content-Type': 'application/json',
|
|
'Content-Type': 'application/json',
|
|
|
|
|
+ 'X-Requested-With': 'XMLHttpRequest',
|
|
|
'authorization': `Bearer ${token}`
|
|
'authorization': `Bearer ${token}`
|
|
|
- }
|
|
|
|
|
- };
|
|
|
|
|
|
|
+ },
|
|
|
|
|
+ responseType: 'json'
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
- function restAPI(path, team, options) {
|
|
|
|
|
|
|
+ function restAPI(path) {
|
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
|
- options.url = `https://${team}.qiita.com/api/v2/${path}`;
|
|
|
|
|
- request(options, function(err, res, body) {
|
|
|
|
|
- if (err) {
|
|
|
|
|
- return console.error('upload failed:', err);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ axios.get(path)
|
|
|
|
|
+ .then(function(res) {
|
|
|
|
|
+ const data = res.data;
|
|
|
const total = res.headers['total-count'];
|
|
const total = res.headers['total-count'];
|
|
|
- resolve([body, total]);
|
|
|
|
|
|
|
+ resolve([data, total]);
|
|
|
|
|
+ })
|
|
|
|
|
+ .catch(function(err) {
|
|
|
|
|
+ reject(err);
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
restQiitaAPI.getQiitaUser = function() {
|
|
restQiitaAPI.getQiitaUser = function() {
|
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
|
- restAPI('users', team, options)
|
|
|
|
|
- .then(function(res){
|
|
|
|
|
- return JSON.parse(res[0].toString());
|
|
|
|
|
- })
|
|
|
|
|
- .then(function(user) {
|
|
|
|
|
|
|
+ restAPI('/users')
|
|
|
|
|
+ .then(function(res) {
|
|
|
|
|
+ const user = res[0];
|
|
|
if(user.length > 0) {
|
|
if(user.length > 0) {
|
|
|
resolve(user);
|
|
resolve(user);
|
|
|
}
|
|
}
|
|
@@ -51,9 +52,9 @@ module.exports = function(qiitaTeam, qiitaToken) {
|
|
|
|
|
|
|
|
restQiitaAPI.getQiitaPages = function(pageNum, per_page) {
|
|
restQiitaAPI.getQiitaPages = function(pageNum, per_page) {
|
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
|
- restAPI(`items?page=${pageNum}&per_page=${per_page}`, team, options)
|
|
|
|
|
|
|
+ restAPI(`/items?page=${pageNum}&per_page=${per_page}`)
|
|
|
.then(function(res) {
|
|
.then(function(res) {
|
|
|
- const pages = JSON.parse(res[0].toString());
|
|
|
|
|
|
|
+ const pages = res[0];
|
|
|
const total = res[1];
|
|
const total = res[1];
|
|
|
if(pages.length > 0) {
|
|
if(pages.length > 0) {
|
|
|
resolve([pages, total]);
|
|
resolve([pages, total]);
|