@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7920dfd

package/dist/m365/yammer/commands/user/user-get.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _YammerUserGetCommand_instances, _YammerUserGetCommand_initTelemetry, _YammerUserGetCommand_initOptions, _YammerUserGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const YammerCommand_1 = require("../../../base/YammerCommand");
 const commands_1 = require("../../commands");
 class YammerUserGetCommand extends YammerCommand_1.default {
@@ -35,46 +36,49 @@ class YammerUserGetCommand extends YammerCommand_1.default {
     defaultProperties() {
         return ['id', 'full_name', 'email', 'job_title', 'state', 'url'];
     }
-    commandAction(logger, args, cb) {
-        let endPoint = `${this.resource}/v1/users/current.json`;
-        if (args.options.userId) {
-            endPoint = `${this.resource}/v1/users/${encodeURIComponent(args.options.userId)}.json`;
-        }
-        else if (args.options.email) {
-            endPoint = `${this.resource}/v1/users/by_email.json?email=${encodeURIComponent(args.options.email)}`;
-        }
-        const requestOptions = {
-            url: endPoint,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let endPoint = `${this.resource}/v1/users/current.json`;
+            if (args.options.id) {
+                endPoint = `${this.resource}/v1/users/${args.options.id}.json`;
+            }
+            else if (args.options.email) {
+                endPoint = `${this.resource}/v1/users/by_email.json?email=${formatting_1.formatting.encodeQueryParameter(args.options.email)}`;
+            }
+            const requestOptions = {
+                url: endPoint,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _YammerUserGetCommand_instances = new WeakSet(), _YammerUserGetCommand_initTelemetry = function _YammerUserGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            userId: args.options.userId !== undefined,
+            userId: args.options.id !== undefined,
             email: args.options.email !== undefined
         });
     });
 }, _YammerUserGetCommand_initOptions = function _YammerUserGetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --userId [userId]'
+        option: '-i, --id [id]'
     }, {
         option: '--email [email]'
     });
 }, _YammerUserGetCommand_initValidators = function _YammerUserGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.userId !== undefined && args.options.email !== undefined) {
+        if (args.options.id !== undefined && args.options.email !== undefined) {
             return `You are only allowed to search by ID or e-mail but not both`;
         }
         return true;

package/dist/m365/yammer/commands/user/user-list.js

@@ -98,14 +98,17 @@ class YammerUserListCommand extends YammerCommand_1.default {
             });
         });
     }
