Added http instead curl for requests

Author: nmicht

install/index.js

@@ -23,8 +23,8 @@ const AUTH_PATH = settings.authPath;
   const authDetails = {
     github: [
       {
-        user: authUser.user,
-        token: authToken.token,
+        user: authUser.github.user,
+        token: authToken.github.token,
       },
     ],
   };

src/githubHandler/index.js

@@ -18,37 +18,40 @@ async function create({
   isPrivate = false,
   description = '',
   url = '',
-  user = '',
+  github = {
+    user: '',
+    token: '',
+  },
 }) {
-  const token = await auth.getToken(user);
-  let result;
+  let data;
 
-  if (!token) {
+  if (!github.token) {
     throw new Error('Token missing');
   }
 
-  try {
-    console.info('Creating github repository ...');
-    // TODO consider use http instead curl?
-    const cmd = `curl -w "%{http_code}" -H "Authorization: token ${token}" -d '{"name": "${name}", "private": ${isPrivate}, "description": "${description}", "homepage": "${url}"}' https://api.github.com/user/repos`;
-
-    result = await utils.process.execp(cmd);
-
-    let json = result.substring(0, result.lastIndexOf('\n'));
-    const statusCode = Number(result.substring(result.lastIndexOf('\n')));
+  console.info('Creating github repository ...');
+  const project = {
+    name,
+    private: isPrivate,
+    description,
+    homepage: url,
+  };
+
+  const headers = {
+    'Content-Type': 'application/json',
+    Accept: 'application/vnd.github.v3+json',
+    Authorization: `token ${github.token}`,
+    'User-Agent': github.user,
+  };
 
-    json = JSON.parse(json);
-
-    if (statusCode !== 201) {
-      console.error('Repository not created: ', json.errors[0].message);
-      return false;
-    }
-
-    console.log(`Repository ${json.name} created`);
-    return json;
-  } catch (error) {
-    throw error;
+  try {
+    data = await utils.requests.postReq(project, 'https://api.github.com/user/repos', headers);
+    console.log(`Repository ${data.name} created`);
+  } catch (e) {
+    console.error('Repository not created: ', e.statusCode, e.data);
   }
+
+  return data;
 }
 
 /**
@@ -61,39 +64,29 @@ async function create({
  */
 async function deleteRepo(name, user) {
   const token = await auth.getToken(user);
-  let result;
+  let data;
+
+  const headers = {
+    'Content-Type': 'application/json',
+    Accept: 'application/vnd.github.v3+json',
+    Authorization: `token ${token}`,
+    'User-Agent': user,
+  };
 
   if (!token) {
     throw new Error('Token missing');
   }
 
-  try {
-    console.info('Deleting github repository ...');
-    // TODO consider use http instead curl?
-    const cmd = `curl -w "%{http_code}" -XDELETE -H "Authorization: token ${token}" https://api.github.com/repos/${user}/${name}`;
-
-    result = await utils.process.execp(cmd);
-
-    const statusCode = Number(result.substring(result.lastIndexOf('\n')));
-
-    if (statusCode !== 204) {
-      let json = result.substring(0, result.lastIndexOf('\n'));
-
-      json = JSON.parse(json);
-
-      console.error('Repository not deleted: ', json.message);
-      return false;
-    }
 
+  console.info('Deleting github repository ...');
+  try {
+    data = await utils.requests.deleteReq(null, `https://api.github.com/repos/${user}/${name}`, headers);
     console.log(`Repository ${name} deleted`);
-
-    return {
-      message: 'Repository deleted',
-      statusCode,
-    };
-  } catch (error) {
-    throw error;
+  } catch (e) {
+    console.error('Repository not deleted: ', e.statusCode, e.data);
   }
+
+  return data;
 }
 
 // TODO include a method to handle the topics (will require to get the github user)

src/project/index.js

@@ -54,6 +54,10 @@ class Project {
       url: '',
     },
     useGithub = false,
+    github = {
+      user: '',
+      token: '',
+    },
     hasRemote = false,
     git = {
       name: '',
@@ -78,6 +82,10 @@ class Project {
       url: author.url,
     };
     this.useGithub = useGithub;
+    this.github = {
+      user: github.user,
+      token: github.token,
+    };
     this.hasRemote = hasRemote;
     this.git = {
       name: git.name,

src/questionnaire/index.js

@@ -11,6 +11,7 @@ async function run(name) {
     updateToken: false,
   };
 
+  const github = {};
   let currentAuthUser;
   let currentToken;
 
@@ -26,25 +27,28 @@ async function run(name) {
 
     userAnswers = await questions.getGithubUser(currentAuthUser.user);
 
-    currentToken = await auth.getToken(userAnswers.user, authFileAnswers.authPath);
+    currentToken = await auth.getToken(userAnswers.github.user, authFileAnswers.authPath);
 
-    tokenAnswers = await questions.getAuthToken(userAnswers.user, currentToken);
+    tokenAnswers = await questions.getAuthToken(userAnswers.github.user, currentToken);
 
+    github.user = userAnswers.github.user;
+    github.token = tokenAnswers.github.token;
 
-    if (userAnswers.user !== currentAuthUser.user || tokenAnswers.token !== currentToken) {
+    if (github.user !== currentAuthUser.user
+      || github.token !== currentToken) {
       updateAnswers = await questions.confirmUpdateToken();
     }
 
     if (updateAnswers.updateToken) {
-      auth.updateAuthFile(userAnswers.user, tokenAnswers.token, settings.authPath);
+      auth.updateAuthFile(github.user, github.token, settings.authPath);
     }
 
     if (!currentToken) {
       resp.useGithub = false;
     }
   }
 
-  Object.assign(resp, remoteAnswers, authFileAnswers, userAnswers, tokenAnswers);
+  Object.assign(resp, remoteAnswers, authFileAnswers, { github });
 
   return resp;
 }

src/questionnaire/questions.js

@@ -150,7 +150,7 @@ async function getGithubUser(user) {
   return inquirer.prompt([
     {
       type: 'input',
-      name: 'user',
+      name: 'github.user',
       message: 'What is your Github user?',
       default: user,
     },
@@ -167,7 +167,7 @@ async function getAuthToken(user, token) {
   return inquirer.prompt([
     {
       type: 'input',
-      name: 'token',
+      name: 'github.token',
       message: `What is your GitHub token for user ${user}?`,
       default: token,
     },

src/utils/index.js

@@ -1,3 +1,4 @@
 exports.files = require('./files');
 exports.string = require('./string');
 exports.process = require('./process');
+exports.requests = require('./requests');

src/utils/requests.js

@@ -8,9 +8,13 @@ const https = require('https');
  * @param  {Boolean} jsonResponse   If the response will be a json
  * @return {Promise}
  */
-function post(data, url, headers, jsonResponse = true) {
+function postReq(data, url, headers, jsonResponse = true) {
   const apiUrl = new URL(url);
 
+  if (apiUrl.protocol === 'https') {
+    throw new Error('Only https requests allowed');
+  }
+
   const options = {
     hostname: apiUrl.hostname,
     path: apiUrl.pathname,
@@ -34,8 +38,71 @@ function post(data, url, headers, jsonResponse = true) {
         }
 
         // FIXME probably also other status?
-        if (res.statusCode !== 200 || res.statusCode !== 201) {
-          reject(response);
+        if (res.statusCode !== 200 && res.statusCode !== 201) {
+          const e = {
+            statusCode: res.statusCode,
+            data: response,
+          };
+          reject(e);
+        }
+
+        resolve(response);
+      });
+    });
+
+    req.on('error', (e) => {
+      reject(e);
+    });
+
+    req.write(json);
+    req.end();
+  });
+}
+
+/**
+* HTTP delete method with json body and json response
+* @param  {Object} data            The object with all the data to send
+* @param  {String} url             The http options
+* @param  {Object} headers         The headers for the request
+* @param  {Boolean} jsonResponse   If the response will be a json
+* @return {Promise}
+ */
+function deleteReq(data, url, headers, jsonResponse = true) {
+  const apiUrl = new URL(url);
+
+  if (apiUrl.protocol === 'https') {
+    throw new Error('Only https requests allowed');
+  }
+
+  const options = {
+    hostname: apiUrl.hostname,
+    path: apiUrl.pathname,
+    method: 'DELETE',
+    headers,
+  };
+
+  const json = JSON.stringify(data);
+
+  return new Promise((resolve, reject) => {
+    const req = https.request(options, (res) => {
+      let response = '';
+
+      res.on('data', (chunk) => {
+        response += chunk;
+      });
+
+      res.on('end', () => {
+        if (jsonResponse) {
+          response = JSON.parse(response);
+        }
+
+        // FIXME probably also other status?
+        if (res.statusCode !== 204) {
+          const e = {
+            statusCode: res.statusCode,
+            data: response,
+          };
+          reject(e);
         }
 
         resolve(response);
@@ -52,5 +119,6 @@ function post(data, url, headers, jsonResponse = true) {
 }
 
 module.exports = {
-  post,
+  postReq,
+  deleteReq,
 };