@extrahorizon/exh-cli 1.8.2-dev-72-be06d62 → 1.8.2-dev-74-994b4dc

package/build/exh.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sdkAuth = exports.sdkInitOnly = void 0;
-const fs = require("fs");
 const javascript_sdk_1 = require("@extrahorizon/javascript-sdk");
-const constants_1 = require("./constants");
+const util_1 = require("./helpers/util");
 let sdk = null;
 function sdkInitOnly(apiHost, consumerKey, consumerSecret) {
     sdk = (0, javascript_sdk_1.createOAuth1Client)({
@@ -15,46 +14,16 @@ function sdkInitOnly(apiHost, consumerKey, consumerSecret) {
 }
 exports.sdkInitOnly = sdkInitOnly;
 async function sdkAuth() {
-    let credentials = {};
-    let haveCredFile = false;
-    const needed = ['API_HOST', 'API_OAUTH_CONSUMER_KEY', 'API_OAUTH_CONSUMER_SECRET', 'API_OAUTH_TOKEN', 'API_OAUTH_TOKEN_SECRET'];
-    const error = missing => {
-        let message = 'Failed to retrieve all credentials. ';
-        if (!haveCredFile) {
-            message += 'Couldn\'t open ~/.exh/credentials. ';
-        }
-        if (missing.length) {
-            message += `Missing properties: ${missing.join(',')}`;
-        }
-        throw new Error(message);
-    };
-    try {
-        const credentialsFile = fs.readFileSync(constants_1.EXH_CONFIG_FILE, 'utf-8');
-        haveCredFile = true;
-        credentials = credentialsFile
-            .split(/\r?\n/).map(l => l.split(/=/)).filter(i => i.length === 2)
-            .reduce((r, v) => { r[v[0].trim()] = v[1].trim(); return r; }, {});
-        for (const k of Object.keys(credentials)) {
-            if (!process.env[k]) {
-                process.env[k] = credentials[k];
-            }
-        }
-    }
-    catch (err) { }
-    needed.forEach(v => { credentials[v] = process.env[v] ?? credentials[v]; });
-    const missingProperties = needed.filter(p => credentials[p] === undefined);
-    if (missingProperties.length) {
-        error(missingProperties);
-    }
+    (0, util_1.loadAndAssertCredentials)();
     sdk = (0, javascript_sdk_1.createOAuth1Client)({
-        consumerKey: credentials.API_OAUTH_CONSUMER_KEY,
-        consumerSecret: credentials.API_OAUTH_CONSUMER_SECRET,
-        host: credentials.API_HOST,
+        host: process.env.API_HOST,
+        consumerKey: process.env.API_OAUTH_CONSUMER_KEY,
+        consumerSecret: process.env.API_OAUTH_CONSUMER_SECRET,
     });
     try {
         await sdk.auth.authenticate({
-            token: credentials.API_OAUTH_TOKEN,
-            tokenSecret: credentials.API_OAUTH_TOKEN_SECRET,
+            token: process.env.API_OAUTH_TOKEN,
+            tokenSecret: process.env.API_OAUTH_TOKEN_SECRET,
         });
     }
     catch (err) {

package/build/helpers/util.d.ts

@@ -1,3 +1,4 @@
 import * as yargs from 'yargs';
 export declare function epilogue(y: yargs.Argv): yargs.Argv;
 export declare function asyncExec(cmd: string): Promise<string>;
+export declare function loadAndAssertCredentials(): void;

package/build/helpers/util.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.asyncExec = exports.epilogue = void 0;
+exports.loadAndAssertCredentials = exports.asyncExec = exports.epilogue = void 0;
 const child_process_1 = require("child_process");
+const fs = require("fs");
 const chalk = require("chalk");
+const constants_1 = require("../constants");
 const error_1 = require("./error");
 function epilogue(y) {
     return y.epilogue('Visit https://docs.extrahorizon.com/extrahorizon-cli/ for more information.').fail((msg, err, argv) => {
@@ -34,3 +36,33 @@ async function asyncExec(cmd) {
     });
 }
 exports.asyncExec = asyncExec;
+function loadAndAssertCredentials() {
+    const credentials = {};
+    let credentialsFile;
+    let errorMessage = '';
+    try {
+        credentialsFile = fs.readFileSync(constants_1.EXH_CONFIG_FILE, 'utf-8');
+    }
+    catch (e) {
+        errorMessage += 'Couldn\'t open ~/.exh/credentials. ';
+    }
+    const credentialFileLines = credentialsFile.split(/\r?\n/);
+    for (const credentialFileLine of credentialFileLines) {
+        const [key, value] = credentialFileLine.split('=');
+        if (key && value) {
+            credentials[key.trim()] = value.trim();
+        }
+    }
+    const requiredEnvVariables = ['API_HOST', 'API_OAUTH_CONSUMER_KEY', 'API_OAUTH_CONSUMER_SECRET', 'API_OAUTH_TOKEN', 'API_OAUTH_TOKEN_SECRET'];
+    for (const key of requiredEnvVariables) {
+        if (credentials[key] && !process.env[key]) {
+            process.env[key] = credentials[key];
+        }
+    }
+    const missingEnvironmentVariables = requiredEnvVariables.filter(key => !process.env[key]);
+    if (missingEnvironmentVariables.length > 0) {
+        errorMessage += `Missing environment variables: ${missingEnvironmentVariables.join(',')}`;
+        throw new Error(`Failed to retrieve all credentials. ${errorMessage}`);
+    }
+}
+exports.loadAndAssertCredentials = loadAndAssertCredentials;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/exh-cli",
-  "version": "1.8.2-dev-72-be06d62",
+  "version": "1.8.2-dev-74-994b4dc",
   "main": "build/index.js",
   "exports": "./build/index.js",
   "license": "MIT",
@@ -15,6 +15,7 @@
     "clean": "rimraf build",
     "build": "yarn clean && tsc",
     "test": "jest",
+    "test:ci": "jest --silent",
     "lint": "eslint src tests --ext .ts"
   },
   "bin": {