dataverse-utils 2.3.0 → 2.3.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: {

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

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