@pnp/cli-microsoft365 6.9.0-beta.41bb38c → 6.9.0-beta.8393174

package/dist/m365/cli/commands/cli-issue.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _CliIssueCommand_instances, _CliIssueCommand_initTelemetry, _CliIssueCommand_initOptions, _CliIssueCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const open = require("open");
 const AnonymousCommand_1 = require("../../base/AnonymousCommand");
 const commands_1 = require("../commands");
+const browserUtil_1 = require("../../../utils/browserUtil");
 class CliIssueCommand extends AnonymousCommand_1.default {
     get name() {
         return commands_1.default.ISSUE;
@@ -25,9 +25,8 @@ class CliIssueCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Returns, or opens a URL that takes the user to the right place in the CLI GitHub repo to create a new issue reporting bug, feedback, ideas, etc.';
     }
-    constructor(open) {
+    constructor() {
         super();
-        this.open = open;
         _CliIssueCommand_instances.add(this);
         __classPrivateFieldGet(this, _CliIssueCommand_instances, "m", _CliIssueCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _CliIssueCommand_instances, "m", _CliIssueCommand_initOptions).call(this);
@@ -47,15 +46,10 @@ class CliIssueCommand extends AnonymousCommand_1.default {
                     issueLink = 'https://aka.ms/cli-m365/new-sample-script';
                     break;
             }
-            yield this.openBrowser(issueLink);
+            yield browserUtil_1.browserUtil.open(issueLink);
             logger.log(issueLink);
         });
     }
-    openBrowser(issueLink) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.open(issueLink, { wait: false });
-        });
-    }
 }
 _CliIssueCommand_instances = new WeakSet(), _CliIssueCommand_initTelemetry = function _CliIssueCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -81,5 +75,5 @@ CliIssueCommand.issueType = [
     'command',
     'sample'
 ];
-module.exports = new CliIssueCommand(open);
+module.exports = new CliIssueCommand();
 //# sourceMappingURL=cli-issue.js.map

package/dist/m365/cli/commands/cli-reconsent.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../cli/Cli");
 const config_1 = require("../../../config");
 const settingsNames_1 = require("../../../settingsNames");
+const browserUtil_1 = require("../../../utils/browserUtil");
 const AnonymousCommand_1 = require("../../base/AnonymousCommand");
 const commands_1 = require("../commands");
 class CliReconsentCommand extends AnonymousCommand_1.default {
@@ -29,15 +30,8 @@ class CliReconsentCommand extends AnonymousCommand_1.default {
                 return;
             }
             logger.log(`Opening the following page in your browser: ${url}`);
-            // _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
-            /* c8 ignore next 3 */
-            if (!this._open) {
-                this._open = require('open');
-            }
             try {
-                yield this._open(url);
+                yield browserUtil_1.browserUtil.open(url);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

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

@@ -43,6 +43,7 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
                 case settingsNames_1.settingsNames.csvQuoted:
                 case settingsNames_1.settingsNames.csvQuotedEmpty:
                 case settingsNames_1.settingsNames.disableTelemetry:
+                case settingsNames_1.settingsNames.interactive:
                 case settingsNames_1.settingsNames.printErrorsAsPlainText:
                 case settingsNames_1.settingsNames.prompt:
                 case settingsNames_1.settingsNames.showHelpOnFailure:

package/dist/m365/commands/docs.js

@@ -13,6 +13,7 @@ const AnonymousCommand_1 = require("../base/AnonymousCommand");
 const Cli_1 = require("../../cli/Cli");
 const commands_1 = require("./commands");
 const settingsNames_1 = require("../../settingsNames");
+const browserUtil_1 = require("../../utils/browserUtil");
 const packageJSON = require('../../../package.json');
 class DocsCommand extends AnonymousCommand_1.default {
     get name() {
@@ -27,14 +28,7 @@ class DocsCommand extends AnonymousCommand_1.default {
             if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false) === false) {
                 return;
             }
-            // _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
-            /* c8 ignore next 3 */
-            if (!this._open) {
-                this._open = require('open');
-            }
-            yield this._open(packageJSON.homepage);
+            yield browserUtil_1.browserUtil.open(packageJSON.homepage);
         });
     }
 }

