@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

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

@@ -33,14 +33,15 @@ class CliConfigResetCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Resets the specified CLI configuration option to its default value';
     }
-    commandAction(logger, args, cb) {
-        if (args.options.key) {
-            cli_1.Cli.getInstance().config.delete(args.options.key);
-        }
-        else {
-            cli_1.Cli.getInstance().config.clear();
-        }
-        cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.key) {
+                cli_1.Cli.getInstance().config.delete(args.options.key);
+            }
+            else {
+                cli_1.Cli.getInstance().config.clear();
+            }
+        });
     }
 }
 _CliConfigResetCommand_instances = new WeakSet(), _CliConfigResetCommand_initTelemetry = function _CliConfigResetCommand_initTelemetry() {

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

@@ -33,25 +33,26 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Manage global configuration settings about the CLI for Microsoft 365';
     }
-    commandAction(logger, args, cb) {
-        let value = undefined;
-        switch (args.options.key) {
-            case settingsNames_1.settingsNames.autoOpenBrowserOnLogin:
-            case settingsNames_1.settingsNames.autoOpenLinksInBrowser:
-            case settingsNames_1.settingsNames.copyDeviceCodeToClipboard:
-            case settingsNames_1.settingsNames.csvHeader:
-            case settingsNames_1.settingsNames.csvQuoted:
-            case settingsNames_1.settingsNames.csvQuotedEmpty:
-            case settingsNames_1.settingsNames.printErrorsAsPlainText:
-            case settingsNames_1.settingsNames.showHelpOnFailure:
-                value = args.options.value === 'true';
-                break;
-            default:
-                value = args.options.value;
-                break;
-        }
-        cli_1.Cli.getInstance().config.set(args.options.key, value);
-        cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let value = undefined;
+            switch (args.options.key) {
+                case settingsNames_1.settingsNames.autoOpenBrowserOnLogin:
+                case settingsNames_1.settingsNames.autoOpenLinksInBrowser:
+                case settingsNames_1.settingsNames.copyDeviceCodeToClipboard:
+                case settingsNames_1.settingsNames.csvHeader:
+                case settingsNames_1.settingsNames.csvQuoted:
+                case settingsNames_1.settingsNames.csvQuotedEmpty:
+                case settingsNames_1.settingsNames.printErrorsAsPlainText:
+                case settingsNames_1.settingsNames.showHelpOnFailure:
+                    value = args.options.value === 'true';
+                    break;
+                default:
+                    value = args.options.value;
+                    break;
+            }
+            cli_1.Cli.getInstance().config.set(args.options.key, value);
+        });
     }
 }
 _CliConfigSetCommand_instances = new WeakSet(), _CliConfigSetCommand_initTelemetry = function _CliConfigSetCommand_initTelemetry() {

package/dist/m365/commands/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     LOGIN: `login`,
     LOGOUT: `logout`,
+    REQUEST: `request`,
     STATUS: `status`,
     VERSION: 'version'
 };

package/dist/m365/commands/login.js

