@extrahorizon/exh-cli 1.13.0-feat-168-eab0ce8 → 1.13.0

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/index.js

@@ -13,6 +13,7 @@ yargs((0, helpers_1.hideBin)(process.argv))
         (0, lodash_1.isEqual)(argv._, ['data', 'schemas', 'init']) ||
         (0, lodash_1.isEqual)(argv._, ['data', 'schemas', 'verify']) ||
         (0, lodash_1.isEqual)(argv._, ['dispatchers', 'init']) ||
+        (0, lodash_1.isEqual)(argv._, ['tasks', 'init']) ||
         (0, lodash_1.isEqual)(argv._, ['tasks', 'create-repo']) ||
         (0, lodash_1.isEqual)(argv._, ['templates', 'init']) ||
         (0, lodash_1.isEqual)(argv._, ['completion']) ||

package/build/repositories/auth.d.ts

@@ -1,3 +1,3 @@
 export declare function getHost(): string;
-export declare function createOAuth1Tokens(email: string, password: string): Promise<any>;
+export declare function createOAuth1Tokens(email: string, password: string): Promise<import("@extrahorizon/javascript-sdk").TokenDataOauth1>;
 export declare function fetchMe(): Promise<import("@extrahorizon/javascript-sdk").UserData>;

package/build/repositories/auth.js

