@extrahorizon/exh-cli 1.13.0-dev-178-60ea982 → 1.13.0-dev-180-80916a9

package/build/config-json-schemas/Dispatchers.json

@@ -71,7 +71,11 @@
         },
         "MailAction": {
             "type": "object",
-            "required": ["type", "name", "recipients", "templateId"],
+            "required": ["type", "name", "recipients"],
+            "anyOf": [
+                { "required": ["templateId"] },
+                { "required": ["templateName"] }
+            ],
             "properties": {
                 "type": { "const": "mail" },
                 "name": { "type": "string" },
@@ -94,7 +98,15 @@
                         }
                     }
                 },
-                "templateId": { "type": "string" }
+                "templateId": {
+                    "deprecated": true,
+                    "description": "Deprecated, use templateName instead to target a V2 template by its name.",
+                    "type": "string"
+                },
+                "templateName": {
+                    "description": "The name of a V2 template",
+                    "type": "string"
+                }
             }
         },
         "TaskAction": {

package/build/exh.d.ts

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

package/build/exh.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSdk = exports.sdkAuth = exports.sdkInitOnly = void 0;
+exports.getNewSdkInstance = exports.getSdk = exports.sdkAuth = exports.sdkInitOnly = void 0;
 const javascript_sdk_1 = require("@extrahorizon/javascript-sdk");
 const util_1 = require("./helpers/util");
 let sdk = null;
@@ -39,3 +39,11 @@ function getSdk() {
     return sdk;
 }
 exports.getSdk = getSdk;
+function getNewSdkInstance() {
+    return (0, javascript_sdk_1.createOAuth1Client)({
+        host: process.env.API_HOST,
+        consumerKey: process.env.API_OAUTH_CONSUMER_KEY,
+        consumerSecret: process.env.API_OAUTH_CONSUMER_SECRET,
+    });
+}
+exports.getNewSdkInstance = getNewSdkInstance;

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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/exh-cli",
-  "version": "1.13.0-dev-178-60ea982",
+  "version": "1.13.0-dev-180-80916a9",
   "main": "build/index.js",
   "exports": "./build/index.js",
   "license": "MIT",