@@ -34,77 +34,80 @@ class LoginCommand extends Command_1.default {
     get description() {
         return 'Log in to Microsoft 365';
     }
-    commandAction(logger, args, cb) {
-        // disconnect before re-connecting
-        if (this.debug) {
-            logger.logToStderr(`Logging out from Microsoft 365...`);
-        }
-        const logout = () => Auth_1.default.service.logout();
-        const login = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Signing in to Microsoft 365...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // disconnect before re-connecting
+            if (this.debug) {
+                logger.logToStderr(`Logging out from Microsoft 365...`);
             }
-            Auth_1.default.service.appId = args.options.appId || config_1.default.cliAadAppId;
-            Auth_1.default.service.tenant = args.options.tenant || config_1.default.tenant;
-            switch (args.options.authType) {
-                case 'password':
-                    Auth_1.default.service.authType = Auth_1.AuthType.Password;
-                    Auth_1.default.service.userName = args.options.userName;
-                    Auth_1.default.service.password = args.options.password;
-                    break;
-                case 'certificate':
-                    Auth_1.default.service.authType = Auth_1.AuthType.Certificate;
-                    Auth_1.default.service.certificate = args.options.certificateBase64Encoded ? args.options.certificateBase64Encoded : fs.readFileSync(args.options.certificateFile, 'base64');
-                    Auth_1.default.service.thumbprint = args.options.thumbprint;
-                    Auth_1.default.service.password = args.options.password;
-                    break;
-                case 'identity':
-                    Auth_1.default.service.authType = Auth_1.AuthType.Identity;
-                    Auth_1.default.service.userName = args.options.userName;
-                    break;
-                case 'browser':
-                    Auth_1.default.service.authType = Auth_1.AuthType.Browser;
-                    break;
-                case 'secret':
-                    Auth_1.default.service.authType = Auth_1.AuthType.Secret;
-                    Auth_1.default.service.secret = args.options.secret;
-                    break;
+            const logout = () => Auth_1.default.service.logout();
+            const login = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Signing in to Microsoft 365...`);
+                }
+                Auth_1.default.service.appId = args.options.appId || config_1.default.cliAadAppId;
+                Auth_1.default.service.tenant = args.options.tenant || config_1.default.tenant;
+                switch (args.options.authType) {
+                    case 'password':
+                        Auth_1.default.service.authType = Auth_1.AuthType.Password;
+                        Auth_1.default.service.userName = args.options.userName;
+                        Auth_1.default.service.password = args.options.password;
+                        break;
+                    case 'certificate':
+                        Auth_1.default.service.authType = Auth_1.AuthType.Certificate;
+                        Auth_1.default.service.certificate = args.options.certificateBase64Encoded ? args.options.certificateBase64Encoded : fs.readFileSync(args.options.certificateFile, 'base64');
+                        Auth_1.default.service.thumbprint = args.options.thumbprint;
+                        Auth_1.default.service.password = args.options.password;
+                        break;
+                    case 'identity':
+                        Auth_1.default.service.authType = Auth_1.AuthType.Identity;
+                        Auth_1.default.service.userName = args.options.userName;
+                        break;
+                    case 'browser':
+                        Auth_1.default.service.authType = Auth_1.AuthType.Browser;
+                        break;
+                    case 'secret':
+                        Auth_1.default.service.authType = Auth_1.AuthType.Secret;
+                        Auth_1.default.service.secret = args.options.secret;
+                        break;
+                }
+                try {
+                    yield Auth_1.default.ensureAccessToken(Auth_1.default.defaultResource, logger, this.debug);
+                    Auth_1.default.service.connected = true;
+                }
+                catch (error) {
+                    if (this.debug) {
+                        logger.logToStderr('Error:');
+                        logger.logToStderr(error);
+                        logger.logToStderr('');
+                    }
+                    throw new Command_1.CommandError(error.message);
+                }
+            });
+            try {
+                yield Auth_1.default.clearConnectionInfo();
             }
-            Auth_1.default
-                .ensureAccessToken(Auth_1.default.defaultResource, logger, this.debug)
-                .then(() => {
-                Auth_1.default.service.connected = true;
-                cb();
-            }, (rej) => {
+            catch (error) {
                 if (this.debug) {
-                    logger.logToStderr('Error:');
-                    logger.logToStderr(rej);
-                    logger.logToStderr('');
+                    logger.logToStderr(new Command_1.CommandError(error));
                 }
-                cb(new Command_1.CommandError(rej.message));
-            });
-        };
-        Auth_1.default
-            .clearConnectionInfo()
-            .then(() => {
-            logout();
-            login();
-        }, (error) => {
-            if (this.debug) {
-                logger.logToStderr(new Command_1.CommandError(error));
             }
-            logout();
-            login();
+            finally {
+                logout();
+                yield login();
+            }
         });
     }
-    action(logger, args, cb) {
-        Auth_1.default
-            .restoreAuth()
-            .then(() => {
+    action(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield Auth_1.default.restoreAuth();
+            }
+            catch (error) {
+                throw new Command_1.CommandError(error);
+            }
             this.initAction(args, logger);
-            this.commandAction(logger, args, cb);
-        }, (error) => {
-            cb(new Command_1.CommandError(error));
+            yield this.commandAction(logger, args);
         });
     }
 }

package/dist/m365/commands/logout.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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../Auth");
 const Command_1 = require("../../Command");
@@ -10,33 +19,35 @@ class LogoutCommand extends Command_1.default {
     get description() {
         return 'Log out from Microsoft 365';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr('Logging out from Microsoft 365...');
-        }
-        const logout = () => {
-            Auth_1.default.service.logout();
-            cb();
-        };
-        Auth_1.default
-            .clearConnectionInfo()
-            .then(() => {
-            logout();
-        }, (error) => {
-            if (this.debug) {
-                logger.logToStderr(new Command_1.CommandError(error));
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Logging out from Microsoft 365...');
+            }
+            const logout = () => Auth_1.default.service.logout();
+            try {
+                yield Auth_1.default.clearConnectionInfo();
+            }
+            catch (error) {
+                if (this.debug) {
+                    logger.logToStderr(new Command_1.CommandError(error));
+                }
+            }
+            finally {
+                logout();
             }
-            logout();
         });
     }
-    action(logger, args, cb) {
-        Auth_1.default
-            .restoreAuth()
-            .then(() => {
+    action(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield Auth_1.default.restoreAuth();
+            }
+            catch (error) {
+                throw new Command_1.CommandError(error);
+            }
             this.initAction(args, logger);
-            this.commandAction(logger, args, cb);
-        }, (error) => {
-            cb(new Command_1.CommandError(error));
+            this.commandAction(logger);
         });
     }
 }

package/dist/m365/commands/request.js

@@ -0,0 +1,150 @@
+"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 _RequestCommand_instances, _RequestCommand_initTelemetry, _RequestCommand_initOptions, _RequestCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const Command_1 = require("../../Command");
+const request_1 = require("../../request");
+const commands_1 = require("./commands");
+const path = require("path");
+class RequestCommand extends Command_1.default {
+    constructor() {
+        super();
+        _RequestCommand_instances.add(this);
+        this.allowedMethods = ['get', 'post', 'put', 'patch', 'delete', 'head', 'options'];
+        __classPrivateFieldGet(this, _RequestCommand_instances, "m", _RequestCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _RequestCommand_instances, "m", _RequestCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _RequestCommand_instances, "m", _RequestCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.REQUEST;
+    }
+    get description() {
+        return 'Executes the specified web request using CLI for Microsoft 365';
+    }
+    allowUnknownOptions() {
+        return true;
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.debug) {
+                logger.logToStderr(`Preparing request...`);
+            }
+            try {
+                const method = (args.options.method || 'get').toUpperCase();
+                const headers = {};
+                const unknownOptions = this.getUnknownOptions(args.options);
+                const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
+                unknownOptionsNames.forEach(o => {
+                    headers[o] = unknownOptions[o];
+                });
+                if (!headers.accept) {
+                    headers.accept = 'application/json';
+                }
+                if (args.options.resource) {
+                    headers['x-resource'] = args.options.resource;
+                }
+                const config = {
+                    url: args.options.url,
+                    headers,
+                    method,
+                    data: args.options.body
+                };
+                if (headers.accept.toString().startsWith('application/json')) {
+                    config.responseType = 'json';
+                }
+                if (args.options.filePath) {
+                    config.responseType = 'stream';
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Executing request...`);
+                }
+                if (args.options.filePath) {
+                    const file = yield request_1.default.execute(config);
+                    const filePath = yield new Promise((resolve, reject) => {
+                        const writer = fs.createWriteStream(args.options.filePath);
+                        file.data.pipe(writer);
+                        writer.on('error', err => {
+                            reject(err);
+                        });
+                        writer.on('close', () => {
+                            resolve(args.options.filePath);
+                        });
+                    });
+                    if (this.verbose) {
+                        logger.logToStderr(`File saved to path ${filePath}`);
+                    }
+                }
+                else {
+                    const res = yield request_1.default.execute(config);
+                    logger.log(res);
+                }
+            }
+            catch (err) {
+                this.handleError(err);
+            }
+        });
+    }
+}
+_RequestCommand_instances = new WeakSet(), _RequestCommand_initTelemetry = function _RequestCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        const properties = {
+            method: args.options.method || 'get',
+            resource: typeof args.options.resource !== 'undefined',
+            accept: args.options.accept || 'application/json',
+            body: typeof args.options.body !== 'undefined',
+            filePath: typeof args.options.filePath !== 'undefined'
+        };
+        const unknownOptions = this.getUnknownOptions(args.options);
+        const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
+        unknownOptionsNames.forEach(o => {
+            properties[o] = typeof unknownOptions[o] !== 'undefined';
+        });
+        Object.assign(this.telemetryProperties, properties);
+    });
+}, _RequestCommand_initOptions = function _RequestCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --url <url>'
+    }, {
+        option: '-m, --method [method]',
+        autocomplete: this.allowedMethods
+    }, {
+        option: '-r, --resource [resource]'
+    }, {
+        option: '-b, --body [body]'
+    }, {
+        option: '-p, --filePath [filePath]'
+    });
+}, _RequestCommand_initValidators = function _RequestCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const currentMethod = args.options.method || 'get';
+        if (this.allowedMethods.indexOf(currentMethod) === -1) {
+            return `${currentMethod} is not a valid value for method. Allowed values: ${this.allowedMethods.join(', ')}`;
+        }
+        if (args.options.body && (!args.options.method || args.options.method === 'get')) {
+            return 'Specify a different method when using body';
+        }
+        if (args.options.body && !args.options['content-type']) {
+            return 'Specify the content-type when using body';
+        }
+        if (args.options.filePath && !fs.existsSync(path.dirname(args.options.filePath))) {
+            return 'The location specified in the filePath does not exist';
+        }
+        return true;
+    }));
+};
+module.exports = new RequestCommand();
+//# sourceMappingURL=request.js.map

