@pnp/cli-microsoft365 6.0.0-beta.5637b93 → 6.0.0-beta.66b6874

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

@@ -122,28 +122,31 @@ class YammerMessageListCommand 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(() => {
-            this.items.forEach(m => {
-                let shortBody;
-                const bodyToProcess = m.body.plain;
-                if (bodyToProcess) {
-                    let maxLength = 35;
-                    let addedDots = "...";
-                    if (bodyToProcess.length < maxLength) {
-                        maxLength = bodyToProcess.length;
-                        addedDots = "";
+    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);
+                this.items.forEach(m => {
+                    let shortBody;
+                    const bodyToProcess = m.body.plain;
+                    if (bodyToProcess) {
+                        let maxLength = 35;
+                        let addedDots = "...";
+                        if (bodyToProcess.length < maxLength) {
+                            maxLength = bodyToProcess.length;
+                            addedDots = "";
+                        }
+                        shortBody = bodyToProcess.replace(/\n/g, ' ').substring(0, maxLength) + addedDots;
                     }
-                    shortBody = bodyToProcess.replace(/\n/g, ' ').substring(0, maxLength) + addedDots;
-                }
-                m.shortBody = shortBody;
-            });
-            logger.log(this.items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+                    m.shortBody = shortBody;
+                });
+                logger.log(this.items);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _YammerMessageListCommand_instances = new WeakSet(), _YammerMessageListCommand_initTelemetry = function _YammerMessageListCommand_initTelemetry() {

package/dist/m365/yammer/commands/message/message-remove.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _YammerMessageRemoveCommand_instances, _YammerMessageRemoveCommand_initTelemetry, _YammerMessageRemoveCommand_initOptions, _YammerMessageRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const YammerCommand_1 = require("../../../base/YammerCommand");
 const commands_1 = require("../../commands");
@@ -33,38 +33,39 @@ class YammerMessageRemoveCommand extends YammerCommand_1.default {
     get description() {
         return 'Removes a Yammer message';
     }
-    commandAction(logger, args, cb) {
-        const removeMessage = () => {
-            const requestOptions = {
-                url: `${this.resource}/v1/messages/${args.options.id}.json`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .delete(requestOptions)
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeMessage();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the Yammer message ${args.options.id}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeMessage = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const requestOptions = {
+                        url: `${this.resource}/v1/messages/${args.options.id}.json`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none',
+                            'content-type': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removeMessage();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeMessage();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the Yammer message ${args.options.id}?`
+                });
+                if (result.continue) {
+                    yield removeMessage();
+                }
+            }
+        });
     }
 }
 _YammerMessageRemoveCommand_instances = new WeakSet(), _YammerMessageRemoveCommand_initTelemetry = function _YammerMessageRemoveCommand_initTelemetry() {

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

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
@@ -25,24 +34,27 @@ class YammerNetworkListCommand extends YammerCommand_1.default {
     defaultProperties() {
         return ['id', 'name', 'email', 'community', 'permalink', 'web_url'];
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${this.resource}/v1/networks/current.json`,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json;odata=nometadata'
-            },
-            responseType: 'json',
-            data: {
-                includeSuspended: args.options.includeSuspended !== undefined && args.options.includeSuspended !== false
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1/networks/current.json`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    includeSuspended: args.options.includeSuspended !== undefined && args.options.includeSuspended !== false
+                }
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
             }
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _YammerNetworkListCommand_instances = new WeakSet(), _YammerNetworkListCommand_initTelemetry = function _YammerNetworkListCommand_initTelemetry() {

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

@@ -35,28 +35,31 @@ 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.id) {
-            endPoint = `${this.resource}/v1/users/${encodeURIComponent(args.options.id)}.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/${encodeURIComponent(args.options.id)}.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'
+            };
+            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() {

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

@@ -110,85 +110,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',

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/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

@@ -46,7 +46,7 @@ function convertHyperlinks(md) {
     });
 }
 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}`;
     });