dataverse-utils 2.3.0 → 2.4.1

package/lib/auth.js

@@ -1,10 +1,33 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccessToken = void 0;
+exports.getAccessToken = exports.onTokenFailure = void 0;
+const prompts_1 = __importDefault(require("prompts"));
 const cachePlugin_1 = require("./cachePlugin");
 const msal_node_1 = require("@azure/msal-node");
 const logger_1 = require("./logger");
 const clientId = '51f81489-12ee-4a9e-aaae-a2591f45987d';
+const onTokenFailure = async (url, error) => {
+    if (error) {
+        logger_1.logger.error(`failed to acquire access token: ${error}`);
+    }
+    else {
+        logger_1.logger.error('failed to acquire access token');
+    }
+    if ((0, cachePlugin_1.cacheExists)(url)) {
+        const { deleteToken } = await (0, prompts_1.default)({
+            type: 'confirm',
+            name: 'deleteToken',
+            message: `delete current token cache for ${url}?`
+        });
+        if (deleteToken) {
+            (0, cachePlugin_1.deleteCache)(url);
+        }
+    }
+};
+exports.onTokenFailure = onTokenFailure;
 const getAccessToken = async (tenant, url) => {
     const config = {
         auth: {
@@ -22,23 +45,31 @@ const getAccessToken = async (tenant, url) => {
     });
     // Try to get token silently
     if (accounts.length > 0) {
-        const silentToken = await pca.acquireTokenSilent({
-            account: accounts[0],
-            scopes: [`${url}/.default`]
-        }).catch(ex => {
-            throw new Error(ex.message);
-        });
-        if (silentToken) {
-            return silentToken;
+        try {
+            const silentToken = await pca.acquireTokenSilent({
+                account: accounts[0],
+                scopes: [`${url}/.default`]
+            });
+            if (silentToken) {
+                return silentToken;
+            }
+        }
+        catch (ex) {
+            if (ex.message.indexOf('The refresh token has expired due to inactivity') === -1) {
+                throw new Error(ex.message);
+            }
         }
     }
     // Acquire token by device code
-    const token = await pca.acquireTokenByDeviceCode({
-        scopes: [`${url}/.default`],
-        deviceCodeCallback: (response) => logger_1.logger.info(response.message)
-    }).catch(ex => {
+    try {
+        const token = await pca.acquireTokenByDeviceCode({
+            scopes: [`${url}/.default`],
+            deviceCodeCallback: (response) => logger_1.logger.info(response.message)
+        });
+        return token;
+    }
+    catch (ex) {
         throw new Error(ex.message);
-    });
-    return token;
+    }
 };
 exports.getAccessToken = getAccessToken;

package/lib/deploy.js

@@ -11,25 +11,6 @@ const assemblyDeploy_1 = require("./assemblyDeploy");
 const webResourceDeploy_1 = require("./webResourceDeploy");
 const node_1 = require("dataverse-webapi/lib/node");
 const auth_1 = require("./auth");
-const cachePlugin_1 = require("./cachePlugin");
-const onTokenFailure = async (url, error) => {
-    if (error) {
-        logger_1.logger.error(`failed to acquire access token: ${error}`);
-    }
-    else {
-        logger_1.logger.error('failed to acquire access token');
-    }
-    if ((0, cachePlugin_1.cacheExists)(url)) {
-        const { deleteToken } = await (0, prompts_1.default)({
-            type: 'confirm',
-            name: 'deleteToken',
-            message: `delete current token cache for ${url}?`
-        });
-        if (deleteToken) {
-            (0, cachePlugin_1.deleteCache)(url);
-        }
-    }
-};
 async function deploy(type, files) {
     if (!type || (type !== 'webresource' && type !== 'assembly')) {
         const invalid = type !== undefined && type !== 'webresource' && type !== 'assembly';
@@ -57,11 +38,11 @@ async function deploy(type, files) {
         token = await (0, auth_1.getAccessToken)(creds.tenant, creds.server);
     }
     catch (error) {
-        onTokenFailure(creds.server, error.message);
+        (0, auth_1.onTokenFailure)(creds.server, error.message);
         return;
     }
     if (token == null || token.accessToken == null) {
-        onTokenFailure(creds.server);
+        (0, auth_1.onTokenFailure)(creds.server);
         return;
     }
     const apiConfig = new node_1.WebApiConfig('8.2', token.accessToken, creds.server);

package/lib/generate.js

@@ -31,11 +31,11 @@ async function generate(table) {
         token = await (0, auth_1.getAccessToken)(creds.tenant, creds.server);
     }
     catch (error) {
-        logger_1.logger.error(`failed to acquire access token: ${error.message}`);
+        (0, auth_1.onTokenFailure)(creds.server, error.message);
         return;
     }
     if (token == null || token.accessToken == null) {
-        logger_1.logger.error('failed to acquire access token');
+        (0, auth_1.onTokenFailure)(creds.server);
         return;
     }
     const apiConfig = new node_1.WebApiConfig('8.2', token.accessToken, creds.server);

package/lib/models/pluginImage.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployImage = void 0;
 const logger_1 = require("../logger");
 const node_1 = require("dataverse-webapi/lib/node");
-async function deployImage(stepId, image, message, apiConfig) {
+async function deployImage(stepId, stepName, image, message, apiConfig) {
     image['sdkmessageprocessingstepid@odata.bind'] = `/sdkmessageprocessingsteps(${stepId})`;
     switch (message) {
         case 'Create':
@@ -25,7 +25,7 @@ async function deployImage(stepId, image, message, apiConfig) {
     let imageId = await retrieveImage(stepId, image, apiConfig);
     if (imageId != '') {
         try {
-            await updateImage(imageId, image, apiConfig);
+            await updateImage(imageId, image, stepName, apiConfig);
         }
         catch (error) {
             throw new Error(`failed to update plugin image: ${error.message}`);
@@ -33,7 +33,7 @@ async function deployImage(stepId, image, message, apiConfig) {
     }
     else {
         try {
-            imageId = await createImage(image, apiConfig);
+            imageId = await createImage(image, stepName, apiConfig);
         }
         catch (error) {
             throw new Error(`failed to create plugin image: ${error.message}`);
@@ -47,15 +47,15 @@ async function retrieveImage(stepId, image, apiConfig) {
     const result = await (0, node_1.retrieveMultiple)(apiConfig, 'sdkmessageprocessingstepimages', options);
     return result.value.length > 0 ? result.value[0].sdkmessageprocessingstepimageid : '';
 }
-async function createImage(image, apiConfig) {
-    logger_1.logger.info(`create plugin image ${image.name}`);
+async function createImage(image, stepName, apiConfig) {
+    logger_1.logger.info(`create plugin image ${image.name} for step ${stepName}`);
     const result = await (0, node_1.createWithReturnData)(apiConfig, 'sdkmessageprocessingstepimages', image, '$select=sdkmessageprocessingstepimageid');
     if (result.error) {
         throw new Error(result.error.message);
     }
     return result.sdkmessageprocessingstepimageid;
 }
-async function updateImage(id, image, apiConfig) {
-    logger_1.logger.info(`update plugin image ${image.name}`);
+async function updateImage(id, image, stepName, apiConfig) {
+    logger_1.logger.info(`update plugin image ${image.name} for step ${stepName}`);
     return (0, node_1.update)(apiConfig, 'sdkmessageprocessingstepimages', id, image);
 }

package/lib/models/pluginStep.js

@@ -53,7 +53,7 @@ async function deployStep(step, typeId, apiConfig, solution) {
     }
     if (images && images.length > 0) {
         try {
-            const promises = images.map(image => (0, pluginImage_1.deployImage)(stepId, image, message, apiConfig));
+            const promises = images.map(image => (0, pluginImage_1.deployImage)(stepId, step.name, image, message, apiConfig));
             await Promise.all(promises);
         }
         catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataverse-utils",
-  "version": "2.3.0",
+  "version": "2.4.1",
   "license": "MIT",
   "description": "Utilities for interacting with Dataverse environments",
   "main": "lib/index.js",