package/dist/m365/commands/status.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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../Auth");
 const Command_1 = require("../../Command");
@@ -11,39 +20,52 @@ class StatusCommand extends Command_1.default {
     get description() {
         return 'Shows Microsoft 365 login status';
     }
-    commandAction(logger, args, cb) {
-        if (Auth_1.default.service.connected) {
-            if (this.debug) {
-                logger.logToStderr({
-                    connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
-                    authType: Auth_1.AuthType[Auth_1.default.service.authType],
-                    accessTokens: JSON.stringify(Auth_1.default.service.accessTokens, null, 2)
-                });
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (Auth_1.default.service.connected) {
+                try {
+                    yield Auth_1.default.ensureAccessToken(Auth_1.default.defaultResource, logger, this.debug);
+                }
+                catch (err) {
+                    if (this.debug) {
+                        logger.logToStderr(err);
+                    }
+                    Auth_1.default.service.logout();
+                    throw new Command_1.CommandError(`Your login has expired. Sign in again to continue. ${err.message}`);
+                }
+                if (this.debug) {
+                    logger.logToStderr({
+                        connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                        authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        accessTokens: JSON.stringify(Auth_1.default.service.accessTokens, null, 2)
+                    });
+                }
+                else {
+                    logger.log({
+                        connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)
+                    });
+                }
             }
             else {
-                logger.log({
-                    connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)
-                });
+                if (this.verbose) {
+                    logger.logToStderr('Logged out from Microsoft 365');
+                }
+                else {
+                    logger.log('Logged out');
+                }
             }
-        }
-        else {
-            if (this.verbose) {
-                logger.logToStderr('Logged out from Microsoft 365');
+        });
+    }
+    action(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield Auth_1.default.restoreAuth();
             }
-            else {
-                logger.log('Logged out');
+            catch (error) {
+                throw new Command_1.CommandError(error);
             }
-        }
-        cb();
-    }
-    action(logger, args, cb) {
-        Auth_1.default
-            .restoreAuth()
-            .then(() => {
             this.initAction(args, logger);
-            this.commandAction(logger, args, cb);
-        }, (error) => {
-            cb(new Command_1.CommandError(error));
+            yield this.commandAction(logger);
         });
     }
 }

package/dist/m365/commands/version.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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const AnonymousCommand_1 = require("../base/AnonymousCommand");
 const commands_1 = require("./commands");
@@ -10,9 +19,10 @@ class VersionCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Shows CLI for Microsoft 365 version';
     }
-    commandAction(logger, args, cb) {
-        logger.log(`v${packageJSON.version}`);
-        cb();
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            logger.log(`v${packageJSON.version}`);
+        });
     }
 }
 module.exports = new VersionCommand();