@pnp/cli-microsoft365 6.5.0-beta.f8b8018 → 6.6.0-beta.2339ae2

package/.eslintrc.js

@@ -10,6 +10,7 @@ const dictionary = [
   'application',
   'apply',
   'approve',
+  'assessment',
   'assets',
   'audit',
   'bin',
@@ -84,6 +85,7 @@ const dictionary = [
   'storage',
   'table',
   'teams',
+  'threat',
   'token',
   'type',
   'user',

package/Dockerfile

@@ -43,6 +43,7 @@ RUN bash -c 'echo "export PATH=$PATH:/home/cli-microsoft365/.npm-global/bin:/hom
   && bash -c 'echo "export CLIMICROSOFT365_ENV=\"docker\"" >> ~/.bash_profile' \
   && bash -c 'npm i -g @pnp/cli-microsoft365@${CLI_VERSION} --production --quiet --no-progress' \ 
   && bash -c 'echo "source /etc/profile.d/bash_completion.sh" >> ~/.bash_profile' \
+  && bash -c 'echo ". .bashrc" >> ~/.bash_profile' \
   && bash -c 'npm cache clean --force' \
   && bash -c 'm365 cli completion sh setup' \
   && pwsh -c 'm365 cli completion pwsh setup --profile $profile'

package/dist/Command.js

@@ -458,9 +458,18 @@ class Command {
             // replace unescaped newlines with escaped newlines #2807
             .replace(/([^\\])\\n/g, '$1\\\\\\n');
     }
-    getCsvOutput(logStatement) {
+    getCsvOutput(logStatement, options) {
         const { stringify } = require('csv-stringify/sync');
         const cli = Cli_1.Cli.getInstance();
+        if (logStatement && logStatement.length > 0 && !options.query) {
+            logStatement.map(l => {
+                for (const x of Object.keys(l)) {
+                    if (typeof l[x] === 'object') {
+                        delete l[x];
+                    }
+                }
+            });
+        }
         // https://csv.js.org/stringify/options/
         return stringify(logStatement, {
             header: cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.csvHeader, true),
@@ -494,13 +503,14 @@ class Command {
                     output.push(`## ${id}`, os.EOL, os.EOL);
                 }
                 output.push(`Property | Value`, os.EOL, `---------|-------`, os.EOL);
-                output.push(Object.keys(l).map(k => {
-                    const value = l[k];
-                    let stringValue = value;
-                    if (typeof value === 'object') {
-                        stringValue = JSON.stringify(value);
+                output.push(Object.keys(l).filter(x => {
+                    if (!options.query && typeof l[x] === 'object') {
+                        return;
                     }
-                    return `${md_1.md.escapeMd(k)} | ${md_1.md.escapeMd(stringValue)}`;
+                    return x;
+                }).map(k => {
+                    const value = l[k];
+                    return `${md_1.md.escapeMd(k)} | ${md_1.md.escapeMd(value)}`;
                 }).join(os.EOL), os.EOL);
                 output.push(os.EOL);
             });

package/dist/cli/Cli.js

@@ -158,9 +158,10 @@ class Cli {
             const cli = Cli.getInstance();
             const parentCommandName = cli.currentCommandName;
             cli.currentCommandName = command.getCommandName(cli.currentCommandName);
+            const showSpinner = cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.showSpinner, true);
             // don't show spinner if running tests
             /* c8 ignore next 3 */
-            if (typeof global.it === 'undefined') {
+            if (showSpinner && typeof global.it === 'undefined') {
                 cli.spinner.start();
             }
             try {
@@ -529,7 +530,7 @@ class Cli {
         }
         switch (options.output) {
             case 'csv':
-                return command.getCsvOutput(logStatement);
+                return command.getCsvOutput(logStatement, options);
             case 'md':
                 return command.getMdOutput(logStatement, command, options);
             default:
@@ -756,9 +757,10 @@ class Cli {
         /* c8 ignore next */
     }
     static log(message, ...optionalParams) {
+        const cli = Cli.getInstance();
         /* c8 ignore next 3 */
-        if (Cli.getInstance().spinner.isSpinning) {
-            Cli.getInstance().spinner.stop();
+        if (cli.spinner.isSpinning) {
+            cli.spinner.stop();
         }
         if (message) {
             console.log(message, ...optionalParams);
@@ -768,11 +770,12 @@ class Cli {
         }
     }
     static error(message, ...optionalParams) {
+        const cli = Cli.getInstance();
         /* c8 ignore next 3 */
-        if (Cli.getInstance().spinner.isSpinning) {
-            Cli.getInstance().spinner.stop();
+        if (cli.spinner.isSpinning) {
+            cli.spinner.stop();
         }
-        const errorOutput = Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.errorOutput, 'stderr');
+        const errorOutput = cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.errorOutput, 'stderr');
         if (errorOutput === 'stdout') {
             console.log(message, ...optionalParams);
         }
@@ -783,16 +786,17 @@ class Cli {
     static prompt(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const inquirer = require('inquirer');
-            const spinnerSpinning = Cli.getInstance().spinner.isSpinning;
+            const cli = Cli.getInstance();
+            const spinnerSpinning = cli.spinner.isSpinning;
             /* c8 ignore next 3 */
             if (spinnerSpinning) {
-                Cli.getInstance().spinner.stop();
+                cli.spinner.stop();
             }
             const response = yield inquirer.prompt(options);
             // Restart the spinner if it was running before the prompt
             /* c8 ignore next 3 */
             if (spinnerSpinning) {
-                Cli.getInstance().spinner.start();
+                cli.spinner.start();
             }
             return response;
         });
@@ -822,7 +826,7 @@ class Cli {
         });
     }
     static shouldTrimOutput(output) {
-        return output === 'text' || output === 'csv';
+        return output === 'text';
     }
 }
 exports.Cli = Cli;

package/dist/m365/cli/commands/config/config-set.js

@@ -46,6 +46,7 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
                 case settingsNames_1.settingsNames.printErrorsAsPlainText:
                 case settingsNames_1.settingsNames.prompt:
                 case settingsNames_1.settingsNames.showHelpOnFailure:
+                case settingsNames_1.settingsNames.showSpinner:
                     value = args.options.value === 'true';
                     break;
                 default:

package/dist/m365/commands/request.js

@@ -20,6 +20,7 @@ const Command_1 = require("../../Command");
 const request_1 = require("../../request");
 const commands_1 = require("./commands");
 const path = require("path");
+const Auth_1 = require("../../Auth");
 class RequestCommand extends Command_1.default {
     get name() {
         return commands_1.default.REQUEST;
@@ -44,6 +45,7 @@ class RequestCommand extends Command_1.default {
                 logger.logToStderr(`Preparing request...`);
             }
             try {
+                const url = this.resolveUrlTokens(args.options.url);
                 const method = (args.options.method || 'get').toUpperCase();
                 const headers = {};
                 const unknownOptions = this.getUnknownOptions(args.options);
@@ -58,7 +60,7 @@ class RequestCommand extends Command_1.default {
                     headers['x-resource'] = args.options.resource;
                 }
                 const config = {
-                    url: args.options.url,
+                    url: url,
                     headers,
                     method,
                     data: args.options.body
@@ -98,6 +100,21 @@ class RequestCommand extends Command_1.default {
             }
         });
     }
+    resolveUrlTokens(url) {
+        if (url.startsWith('@graphbeta')) {
+            return url.replace('@graphbeta', 'https://graph.microsoft.com/beta');
+        }
+        if (url.startsWith('@graph')) {
+            return url.replace('@graph', 'https://graph.microsoft.com/v1.0');
+        }
+        if (url.startsWith('@spo')) {
+            if (Auth_1.default.service.spoUrl) {
+                return url.replace('@spo', Auth_1.default.service.spoUrl);
+            }
+            throw `SharePoint root site URL is unknown. Please set your SharePoint URL using command 'spo set'.`;
+        }
+        return url;
+    }
 }
 _RequestCommand_instances = new WeakSet(), _RequestCommand_initTelemetry = function _RequestCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/pa/commands/app/app-export.js

@@ -0,0 +1,197 @@
+"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");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PaAppExportCommand_instances, _PaAppExportCommand_initTelemetry, _PaAppExportCommand_initOptions, _PaAppExportCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const validation_1 = require("../../../../utils/validation");
+const commands_1 = require("../../commands");
+const fs = require("fs");
+const path = require("path");
+const formatting_1 = require("../../../../utils/formatting");
+const request_1 = require("../../../../request");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+class PaAppExportCommand extends PowerPlatformCommand_1.default {
+    get name() {
+        return commands_1.default.APP_EXPORT;
+    }
+    get description() {
+        return 'Exports the specified Power App';
+    }
+    constructor() {
+        super();
+        _PaAppExportCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const location = yield this.exportPackage(args, logger);
+                const packageLink = yield this.getPackageLink(args, logger, location);
+                //Replace all illegal characters from the file name
+                const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
+                const filename = args.options.packageDisplayName.replace(illegalCharsRegEx, '_');
+                const requestOptions = {
+                    url: packageLink,
+                    // Set responseType to arraybuffer, otherwise binary data will be encoded
+                    // to utf8 and binary data is corrupt
+                    responseType: 'arraybuffer',
+                    headers: {
+                        'x-anonymous': true
+                    }
+                };
+                const file = yield request_1.default.get(requestOptions);
+                let path = args.options.path || './';
+                if (!path.endsWith('/')) {
+                    path += '/';
+                }
+                path += `${filename}.zip`;
+                fs.writeFileSync(path, file, 'binary');
+                if (this.verbose) {
+                    logger.logToStderr(`File saved to path '${path}'`);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getPackageResources(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Getting the Microsoft Power App resources...');
+            }
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environment)}/listPackageResources?api-version=2016-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                data: {
+                    baseResourceIds: [
+                        `/providers/Microsoft.PowerApps/apps/${args.options.id}`
+                    ]
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.post(requestOptions);
+            Object.keys(response.resources).forEach((key) => {
+                response.resources[key].suggestedCreationType = 'Update';
+            });
+            return response.resources;
+        });
+    }
+    exportPackage(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Initiating package export for Microsoft Power App ${args.options.id}...`);
+            }
+            const resources = yield this.getPackageResources(args, logger);
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environment)}/exportPackage?api-version=2016-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json',
+                data: {
+                    includedResourceIds: [
+                        `/providers/Microsoft.PowerApps/apps/${args.options.id}`
+                    ],
+                    details: {
+                        creator: args.options.packageCreatedBy,
+                        description: args.options.packageDescription,
+                        displayName: args.options.packageDisplayName,
+                        sourceEnvironment: args.options.packageSourceEnvironment
+                    },
+                    resources: resources
+                },
+                fullResponse: true
+            };
+            const response = yield request_1.default.post(requestOptions);
+            return response.headers.location;
+        });
+    }
+    getPackageLink(args, logger, location) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Retrieving the package link and waiting on the exported package.');
+            }
+            let status;
+            let link;
+            const requestOptions = {
+                url: location,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            do {
+                const response = yield request_1.default.get(requestOptions);
+                status = response.properties.status;
+                if (status === "Succeeded") {
+                    link = response.properties.packageLink.value;
+                }
+                else {
+                    yield this.sleep(5000);
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Current status of the get package link: ${status}`);
+                }
+            } while (status === 'Running');
+            return link;
+        });
+    }
+    sleep(ms) {
+        return new Promise(resolve => setTimeout(resolve, ms));
+    }
+}
+_PaAppExportCommand_instances = new WeakSet(), _PaAppExportCommand_initTelemetry = function _PaAppExportCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            packageDescription: typeof args.options.packageDescription !== 'undefined',
+            packageCreatedBy: typeof args.options.packageCreatedBy !== 'undefined',
+            packageSourceEnvironment: typeof args.options.packageSourceEnvironment !== 'undefined',
+            path: typeof args.options.path !== 'undefined'
+        });
+    });
+}, _PaAppExportCommand_initOptions = function _PaAppExportCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '-e, --environment <environment>'
+    }, {
+        option: '-n, --packageDisplayName [packageDisplayName]'
+    }, {
+        option: '-d, --packageDescription [packageDescription]'
+    }, {
+        option: '-c, --packageCreatedBy [packageCreatedBy]'
+    }, {
+        option: '-s, --packageSourceEnvironment [packageSourceEnvironment]'
+    }, {
+        option: '-p, --path [path]'
+    });
+}, _PaAppExportCommand_initValidators = function _PaAppExportCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.path && !fs.existsSync(path.dirname(args.options.path))) {
+            return 'Specified path where to save the file does not exist';
+        }
+        return true;
+    }));
+};
+module.exports = new PaAppExportCommand();
+//# sourceMappingURL=app-export.js.map

package/dist/m365/pa/commands.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'pa';
 exports.default = {
+    APP_EXPORT: `${prefix} app export`,
     APP_GET: `${prefix} app get`,
     APP_LIST: `${prefix} app list`,
     APP_REMOVE: `${prefix} app remove`,