dataverse-utils 2.7.4 → 2.7.6

package/lib/assemblyDeploy.js

@@ -1,56 +1,57 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assemblyDeploy = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const pluginAssembly_1 = require("./models/pluginAssembly");
-const pluginPackage_1 = require("./models/pluginPackage");
-const customApi_1 = require("./models/customApi");
-const logger_1 = require("./logger");
-async function assemblyDeploy(creds, apiConfig) {
-    const currentPath = '.';
-    const configFile = await fs_1.default.promises.readFile(path_1.default.resolve(currentPath, 'dataverse.config.json'), 'utf8');
-    if (configFile == null) {
-        logger_1.logger.warn('unable to find dataverse.config.json file');
-        return;
-    }
-    const config = JSON.parse(configFile);
-    if (config.assembly) {
-        logger_1.logger.info('deploy plugin package');
-        try {
-            await (0, pluginPackage_1.deployPluginPackage)(config, apiConfig, creds.solution);
-        }
-        catch (error) {
-            logger_1.logger.error(error.message);
-            return;
-        }
-        logger_1.logger.done(`deployed plugin package ${config.prefix}_${config.name}\r\n`);
-    }
-    else {
-        logger_1.logger.info(`deploy assembly to ${creds.server}`);
-        try {
-            await (0, pluginAssembly_1.deployAssembly)(config, apiConfig, creds.solution);
-        }
-        catch (error) {
-            logger_1.logger.error(error.message);
-            return;
-        }
-        logger_1.logger.done(`deployed assembly ${config.name}`);
-    }
-    if (config.customapis != null && config.pluginassemblyid) {
-        logger_1.logger.info('deploy custom api');
-        try {
-            const promises = config.customapis.map((a) => (0, customApi_1.deployApi)(a, config.pluginassemblyid, apiConfig, creds.solution));
-            await Promise.all(promises);
-        }
-        catch (error) {
-            logger_1.logger.error(error.message);
-        }
-        logger_1.logger.done('deployed custom api');
-    }
-    await fs_1.default.promises.writeFile(path_1.default.resolve(currentPath, 'dataverse.config.json'), JSON.stringify(config, null, 4), 'utf8');
-}
-exports.assemblyDeploy = assemblyDeploy;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assemblyDeploy = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const pluginAssembly_1 = require("./models/pluginAssembly");
+const pluginPackage_1 = require("./models/pluginPackage");
+const customApi_1 = require("./models/customApi");
+const logger_1 = require("./logger");
+async function assemblyDeploy(creds, apiConfig) {
+    const currentPath = '.';
+    const configFile = await fs_1.default.promises.readFile(path_1.default.resolve(currentPath, 'dataverse.config.json'), 'utf8');
+    if (configFile == null) {
+        logger_1.logger.warn('unable to find dataverse.config.json file');
+        return;
+    }
+    const config = JSON.parse(configFile);
+    if (config.assembly) {
+        logger_1.logger.info('deploy plugin package');
+        try {
+            await (0, pluginPackage_1.deployPluginPackage)(config, apiConfig, creds.solution);
+        }
+        catch (error) {
+            logger_1.logger.error(error.message);
+            return;
+        }
+        logger_1.logger.done(`deployed plugin package ${config.prefix}_${config.name}\r\n`);
+    }
+    else {
+        logger_1.logger.info(`deploy assembly to ${creds.server}`);
+        try {
+            await (0, pluginAssembly_1.deployAssembly)(config, apiConfig, creds.solution);
+        }
+        catch (error) {
+            logger_1.logger.error(error.message);
+            return;
+        }
+        logger_1.logger.done(`deployed assembly ${config.name}`);
+    }
+    if ((config.customapis != null && config.pluginassemblyid) || config.assembly.pluginassemblyid) {
+        logger_1.logger.info('deploy custom api');
+        const assemblyId = config.pluginassemblyid ?? config.assembly.pluginassemblyid;
+        try {
+            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);
+        }
+        logger_1.logger.done('deployed custom api');
+    }
+    await fs_1.default.promises.writeFile(path_1.default.resolve(currentPath, 'dataverse.config.json'), JSON.stringify(config, null, 4), 'utf8');
+}
+exports.assemblyDeploy = assemblyDeploy;

package/lib/auth.js

