@extrahorizon/exh-cli 1.13.0-dev-185-2ec8f03 → 1.13.0-dev-187-6a4e090

package/CHANGELOG.md

@@ -10,6 +10,7 @@
   * The CLI automatically resolves the template id based on the provided template name.
 * Removed validation for v1 templates, focusing on improved support for v2 templates in JetBrains IDEs using the provided JSON schemas via `$schema`.
 * Updated `exh tasks sync` to create users with `activationMode: 'manual'`, preventing unnecessary activation emails.
+* Made file argument optional for `exh dispatchers sync`, defaults to `./dispatchers.json` when no file argument is provided.
 * Deprecated `exh tasks create-repo` in favor of the new `exh tasks init` command.
 * Deprecated the use of `templateId` in mail actions, recommending `templateName` instead.
 

package/build/commands/dispatchers/sync.d.ts

@@ -3,9 +3,10 @@ export declare const command = "sync";
 export declare const desc = "Synchronize Dispatchers, if a declared Dispatcher does not exist, it will be created";
 export declare const builder: (yargs: Argv) => Argv<import("yargs").Omit<{}, "file" | "clean"> & import("yargs").InferredOptionTypes<{
     file: {
-        demandOption: true;
+        demandOption: false;
         describe: string;
         type: "string";
+        default: string;
     };
     clean: {
         demandOption: false;

package/build/commands/dispatchers/sync.js

@@ -7,9 +7,10 @@ exports.command = 'sync';
 exports.desc = 'Synchronize Dispatchers, if a declared Dispatcher does not exist, it will be created';
 const builder = (yargs) => (0, util_1.epilogue)(yargs).options({
     file: {
-        demandOption: true,
+        demandOption: false,
         describe: 'Path to the file containing the Dispatcher(s) configuration',
         type: 'string',
+        default: './dispatchers.json',
     },
     clean: {
         demandOption: false,

package/build/exh.d.ts

@@ -2,3 +2,4 @@ import { OAuth1Client } from '@extrahorizon/javascript-sdk';
 export declare function sdkAuth(): Promise<OAuth1Client>;
 export declare function getSdk(): OAuth1Client;
 export declare function getNewSdkInstance(): OAuth1Client;
+export declare function writeCredentialsToFile(host: string, consumerKey: string, consumerSecret: string, token: string, tokenSecret: string): void;

package/build/exh.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNewSdkInstance = exports.getSdk = exports.sdkAuth = void 0;
+exports.writeCredentialsToFile = exports.getNewSdkInstance = exports.getSdk = exports.sdkAuth = void 0;
+const fs = require("fs");
 const javascript_sdk_1 = require("@extrahorizon/javascript-sdk");
-const util_1 = require("./helpers/util");
+const chalk = require("chalk");
+const constants_1 = require("./constants");
 let sdk = null;
 async function sdkAuth() {
-    (0, util_1.loadAndAssertCredentials)();
+    loadAndAssertCredentials();
     sdk = getNewSdkInstance();
     try {
         await sdk.auth.authenticate({
@@ -34,3 +36,47 @@ function getNewSdkInstance() {
     });
 }
 exports.getNewSdkInstance = getNewSdkInstance;
+function loadAndAssertCredentials() {
+    const credentials = {};
+    let errorMessage = '';
+    try {
+        const credentialsFile = fs.readFileSync(constants_1.EXH_CONFIG_FILE, 'utf-8');
+        const credentialFileLines = credentialsFile.split(/\r?\n/);
+        for (const credentialFileLine of credentialFileLines) {
+            const [key, value] = credentialFileLine.split('=');
+            if (key && value) {
+                credentials[key.trim()] = value.trim();
+            }
+        }
+    }
+    catch (e) {
+        errorMessage += 'Couldn\'t open ~/.exh/credentials. ';
+    }
+    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}`);
+    }
+}
+function writeCredentialsToFile(host, consumerKey, consumerSecret, token, tokenSecret) {
+    try {
+        fs.statSync(constants_1.EXH_CONFIG_FILE_DIR);
+    }
+    catch (err) {
+        fs.mkdirSync(constants_1.EXH_CONFIG_FILE_DIR);
+    }
+    fs.writeFileSync(constants_1.EXH_CONFIG_FILE, `API_HOST=${host}
+API_OAUTH_CONSUMER_KEY=${consumerKey}
+API_OAUTH_CONSUMER_SECRET=${consumerSecret}
+API_OAUTH_TOKEN=${token}
+API_OAUTH_TOKEN_SECRET=${tokenSecret}
+`);
+    console.log(chalk.green('Wrote credentials to', constants_1.EXH_CONFIG_FILE));
+}
+exports.writeCredentialsToFile = writeCredentialsToFile;

package/build/helpers/util.d.ts

@@ -1,7 +1,6 @@
 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;
 export declare function getSwaggerDocumentationUrl(subPath: string): string;
 export declare function ajvValidate<T>(schema: any, data: any): asserts data is T;
 export declare function getAjvErrorStrings(errors: any[]): string[];

package/build/helpers/util.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAjvErrorStrings = exports.ajvValidate = exports.getSwaggerDocumentationUrl = exports.loadAndAssertCredentials = exports.asyncExec = exports.epilogue = void 0;
+exports.getAjvErrorStrings = exports.ajvValidate = exports.getSwaggerDocumentationUrl = exports.asyncExec = exports.epilogue = void 0;
 const child_process_1 = require("child_process");
 const fs = require("fs");
 const path = require("path");
 const ajv_1 = require("ajv");
 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) => {
@@ -38,35 +37,6 @@ async function asyncExec(cmd) {
     });
 }
 exports.asyncExec = asyncExec;
-function loadAndAssertCredentials() {
-    const credentials = {};
-    let errorMessage = '';
-    try {
-        const credentialsFile = fs.readFileSync(constants_1.EXH_CONFIG_FILE, 'utf-8');
-        const credentialFileLines = credentialsFile.split(/\r?\n/);
-        for (const credentialFileLine of credentialFileLines) {
-            const [key, value] = credentialFileLine.split('=');
-            if (key && value) {
-                credentials[key.trim()] = value.trim();
-            }
-        }
-    }
-    catch (e) {
-        errorMessage += 'Couldn\'t open ~/.exh/credentials. ';
-    }
-    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;
 function getSwaggerDocumentationUrl(subPath) {
     const packageJsonPath = path.join(__dirname, '../../package.json');
     const packageJsonString = fs.readFileSync(packageJsonPath, 'utf-8');

package/build/services/auth.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.whoami = exports.login = void 0;
-const fs = require("fs/promises");
 const javascript_sdk_1 = require("@extrahorizon/javascript-sdk");
-const chalk = require("chalk");
-const constants_1 = require("../constants");
+const exh_1 = require("../exh");
 const authRepository = require("../repositories/auth");
 async function login(host, email, password, consumerKey, consumerSecret) {
     const sdk = (0, javascript_sdk_1.createOAuth1Client)({
@@ -16,19 +14,7 @@ async function login(host, email, password, consumerKey, consumerSecret) {
         email,
         password,
     });
-    try {
-        await fs.stat(constants_1.EXH_CONFIG_FILE_DIR);
-    }
-    catch (err) {
-        await fs.mkdir(constants_1.EXH_CONFIG_FILE_DIR);
-    }
-    await fs.writeFile(constants_1.EXH_CONFIG_FILE, `API_HOST=${host}
-API_OAUTH_CONSUMER_KEY=${consumerKey}
-API_OAUTH_CONSUMER_SECRET=${consumerSecret}
-API_OAUTH_TOKEN=${response.token}
-API_OAUTH_TOKEN_SECRET=${response.tokenSecret}
-`);
-    console.log(chalk.green('Wrote credentials to', constants_1.EXH_CONFIG_FILE));
+    (0, exh_1.writeCredentialsToFile)(host, consumerKey, consumerSecret, response.token, response.tokenSecret);
 }
 exports.login = login;
 async function whoami() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/exh-cli",
-  "version": "1.13.0-dev-185-2ec8f03",
+  "version": "1.13.0-dev-187-6a4e090",
   "main": "build/index.js",
   "exports": "./build/index.js",
   "license": "MIT",