dataverse-utils 2.5.3 → 2.6.0

package/lib/assemblyDeploy.js

@@ -41,14 +41,13 @@ async function assemblyDeploy(creds, apiConfig) {
         }
         logger_1.logger.done(`deployed assembly ${config.name}\r\n`);
     }
-    if (config.customApis && config.customApis.length > 0 && assemblyId) {
+    if (config.customapis != null && assemblyId) {
         try {
-            const promises = config.customApis.map(a => (0, customApi_1.deployApi)(a, apiConfig, creds.solution, assemblyId ?? ''));
+            const promises = config.customapis.map((a) => (0, customApi_1.deployApi)(a, assemblyId, apiConfig, creds.solution));
             await Promise.all(promises);
         }
         catch (error) {
             logger_1.logger.error(error.message);
-            return;
         }
     }
 }

package/lib/models/customApi.js

@@ -1,38 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployApi = exports.ParameterType = exports.BindingType = exports.CustomProcessingStepType = void 0;
+exports.retrieveApi = exports.deployApi = void 0;
 const node_1 = require("dataverse-webapi/lib/node");
 const pluginType_1 = require("./pluginType");
 const logger_1 = require("../logger");
-var CustomProcessingStepType;
-(function (CustomProcessingStepType) {
-})(CustomProcessingStepType = exports.CustomProcessingStepType || (exports.CustomProcessingStepType = {}));
-var BindingType;
-(function (BindingType) {
-})(BindingType = exports.BindingType || (exports.BindingType = {}));
-var ParameterType;
-(function (ParameterType) {
-})(ParameterType = exports.ParameterType || (exports.ParameterType = {}));
-async function deployApi(config, apiConfig, solution, assemblyId) {
-    const apiId = await retrieveApi(config.name, apiConfig);
-    const pluginTypeId = await (0, pluginType_1.retrieveType)(config.pluginType ?? '', assemblyId, apiConfig);
-    if (pluginTypeId === '') {
-        logger_1.logger.error(`Unable to retrieve plugin type ${config.pluginType}`);
-        return;
+async function deployApi(api, assemblyId, apiConfig, solution) {
+    let apiId = await retrieveApi(api.name, apiConfig);
+    if (api.plugintype) {
+        const pluginTypeId = await (0, pluginType_1.retrieveType)(api.plugintype ?? '', assemblyId, apiConfig);
+        if (pluginTypeId === '') {
+            logger_1.logger.error(`unable to find plugin type ${api.plugintype}`);
+            return;
+        }
+        delete api.plugintype;
+        api['PluginTypeId@odata.bind'] = `plugintypes(${pluginTypeId})`;
     }
-    delete config.pluginType;
-    config['PluginTypeId@odata.bind'] = `plugintypes(${pluginTypeId})`;
     if (apiId != '') {
         try {
-            await updateApi(apiId, config, apiConfig);
+            await updateApi(apiId, api, apiConfig);
         }
         catch (error) {
-            throw new Error(`failed to update customa api: ${error.message}`);
+            throw new Error(`failed to update custom api: ${error.message}`);
         }
     }
     else {
         try {
-            await createApi(config, solution, apiConfig);
+            apiId = await createApi(api, apiConfig, solution);
         }
         catch (error) {
             throw new Error(`failed to create custom api: ${error.message}`);
@@ -45,15 +38,32 @@ async function retrieveApi(name, apiConfig) {
     const result = await (0, node_1.retrieveMultiple)(apiConfig, 'customapis', options);
     return result.value.length > 0 ? result.value[0].customapiid : '';
 }
-async function createApi(api, solution, apiConfig) {
-    logger_1.logger.info(`create custom api ${api.displayname}`);
-    const result = await (0, node_1.createWithReturnData)(apiConfig, 'customapis', api, '$select=customapiid');
+exports.retrieveApi = retrieveApi;
+async function createApi(api, apiConfig, solution) {
+    logger_1.logger.info(`create custom api ${api.name}`);
+    const options = {};
+    if (solution) {
+        options.customHeaders = { 'MSCRM.SolutionUniqueName': solution };
+    }
+    const result = await (0, node_1.createWithReturnData)(apiConfig, 'plugintypes', api, '$select=plugintypeid', options);
     if (result.error) {
         throw new Error(result.error.message);
     }
     return result.customapiid;
 }
 async function updateApi(id, api, apiConfig) {
-    logger_1.logger.info(`update custom api ${api.displayname}`);
+    logger_1.logger.info(`update custom api ${api.name}`);
+    const record = {
+        displayname: api.displayname,
+        description: api.description,
+        name: api.name,
+        executeprivilegename: api.executeprivilegename
+    };
+    if (api['PluginTypeId@odata.bind']) {
+        record['PluginTypeId@odata.bind'] = api['PluginTypeId@odata.bind'];
+    }
+    else {
+        record['PluginTypeId@odata.bind'] = null;
+    }
     return (0, node_1.update)(apiConfig, 'customapis', id, api);
 }

package/lib/models/pluginAssembly.js

@@ -8,7 +8,6 @@ const fs_1 = __importDefault(require("fs"));
 const glob_1 = __importDefault(require("glob"));
 const node_1 = require("dataverse-webapi/lib/node");
 const pluginType_1 = require("./pluginType");
-const dataverse_service_1 = require("../dataverse.service");
 const logger_1 = require("../logger");
 async function deployAssembly(config, apiConfig, solution) {
     const files = glob_1.default.sync(`**/${config.name}.dll`);
@@ -35,25 +34,17 @@ async function deployAssembly(config, apiConfig, solution) {
     }
     else {
         try {
-            assemblyId = await createAssembly(config, content, apiConfig);
+            assemblyId = await createAssembly(config, content, apiConfig, solution);
         }
         catch (error) {
             throw new Error(`failed to create assembly: ${error.message}`);
         }
-        if (solution != undefined) {
-            try {
-                await (0, dataverse_service_1.addToSolution)(assemblyId, solution, dataverse_service_1.ComponentType.PluginAssembly, apiConfig);
-            }
-            catch (error) {
-                logger_1.logger.error(`failed to add to solution: ${error.message}`);
-            }
-        }
     }
     if (config.types != null) {
         try {
-            const promises = config.types.map(async (type) => {
+            const promises = config.types.map((type) => {
                 type['pluginassemblyid@odata.bind'] = `/pluginassemblies(${assemblyId})`;
-                await (0, pluginType_1.deployType)(type, assemblyId, apiConfig, solution);
+                return (0, pluginType_1.deployType)(type, assemblyId, apiConfig, solution);
             });
             await Promise.all(promises);
         }
@@ -70,7 +61,7 @@ async function retrieveAssembly(name, apiConfig) {
     const result = await (0, node_1.retrieveMultiple)(apiConfig, 'pluginassemblies', options);
     return result.value.length > 0 ? result.value[0].pluginassemblyid : '';
 }
-async function createAssembly(config, content, apiConfig) {
+async function createAssembly(config, content, apiConfig, solution) {
     logger_1.logger.info(`create assembly ${config.name}`);
     const assembly = {
         name: config.name,
@@ -81,10 +72,11 @@ async function createAssembly(config, content, apiConfig) {
         sourcetype: 0,
         culture: ''
     };
-    if (config['packageid@odata.bind']) {
-        assembly['packageid@odata.bind'] = config['packageid@odata.bind'];
+    const options = {};
+    if (solution) {
+        options.customHeaders = { 'MSCRM.SolutionUniqueName': solution };
     }
-    const result = await (0, node_1.createWithReturnData)(apiConfig, 'pluginassemblies', assembly, '$select=pluginassemblyid');
+    const result = await (0, node_1.createWithReturnData)(apiConfig, 'pluginassemblies', assembly, '$select=pluginassemblyid', options);
     if (result.error) {
         throw new Error(result.error.message);
     }

package/lib/models/pluginPackage.js

@@ -8,7 +8,6 @@ const fs_1 = __importDefault(require("fs"));
 const glob_1 = __importDefault(require("glob"));
 const node_1 = require("dataverse-webapi/lib/node");
 const pluginAssembly_1 = require("./pluginAssembly");
-const dataverse_service_1 = require("../dataverse.service");
 const logger_1 = require("../logger");
 async function deployPluginPackage(config, apiConfig, solution) {
     const files = glob_1.default.sync(`**/${config.name}.*.nupkg`);
@@ -18,7 +17,6 @@ async function deployPluginPackage(config, apiConfig, solution) {
     }
     const content = (await fs_1.default.promises.readFile(files[0])).toString('base64');
     let packageId = '';
-    let assemblyId;
     try {
         packageId = await retrievePackage(config.prefix, config.name, apiConfig);
     }
@@ -36,20 +34,13 @@ async function deployPluginPackage(config, apiConfig, solution) {
     }
     else {
         try {
-            packageId = await createPackage(config, content, apiConfig);
+            packageId = await createPackage(config, content, apiConfig, solution);
         }
         catch (error) {
             throw new Error(`failed to create package: ${error.message}`);
         }
-        if (solution != undefined) {
-            try {
-                await (0, dataverse_service_1.addToSolution)(packageId, solution, dataverse_service_1.ComponentType.PluginPackage, apiConfig);
-            }
-            catch (error) {
-                logger_1.logger.error(`failed to add package to solution: ${error.message}`);
-            }
-        }
     }
+    let assemblyId;
     if (config.assembly != null) {
         try {
             config.assembly['packageid@odata.bind'] = `/pluginpackages(${packageId})`;
@@ -68,14 +59,18 @@ async function retrievePackage(prefix, name, apiConfig) {
     const result = await (0, node_1.retrieveMultiple)(apiConfig, 'pluginpackages', options);
     return result.value.length > 0 ? result.value[0].pluginassemblyid : '';
 }
-async function createPackage(config, content, apiConfig) {
+async function createPackage(config, content, apiConfig, solution) {
     logger_1.logger.info(`create package ${config.name}`);
     const pluginPackage = {
         name: `${config.prefix}_${config.name}`,
         version: config.version,
         content: content
     };
-    const result = await (0, node_1.createWithReturnData)(apiConfig, 'pluginpackages', pluginPackage, '$select=pluginpackageid');
+    const options = {};
+    if (solution) {
+        options.customHeaders = { 'MSCRM.SolutionUniqueName': solution };
+    }
+    const result = await (0, node_1.createWithReturnData)(apiConfig, 'pluginpackages', pluginPackage, '$select=pluginpackageid', options);
     if (result.error) {
         throw new Error(result.error.message);
     }

package/lib/models/pluginStep.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployStep = void 0;
 const node_1 = require("dataverse-webapi/lib/node");
-const dataverse_service_1 = require("../dataverse.service");
 const logger_1 = require("../logger");
 const pluginImage_1 = require("./pluginImage");
 async function deployStep(step, typeId, apiConfig, solution) {
@@ -39,19 +38,11 @@ async function deployStep(step, typeId, apiConfig, solution) {
     }
     else {
         try {
-            stepId = await createStep(step, apiConfig);
+            stepId = await createStep(step, apiConfig, solution);
         }
         catch (error) {
             throw new Error(`failed to create plugin step: ${error.message}`);
         }
-        if (solution != undefined) {
-            try {
-                await (0, dataverse_service_1.addToSolution)(stepId, solution, dataverse_service_1.ComponentType.SDKMessageProcessingStep, apiConfig);
-            }
-            catch (error) {
-                throw new Error(`failed to add to solution: ${error.message}`);
-            }
-        }
     }
     if (images && images.length > 0) {
         try {
@@ -83,9 +74,13 @@ async function getSdkMessageId(name, apiConfig) {
     const message = await (0, node_1.retrieveMultiple)(apiConfig, 'sdkmessages', options);
     return message.value.length > 0 ? message.value[0].sdkmessageid : '';
 }
-async function createStep(step, apiConfig) {
+async function createStep(step, apiConfig, solution) {
     logger_1.logger.info(`create plugin step ${step.name}`);
-    const result = await (0, node_1.createWithReturnData)(apiConfig, 'sdkmessageprocessingsteps', step, '$select=sdkmessageprocessingstepid');
+    const options = {};
+    if (solution) {
+        options.customHeaders = { 'MSCRM.SolutionUniqueName': solution };
+    }
+    const result = await (0, node_1.createWithReturnData)(apiConfig, 'sdkmessageprocessingsteps', step, '$select=sdkmessageprocessingstepid', options);
     if (result.error) {
         throw new Error(result.error.message);
     }

package/lib/models/pluginType.js

@@ -31,9 +31,9 @@ async function deployType(config, assemblyId, apiConfig, solution) {
     }
     try {
         if (config.steps) {
-            const promises = config.steps.map(async (step) => {
+            const promises = config.steps.map((step) => {
                 step['plugintypeid@odata.bind'] = `/plugintypes(${typeId})`;
-                await (0, pluginStep_1.deployStep)(step, typeId, apiConfig, solution);
+                return (0, pluginStep_1.deployStep)(step, typeId, apiConfig, solution);
             });
             await Promise.all(promises);
         }

package/lib/models/webResource.js

@@ -75,19 +75,11 @@ async function deploy(webResources, apiConfig, solution, files) {
         }
         else {
             try {
-                resourceId = await createResource(resource, content, apiConfig);
+                resourceId = await createResource(resource, content, apiConfig, solution);
             }
             catch (error) {
                 logger_1.logger.error(`failed to create resource: ${error.message}`);
             }
-            if (solution != undefined) {
-                try {
-                    await (0, dataverse_service_1.addToSolution)(resourceId, solution, dataverse_service_1.ComponentType.WebResource, apiConfig);
-                }
-                catch (error) {
-                    logger_1.logger.error(`failed to add to solution: ${error.message}`);
-                }
-            }
         }
     });
     await Promise.all(promises);
@@ -107,7 +99,7 @@ async function retrieveResource(name, apiConfig) {
     const result = await (0, node_1.retrieveMultiple)(apiConfig, 'webresourceset', options);
     return result.value.length > 0 ? result.value[0].webresourceid : '';
 }
-async function createResource(resource, content, apiConfig) {
+async function createResource(resource, content, apiConfig, solution) {
     logger_1.logger.info(`create web resource ${resource.name}`);
     const webResource = {
         webresourcetype: getWebResourceType(resource.type),
@@ -115,7 +107,11 @@ async function createResource(resource, content, apiConfig) {
         displayname: resource.displayname || resource.name,
         content: content
     };
-    const result = await (0, node_1.createWithReturnData)(apiConfig, 'webresourceset', webResource, '$select=webresourceid');
+    const options = {};
+    if (solution) {
+        options.customHeaders = { 'MSCRM.SolutionUniqueName': solution };
+    }
+    const result = await (0, node_1.createWithReturnData)(apiConfig, 'webresourceset', webResource, '$select=webresourceid', options);
     if (result.error) {
         throw new Error(result.error.message);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataverse-utils",
-  "version": "2.5.3",
+  "version": "2.6.0",
   "license": "MIT",
   "description": "Utilities for interacting with Dataverse environments",
   "main": "lib/index.js",
@@ -20,10 +20,10 @@
     "clean": "rimraf lib"
   },
   "dependencies": {
-    "@azure/msal-node": "^1.12.0",
+    "@azure/msal-node": "^1.14.5",
     "commander": "^8.3.0",
     "cryptr": "^6.0.3",
-    "dataverse-webapi": "^2.2.1",
+    "dataverse-webapi": "^2.3.0",
     "envinfo": "^7.8.1",
     "figures": "^3.2.0",
     "glob": "^7.2.0",