@@ -1,75 +1,75 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-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: {
-            clientId: clientId,
-            authority: `https://login.microsoftonline.com/${tenant}/`
-        },
-        cache: {
-            cachePlugin: (0, cachePlugin_1.cachePlugin)(url)
-        }
-    };
-    const pca = new msal_node_1.PublicClientApplication(config);
-    const cache = pca.getTokenCache();
-    const accounts = await cache?.getAllAccounts().catch(ex => {
-        throw new Error(ex.message);
-    });
-    // Try to get token silently
-    if (accounts.length > 0) {
-        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
-    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);
-    }
-};
-exports.getAccessToken = getAccessToken;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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: {
+            clientId: clientId,
+            authority: `https://login.microsoftonline.com/${tenant}/`
+        },
+        cache: {
+            cachePlugin: (0, cachePlugin_1.cachePlugin)(url)
+        }
+    };
+    const pca = new msal_node_1.PublicClientApplication(config);
+    const cache = pca.getTokenCache();
+    const accounts = await cache?.getAllAccounts().catch(ex => {
+        throw new Error(ex.message);
+    });
+    // Try to get token silently
+    if (accounts.length > 0) {
+        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
+    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);
+    }
+};
+exports.getAccessToken = getAccessToken;

package/lib/cachePlugin.js

@@ -1,97 +1,97 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cachePlugin = exports.deleteCache = exports.cacheExists = exports.getCachePath = void 0;
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const cryptr_1 = __importDefault(require("cryptr"));
-const encrypt = (text) => {
-    const user = os_1.default.userInfo().username;
-    const cryptr = new cryptr_1.default(user);
-    const encrypted = cryptr.encrypt(text);
-    return encrypted;
-};
-const decrypt = (text) => {
-    const user = os_1.default.userInfo().username;
-    const cryptr = new cryptr_1.default(user);
-    const decrypted = cryptr.decrypt(text);
-    return decrypted;
-};
-const getCachePath = (url) => {
-    const org = new URL(url).hostname.split('.')[0];
-    if (!fs_1.default.existsSync(path_1.default.join(os_1.default.homedir(), './.dataverse-utils/'))) {
-        fs_1.default.mkdirSync(path_1.default.join(os_1.default.homedir(), './.dataverse-utils/'));
-    }
-    return path_1.default.join(os_1.default.homedir(), `./.dataverse-utils/${org}.json`);
-};
-exports.getCachePath = getCachePath;
-const cacheExists = (url) => {
-    const cacheLocation = (0, exports.getCachePath)(url);
-    return fs_1.default.existsSync(cacheLocation);
-};
-exports.cacheExists = cacheExists;
-const deleteCache = (url) => {
-    const cacheLocation = (0, exports.getCachePath)(url);
-    if (fs_1.default.existsSync(cacheLocation)) {
-        fs_1.default.unlinkSync(cacheLocation);
-        return true;
-    }
-    else {
-        return false;
-    }
-};
-exports.deleteCache = deleteCache;
-const cachePlugin = (url) => {
-    const cacheLocation = (0, exports.getCachePath)(url);
-    const beforeCacheAccess = (tokenCacheContext) => {
-        return new Promise((resolve, reject) => {
-            if (fs_1.default.existsSync(cacheLocation)) {
-                fs_1.default.readFile(cacheLocation, 'utf-8', (err, data) => {
-                    if (err) {
-                        reject();
-                    }
-                    else {
-                        const decrypted = decrypt(data);
-                        tokenCacheContext.tokenCache.deserialize(decrypted);
-                        resolve();
-                    }
-                });
-            }
-            else {
-                const encrypted = encrypt(tokenCacheContext.tokenCache.serialize());
-                fs_1.default.writeFile(cacheLocation, encrypted, (err) => {
-                    if (err) {
-                        reject();
-                    }
-                    else {
-                        resolve();
-                    }
-                });
-            }
-        });
-    };
-    const afterCacheAccess = (tokenCacheContext) => {
-        return new Promise((resolve, reject) => {
-            if (tokenCacheContext.cacheHasChanged) {
-                const encrypted = encrypt(tokenCacheContext.tokenCache.serialize());
-                fs_1.default.writeFile(cacheLocation, encrypted, (err) => {
-                    if (err) {
-                        reject(err);
-                    }
-                    resolve();
-                });
-            }
-            else {
-                resolve();
-            }
-        });
-    };
-    return {
-        beforeCacheAccess,
-        afterCacheAccess
-    };
-};
-exports.cachePlugin = cachePlugin;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cachePlugin = exports.deleteCache = exports.cacheExists = exports.getCachePath = void 0;
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const cryptr_1 = __importDefault(require("cryptr"));
+const encrypt = (text) => {
+    const user = os_1.default.userInfo().username;
+    const cryptr = new cryptr_1.default(user);
+    const encrypted = cryptr.encrypt(text);
+    return encrypted;
+};
+const decrypt = (text) => {
+    const user = os_1.default.userInfo().username;
+    const cryptr = new cryptr_1.default(user);
+    const decrypted = cryptr.decrypt(text);
+    return decrypted;
+};
+const getCachePath = (url) => {
+    const org = new URL(url).hostname.split('.')[0];
+    if (!fs_1.default.existsSync(path_1.default.join(os_1.default.homedir(), './.dataverse-utils/'))) {
+        fs_1.default.mkdirSync(path_1.default.join(os_1.default.homedir(), './.dataverse-utils/'));
+    }
+    return path_1.default.join(os_1.default.homedir(), `./.dataverse-utils/${org}.json`);
+};
+exports.getCachePath = getCachePath;
+const cacheExists = (url) => {
+    const cacheLocation = (0, exports.getCachePath)(url);
+    return fs_1.default.existsSync(cacheLocation);
+};
+exports.cacheExists = cacheExists;
+const deleteCache = (url) => {
+    const cacheLocation = (0, exports.getCachePath)(url);
+    if (fs_1.default.existsSync(cacheLocation)) {
+        fs_1.default.unlinkSync(cacheLocation);
+        return true;
+    }
+    else {
+        return false;
+    }
+};
+exports.deleteCache = deleteCache;
+const cachePlugin = (url) => {
+    const cacheLocation = (0, exports.getCachePath)(url);
+    const beforeCacheAccess = (tokenCacheContext) => {
+        return new Promise((resolve, reject) => {
+            if (fs_1.default.existsSync(cacheLocation)) {
+                fs_1.default.readFile(cacheLocation, 'utf-8', (err, data) => {
+                    if (err) {
+                        reject();
+                    }
+                    else {
+                        const decrypted = decrypt(data);
+                        tokenCacheContext.tokenCache.deserialize(decrypted);
+                        resolve();
+                    }
+                });
+            }
+            else {
+                const encrypted = encrypt(tokenCacheContext.tokenCache.serialize());
+                fs_1.default.writeFile(cacheLocation, encrypted, (err) => {
+                    if (err) {
+                        reject();
+                    }
+                    else {
+                        resolve();
+                    }
+                });
+            }
+        });
+    };
+    const afterCacheAccess = (tokenCacheContext) => {
+        return new Promise((resolve, reject) => {
+            if (tokenCacheContext.cacheHasChanged) {
+                const encrypted = encrypt(tokenCacheContext.tokenCache.serialize());
+                fs_1.default.writeFile(cacheLocation, encrypted, (err) => {
+                    if (err) {
+                        reject(err);
+                    }
+                    resolve();
+                });
+            }
+            else {
+                resolve();
+            }
+        });
+    };
+    return {
+        beforeCacheAccess,
+        afterCacheAccess
+    };
+};
+exports.cachePlugin = cachePlugin;

