@pnp/cli-microsoft365 6.0.0-beta.4e32416 → 6.0.0-beta.55cbe4a

package/dist/Auth.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Auth = exports.CertificateType = exports.AuthType = exports.Service = void 0;
 const FileTokenStorage_1 = require("./auth/FileTokenStorage");
 const msalCachePlugin_1 = require("./auth/msalCachePlugin");
-const cli_1 = require("./cli");
+const Cli_1 = require("./cli/Cli");
 const Command_1 = require("./Command");
 const config_1 = require("./config");
 const request_1 = require("./request");
@@ -301,7 +301,7 @@ class Auth {
             logger.logToStderr('');
         }
         logger.log(response.message);
-        if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false)) {
+        if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false)) {
             // _open is never set before hitting this line, but this check
             // is implemented so that we can support lazy loading
             // but also stub it for testing
@@ -311,7 +311,7 @@ class Auth {
             }
             this._open(response.verificationUri);
         }
-        if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.copyDeviceCodeToClipboard, false)) {
+        if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.copyDeviceCodeToClipboard, false)) {
             // _clipboardy is never set before hitting this line, but this check
             // is implemented so that we can support lazy loading
             // but also stub it for testing

package/dist/Command.js

@@ -19,10 +19,10 @@ exports.CommandErrorWithOutput = exports.CommandError = void 0;
 const os = require("os");
 const appInsights_1 = require("./appInsights");
 const Auth_1 = require("./Auth");
-const cli_1 = require("./cli");
+const Cli_1 = require("./cli/Cli");
 const request_1 = require("./request");
 const settingsNames_1 = require("./settingsNames");
-const utils_1 = require("./utils");
+const accessToken_1 = require("./utils/accessToken");
 class CommandError {
     constructor(message, code) {
         this.message = message;
@@ -87,7 +87,7 @@ class Command {
     }
     validateRequiredOptions(args, command) {
         return __awaiter(this, void 0, void 0, function* () {
-            const shouldPrompt = cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.prompt, false);
+            const shouldPrompt = Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.prompt, false);
             let inquirer;
             let prompted = false;
             for (let i = 0; i < command.options.length; i++) {
@@ -100,7 +100,7 @@ class Command {
                 }
                 if (!prompted) {
                     prompted = true;
-                    cli_1.Cli.log('Provide values for the following parameters:');
+                    Cli_1.Cli.log('Provide values for the following parameters:');
                 }
                 if (!inquirer) {
                     inquirer = require('inquirer');
@@ -159,24 +159,28 @@ class Command {
         return __awaiter(this, void 0, void 0, function* () {
         });
     }
-    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 CommandError(error);
+            }
             this.initAction(args, logger);
             if (!Auth_1.default.service.connected) {
-                cb(new CommandError('Log in to Microsoft 365 first'));
-                return;
+                throw new CommandError('Log in to Microsoft 365 first');
             }
             try {
                 this.loadValuesFromAccessToken(args);
-                this.commandAction(logger, args, cb);
+                yield this.commandAction(logger, args);
             }
             catch (ex) {
-                cb(new CommandError(ex));
+                if (ex instanceof CommandError) {
+                    throw ex;
+                }
+                throw new CommandError(ex);
             }
-        }, (error) => {
-            cb(new CommandError(error));
         });
     }
     validate(args, command) {
@@ -207,86 +211,95 @@ class Command {
         }
         return commandName;
     }
-    handleRejectedODataPromise(rawResponse, logger, callback) {
+    handleRejectedODataPromise(rawResponse) {
         const res = JSON.parse(JSON.stringify(rawResponse));
         if (res.error) {
             try {
                 const err = JSON.parse(res.error);
-                callback(new CommandError(err['odata.error'].message.value));
+                throw new CommandError(err['odata.error'].message.value);
             }
-            catch (_a) {
+            catch (err) {
+                if (err instanceof CommandError) {
+                    throw err;
+                }
                 try {
                     const graphResponseError = res.error;
                     if (graphResponseError.error.code) {
-                        callback(new CommandError(graphResponseError.error.code + " - " + graphResponseError.error.message));
+                        throw new CommandError(graphResponseError.error.code + " - " + graphResponseError.error.message);
                     }
                     else {
-                        callback(new CommandError(graphResponseError.error.message));
+                        throw new CommandError(graphResponseError.error.message);
                     }
                 }
-                catch (_b) {
-                    callback(new CommandError(res.error));
+                catch (err) {
+                    if (err instanceof CommandError) {
+                        throw err;
+                    }
+                    throw new CommandError(res.error);
                 }
             }
         }
         else {
             if (rawResponse instanceof Error) {
-                callback(new CommandError(rawResponse.message));
+                throw new CommandError(rawResponse.message);
             }
             else {
-                callback(new CommandError(rawResponse));
+                throw new CommandError(rawResponse);
             }
         }
     }
-    handleRejectedODataJsonPromise(response, logger, callback) {
+    handleRejectedODataJsonPromise(response) {
         if (response.error &&
             response.error['odata.error'] &&
             response.error['odata.error'].message) {
-            return callback(new CommandError(response.error['odata.error'].message.value));
+            throw new CommandError(response.error['odata.error'].message.value);
         }
         if (!response.error) {
             if (response instanceof Error) {
-                return callback(new CommandError(response.message));
+                throw new CommandError(response.message);
             }
             else {
-                return callback(new CommandError(response));
+                throw new CommandError(response);
             }
         }
         if (response.error.error &&
             response.error.error.message) {
-            return callback(new CommandError(response.error.error.message));
+            throw new CommandError(response.error.error.message);
         }
         if (response.error.message) {
-            return callback(new CommandError(response.error.message));
+            throw new CommandError(response.error.message);
         }
         if (response.error.error_description) {
-            return callback(new CommandError(response.error.error_description));
+            throw new CommandError(response.error.error_description);
         }
         try {
             const error = JSON.parse(response.error);
             if (error &&
                 error.error &&
                 error.error.message) {
-                callback(new CommandError(error.error.message));
+                throw new CommandError(error.error.message);
             }
             else {
-                callback(new CommandError(response.error));
+                throw new CommandError(response.error);
             }
         }
-        catch (_a) {
-            callback(new CommandError(response.error));
+        catch (err) {
+            if (err instanceof CommandError) {
+                throw err;
+            }
+            throw new CommandError(response.error);
         }
     }
-    handleError(rawResponse, logger, callback) {
+    handleError(rawResponse) {
         if (rawResponse instanceof Error) {
-            callback(new CommandError(rawResponse.message));
+            throw new CommandError(rawResponse.message);
         }
         else {
-            callback(new CommandError(rawResponse));
+            throw new CommandError(rawResponse);
         }
     }
-    handleRejectedPromise(rawResponse, logger, callback) {
-        this.handleError(rawResponse, logger, callback);
+    handleRejectedPromise(rawResponse) {
+        this.handleError(rawResponse);
     }
     initAction(args, logger) {
         this.debug = args.options.debug || process.env.CLIMICROSOFT365_DEBUG === '1';
@@ -346,15 +359,15 @@ class Command {
             }
             const lowerCaseValue = value.toLowerCase();
             if (lowerCaseValue === '@meid') {
-                args.options[option] = utils_1.accessToken.getUserIdFromAccessToken(token);
+                args.options[option] = accessToken_1.accessToken.getUserIdFromAccessToken(token);
             }
             if (lowerCaseValue === '@meusername') {
-                args.options[option] = utils_1.accessToken.getUserNameFromAccessToken(token);
+                args.options[option] = accessToken_1.accessToken.getUserNameFromAccessToken(token);
             }
         });
     }
     showDeprecationWarning(logger, deprecated, recommended) {
-        const cli = cli_1.Cli.getInstance();
+        const cli = Cli_1.Cli.getInstance();
         if (cli.currentCommandName &&
             cli.currentCommandName.indexOf(deprecated) === 0) {
             const chalk = require('chalk');
@@ -366,7 +379,7 @@ class Command {
         logger.logToStderr(chalk.yellow(warning));
     }
     getUsedCommandName() {
-        const cli = cli_1.Cli.getInstance();
+        const cli = Cli_1.Cli.getInstance();
         const commandName = this.getCommandName();
         if (!cli.currentCommandName) {
             return commandName;

package/dist/api.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeCommand = void 0;
-const cli_1 = require("./cli");
+const Cli_1 = require("./cli/Cli");
 const path = require("path");
 function executeCommand(commandName, options, listener) {
-    const cli = cli_1.Cli.getInstance();
+    const cli = Cli_1.Cli.getInstance();
     cli.commandsFolder = path.join(__dirname, 'm365');
     cli.commands = [];
     cli.loadCommandFromArgs(commandName.split(' '));
     if (cli.commands.length !== 1) {
         return Promise.reject(`Command not found: ${commandName}`);
     }
-    return cli_1.Cli.executeCommandWithOutput(cli.commands[0].command, { options: options !== null && options !== void 0 ? options : {} }, listener);
+    return Cli_1.Cli.executeCommandWithOutput(cli.commands[0].command, { options: options !== null && options !== void 0 ? options : {} }, listener);
 }
 exports.executeCommand = executeCommand;
 //# sourceMappingURL=api.js.map

package/dist/appInsights.js

@@ -10,6 +10,7 @@ const appInsights = require("applicationinsights");
 const crypto = require("crypto");
 const fs = require("fs");
 const path = require("path");
+const pid_1 = require("./utils/pid");
 const config = appInsights.setup('6b908c80-d09f-4cf6-8274-e54349a0149a');
 config.setInternalLogging(false, false);
 // append -dev to the version number when ran locally
@@ -20,6 +21,7 @@ const env = process.env.CLIMICROSOFT365_ENV !== undefined ? process.env.CLIMICRO
 appInsights.defaultClient.commonProperties = {
     version: version,
     node: process.version,
+    shell: pid_1.pid.getProcessName(process.ppid) || '',
     env: env,
     ci: Boolean(process.env.CI).toString()
 };

package/dist/cli/Cli.js

@@ -19,7 +19,9 @@ const Command_1 = require("../Command");
 const config_1 = require("../config");
 const request_1 = require("../request");
 const settingsNames_1 = require("../settingsNames");
-const utils_1 = require("../utils");
+const formatting_1 = require("../utils/formatting");
+const fsUtil_1 = require("../utils/fsUtil");
+const md_1 = require("../utils/md");
 const packageJSON = require('../../package.json');
 class Cli {
     // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -128,7 +130,7 @@ class Cli {
         });
     }
     static executeCommand(command, args) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             const logger = {
                 log: (message) => {
                     const output = Cli.formatOutput(message, args.options);
@@ -145,22 +147,21 @@ class Cli {
             const cli = Cli.getInstance();
             const parentCommandName = cli.currentCommandName;
             cli.currentCommandName = command.getCommandName(cli.currentCommandName);
-            command.action(logger, args, (err) => {
-                // restore the original command name
-                cli.currentCommandName = parentCommandName;
-                if (err) {
-                    return reject(err);
-                }
+            try {
+                yield command.action(logger, args);
                 if (args.options.debug || args.options.verbose) {
                     const chalk = require('chalk');
                     logger.logToStderr(chalk.green('DONE'));
                 }
-                resolve();
-            });
+            }
+            finally {
+                // restore the original command name
+                cli.currentCommandName = parentCommandName;
+            }
         });
     }
     static executeCommandWithOutput(command, args, listener) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             const log = [];
             const logErr = [];
             const logger = {
@@ -199,26 +200,33 @@ class Cli {
             cli.currentCommandName = command.getCommandName();
             // store the current logger if any
             const currentLogger = request_1.default.logger;
-            command.action(logger, args, (err) => {
+            try {
+                yield command.action(logger, args);
+                // restoring the command and logger is done here instead of in a 'finally' because there were issues with the code coverage tool
                 // restore the original command name
                 cli.currentCommandName = parentCommandName;
                 // restore the original logger
                 request_1.default.logger = currentLogger;
-                if (err) {
-                    return reject({
-                        error: err,
-                        stderr: logErr.join(os.EOL)
-                    });
-                }
-                resolve({
+                return ({
                     stdout: log.join(os.EOL),
                     stderr: logErr.join(os.EOL)
                 });
-            });
+            }
+            catch (err) {
+                // restoring the command and logger is done here instead of in a 'finally' because there were issues with the code coverage tool
+                // restore the original command name
+                cli.currentCommandName = parentCommandName;
+                // restore the original logger
+                request_1.default.logger = currentLogger;
+                throw {
+                    error: err,
+                    stderr: logErr.join(os.EOL)
+                };
+            }
         });
     }
     loadAllCommands() {
-        const files = utils_1.fsUtil.readdirR(this.commandsFolder);
+        const files = fsUtil_1.fsUtil.readdirR(this.commandsFolder);
         files.forEach(file => {
             if (file.indexOf(`${path.sep}commands${path.sep}`) > -1 &&
                 file.indexOf(`${path.sep}assets${path.sep}`) < 0 &&
@@ -429,7 +437,7 @@ class Cli {
                         Array.isArray(logStatement[0].value)) {
                         logStatement = logStatement[0].value;
                     }
-                    logStatement = logStatement.map((s) => utils_1.formatting.filterObject(s, currentCommand.defaultProperties));
+                    logStatement = logStatement.map((s) => formatting_1.formatting.filterObject(s, currentCommand.defaultProperties));
                 }
             }
         }
@@ -531,7 +539,7 @@ class Cli {
         helpFilePath = path.join(...pathChunks);
         if (fs.existsSync(helpFilePath)) {
             Cli.log();
-            Cli.log(utils_1.md.md2plain(fs.readFileSync(helpFilePath, 'utf8'), path.join(this.commandsFolder, '..', '..', 'docs')));
+            Cli.log(md_1.md.md2plain(fs.readFileSync(helpFilePath, 'utf8'), path.join(this.commandsFolder, '..', '..', 'docs')));
         }
     }
     printAvailableCommands() {
@@ -664,11 +672,11 @@ class Cli {
             console.error(message, ...optionalParams);
         }
     }
-    static prompt(options, cb) {
-        const inquirer = require('inquirer');
-        inquirer
-            .prompt(options)
-            .then(result => cb(result));
+    static prompt(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const inquirer = require('inquirer');
+            return yield inquirer.prompt(options);
+        });
     }
     static removeShortOptions(args) {
         const filteredArgs = JSON.parse(JSON.stringify(args));

package/dist/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const appInsights_1 = require("./appInsights");
-const cli_1 = require("./cli");
+const Cli_1 = require("./cli/Cli");
 const packageJSON = require('../package.json');
 // required to make console.log() in combination with piped output synchronous
 // on Windows/in PowerShell so that the output is not trimmed by calling
@@ -19,7 +19,7 @@ if (!process.env.CLIMICROSOFT365_NOUPDATE) {
 }
 fs.realpath(__dirname, (err, resolvedPath) => {
     try {
-        const cli = cli_1.Cli.getInstance();
+        const cli = Cli_1.Cli.getInstance();
         cli.execute(path.join(resolvedPath, 'm365'), process.argv.slice(2));
     }
     catch (e) {

package/dist/m365/aad/commands/app/app-add.js

@@ -19,7 +19,8 @@ const fs = require("fs");
 const uuid_1 = require("uuid");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppAddCommand extends GraphCommand_1.default {
@@ -38,38 +39,35 @@ class AadAppAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Creates new Azure AD app registration';
     }
-    commandAction(logger, args, cb) {
-        this
-            .resolveApis(args, logger)
-            .then(apis => this.createAppRegistration(args, apis, logger))
-            .then(appInfo => {
-            // based on the assumption that we're adding AAD app to the current
-            // directory. If we in the future extend the command with allowing
-            // users to create AAD app in a different directory, we'll need to
-            // adjust this
-            appInfo.tenantId = utils_1.accessToken.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
-            return Promise.resolve(appInfo);
-        })
-            .then(appInfo => this.updateAppFromManifest(args, appInfo))
-            .then(appInfo => this.grantAdminConsent(appInfo, args.options.grantAdminConsent, logger))
-            .then(appInfo => this.configureUri(args, appInfo, logger))
-            .then(appInfo => this.configureSecret(args, appInfo, logger))
-            .then(appInfo => this.saveAppInfo(args, appInfo, logger))
-            .then((_appInfo) => {
-            const appInfo = {
-                appId: _appInfo.appId,
-                objectId: _appInfo.id,
-                tenantId: _appInfo.tenantId
-            };
-            if (_appInfo.secret) {
-                appInfo.secret = _appInfo.secret;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const apis = yield this.resolveApis(args, logger);
+                let appInfo = yield this.createAppRegistration(args, apis, logger);
+                // based on the assumption that we're adding AAD app to the current
+                // directory. If we in the future extend the command with allowing
+                // users to create AAD app in a different directory, we'll need to
+                // adjust this
+                appInfo.tenantId = accessToken_1.accessToken.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+                appInfo = yield this.updateAppFromManifest(args, appInfo);
+                appInfo = yield this.grantAdminConsent(appInfo, args.options.grantAdminConsent, logger);
+                appInfo = yield this.configureUri(args, appInfo, logger);
+                appInfo = yield this.configureSecret(args, appInfo, logger);
+                const _appInfo = yield this.saveAppInfo(args, appInfo, logger);
+                appInfo = {
+                    appId: _appInfo.appId,
+                    objectId: _appInfo.id,
+                    tenantId: _appInfo.tenantId
+                };
+                if (_appInfo.secrets) {
+                    appInfo.secrets = _appInfo.secrets;
+                }
+                logger.log(appInfo);
             }
-            if (_appInfo.secrets) {
-                appInfo.secrets = _appInfo.secrets;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(appInfo);
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
     createAppRegistration(args, apis, logger) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -424,7 +422,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
         if (this.verbose) {
             logger.logToStderr('Resolving requested APIs...');
         }
-        return utils_1.odata
+        return odata_1.odata
             .getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`)
             .then(servicePrincipals => {
             var _a;
@@ -558,7 +556,10 @@ class AadAppAddCommand extends GraphCommand_1.default {
         return this
             .createSecret({ appObjectId: appInfo.id })
             .then(secret => {
-            appInfo.secret = secret.value;
+            if (!appInfo.secrets) {
+                appInfo.secrets = [];
+            }
+            appInfo.secrets.push(secret);
             return Promise.resolve(appInfo);
         });
     }

package/dist/m365/aad/commands/app/app-get.js

@@ -17,7 +17,7 @@ var _AadAppGetCommand_instances, _AadAppGetCommand_initTelemetry, _AadAppGetComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppGetCommand extends GraphCommand_1.default {
@@ -35,15 +35,18 @@ class AadAppGetCommand extends GraphCommand_1.default {
     get description() {
         return 'Gets an Azure AD app registration';
     }
-    commandAction(logger, args, cb) {
-        this
-            .getAppObjectId(args)
-            .then(appObjectId => this.getAppInfo(appObjectId))
-            .then(appInfo => this.saveAppInfo(args, appInfo, logger))
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const appObjectId = yield this.getAppObjectId(args);
+                const appInfo = yield this.getAppInfo(appObjectId);
+                const res = yield this.saveAppInfo(args, appInfo, logger);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getAppObjectId(args) {
         if (args.options.objectId) {
@@ -137,10 +140,10 @@ _AadAppGetCommand_instances = new WeakSet(), _AadAppGetCommand_initTelemetry = f
     this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' }, { option: '--save' });
 }, _AadAppGetCommand_initValidators = function _AadAppGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !validation_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;