package/dist/m365/commands/login.js

@@ -19,6 +19,7 @@ const fs = require("fs");
 const Auth_1 = require("../../Auth");
 const Command_1 = require("../../Command");
 const config_1 = require("../../config");
+const accessToken_1 = require("../../utils/accessToken");
 const misc_1 = require("../../utils/misc");
 const commands_1 = require("./commands");
 class LoginCommand extends Command_1.default {
@@ -90,6 +91,25 @@ class LoginCommand extends Command_1.default {
                     }
                     throw new Command_1.CommandError(error.message);
                 }
+                if (this.debug) {
+                    logger.logToStderr({
+                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                        authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        appId: Auth_1.default.service.appId,
+                        appTenant: Auth_1.default.service.tenant,
+                        accessToken: JSON.stringify(Auth_1.default.service.accessTokens, null, 2),
+                        cloudType: Auth_1.CloudType[Auth_1.default.service.cloudType]
+                    });
+                }
+                else {
+                    logger.logToStderr({
+                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                        authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        appId: Auth_1.default.service.appId,
+                        appTenant: Auth_1.default.service.tenant,
+                        cloudType: Auth_1.CloudType[Auth_1.default.service.cloudType]
+                    });
+                }
             });
             try {
                 yield Auth_1.default.clearConnectionInfo();

package/dist/m365/commands/setupPresets.js

@@ -4,6 +4,7 @@ exports.powerShellPreset = exports.scriptingPreset = exports.interactivePreset =
 exports.interactivePreset = {
     autoOpenLinksInBrowser: true,
     copyDeviceCodeToClipboard: true,
+    interactive: true,
     output: 'text',
     printErrorsAsPlainText: true,
     prompt: true,
@@ -13,6 +14,7 @@ exports.interactivePreset = {
 exports.scriptingPreset = {
     autoOpenLinksInBrowser: false,
     copyDeviceCodeToClipboard: false,
+    interactive: false,
     output: 'json',
     printErrorsAsPlainText: false,
     prompt: false,

package/dist/m365/file/commands/convert/convert-pdf.js

@@ -119,20 +119,22 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
      * @returns Web URL of the file to upload
      */
     getSourceFileUrl(logger, args, isAppOnlyAccessToken) {
-        if (args.options.sourceFile.toLowerCase().startsWith('https://')) {
-            return Promise.resolve(args.options.sourceFile);
-        }
-        if (this.verbose) {
-            logger.logToStderr('Uploading local file temporarily for conversion...');
-        }
-        const driveUrl = `${this.resource}/v1.0/${isAppOnlyAccessToken ? 'drive/root' : 'me/drive/root'}`;
-        // we need the original file extension because otherwise Graph won't be able
-        // to convert the file to PDF
-        this.sourceFileGraphUrl = `${driveUrl}:/${(0, uuid_1.v4)()}${path.extname(args.options.sourceFile)}`;
-        if (this.debug) {
-            logger.logToStderr(`Source is a local file. Uploading to ${this.sourceFileGraphUrl}...`);
-        }
-        return this.uploadFile(args.options.sourceFile, this.sourceFileGraphUrl);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.sourceFile.toLowerCase().startsWith('https://')) {
+                return args.options.sourceFile;
+            }
+            if (this.verbose) {
+                logger.logToStderr('Uploading local file temporarily for conversion...');
+            }
+            const driveUrl = `${this.resource}/v1.0/${isAppOnlyAccessToken ? 'drive/root' : 'me/drive/root'}`;
+            // we need the original file extension because otherwise Graph won't be able
+            // to convert the file to PDF
+            this.sourceFileGraphUrl = `${driveUrl}:/${(0, uuid_1.v4)()}${path.extname(args.options.sourceFile)}`;
+            if (this.debug) {
+                logger.logToStderr(`Source is a local file. Uploading to ${this.sourceFileGraphUrl}...`);
+            }
+            return yield this.uploadFile(args.options.sourceFile, this.sourceFileGraphUrl);
+        });
     }
     /**
      * Uploads the specified local file to a document library using Microsoft Graph
@@ -141,18 +143,17 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
      * @returns Absolute URL of the uploaded file
      */
     uploadFile(localFilePath, targetGraphFileUrl) {
-        const requestOptions = {
-            url: `${targetGraphFileUrl}:/createUploadSession`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .post(requestOptions)
-            .then((res) => {
-            const fileContents = fs.readFileSync(localFilePath);
+        return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
+                url: `${targetGraphFileUrl}:/createUploadSession`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.post(requestOptions);
+            const fileContents = fs.readFileSync(localFilePath);
+            const requestOptionsPut = {
                 url: res.uploadUrl,
                 headers: {
                     'x-anonymous': true,
@@ -163,9 +164,9 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
                 data: fileContents,
                 responseType: 'json'
             };
-            return request_1.default.put(requestOptions);
-        })
-            .then((res) => res.webUrl);
+            const resPut = yield request_1.default.put(requestOptionsPut);
+            return resPut.webUrl;
+        });
     }
     /**
      * Gets Graph's drive item URL for the specified file. If the user specified
@@ -186,21 +187,20 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
      * @returns Graph's drive item URL for the specified file
      */
     getGraphFileUrl(logger, fileWebUrl, fileGraphUrl) {
-        if (this.debug) {
-            logger.logToStderr(`Resolving Graph drive item URL for ${fileWebUrl}`);
-        }
-        if (fileGraphUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
             if (this.debug) {
-                logger.logToStderr(`Returning previously resolved Graph drive item URL ${fileGraphUrl}`);
+                logger.logToStderr(`Resolving Graph drive item URL for ${fileWebUrl}`);
             }
-            return Promise.resolve(fileGraphUrl);
-        }
-        const _url = url.parse(fileWebUrl);
-        let siteId = '';
-        let driveRelativeFileUrl = '';
-        return this
-            .getGraphSiteInfoFromFullUrl(_url.host, _url.path)
-            .then(siteInfo => {
+            if (fileGraphUrl) {
+                if (this.debug) {
+                    logger.logToStderr(`Returning previously resolved Graph drive item URL ${fileGraphUrl}`);
+                }
+                return fileGraphUrl;
+            }
+            const _url = url.parse(fileWebUrl);
+            let siteId = '';
+            let driveRelativeFileUrl = '';
+            const siteInfo = yield this.getGraphSiteInfoFromFullUrl(_url.host, _url.path);
             siteId = siteInfo.id;
             let siteRelativeFileUrl = _url.path.replace(siteInfo.serverRelativeUrl, '');
             // normalize site-relative URLs for root site collections and root sites
@@ -210,9 +210,7 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
             const siteRelativeFileUrlChunks = siteRelativeFileUrl.split('/');
             driveRelativeFileUrl = `/${siteRelativeFileUrlChunks.slice(2).join('/')}`;
             // chunk 0 is empty because the URL starts with /
-            return this.getDriveId(logger, siteId, siteRelativeFileUrlChunks[1]);
-        })
-            .then(driveId => {
+            const driveId = yield this.getDriveId(logger, siteId, siteRelativeFileUrlChunks[1]);
             const graphUrl = `${this.resource}/v1.0/sites/${siteId}/drives/${driveId}/root:${driveRelativeFileUrl}`;
             if (this.debug) {
                 logger.logToStderr(`Resolved URL ${graphUrl}`);
@@ -228,10 +226,10 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
      * @returns ID and server-relative URL of the site denoted by urlPath
      */
     getGraphSiteInfoFromFullUrl(hostName, urlPath) {
-        const siteId = '';
-        const urlChunks = urlPath.split('/');
-        return new Promise((resolve, reject) => {
-            this.getGraphSiteInfo(hostName, urlChunks, 0, siteId, resolve, reject);
+        return __awaiter(this, void 0, void 0, function* () {
+            const siteId = '';
+            const urlChunks = urlPath.split('/');
+            return yield this.getGraphSiteInfo(hostName, urlChunks, 0, siteId);
         });
     }
     /**
@@ -248,40 +246,45 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
      * @param reject Callback method to call when resolving site info failed
      * @returns Graph site ID and server-relative URL of the site specified through chunks
      */
-    getGraphSiteInfo(hostName, urlChunks, currentChunk, lastSiteId, resolve, reject) {
-        let currentPath = urlChunks.slice(0, currentChunk + 1).join('/');
-        if (currentPath.endsWith('/sites') ||
-            currentPath.endsWith('/teams') ||
-            currentPath.endsWith('/personal')) {
-            return this.getGraphSiteInfo(hostName, urlChunks, ++currentChunk, '', resolve, reject);
-        }
-        if (!currentPath.startsWith('/')) {
-            currentPath = '/' + currentPath;
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${hostName}:${currentPath}?$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            this.getGraphSiteInfo(hostName, urlChunks, ++currentChunk, res.id, resolve, reject);
-        }, err => {
-            if (lastSiteId) {
-                let serverRelativeUrl = `${urlChunks.slice(0, currentChunk).join('/')}`;
-                if (!serverRelativeUrl.startsWith('/')) {
-                    serverRelativeUrl = '/' + serverRelativeUrl;
-                }
-                resolve({
-                    id: lastSiteId,
-                    serverRelativeUrl: serverRelativeUrl
-                });
+    getGraphSiteInfo(hostName, urlChunks, currentChunk, lastSiteId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let currentPath = urlChunks.slice(0, currentChunk + 1).join('/');
+            if (currentPath.endsWith('/sites') ||
+                currentPath.endsWith('/teams') ||
+                currentPath.endsWith('/personal')) {
+                return yield this.getGraphSiteInfo(hostName, urlChunks, ++currentChunk, '');
+            }
+            if (!currentPath.startsWith('/')) {
+                currentPath = '/' + currentPath;
             }
-            else {
-                reject(err);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/sites/${hostName}:${currentPath}?$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const getResult = (id, serverRelativeUrl) => {
+                return {
+                    id,
+                    serverRelativeUrl
+                };
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                return yield this.getGraphSiteInfo(hostName, urlChunks, ++currentChunk, res.id);
+            }
+            catch (err) {
+                if (lastSiteId) {
+                    let serverRelativeUrl = `${urlChunks.slice(0, currentChunk).join('/')}`;
+                    if (!serverRelativeUrl.startsWith('/')) {
+                        serverRelativeUrl = '/' + serverRelativeUrl;
+                    }
+                    return getResult(lastSiteId, serverRelativeUrl);
+                }
+                else {
+                    throw err;
+                }
             }
         });
     }
@@ -292,24 +295,23 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
      * @returns Graph drive ID of the specified document library
      */
     getDriveId(logger, graphSiteId, siteRelativeListUrl) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${graphSiteId}/drives?$select=webUrl,id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/sites/${graphSiteId}/drives?$select=webUrl,id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
             if (this.debug) {
                 logger.logToStderr(`Searching for drive with a URL ending with /${siteRelativeListUrl}...`);
             }
             const drive = res.value.find(d => d.webUrl.endsWith(`/${siteRelativeListUrl}`));
             if (!drive) {
-                return Promise.reject('Drive not found');
+                throw 'Drive not found';
             }
-            return Promise.resolve(drive.id);
+            return drive.id;
         });
     }
     /**
@@ -320,17 +322,19 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
      * the file converted to PDF. The URL must be called anonymously
      */
     convertFile(logger, graphFileUrl) {
-        if (this.verbose) {
-            logger.logToStderr('Converting file...');
-        }
-        const requestOptions = {
-            url: `${graphFileUrl}:/content?format=pdf`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'stream'
-        };
-        return request_1.default.get(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Converting file...');
+            }
+            const requestOptions = {
+                url: `${graphFileUrl}:/content?format=pdf`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'stream'
+            };
+            return yield request_1.default.get(requestOptions);
+        });
     }
     /**
      * Writes the contents of the specified file stream to a local file
@@ -339,18 +343,19 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
      * @param localFilePath Local file path where to store the file
      */
     writeFileToDisk(logger, fileResponse, localFilePath) {
-        if (this.verbose) {
-            logger.logToStderr(`Writing converted PDF file to ${localFilePath}...`);
-        }
-        return new Promise((resolve, reject) => {
-            // write the downloaded file to disk
-            const writer = fs.createWriteStream(localFilePath);
-            fileResponse.data.pipe(writer);
-            writer.on('error', err => {
-                reject(err);
-            });
-            writer.on('close', () => {
-                resolve();
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Writing converted PDF file to ${localFilePath}...`);
+            }
+            yield new Promise((resolve, reject) => {
+                const writer = fs.createWriteStream(localFilePath);
+                fileResponse.data.pipe(writer);
+                writer.on('error', err => {
+                    reject(err);
+                });
+                writer.on('close', () => {
+                    resolve();
+                });
             });
         });
     }
@@ -364,21 +369,21 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
      * @param targetFileUrl Web URL of the file to upload
      */
     uploadConvertedFileIfNecessary(logger, targetIsLocalFile, localFilePath, targetFileUrl) {
-        // if the target was a local path, we're done.
-        // Otherwise, upload the file to the specified URL
-        if (targetIsLocalFile) {
-            if (this.debug) {
-                logger.logToStderr('Specified target is a local file. Not uploading.');
+        return __awaiter(this, void 0, void 0, function* () {
+            // if the target was a local path, we're done.
+            // Otherwise, upload the file to the specified URL
+            if (targetIsLocalFile) {
+                if (this.debug) {
+                    logger.logToStderr('Specified target is a local file. Not uploading.');
+                }
+                return;
             }
-            return Promise.resolve();
-        }
-        if (this.verbose) {
-            logger.logToStderr(`Uploading converted PDF file to ${targetFileUrl}...`);
-        }
-        return this
-            .getGraphFileUrl(logger, targetFileUrl, undefined)
-            .then(targetGraphFileUrl => this.uploadFile(localFilePath, targetGraphFileUrl))
-            .then(_ => Promise.resolve());
+            if (this.verbose) {
+                logger.logToStderr(`Uploading converted PDF file to ${targetFileUrl}...`);
+            }
+            const targetGraphFileUrl = yield this.getGraphFileUrl(logger, targetFileUrl, undefined);
+            yield this.uploadFile(localFilePath, targetGraphFileUrl);
+        });
     }
     /**
      * If the user specified local file to be converted to PDF, removes the file
@@ -389,20 +394,19 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
      * @param sourceFileUrl Web URL of the temporary source file to delete
      */
     deleteRemoteSourceFileIfNecessary(logger, sourceIsLocalFile, sourceFileUrl) {
-        // if the source was a remote file, we're done,
-        // otherwise delete the temporary uploaded file
-        if (!sourceIsLocalFile) {
-            if (this.debug) {
-                logger.logToStderr('Source file was URL. Not removing.');
+        return __awaiter(this, void 0, void 0, function* () {
+            // if the source was a remote file, we're done,
+            // otherwise delete the temporary uploaded file
+            if (!sourceIsLocalFile) {
+                if (this.debug) {
+                    logger.logToStderr('Source file was URL. Not removing.');
+                }
+                return;
             }
-            return Promise.resolve();
-        }
-        if (this.verbose) {
-            logger.logToStderr(`Deleting the temporary file at ${sourceFileUrl}...`);
-        }
-        return this
-            .getGraphFileUrl(logger, sourceFileUrl, this.sourceFileGraphUrl)
-            .then((graphFileUrl) => {
+            if (this.verbose) {
+                logger.logToStderr(`Deleting the temporary file at ${sourceFileUrl}...`);
+            }
+            const graphFileUrl = yield this.getGraphFileUrl(logger, sourceFileUrl, this.sourceFileGraphUrl);
             const requestOptions = {
                 url: graphFileUrl,
                 headers: {