package/lib/dataverse.service.js

@@ -1,71 +1,71 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTableMetadata = exports.publish = exports.addToSolution = exports.ComponentType = void 0;
-const node_1 = require("dataverse-webapi/lib/node");
-const logger_1 = require("./logger");
-var ComponentType;
-(function (ComponentType) {
-    ComponentType[ComponentType["WebResource"] = 61] = "WebResource";
-    ComponentType[ComponentType["PluginType"] = 90] = "PluginType";
-    ComponentType[ComponentType["PluginAssembly"] = 91] = "PluginAssembly";
-    ComponentType[ComponentType["SDKMessageProcessingStep"] = 92] = "SDKMessageProcessingStep";
-    ComponentType[ComponentType["SDKMessageProcessingStepImage"] = 93] = "SDKMessageProcessingStepImage";
-    ComponentType[ComponentType["PluginPackage"] = 10865] = "PluginPackage";
-})(ComponentType = exports.ComponentType || (exports.ComponentType = {}));
-async function addToSolution(id, solution, type, apiConfig) {
-    const data = {
-        ComponentId: id,
-        ComponentType: type,
-        SolutionUniqueName: solution,
-        AddRequiredComponents: false,
-        IncludedComponentSettingsValues: null
-    };
-    logger_1.logger.info(`add component ${id} to solution ${solution}`);
-    await (0, node_1.unboundAction)(apiConfig, 'AddSolutionComponent', data);
-}
-exports.addToSolution = addToSolution;
-async function publish(publishXml, apiConfig) {
-    const data = {
-        ParameterXml: `<importexportxml><webresources>${publishXml}</webresources></importexportxml>`
-    };
-    await (0, node_1.unboundAction)(apiConfig, 'PublishXml', data);
-}
-exports.publish = publish;
-async function getTableMetadata(table, apiConfig) {
-    const options = [
-        '?$select=DisplayName,LogicalName,EntitySetName,SchemaName',
-        '&$expand=Attributes($select=LogicalName,SchemaName)'
-    ].join('');
-    const metadata = await (0, node_1.retrieveMultiple)(apiConfig, `EntityDefinitions(LogicalName='${table}')`, options);
-    if (metadata == null) {
-        throw Error(`Table ${table} not found in metadata cache`);
-    }
-    const choiceOptions = [
-        '?$select=attributevalue,value,attributename',
-        `&$filter=objecttypecode eq '${table}'`
-    ].join('');
-    const choiceMetadata = await (0, node_1.retrieveMultiple)(apiConfig, 'stringmaps', choiceOptions);
-    const tableMetadata = {
-        logicalName: metadata.LogicalName,
-        schemaName: metadata.SchemaName,
-        entitySetName: metadata.EntitySetName,
-        choices: [],
-        fields: metadata.Attributes.map((a) => {
-            return {
-                logicalName: a.LogicalName,
-                schemaName: a.SchemaName
-            };
-        })
-    };
-    choiceMetadata.value.forEach((c) => {
-        const index = tableMetadata.choices.findIndex(x => x.column === c.attributename);
-        if (index === -1) {
-            tableMetadata.choices.push({ column: c.attributename, options: [{ text: c.value, value: c.attributevalue }] });
-        }
-        else {
-            tableMetadata.choices[index].options.push({ text: c.value, value: c.attributevalue });
-        }
-    });
-    return tableMetadata;
-}
-exports.getTableMetadata = getTableMetadata;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTableMetadata = exports.publish = exports.addToSolution = exports.ComponentType = void 0;
+const node_1 = require("dataverse-webapi/lib/node");
+const logger_1 = require("./logger");
+var ComponentType;
+(function (ComponentType) {
+    ComponentType[ComponentType["WebResource"] = 61] = "WebResource";
+    ComponentType[ComponentType["PluginType"] = 90] = "PluginType";
+    ComponentType[ComponentType["PluginAssembly"] = 91] = "PluginAssembly";
+    ComponentType[ComponentType["SDKMessageProcessingStep"] = 92] = "SDKMessageProcessingStep";
+    ComponentType[ComponentType["SDKMessageProcessingStepImage"] = 93] = "SDKMessageProcessingStepImage";
+    ComponentType[ComponentType["PluginPackage"] = 10865] = "PluginPackage";
+})(ComponentType = exports.ComponentType || (exports.ComponentType = {}));
+async function addToSolution(id, solution, type, apiConfig) {
+    const data = {
+        ComponentId: id,
+        ComponentType: type,
+        SolutionUniqueName: solution,
+        AddRequiredComponents: false,
+        IncludedComponentSettingsValues: null
+    };
+    logger_1.logger.info(`add component ${id} to solution ${solution}`);
+    await (0, node_1.unboundAction)(apiConfig, 'AddSolutionComponent', data);
+}
+exports.addToSolution = addToSolution;
+async function publish(publishXml, apiConfig) {
+    const data = {
+        ParameterXml: `<importexportxml><webresources>${publishXml}</webresources></importexportxml>`
+    };
+    await (0, node_1.unboundAction)(apiConfig, 'PublishXml', data);
+}
+exports.publish = publish;
+async function getTableMetadata(table, apiConfig) {
+    const options = [
+        '?$select=DisplayName,LogicalName,EntitySetName,SchemaName',
+        '&$expand=Attributes($select=LogicalName,SchemaName)'
+    ].join('');
+    const metadata = await (0, node_1.retrieveMultiple)(apiConfig, `EntityDefinitions(LogicalName='${table}')`, options);
+    if (metadata == null) {
+        throw Error(`Table ${table} not found in metadata cache`);
+    }
+    const choiceOptions = [
+        '?$select=attributevalue,value,attributename',
+        `&$filter=objecttypecode eq '${table}'`
+    ].join('');
+    const choiceMetadata = await (0, node_1.retrieveMultiple)(apiConfig, 'stringmaps', choiceOptions);
+    const tableMetadata = {
+        logicalName: metadata.LogicalName,
+        schemaName: metadata.SchemaName,
+        entitySetName: metadata.EntitySetName,
+        choices: [],
+        fields: metadata.Attributes.map((a) => {
+            return {
+                logicalName: a.LogicalName,
+                schemaName: a.SchemaName
+            };
+        })
+    };
+    choiceMetadata.value.forEach((c) => {
+        const index = tableMetadata.choices.findIndex(x => x.column === c.attributename);
+        if (index === -1) {
+            tableMetadata.choices.push({ column: c.attributename, options: [{ text: c.value, value: c.attributevalue }] });
+        }
+        else {
+            tableMetadata.choices[index].options.push({ text: c.value, value: c.attributevalue });
+        }
+    });
+    return tableMetadata;
+}
+exports.getTableMetadata = getTableMetadata;