@@ -7,8 +7,7 @@ function getHost() {
 }
 exports.getHost = getHost;
 async function createOAuth1Tokens(email, password) {
-    const response = await (0, exh_1.getSdk)().raw.post('/auth/v2/oauth1/tokens', { email, password });
-    return response.data;
+    return (0, exh_1.getNewSdkInstance)().auth.authenticate({ email, password });
 }
 exports.createOAuth1Tokens = createOAuth1Tokens;
 async function fetchMe() {

package/build/repositories/functions.js

@@ -10,7 +10,7 @@ async function find() {
 exports.find = find;
 async function findByName(name) {
     try {
-        return (0, exh_1.getSdk)().tasks.functions.getByName(name);
+        return await (0, exh_1.getSdk)().tasks.functions.getByName(name);
     }
     catch (e) {
         if (e instanceof javascript_sdk_1.ResourceUnknownError) {

package/build/repositories/schemas.d.ts

@@ -15,7 +15,7 @@ export declare function createStatus(id: string, name: string, data: StatusData)
 export declare function updateStatus(id: string, name: string, data: StatusData): Promise<import("@extrahorizon/javascript-sdk").AffectedRecords>;
 export declare function deleteStatus(id: string, name: string): Promise<import("@extrahorizon/javascript-sdk").AffectedRecords>;
 export declare function updateCreationTransition(id: string, data: CreationTransition): Promise<import("@extrahorizon/javascript-sdk").AffectedRecords>;
-export declare function createTransition(id: string, data: TransitionInput): Promise<import("@extrahorizon/javascript-sdk").AffectedRecords>;
+export declare function createTransition(id: string, data: TransitionInput): Promise<import("@extrahorizon/javascript-sdk").Transition>;
 export declare function updateTransition(schemaId: string, transitionId: string, data: TransitionInput): Promise<import("@extrahorizon/javascript-sdk").AffectedRecords>;
 export declare function deleteTransition(schemaId: string, transitionId: string): Promise<import("@extrahorizon/javascript-sdk").AffectedRecords>;
 export declare function createIndex(schemaId: string, index: IndexInput): Promise<import("@extrahorizon/javascript-sdk").Index>;

package/build/repositories/schemas.js

@@ -48,7 +48,7 @@ async function createStatus(id, name, data) {
 }
 exports.createStatus = createStatus;
 async function updateStatus(id, name, data) {
-    return (0, exh_1.getSdk)().data.statuses.update(id, name, data);
+    return (0, exh_1.getSdk)().data.statuses.update(id, name, { data });
 }
 exports.updateStatus = updateStatus;
 async function deleteStatus(id, name) {

package/build/repositories/user.d.ts

@@ -9,4 +9,4 @@ export declare function removePermissionsFromGlobalRole(name: string, permission
 export declare function addGlobalRoleToUser(userId: string, roleId: string): Promise<import("@extrahorizon/javascript-sdk").AffectedRecords>;
 export declare function updateVerificationSettings(settings: Partial<VerificationSettings>): Promise<VerificationSettings>;
 export declare function updateEmailTemplates(emailTemplates: Partial<EmailTemplates>): Promise<EmailTemplates>;
-export declare function updatePasswordPolicy(passwordPolicy: Partial<PasswordPolicy>): Promise<PasswordPolicy>;
+export declare function updatePasswordPolicy(passwordPolicy: Partial<PasswordPolicy>): Promise<import("@extrahorizon/javascript-sdk").PasswordPolicyUpdate>;

package/build/services/auth.js

@@ -1,30 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.whoami = exports.login = void 0;
-const fs = require("fs/promises");
-const chalk = require("chalk");
-const constants_1 = require("../constants");
+const javascript_sdk_1 = require("@extrahorizon/javascript-sdk");
 const exh_1 = require("../exh");
 const authRepository = require("../repositories/auth");
 async function login(host, email, password, consumerKey, consumerSecret) {
-    const sdk = (0, exh_1.sdkInitOnly)(host, consumerKey, consumerSecret);
+    const sdk = (0, javascript_sdk_1.createOAuth1Client)({
+        consumerKey,
+        consumerSecret,
+        host,
+    });
     const response = await sdk.auth.authenticate({
         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/build/services/dispatchers/init.d.ts

@@ -1 +1 @@
-export declare function init(name: string, path: string): Promise<void>;
+export declare function init(name: string, filePath: string): Promise<void>;

package/build/services/dispatchers/init.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
 const fs_1 = require("fs");
 const promises_1 = require("fs/promises");
-const osPath = require("path");
+const path = require("path");
 const javascript_sdk_1 = require("@extrahorizon/javascript-sdk");
 const util_1 = require("../../helpers/util");
 const readDispatcherFile_1 = require("./util/readDispatcherFile");
-async function init(name, path) {
-    const filePath = osPath.join(path, 'dispatchers.json');
+async function init(name, filePath) {
     const exists = (0, fs_1.existsSync)(filePath);
     const fileContent = {
         dispatchers: [createDispatcher(name)],
@@ -19,7 +18,8 @@ async function init(name, path) {
         fileContent.dispatchers.push(...existingDispatchers);
     }
     else {
-        await (0, promises_1.mkdir)(`${path}`, { recursive: true });
+        const dirPath = path.dirname(filePath);
+        await (0, promises_1.mkdir)(dirPath, { recursive: true });
     }
     await (0, promises_1.writeFile)(filePath, JSON.stringify(fileContent, null, 2));
     console.log(`✅  Successfully ${exists ? 'updated' : 'created'} ${filePath}`);

package/build/services/dispatchers/sync.js

@@ -4,6 +4,7 @@ exports.sync = exports.cliManagedTag = void 0;
 const javascript_sdk_1 = require("@extrahorizon/javascript-sdk");
 const chalk_1 = require("chalk");
 const dispatcherRepository = require("../../repositories/dispatchers");
+const templateRepository = require("../../repositories/templatesV2");
 const readDispatcherFile_1 = require("./util/readDispatcherFile");
 exports.cliManagedTag = 'EXH_CLI_MANAGED';
 async function sync(path, clean = false) {
@@ -23,17 +24,41 @@ async function sync(path, clean = false) {
 }
 exports.sync = sync;
 async function synchronizeDispatcher(localDispatcher, exhDispatcher) {
-    localDispatcher.tags = localDispatcher.tags || [];
-    const hasCliManagedTag = localDispatcher.tags.includes(exports.cliManagedTag);
-    if (!hasCliManagedTag) {
-        localDispatcher.tags.push(exports.cliManagedTag);
-    }
+    const dispatcherWithTag = ensureCliManagedTag(localDispatcher);
+    const dispatcherWithResolvedTemplateIds = await resolveTemplateIds(dispatcherWithTag);
     if (!exhDispatcher) {
-        await createDispatcher(localDispatcher);
+        await createDispatcher(dispatcherWithResolvedTemplateIds);
     }
     else {
-        await updateDispatcher(localDispatcher, exhDispatcher);
+        await updateDispatcher(dispatcherWithResolvedTemplateIds, exhDispatcher);
+    }
+}
+function ensureCliManagedTag(dispatcher) {
+    const tags = dispatcher.tags ?? [];
+    if (tags.includes(exports.cliManagedTag)) {
+        return dispatcher;
+    }
+    return { ...dispatcher, tags: [...tags, exports.cliManagedTag] };
+}
+async function resolveTemplateIds(dispatcher) {
+    const resolvedActions = [];
+    for (const action of dispatcher.actions) {
+        if (action.type !== 'mail') {
+            resolvedActions.push(action);
+            continue;
+        }
+        const mailAction = action;
+        if (!mailAction.templateName) {
+            resolvedActions.push(action);
+            continue;
+        }
+        const template = await templateRepository.findByName(mailAction.templateName);
+        if (!template) {
+            throw new Error(`Template "${mailAction.templateName}" not found for Action "${action.name}"`);
+        }
+        resolvedActions.push({ ...action, templateId: template.id });
     }
+    return { ...dispatcher, actions: resolvedActions };
 }
 async function createDispatcher(dispatcher) {
     console.group((0, chalk_1.blue)(`Creating Dispatcher: ${dispatcher.name}`));

package/build/services/settings/sync.js

@@ -15,7 +15,7 @@ async function sync(path) {
 }
 exports.sync = sync;
 async function syncUserSettings(userServiceSettings) {
-    if (!userServiceSettings) {
+    if (!userServiceSettings || Object.keys(userServiceSettings).length === 0) {
         return;
     }
     console.group((0, chalk_1.blue)('Syncing user service settings:'));

package/build/services/settings/util/readServiceSettingsFile.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readAndValidateServiceSettingsConfig = void 0;
 const promises_1 = require("fs/promises");
-const serviceSettingsSchema = require("../../../config-json-schemas/SettingsConfig.json");
+const serviceSettingsSchema = require("../../../config-json-schemas/ServiceSettings.json");
 const util_1 = require("../../../helpers/util");
 async function readAndValidateServiceSettingsConfig(path) {
     let config;

package/build/services/sync.js

@@ -13,7 +13,7 @@ const taskService = require("../services/tasks");
 const templateService = require("../services/templates");
 async function sync({ path, schemas, tasks, templates, dispatchers, cleanDispatchers, localizations, settings, ignoreSchemaVerificationErrors, }) {
     const targetPath = path || '.';
-    const cfg = await (0, repoConfig_1.getRepoConfig)(targetPath);
+    const cfg = (0, repoConfig_1.getRepoConfig)(targetPath);
     const syncAll = !(schemas || tasks || templates || dispatchers || localizations || settings);
     if ((syncAll || schemas) && cfg.schemas) {
         console.log(chalk.green('\n ⚙️  Syncing schemas ...'));

package/build/services/tasks/index.d.ts

@@ -1,5 +1,5 @@
 export { sync } from './sync';
-export { createRepo } from './createRepo';
+export { init } from './init';
 export { assertExecutionPermission } from './taskConfig';
 export declare function list(isTTY: boolean): Promise<void>;
 export declare function remove(name: string): Promise<void>;

package/build/services/tasks/index.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remove = exports.list = exports.assertExecutionPermission = exports.createRepo = exports.sync = void 0;
+exports.remove = exports.list = exports.assertExecutionPermission = exports.init = exports.sync = void 0;
 const chalk = require("chalk");
 const functionRepository = require("../../repositories/functions");
 var sync_1 = require("./sync");
 Object.defineProperty(exports, "sync", { enumerable: true, get: function () { return sync_1.sync; } });
-var createRepo_1 = require("./createRepo");
-Object.defineProperty(exports, "createRepo", { enumerable: true, get: function () { return createRepo_1.createRepo; } });
+var init_1 = require("./init");
+Object.defineProperty(exports, "init", { enumerable: true, get: function () { return init_1.init; } });
 var taskConfig_1 = require("./taskConfig");
 Object.defineProperty(exports, "assertExecutionPermission", { enumerable: true, get: function () { return taskConfig_1.assertExecutionPermission; } });
 async function list(isTTY) {

package/build/services/tasks/init.d.ts

@@ -0,0 +1,8 @@
+interface InitFunctionOptions {
+    name: string;
+    repo: string;
+    path: string;
+    git?: boolean;
+}
+export declare function init({ name, repo, git, path }: InitFunctionOptions): Promise<void>;
+export {};

package/build/services/tasks/init.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.init = void 0;
+const promises_1 = require("fs/promises");
+const path_1 = require("path");
+const chalk = require("chalk");
+const util_1 = require("../../helpers/util");
+async function init({ name, repo, git, path }) {
+    try {
+        await (0, util_1.asyncExec)('git --version');
+    }
+    catch (err) {
+        console.log(chalk.red('Git is not installed. Please install git first.'));
+    }
+    console.log(`Creating new task ${chalk.green(name)}...`);
+    try {
+        const repoPath = (0, path_1.join)(path || '', name);
+        await (0, util_1.asyncExec)(`git clone ${repo} ${repoPath}`);
+        try {
+            await changePackageFile(repoPath, name);
+        }
+        catch (err) { }
+        await (0, util_1.asyncExec)(`cd ${repoPath} && rm -rf .git`);
+        if (git) {
+            console.log('Initializing git');
+            await (0, util_1.asyncExec)(`cd ${repoPath} && git init . && git add . && git commit -m "First commit"`);
+        }
+        console.log('Done! 🎉');
+    }
+    catch (err) {
+        console.log(chalk.red('Failed to create task'));
+        console.log(err);
+    }
+}
+exports.init = init;
+async function changePackageFile(repoPath, name) {
+    try {
+        const pkg = JSON.parse((await (0, promises_1.readFile)(`${repoPath}/package.json`)).toString());
+        pkg.name = name;
+        await (0, promises_1.writeFile)(`${repoPath}/package.json`, JSON.stringify(pkg, null, 2));
+    }
+    catch (err) {
+        console.log('WARN: package.json not found. (possibly not a javascript repository)');
+    }
+    try {
+        const taskConfig = JSON.parse((await (0, promises_1.readFile)(`${repoPath}/task-config.json`)).toString());
+        taskConfig.$schema = (0, util_1.getSwaggerDocumentationUrl)('config-json-schemas/TaskConfig.json');
+        taskConfig.name = name;
+        taskConfig.description = `${name} task`;
+        await (0, promises_1.writeFile)(`${repoPath}/task-config.json`, JSON.stringify(taskConfig, null, 2));
+    }
+    catch (err) {
+        console.log('WARN: task-config.json not found.');
+    }
+}

package/build/services/tasks/util.d.ts

@@ -4,6 +4,6 @@ export declare function syncFunctionUser(data: {
     targetEmail?: string;
     targetPermissions: string[];
 }): Promise<{
-    token: any;
-    tokenSecret: any;
+    token: string;
+    tokenSecret: string;
 }>;

package/build/services/tasks/util.js

@@ -42,7 +42,8 @@ async function syncFunctionUser(data) {
     if (!user) {
         console.log(chalk.white('⚙️  Creating the user...'));
         user = await userRepository.createUser({
-            firstName: `${taskName}`,
+            activationMode: 'manual',
+            firstName: taskName,
             lastName: 'exh.tasks',
             email,
             password,

package/build/services/templates/util/readTemplateFiles.js

@@ -25,7 +25,9 @@ exports.readTemplateFiles = readTemplateFiles;
 async function readAndValidateTemplateJson(fileName) {
     try {
         const content = await (0, utils_1.readJsonFile)(fileName);
-        (0, util_1.ajvValidate)(templateConfigSchema, content);
+        if (!(0, utils_1.isV1Template)(content)) {
+            (0, util_1.ajvValidate)(templateConfigSchema, content);
+        }
         return content;
     }
     catch (error) {

package/build/services/templates/util/utils.js

@@ -21,8 +21,7 @@ function removeFileNameExtension(fileName) {
 }
 exports.removeFileNameExtension = removeFileNameExtension;
 function isV1Template(template) {
-    return (template.version === 1 ||
-        !!template.schema ||
+    return (!!template.schema ||
         !!template.fields);
 }
 exports.isV1Template = isV1Template;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/exh-cli",
-  "version": "1.13.0-feat-168-eab0ce8",
+  "version": "1.13.0",
   "main": "build/index.js",
   "exports": "./build/index.js",
   "license": "MIT",
@@ -41,7 +41,7 @@
     "typescript": "4.5.5"
   },
   "dependencies": {
-    "@extrahorizon/javascript-sdk": "8.9.1-dev-152-3f69109",
+    "@extrahorizon/javascript-sdk": "8.9.1",
     "ajv": "8.18.0",
     "archiver": "^7.0.1",
     "chalk": "^4.0.0",

package/build/services/tasks/createRepo.d.ts

@@ -1,5 +0,0 @@
-export declare function createRepo({ name, repo, git }: {
-    name: any;
-    repo: any;
-    git: any;
-}): Promise<void>;

package/build/services/tasks/createRepo.js

@@ -1,52 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRepo = void 0;
-const promises_1 = require("fs/promises");
-const chalk = require("chalk");
-const util_1 = require("../../helpers/util");
-async function createRepo({ name, repo, git }) {
-    try {
-        await (0, util_1.asyncExec)('git --version');
-    }
-    catch (err) {
-        console.log(chalk.red('Git is not installed. Please install git first.'));
-    }
-    console.log(`Creating new repo ${chalk.green(name)}...`);
-    try {
-        await (0, util_1.asyncExec)(`git clone ${repo} ${name}`);
-        try {
-            await changePackageFile(name);
-        }
-        catch (err) { }
-        await (0, util_1.asyncExec)(`cd ${name} && rm -rf .git`);
-        if (git) {
-            console.log('Initializing git');
-            await (0, util_1.asyncExec)(`cd ${name} && git init . && git add . && git commit -m "First commit"`);
-        }
-        console.log('Done! 🎉');
-    }
-    catch (err) {
-        await (0, util_1.asyncExec)(`rm -rf ${name}`);
-        console.log(chalk.red('Failed to create repo'));
-        console.log(err);
-    }
-}
-exports.createRepo = createRepo;
-async function changePackageFile(name) {
-    try {
-        const pkg = JSON.parse((await (0, promises_1.readFile)(`${name}/package.json`)).toString());
-        pkg.name = name;
-        await (0, promises_1.writeFile)(`${name}/package.json`, JSON.stringify(pkg, null, 2));
-    }
-    catch (err) {
-        console.log('WARN: package.json not found. (possibly not a javascript repository');
-    }
-    try {
-        const taskConfig = JSON.parse((await (0, promises_1.readFile)(`${name}/task-config.json`)).toString());
-        taskConfig.$schema = (0, util_1.getSwaggerDocumentationUrl)('config-json-schemas/TaskConfig.json');
-        taskConfig.name = name;
-        taskConfig.description = `${name} task`;
-        await (0, promises_1.writeFile)(`${name}/task-config.json`, JSON.stringify(taskConfig, null, 2));
-    }
-    catch (err) { }
-}