@n42/cli 0.1.83 → 0.1.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n42/cli",
-  "version": "0.1.83",
+  "version": "0.1.88",
   "description": "Node42 CLI – Command-line interface for Peppol eDelivery path discovery, diagnostics, and tooling",
   "keywords": [
     "node42"

package/src/auth.js

@@ -1,14 +1,14 @@
 const fs = require("fs");
-const { NODE42_DIR, TOKENS_FILE, API_URL, EP_SIGNIN, EP_REFRESH } = require("./config");
+const { NODE42_DIR, TOKENS_FILE, API_URL, EP_SIGNIN, EP_REFRESH, EP_ME } = require("./config");
 const { handleError } = require("./errors");
-const { getUser } = require("./user");
+const { getUserWithIndex } = require("./user");
 const { clearScreen, ask, startSpinner } = require("./utils");
 const db = require("./db");
 
 
 async function login() {
   clearScreen("Sign in to Node42");
-  let user = getUser();
+  let user = getUserWithIndex(0);
 
   const username = await ask("Username", user.userMail ?? "");
   const password = await ask("Password", null, true);
@@ -54,7 +54,7 @@ async function login() {
     process.exit(1);
   }
 
-  user = getUser();
+  user = getUserWithIndex(0);
   console.log(
     `Authenticated as ${user.userName} <${user.userMail}> (${user.role})`
   );
@@ -81,7 +81,7 @@ async function checkAuth() {
     return false;
   }
 
-  const res = await fetchWithAuth(`${API_URL}/users/me`, {
+  const res = await fetchWithAuth(`${API_URL}/${EP_ME}`, {
         method: "GET",
         headers: {
             "Content-Type": "application/json"

package/src/cli.js

@@ -2,7 +2,7 @@
 
 const { Command } = require("commander");
 const { login, logout, checkAuth } = require("./auth");
-const { getUser, getUserUsage } = require("./user");
+const { getUserWithIndex, getUserUsage } = require("./user");
 const { runDiscovery } = require("./discover");
 const { clearScreen, startSpinner, validateEnv, validateId, createAppDirs, getArtefactExt, cleanAppDirs } = require("./utils");
 const { NODE42_DIR, ARTEFACTS_DIR, DEFAULT_OUTPUT, DEFAULT_FORMAT } = require("./config");
@@ -77,7 +77,7 @@ program
       process.exit(1);
     }
     
-    const user = getUser();
+    const user = getUserWithIndex(0);
     const currentMonth = new Date().toISOString().slice(0, 7);
     console.log(`Node42 CLI v${pkg.version}
     User
@@ -103,7 +103,7 @@ program
   .description("Returns usage for the authenticated user.")
   .option("-m, --month <yyyy-mm>", "Show usage for a specific month")
   .action((service, options) => {
-    const user = getUser();
+    const user = getUserWithIndex(0);
     const currentMonth = options.month ? options.month : new Date().toISOString().slice(0, 7);
     let usage = getUserUsage(user.id, service, currentMonth);
     if (!usage) {
@@ -172,8 +172,6 @@ program
     for (const item of artefacts) {
       const d = new Date(item.createdAt);
       const dt = d.toISOString().slice(0, 19).replace("T", " ");
-
-      const ext = getArtefactExt(item.output, item.format);
       const file = path.join(ARTEFACTS_DIR, `${item.file}`);
 
       let pid = item.participantId;

package/src/config.js

@@ -23,6 +23,7 @@ const config = {
 
   EP_SIGNIN: "auth/signin",
   EP_REFRESH: "auth/refresh",
+  EP_ME: "users/me",
   EP_DISCOVER: "discover/peppol"
 };
 

package/src/discover.js

@@ -5,7 +5,7 @@ const db = require("./db");
 
 const { fetchWithAuth } = require("./auth");
 const { API_URL, EP_DISCOVER, DEFAULT_OUTPUT, DEFAULT_FORMAT, ARTEFACTS_DIR } = require("./config");
-const { getUser, setUserUsage } = require("./user");
+const { getUserWithIndex, setUserUsage } = require("./user");
 const { clearScreen, startSpinner, buildDocLabel, promptForDocument, getShortId, getArtefactExt } = require("./utils");
 const { handleError } = require("./errors"); 
 
@@ -117,7 +117,7 @@ async function runDiscovery(participantId, options) {
   const encodedDocs = res.headers.get("X-Node42-Documents");
   const currentMonth = new Date().toISOString().slice(0, 7);
  
-  const user = getUser();
+  const user = getUserWithIndex(0);
   setUserUsage(
     user.id,
     "discovery",

package/src/user.js

@@ -1,8 +1,8 @@
 const db = require("./db");
 
-function getUser() {
+function getUserWithIndex(index) {
   const users = db.get("user");
-  return users.length ? users[0] : {
+  return users.length ? users[index] : {
       "id": "n/a",
       "userName": "n/a",
       "userMail": "n/a",
@@ -10,6 +10,21 @@ function getUser() {
     };
 }
 
+function getUserWithId(userId) {
+  const database = db.load();
+
+  const u = database.user.find(x => x.id === userId);
+  if (!u) {
+    return {
+      "id": "n/a",
+      "userName": "n/a",
+      "userMail": "n/a",
+      "role": "n/a"
+    }
+  }
+  return u;
+}
+
 function getUserUsage(userId, service, month) {
   const database = db.load();
 
@@ -34,4 +49,4 @@ function setUserUsage(userId, service, month, value) {
   db.save(database);
 }
 
-module.exports = { getUser, getUserUsage, setUserUsage };
+module.exports = { getUserWithIndex, getUserWithId, getUserUsage, setUserUsage };

package/test/auth.test.js

@@ -36,7 +36,9 @@ describe("auth", () => {
         .onSecondCall().resolves("secret");
 
       sinon.stub(utils, "startSpinner").callsFake(() => () => {});
-      sinon.stub(user, "getUser").returns({
+      sinon.stub(user, "getUserWithIndex")
+      .withArgs(0)
+      .returns({
         id: "1",
         userName: "User",
         userMail: "user@test.com",