-    commandAction(logger, args, cb) {
-        this.items = []; // this will reset the items array in interactive mode
-        this
-            .getAllItems(logger, args, 1)
-            .then(() => {
-            logger.log(this.items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.items = []; // this will reset the items array in interactive mode
+            try {
+                yield this.getAllItems(logger, args, 1);
+                logger.log(this.items);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _YammerUserListCommand_instances = new WeakSet(), _YammerUserListCommand_initTelemetry = function _YammerUserListCommand_initTelemetry() {

package/dist/m365/yammer/commands/yammer-search.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _YammerSearchCommand_instances, _YammerSearchCommand_initTelemetry, _YammerSearchCommand_initOptions, _YammerSearchCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../request");
+const formatting_1 = require("../../../utils/formatting");
 const YammerCommand_1 = require("../../base/YammerCommand");
 const commands_1 = require("../commands");
 class YammerSearchCommand extends YammerCommand_1.default {
@@ -44,10 +45,13 @@ class YammerSearchCommand extends YammerCommand_1.default {
     }
     getAllItems(logger, args, page) {
         return new Promise((resolve, reject) => {
-            const endpoint = `${this.resource}/v1/search.json?search=${encodeURIComponent(args.options.queryText)}&page=${page}`;
+            const endpoint = `${this.resource}/v1/search.json?search=${formatting_1.formatting.encodeQueryParameter(args.options.queryText)}&page=${page}`;
             const requestOptions = {
                 url: endpoint,
-                responseType: 'json'
+                responseType: 'json',
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                }
             };
             request_1.default
                 .get(requestOptions)
@@ -110,85 +114,88 @@ class YammerSearchCommand extends YammerCommand_1.default {
             });
         });
     }
-    commandAction(logger, args, cb) {
-        this.summary = {
-            messages: 0,
-            groups: 0,
-            topics: 0,
-            users: 0
-        };
-        this.messages = [];
-        this.groups = [];
-        this.topics = [];
-        this.users = [];
-        this
-            .getAllItems(logger, args, 1)
-            .then(() => {
-            var _a;
-            if (args.options.output === 'json') {
-                logger.log({
-                    summary: this.summary,
-                    messages: this.messages,
-                    users: this.users,
-                    topics: this.topics,
-                    groups: this.groups
-                });
-            }
-            else {
-                const show = (_a = args.options.show) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-                if (show === "summary") {
-                    logger.log(this.summary);
+    commandAction(logger, args) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            this.summary = {
+                messages: 0,
+                groups: 0,
+                topics: 0,
+                users: 0
+            };
+            this.messages = [];
+            this.groups = [];
+            this.topics = [];
+            this.users = [];
+            try {
+                yield this.getAllItems(logger, args, 1);
+                if (args.options.output === 'json') {
+                    logger.log({
+                        summary: this.summary,
+                        messages: this.messages,
+                        users: this.users,
+                        topics: this.topics,
+                        groups: this.groups
+                    });
                 }
                 else {
-                    let results = [];
-                    if (show === undefined || show === "messages") {
-                        results = [...results, ...this.messages.map((msg) => {
-                                let trimmedMessage = msg.content_excerpt;
-                                trimmedMessage = (trimmedMessage === null || trimmedMessage === void 0 ? void 0 : trimmedMessage.length) >= 80 ? (trimmedMessage.substring(0, 80) + "...") : trimmedMessage;
-                                trimmedMessage = trimmedMessage === null || trimmedMessage === void 0 ? void 0 : trimmedMessage.replace(/\n/g, " ");
-                                return {
-                                    id: msg.id,
-                                    description: trimmedMessage,
-                                    type: "message",
-                                    web_url: msg.web_url
-                                };
-                            })];
+                    const show = (_a = args.options.show) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+                    if (show === "summary") {
+                        logger.log(this.summary);
                     }
-                    if (show === undefined || show === "topics") {
-                        results = [...results, ...this.topics.map((topic) => {
-                                return {
-                                    id: topic.id,
-                                    description: topic.name,
-                                    type: "topic",
-                                    web_url: topic.web_url
-                                };
-                            })];
+                    else {
+                        let results = [];
+                        if (show === undefined || show === "messages") {
+                            results = [...results, ...this.messages.map((msg) => {
+                                    let trimmedMessage = msg.content_excerpt;
+                                    trimmedMessage = (trimmedMessage === null || trimmedMessage === void 0 ? void 0 : trimmedMessage.length) >= 80 ? (trimmedMessage.substring(0, 80) + "...") : trimmedMessage;
+                                    trimmedMessage = trimmedMessage === null || trimmedMessage === void 0 ? void 0 : trimmedMessage.replace(/\n/g, " ");
+                                    return {
+                                        id: msg.id,
+                                        description: trimmedMessage,
+                                        type: "message",
+                                        web_url: msg.web_url
+                                    };
+                                })];
+                        }
+                        if (show === undefined || show === "topics") {
+                            results = [...results, ...this.topics.map((topic) => {
+                                    return {
+                                        id: topic.id,
+                                        description: topic.name,
+                                        type: "topic",
+                                        web_url: topic.web_url
+                                    };
+                                })];
+                        }
+                        if (show === undefined || show === "users") {
+                            results = [...results, ...this.users.map((user) => {
+                                    return {
+                                        id: user.id,
+                                        description: user.name,
+                                        type: "user",
+                                        web_url: user.web_url
+                                    };
+                                })];
+                        }
+                        if (show === undefined || show === "groups") {
+                            results = [...results, ...this.groups.map((group) => {
+                                    return {
+                                        id: group.id,
+                                        description: group.name,
+                                        type: "group",
+                                        web_url: group.web_url
+                                    };
+                                })];
+                        }
+                        logger.log(results);
                     }
-                    if (show === undefined || show === "users") {
-                        results = [...results, ...this.users.map((user) => {
-                                return {
-                                    id: user.id,
-                                    description: user.name,
-                                    type: "user",
-                                    web_url: user.web_url
-                                };
-                            })];
-                    }
-                    if (show === undefined || show === "groups") {
-                        results = [...results, ...this.groups.map((group) => {
-                                return {
-                                    id: group.id,
-                                    description: group.name,
-                                    type: "group",
-                                    web_url: group.web_url
-                                };
-                            })];
-                    }
-                    logger.log(results);
                 }
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _YammerSearchCommand_instances = new WeakSet(), _YammerSearchCommand_initTelemetry = function _YammerSearchCommand_initTelemetry() {

package/dist/request.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = require("axios");
 const stream_1 = require("stream");
 const Auth_1 = require("./Auth");
-const utils_1 = require("./utils");
+const formatting_1 = require("./utils/formatting");
 const packageJSON = require('../package.json');
 class Request {
     constructor() {
@@ -60,7 +60,7 @@ class Request {
                     if (config.responseType !== 'stream') {
                         properties.push('data');
                     }
-                    this._logger.logToStderr(JSON.stringify(utils_1.formatting.filterObject(config, properties), null, 2));
+                    this._logger.logToStderr(JSON.stringify(formatting_1.formatting.filterObject(config, properties), null, 2));
                 }
                 return config;
             });
@@ -75,14 +75,14 @@ class Request {
                         response.headers['content-type'].indexOf('json') > -1) {
                         properties.push('data');
                     }
-                    this._logger.logToStderr(JSON.stringify(Object.assign({ url: response.config.url }, utils_1.formatting.filterObject(response, properties)), null, 2));
+                    this._logger.logToStderr(JSON.stringify(Object.assign({ url: response.config.url }, formatting_1.formatting.filterObject(response, properties)), null, 2));
                 }
                 return response;
             }, (error) => {
                 if (this._logger) {
                     const properties = ['status', 'statusText', 'headers'];
                     this._logger.logToStderr('Request error:');
-                    this._logger.logToStderr(JSON.stringify(Object.assign(Object.assign({ url: error.config.url }, utils_1.formatting.filterObject(error.response, properties)), { error: error.error }), null, 2));
+                    this._logger.logToStderr(JSON.stringify(Object.assign(Object.assign({ url: error.config.url }, formatting_1.formatting.filterObject(error.response, properties)), { error: error.error }), null, 2));
                 }
                 throw error;
             });
@@ -128,7 +128,8 @@ class Request {
                     return Promise.resolve('');
                 }
                 else {
-                    const resource = Auth_1.Auth.getResourceFromUrl(options.url);
+                    const url = options.headers && options.headers['x-resource'] ? options.headers['x-resource'] : options.url;
+                    const resource = Auth_1.Auth.getResourceFromUrl(url);
                     return Auth_1.default.ensureAccessToken(resource, this._logger, this._debug);
                 }
             })()
@@ -137,7 +138,10 @@ class Request {
                     if (options.headers['x-anonymous']) {
                         delete options.headers['x-anonymous'];
                     }
-                    else {
+                    if (options.headers['x-resource']) {
+                        delete options.headers['x-resource'];
+                    }
+                    if (accessToken !== '') {
                         options.headers.authorization = `Bearer ${accessToken}`;
                     }
                 }

package/dist/settingsNames.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.settingsNames = void 0;
 const settingsNames = {
-    autoOpenBrowserOnLogin: 'autoOpenBrowserOnLogin',
     autoOpenLinksInBrowser: 'autoOpenLinksInBrowser',
     copyDeviceCodeToClipboard: 'copyDeviceCodeToClipboard',
     csvEscape: 'csvEscape',
@@ -11,6 +10,7 @@ const settingsNames = {
     csvQuoted: 'csvQuoted',
     csvQuotedEmpty: 'csvQuotedEmpty',
     errorOutput: 'errorOutput',
+    helpMode: 'helpMode',
     output: 'output',
     printErrorsAsPlainText: 'printErrorsAsPlainText',
     prompt: 'prompt',

package/dist/utils/aadGroup.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.aadGroup = void 0;
 const request_1 = require("../request");
+const formatting_1 = require("./formatting");
 const odata_1 = require("./odata");
 const graphResource = 'https://graph.microsoft.com';
 exports.aadGroup = {
@@ -33,7 +34,7 @@ exports.aadGroup = {
      * @param displayName Group display name.
      */
     getGroupsByDisplayName(displayName) {
-        return odata_1.odata.getAllItems(`${graphResource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(displayName)}'`);
+        return odata_1.odata.getAllItems(`${graphResource}/v1.0/groups?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(displayName)}'`);
     },
     /**
      * Get a single group by its display name.

package/dist/utils/cache.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cache = void 0;
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const config_1 = require("../config");
+const cacheFolderPath = path.join(os.tmpdir(), config_1.default.configstoreName.replace('config', 'cache'));
+const mkdirOptions = { mode: 0o0700, recursive: true };
+exports.cache = {
+    cacheFolderPath: cacheFolderPath,
+    getValue(key) {
+        this.clearExpired();
+        try {
+            const cacheFilePath = path.join(cacheFolderPath, key);
+            if (!fs.existsSync(cacheFilePath)) {
+                return undefined;
+            }
+            return fs.readFileSync(cacheFilePath, 'utf8');
+        }
+        catch (_a) {
+            return undefined;
+        }
+    },
+    setValue(key, value) {
+        this.clearExpired();
+        try {
+            fs.mkdirSync(cacheFolderPath, mkdirOptions);
+            const cacheFilePath = path.join(cacheFolderPath, key);
+            // we don't need to wait for the file to be written
+            // eslint-disable-next-line @typescript-eslint/no-empty-function
+            fs.writeFile(cacheFilePath, value, () => { });
+        }
+        catch (_a) { }
+    },
+    clearExpired(cb) {
+        // we don't need to wait for this to complete
+        // even if it stops meanwhile, it will be picked up next time
+        fs.readdir(cacheFolderPath, (err, files) => {
+            if (err) {
+                if (cb) {
+                    cb();
+                }
+                return;
+            }
+            const numFiles = files.length;
+            if (numFiles === 0) {
+                if (cb) {
+                    cb();
+                }
+                return;
+            }
+            files.forEach((file, index) => {
+                fs.stat(path.join(cacheFolderPath, file), (err, stats) => {
+                    if (err || stats.isDirectory()) {
+                        if (cb && index === numFiles - 1) {
+                            cb();
+                        }
+                        return;
+                    }
+                    // remove files that haven't been accessed in the last 24 hours
+                    if (stats.atime.getTime() < Date.now() - 24 * 60 * 60 * 1000) {
+                        // we don't need to wait for the file to be deleted
+                        // eslint-disable-next-line @typescript-eslint/no-empty-function
+                        fs.unlink(path.join(cacheFolderPath, file), () => {
+                            if (cb && index === numFiles - 1) {
+                                cb();
+                            }
+                        });
+                    }
+                    else {
+                        if (cb && index === numFiles - 1) {
+                            cb();
+                        }
+                    }
+                });
+            });
+        });
+    }
+};
+//# sourceMappingURL=cache.js.map

package/dist/utils/formatting.js

@@ -38,21 +38,21 @@ exports.formatting = {
             return filtered;
         }, {});
     },
-    parseCsvToJson(s) {
-        const rows = s.split('\n');
-        const jsonObj = [];
-        const headers = rows[0].split(',');
-        for (let i = 1; i < rows.length; i++) {
-            const data = rows[i].split(',');
-            const obj = {};
-            for (let j = 0; j < data.length; j++) {
-                const value = data[j].trim();
-                const numValue = parseInt(value);
-                obj[headers[j].trim()] = isNaN(numValue) || numValue.toString() !== value ? value : numValue;
-            }
-            jsonObj.push(obj);
-        }
-        return jsonObj;
+    parseCsvToJson(s, quoteChar = '"', delimiter = ',') {
+        const regex = new RegExp(`\\s*(${quoteChar})?(.*?)\\1\\s*(?:${delimiter}|$)`, 'gs');
+        const lines = s.split('\n');
+        const match = (line) => [...line.matchAll(regex)]
+            .map(m => m[2]) // we only want the second capture group
+            .slice(0, -1); // cut off blank match at the end
+        const heads = match(lines[0]);
+        return lines.slice(1).map(line => {
+            return match(line).reduce((acc, cur, i) => {
+                const val = cur;
+                const numValue = parseInt(val);
+                const key = heads[i];
+                return Object.assign(Object.assign({}, acc), { [key]: isNaN(numValue) || numValue.toString() !== val ? val : numValue });
+            }, {});
+        });
     },
     encodeQueryParameter(value) {
         if (!value) {

package/dist/utils/fsUtil.js

@@ -42,12 +42,10 @@ const addFileCommands = {
         addFileCommand: 'cat > [FILEPATH] << EOF [FILECONTENT]EOF'
     },
     powershell: {
-        addFileCommand: `@"[FILECONTENT]"@ | Out-File -FilePath "[FILEPATH]"
-    `
+        addFileCommand: `@"[FILECONTENT]"@ | Out-File -FilePath [FILEPATH]`
     },
     cmd: {
-        addFileCommand: `echo [FILECONTENT] > "[FILEPATH]"
-    `
+        addFileCommand: `echo [FILECONTENT] > [FILEPATH]`
     }
 };
 const removeFileCommands = {

package/dist/utils/md.js

@@ -45,10 +45,16 @@ function convertHyperlinks(md) {
         return `${label} (${url})`;
     });
 }
+function convertContentTabs(md) {
+    const regex = new RegExp('^=== "(.+?)"(?:\r\n|\n){2}((?:^    (?:.*?(?:\r\n|\n))?)+)', 'gms');
+    return md.replace(regex, (match, title, content) => {
+        return `  ${title}${os_1.EOL}${os_1.EOL}${content.replace(/^    /gms, '')}`;
+    });
+}
 function convertCodeFences(md) {
-    const regex = new RegExp('^```.*?' + os_1.EOL + '(.*?)```' + os_1.EOL, 'gms');
+    const regex = new RegExp('^```.*?(?:\r\n|\n)(.*?)```(?:\r\n|\n)', 'gms');
     return md.replace(regex, (match, code) => {
-        return `  ${code}${os_1.EOL}`;
+        return `${code.replace(/^(.+)$/gm, '  $1')}${os_1.EOL}`;
     });
 }
 function removeInlineMarkup(md) {
@@ -65,6 +71,7 @@ const convertFunctions = [
     convertAdmonitions,
     convertDd,
     convertHyperlinks,
+    convertContentTabs,
     convertCodeFences,
     removeInlineMarkup,
     removeTooManyEmptyLines

package/dist/utils/odata.js

@@ -19,7 +19,8 @@ exports.odata = {
             const requestOptions = {
                 url: url,
                 headers: {
-                    accept: `application/json;odata.metadata=${metadata !== null && metadata !== void 0 ? metadata : 'none'}`
+                    accept: `application/json;odata.metadata=${metadata !== null && metadata !== void 0 ? metadata : 'none'}`,
+                    'odata-version': '4.0'
                 },
                 responseType: 'json'
             };

package/dist/utils/pid.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pid = void 0;
+const os = require("os");
+const fs = require("fs");
+const child_process_1 = require("child_process");
+const cache_1 = require("./cache");
+function getProcessNameOnMacOs(pid) {
+    const stdout = (0, child_process_1.execSync)(`ps -o comm= ${pid}`, { encoding: 'utf8' });
+    return stdout.trim();
+}
+function getProcessNameOnLinux(pid) {
+    if (!fs.existsSync(`/proc/${pid}/stat`)) {
+        return undefined;
+    }
+    const stat = fs.readFileSync(`/proc/${pid}/stat`, 'utf8');
+    const start = stat.indexOf('(');
+    const procName = stat.substring(start + 1, stat.indexOf(')') - start);
+    return procName;
+}
+function getProcessNameOnWindows(pid) {
+    const stdout = (0, child_process_1.execSync)(`wmic PROCESS where ProcessId=${pid} get Caption | find /V "Caption"`, { encoding: 'utf8' });
+    return stdout.trim();
+}
+exports.pid = {
+    getProcessName(pid) {
+        let processName = cache_1.cache.getValue(pid.toString());
+        if (processName) {
+            return processName;
+        }
+        let getPidName = undefined;
+        const platform = os.platform();
+        if (platform.indexOf('win') === 0) {
+            getPidName = getProcessNameOnWindows;
+        }
+        if (platform === 'darwin') {
+            getPidName = getProcessNameOnMacOs;
+        }
+        if (platform === 'linux') {
+            getPidName = getProcessNameOnLinux;
+        }
+        if (getPidName) {
+            try {
+                processName = getPidName(pid);
+                if (processName) {
+                    cache_1.cache.setValue(pid.toString(), processName);
+                }
+                return processName;
+            }
+            catch (_a) {
+                return undefined;
+            }
+        }
+        return undefined;
+    }
+};
+//# sourceMappingURL=pid.js.map