Validation for auth on questionnaire and object for project defaults

Author: nmicht

auth-example.json

@@ -1,5 +1,12 @@
 {
-   "github": {
-     "token": "YOUR_TOKEN"
-   }
+   "github": [
+     {
+       "user": "YOUR_USER",
+       "token": "YOUR_TOKEN"
+     },
+     {
+       "user": "OTHER_USER",
+       "token": "OTHER_TOKEN"
+     }
+   ]
 }

src/auth/index.js

@@ -5,10 +5,11 @@ const utils = require('../utils');
 
 /**
  * Get the Github token from the auth file
- * @param  {String} [path=''] The path for the auth.json file
- * @return {String} The github token
+ * @param  {String} [user=undefined] The user owner of the token
+ * @param  {String} [path='']        The path for the auth.json file
+ * @return {String}                  The github token
  */
-async function getToken(jsonPath = '') {
+function getToken(user = undefined, jsonPath = '') {
   let auth = {};
   const authPath = jsonPath || settings.authPath;
   const authFile = utils.resolvePath(authPath);
@@ -19,21 +20,30 @@ async function getToken(jsonPath = '') {
     throw error;
   }
 
-  if (!auth.github.token) {
+  let { token } = auth.github[0];
+
+  if (user) {
+    token = auth.github.filter(obj => obj.user === user)[0].token;
+  }
+
+  if (!token) {
     throw new Error('Token missing');
   }
 
-  return auth.github.token;
+  return token;
 }
 
 /**
  * Update the Token
- * @param  {String} token         The token
- * @param  {String} [jsonPath=''] The path for the auth.json file
- * @return {Boolean}              True in case the file gets updated
+ * @param  {String} [user=undefined] The user owner of the token
+ * @param  {String} token            The token
+ * @param  {String} [jsonPath='']    The path for the auth.json file
+ * @return {Boolean}                 True in case the file gets updated
  */
-async function updateToken(token, jsonPath = '') {
+function updateToken(user = undefined, token, jsonPath = '') {
   let auth = {};
+  let currentToken = '';
+  let userIndex = 0;
   const authPath = jsonPath || settings.authPath;
   const authFile = utils.resolvePath(authPath);
 
@@ -43,16 +53,48 @@ async function updateToken(token, jsonPath = '') {
     throw error;
   }
 
-  if (auth.github.token !== token) {
-    auth.github.token = token;
+  currentToken = auth.github[0].token;
+
+  if (user) {
+    for (let k = 0; k < auth.github.length; k += 1) {
+      if (auth.github[k].user === user) {
+        userIndex = k;
+        currentToken = auth.github[k].token;
+        break;
+      }
+    }
+  }
+
+  if (currentToken !== token) {
+    auth.github[userIndex].token = token;
     fs.writeFileSync(authFile, JSON.stringify(auth));
     return true;
   }
 
   return false;
 }
 
+/**
+ * Get the first user from the auth file
+ * @param  {String} [jsonPath=''] The auth.json file path
+ * @return {String}               The user
+ */
+function getFirstUser(jsonPath = '') {
+  let auth = {};
+  const authPath = jsonPath || settings.authPath;
+  const authFile = utils.resolvePath(authPath);
+
+  try {
+    auth = JSON.parse(fs.readFileSync(authFile, 'utf8'));
+  } catch (error) {
+    throw error;
+  }
+
+  return auth.github[0].user;
+}
+
 module.exports = {
   getToken,
   updateToken,
+  getFirstUser,
 };

src/index.js

@@ -28,8 +28,16 @@ async function run() {
     throw new Error(`The project folder '${destPath} already exists. You need to specify a different path.`);
   }
 
+  const defaults = {
+    projectName: projectFolder,
+    gitUserName: await gitHandler.userValue('name'),
+    gitUserEmail: await gitHandler.userValue('email'),
+    license: settings.default.license,
+    version: settings.default.version,
+  };
+
   // Questionnaire for the options
-  const answers = await questionnaire.run(projectFolder);
+  const answers = await questionnaire.run(defaults);
 
   // Add extra values to the answers
   Object.assign(answers, {

src/questionnaire/index.js

@@ -11,13 +11,17 @@ async function run(name) {
   } else {
     Object.assign(resp, await questions.getAuthFile());
 
-    const token = await auth.getToken(resp.authPath);
+    const githubUser = auth.getFirstUser(resp.authPath);
 
-    Object.assign(resp, await questions.getAuthToken(token));
+    Object.assign(resp, await questions.getGithubUser(githubUser));
+
+    const token = auth.getToken(resp.authUser, resp.authPath);
+
+    Object.assign(resp, await questions.getAuthToken(resp.authUser, token));
 
     if (resp.token) {
-      if (resp.token !== token && await auth.confirmUpdateToken()) {
-        auth.updateToken(resp.token, settings.authPath);
+      if (resp.token !== token && auth.confirmUpdateToken()) {
+        auth.updateToken(resp.authUser, resp.token, settings.authPath);
       }
     } else {
       resp.useGithub = false;

src/questionnaire/questions.js

@@ -4,13 +4,13 @@ const fs = require('fs');
 const settings = require('../settings');
 const utils = require('../utils');
 
-async function getProjectDetails(name) {
+async function getProjectDetails(defaults) {
   return inquirer.prompt([
     {
       type: 'input',
       name: 'name',
       message: 'What is your project name?',
-      default: name,
+      default: defaults.projectName,
     },
 
     {
@@ -23,7 +23,7 @@ async function getProjectDetails(name) {
       type: 'input',
       name: 'version',
       message: 'What version do you want to start with?',
-      default: '0.1.0',
+      default: defaults.version,
     },
 
     {
@@ -38,19 +38,21 @@ async function getProjectDetails(name) {
       name: 'license',
       message: 'Please select a license',
       choices: settings.licenses,
-      default: 'MIT',
+      default: defaults.license,
     },
 
     {
       type: 'input',
       name: 'author.name',
       message: 'What is your name?',
+      default: defaults.gitUserName,
     },
 
     {
       type: 'input',
       name: 'author.email',
       message: 'What is your email?',
+      default: defaults.gitUserEmail,
     },
 
     {
@@ -123,12 +125,23 @@ async function getAuthFile() {
   ]);
 }
 
-async function getAuthToken(token) {
+async function getGithubUser(user) {
+  return inquirer.prompt([
+    {
+      type: 'input',
+      name: 'authUser',
+      message: 'What is your github user?',
+      default: user,
+    },
+  ]);
+}
+
+async function getAuthToken(user, token) {
   return inquirer.prompt([
     {
       type: 'input',
       name: 'token',
-      message: 'What is your GitHub token?',
+      message: `What is your GitHub token for user ${user}?`,
       default: token,
     },
   ]);
@@ -150,4 +163,5 @@ module.exports = {
   getAuthFile,
   getAuthToken,
   confirmUpdateToken,
+  getGithubUser,
 };

src/settings/index.js

@@ -29,6 +29,10 @@ const settings = {
     'MIT',
   ],
   authPath: path.join(os.homedir(), 'auth.json'),
+  default: {
+    license: 'MIT',
+    version: '0.1.0',
+  },
 };
 
 module.exports = settings;