@pnp/cli-microsoft365 6.3.0-beta.c3dc921 → 6.3.0-beta.cefe20e

package/dist/m365/aad/commands.js

@@ -22,6 +22,7 @@ exports.default = {
     GROUPSETTING_SET: `${prefix} groupsetting set`,
     GROUPSETTINGTEMPLATE_GET: `${prefix} groupsettingtemplate get`,
     GROUPSETTINGTEMPLATE_LIST: `${prefix} groupsettingtemplate list`,
+    LICENSE_LIST: `${prefix} license list`,
     O365GROUP_ADD: `${prefix} o365group add`,
     O365GROUP_GET: `${prefix} o365group get`,
     O365GROUP_LIST: `${prefix} o365group list`,
@@ -55,11 +56,20 @@ exports.default = {
     SITECLASSIFICATION_SET: `${prefix} siteclassification set`,
     SP_ADD: `${prefix} sp add`,
     SP_GET: `${prefix} sp get`,
+    USER_ADD: `${prefix} user add`,
     USER_GET: `${prefix} user get`,
     USER_GUEST_ADD: `${prefix} user guest add`,
     USER_HIBP: `${prefix} user hibp`,
+    USER_LICENSE_ADD: `${prefix} user license add`,
+    USER_LICENSE_LIST: `${prefix} user license list`,
+    USER_LICENSE_REMOVE: `${prefix} user license remove`,
     USER_LIST: `${prefix} user list`,
     USER_PASSWORD_VALIDATE: `${prefix} user password validate`,
+    USER_RECYCLEBINITEM_CLEAR: `${prefix} user recyclebinitem clear`,
+    USER_RECYCLEBINITEM_LIST: `${prefix} user recyclebinitem list`,
+    USER_RECYCLEBINITEM_REMOVE: `${prefix} user recyclebinitem remove`,
+    USER_REMOVE: `${prefix} user remove`,
+    USER_RECYCLEBINITEM_RESTORE: `${prefix} user recyclebinitem restore`,
     USER_SET: `${prefix} user set`,
     USER_SIGNIN_LIST: `${prefix} user signin list`
 };

package/dist/m365/base/O365MgmtCommand.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Command_1 = require("../../Command");
+class O365MgmtCommand extends Command_1.default {
+    get resource() {
+        return 'https://manage.office.com';
+    }
+}
+exports.default = O365MgmtCommand;
+//# sourceMappingURL=O365MgmtCommand.js.map

package/dist/m365/context/commands/option/option-list.js

@@ -0,0 +1,54 @@
+"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 fs = require("fs");
+const Command_1 = require("../../../../Command");
+const ContextCommand_1 = require("../../../base/ContextCommand");
+const commands_1 = require("../../commands");
+class ContextOptionListCommand extends ContextCommand_1.default {
+    get name() {
+        return commands_1.default.OPTION_LIST;
+    }
+    get description() {
+        return 'List all options added to the context';
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving context options...`);
+            }
+            const filePath = '.m365rc.json';
+            let m365rc = {};
+            if (fs.existsSync(filePath)) {
+                try {
+                    if (this.verbose) {
+                        logger.logToStderr(`Reading context file...`);
+                    }
+                    const fileContents = fs.readFileSync(filePath, 'utf8');
+                    if (fileContents) {
+                        m365rc = JSON.parse(fileContents);
+                    }
+                }
+                catch (e) {
+                    throw new Command_1.CommandError(`Error reading ${filePath}: ${e}. Please retrieve context options from ${filePath} manually.`);
+                }
+            }
+            if (!m365rc.context) {
+                throw new Command_1.CommandError(`No context present`);
+            }
+            else {
+                logger.log(m365rc.context);
+            }
+        });
+    }
+}
+module.exports = new ContextOptionListCommand();
+//# sourceMappingURL=option-list.js.map

package/dist/m365/context/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'context';
 exports.default = {
     INIT: `${prefix} init`,
+    OPTION_LIST: `${prefix} option list`,
     OPTION_REMOVE: `${prefix} option remove`,
     OPTION_SET: `${prefix} option set`,
     REMOVE: `${prefix} remove`

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

@@ -23,6 +23,7 @@ const uuid_1 = require("uuid");
 const Auth_1 = require("../../../../Auth");
 const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
+const accessToken_1 = require("../../../../utils/accessToken");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class FileConvertPdfCommand extends GraphCommand_1.default {
@@ -46,8 +47,8 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
             let sourceIsLocalFile = true;
             let targetIsLocalFile = true;
             let error;
-            const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
-            if (typeof isAppOnlyAuth === 'undefined') {
+            const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+            if (typeof isAppOnlyAccessToken === 'undefined') {
                 throw 'Unable to determine authentication type';
             }
             if (args.options.sourceFile.toLowerCase().startsWith('https://')) {
@@ -62,7 +63,7 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
             }
             try {
                 try {
-                    sourceFileUrl = yield this.getSourceFileUrl(logger, args, isAppOnlyAuth);
+                    sourceFileUrl = yield this.getSourceFileUrl(logger, args, isAppOnlyAccessToken);
                     const graphFileUrl = yield this.getGraphFileUrl(logger, sourceFileUrl, this.sourceFileGraphUrl);
                     const fileResponse = yield this.convertFile(logger, graphFileUrl);
                     yield this.writeFileToDisk(logger, fileResponse, localTargetFilePath);
@@ -114,17 +115,17 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
      * file to the user's OneDrive for Business
      * @param logger Logger instance
      * @param args Command args
-     * @param isAppOnlyAuth True if CLI is authenticated in app-only mode
+     * @param isAppOnlyAccessToken True if CLI is authenticated in app-only mode
      * @returns Web URL of the file to upload
      */
-    getSourceFileUrl(logger, args, isAppOnlyAuth) {
+    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/${isAppOnlyAuth ? 'drive/root' : 'me/drive/root'}`;
+        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)}`;

package/dist/m365/flow/commands/environment/FlowEnvironmentDetails.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=FlowEnvironmentDetails.js.map

package/dist/m365/flow/commands/environment/environment-get.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _FlowEnvironmentGetCommand_instances, _FlowEnvironmentGetCommand_initOptions;
+var _FlowEnvironmentGetCommand_instances, _FlowEnvironmentGetCommand_initOptions, _FlowEnvironmentGetCommand_initTelemetry;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -33,27 +33,36 @@ class FlowEnvironmentGetCommand extends AzmgmtCommand_1.default {
         super();
         _FlowEnvironmentGetCommand_instances.add(this);
         __classPrivateFieldGet(this, _FlowEnvironmentGetCommand_instances, "m", _FlowEnvironmentGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowEnvironmentGetCommand_instances, "m", _FlowEnvironmentGetCommand_initTelemetry).call(this);
     }
     commandAction(logger, args) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving information about Microsoft Flow environment ${args.options.name}...`);
+                logger.logToStderr(`Retrieving information about Microsoft Flow environment ${(_a = args.options.name) !== null && _a !== void 0 ? _a : ''}...`);
+            }
+            let requestUrl = `${this.resource}providers/Microsoft.ProcessSimple/environments/`;
+            if (args.options.name) {
+                requestUrl += `${formatting_1.formatting.encodeQueryParameter(args.options.name)}`;
+            }
+            else {
+                requestUrl += `~default`;
             }
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting_1.formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+                url: `${requestUrl}?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
                 responseType: 'json'
             };
             try {
-                const res = yield request_1.default.get(requestOptions);
-                res.displayName = res.properties.displayName;
-                res.provisioningState = res.properties.provisioningState;
-                res.environmentSku = res.properties.environmentSku;
-                res.azureRegionHint = res.properties.azureRegionHint;
-                res.isDefault = res.properties.isDefault;
-                logger.log(res);
+                const flowItem = yield request_1.default.get(requestOptions);
+                flowItem.displayName = flowItem.properties.displayName;
+                flowItem.provisioningState = flowItem.properties.provisioningState;
+                flowItem.environmentSku = flowItem.properties.environmentSku;
+                flowItem.azureRegionHint = flowItem.properties.azureRegionHint;
+                flowItem.isDefault = flowItem.properties.isDefault;
+                logger.log(flowItem);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -63,7 +72,13 @@ class FlowEnvironmentGetCommand extends AzmgmtCommand_1.default {
 }
 _FlowEnvironmentGetCommand_instances = new WeakSet(), _FlowEnvironmentGetCommand_initOptions = function _FlowEnvironmentGetCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --name <name>'
+        option: '-n, --name [name]'
+    });
+}, _FlowEnvironmentGetCommand_initTelemetry = function _FlowEnvironmentGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            name: typeof args.options.name !== 'undefined'
+        });
     });
 };
 module.exports = new FlowEnvironmentGetCommand();

package/dist/m365/flow/commands/run/run-list.js

@@ -13,9 +13,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _FlowRunListCommand_instances, _FlowRunListCommand_initOptions;
+var _FlowRunListCommand_instances, _FlowRunListCommand_initTelemetry, _FlowRunListCommand_initOptions, _FlowRunListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const AzmgmtItemsListCommand_1 = require("../../../base/AzmgmtItemsListCommand");
 const commands_1 = require("../../commands");
 class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
@@ -31,14 +32,21 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
     constructor() {
         super();
         _FlowRunListCommand_instances.add(this);
+        this.allowedStatusses = ['Succeeded', 'Running', 'Failed', 'Cancelled'];
+        __classPrivateFieldGet(this, _FlowRunListCommand_instances, "m", _FlowRunListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _FlowRunListCommand_instances, "m", _FlowRunListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowRunListCommand_instances, "m", _FlowRunListCommand_initValidators).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flowName}...`);
             }
-            const url = `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
+            let url = `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
+            const filters = this.getFilters(args.options);
+            if (filters.length > 0) {
+                url += `&$filter=${filters.join(' and ')}`;
+            }
             try {
                 yield this.getAllItems(url, logger, true);
                 if (this.items.length > 0) {
@@ -59,13 +67,57 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
             }
         });
     }
+    getFilters(options) {
+        const filters = [];
+        if (options.status) {
+            filters.push(`status eq '${options.status}'`);
+        }
+        if (options.triggerStartTime) {
+            filters.push(`startTime ge ${options.triggerStartTime}`);
+        }
+        if (options.triggerEndTime) {
+            filters.push(`startTime lt ${options.triggerEndTime}`);
+        }
+        return filters;
+    }
 }
-_FlowRunListCommand_instances = new WeakSet(), _FlowRunListCommand_initOptions = function _FlowRunListCommand_initOptions() {
+_FlowRunListCommand_instances = new WeakSet(), _FlowRunListCommand_initTelemetry = function _FlowRunListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            status: typeof args.options.status !== 'undefined',
+            triggerStartTime: typeof args.options.triggerStartTime !== 'undefined',
+            triggerEndTime: typeof args.options.triggerEndTime !== 'undefined'
+        });
+    });
+}, _FlowRunListCommand_initOptions = function _FlowRunListCommand_initOptions() {
     this.options.unshift({
         option: '-f, --flowName <flowName>'
     }, {
         option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '--status [status]',
+        autocomplete: this.allowedStatusses
+    }, {
+        option: '--triggerStartTime [triggerStartTime]'
+    }, {
+        option: '--triggerEndTime [triggerEndTime]'
     });
+}, _FlowRunListCommand_initValidators = function _FlowRunListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.flowName)) {
+            return `${args.options.flowName} is not a valid GUID`;
+        }
+        if (args.options.status && this.allowedStatusses.indexOf(args.options.status) === -1) {
+            return `'${args.options.status}' is not a valid status. Allowed values are: ${this.allowedStatusses.join(',')}`;
+        }
+        if (args.options.triggerStartTime && !validation_1.validation.isValidISODateTime(args.options.triggerStartTime)) {
+            return `'${args.options.triggerStartTime}' is not a valid datetime.`;
+        }
+        if (args.options.triggerEndTime && !validation_1.validation.isValidISODateTime(args.options.triggerEndTime)) {
+            return `'${args.options.triggerEndTime}' is not a valid datetime.`;
+        }
+        return true;
+    }));
 };
 module.exports = new FlowRunListCommand();
 //# sourceMappingURL=run-list.js.map

package/dist/m365/graph/commands/changelog/changelog-list.js

@@ -21,6 +21,7 @@ const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 const request_1 = require("../../../../request");
 const xmldom_1 = require("@xmldom/xmldom");
+const Cli_1 = require("../../../../cli/Cli");
 class GraphChangelogListCommand extends AnonymousCommand_1.default {
     get name() {
         return commands_1.default.CHANGELOG_LIST;
@@ -106,14 +107,14 @@ class GraphChangelogListCommand extends AnonymousCommand_1.default {
             items: []
         };
         Array.from(xmlDoc.getElementsByTagName('item')).forEach((item) => {
-            const description = args.options.output === 'text' ?
+            const description = Cli_1.Cli.shouldTrimOutput(args.options.output) ?
                 md_1.md.md2plain(item.getElementsByTagName('description').item(0).textContent, '') :
                 item.getElementsByTagName('description').item(0).textContent;
             changelog.items.push({
                 guid: item.getElementsByTagName('guid').item(0).textContent,
                 category: item.getElementsByTagName('category').item(1).textContent,
                 title: item.getElementsByTagName('title').item(0).textContent,
-                description: args.options.output === 'text' ?
+                description: Cli_1.Cli.shouldTrimOutput(args.options.output) ?
                     description.length > 50 ? `${description.substring(0, 47)}...` : description :
                     description,
                 pubDate: new Date(item.getElementsByTagName('pubDate').item(0).textContent)

package/dist/m365/onenote/commands/notebook/notebook-list.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators;
+var _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators, _OneNoteNotebookListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const odata_1 = require("../../../../utils/odata");
@@ -28,75 +28,63 @@ class OneNoteNotebookListCommand extends GraphCommand_1.default {
     get description() {
         return 'Retrieve a list of notebooks';
     }
+    defaultProperties() {
+        return ['createdDateTime', 'displayName', 'id'];
+    }
     constructor() {
         super();
         _OneNoteNotebookListCommand_instances.add(this);
         __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initOptionSets).call(this);
     }
     getEndpointUrl(args) {
-        return new Promise((resolve, reject) => {
-            let endpoint = `${this.resource}/v1.0/me/onenote/notebooks`;
+        return __awaiter(this, void 0, void 0, function* () {
+            let endpoint = `${this.resource}/v1.0/`;
             if (args.options.userId) {
-                endpoint = `${this.resource}/v1.0/users/${args.options.userId}/onenote/notebooks`;
-                return resolve(endpoint);
+                endpoint += `users/${args.options.userId}`;
             }
             else if (args.options.userName) {
-                endpoint = `${this.resource}/v1.0/users/${args.options.userName}/onenote/notebooks`;
-                return resolve(endpoint);
+                endpoint += `users/${args.options.userName}`;
             }
             else if (args.options.groupId) {
-                endpoint = `${this.resource}/v1.0/groups/${args.options.groupId}/onenote/notebooks`;
-                return resolve(endpoint);
+                endpoint += `groups/${args.options.groupId}`;
             }
             else if (args.options.groupName) {
-                this
-                    .getGroupId(args)
-                    .then((retrievedgroupId) => {
-                    endpoint = `${this.resource}/v1.0/groups/${retrievedgroupId}/onenote/notebooks`;
-                    return resolve(endpoint);
-                })
-                    .catch((err) => {
-                    reject(err);
-                });
+                const groupId = yield this.getGroupId(args.options.groupName);
+                endpoint += `groups/${groupId}`;
             }
             else if (args.options.webUrl) {
-                this
-                    .getSpoSiteId(args)
-                    .then((siteId) => {
-                    endpoint = `${this.resource}/v1.0/sites/${siteId}/onenote/notebooks`;
-                    return resolve(endpoint);
-                })
-                    .catch((err) => {
-                    reject(err);
-                });
+                const siteId = yield this.getSpoSiteId(args.options.webUrl);
+                endpoint += `sites/${siteId}`;
             }
             else {
-                return resolve(endpoint);
+                endpoint += 'me';
             }
+            endpoint += '/onenote/notebooks';
+            return endpoint;
         });
     }
-    defaultProperties() {
-        return ['createdDateTime', 'displayName', 'id'];
-    }
-    getGroupId(args) {
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.groupName)
-            .then(group => group.id);
+    getGroupId(groupName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(groupName);
+            return group.id;
+        });
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.webUrl);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((site) => site.id);
+    getSpoSiteId(webUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = new URL(webUrl);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const site = yield request_1.default.get(requestOptions);
+            return site.id;
+        });
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -114,7 +102,11 @@ class OneNoteNotebookListCommand extends GraphCommand_1.default {
 _OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListCommand_initTelemetry = function _OneNoteNotebookListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            joined: args.options.joined
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            webUrl: typeof args.options.webUrl !== 'undefined'
         });
     });
 }, _OneNoteNotebookListCommand_initOptions = function _OneNoteNotebookListCommand_initOptions() {
@@ -127,14 +119,19 @@ _OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListComma
         if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
-        if (args.options.userId && args.options.userName) {
-            return 'Specify either userId or userName, but not both';
-        }
-        if (args.options.groupId && args.options.groupName) {
-            return 'Specify either groupId or groupName, but not both';
+        if (args.options.webUrl) {
+            return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         }
         return true;
     }));
+}, _OneNoteNotebookListCommand_initOptionSets = function _OneNoteNotebookListCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['userId', 'userName', 'groupId', 'groupName', 'webUrl'],
+        runsWhen: (args) => {
+            const options = [args.options.userId, args.options.userName, args.options.groupId, args.options.groupName, args.options.webUrl];
+            return options.some(item => item !== undefined);
+        }
+    });
 };
 module.exports = new OneNoteNotebookListCommand();
 //# sourceMappingURL=notebook-list.js.map

package/dist/m365/onenote/commands/page/page-list.js

@@ -15,12 +15,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OneNotePageListCommand_instances, _OneNotePageListCommand_initTelemetry, _OneNotePageListCommand_initOptions, _OneNotePageListCommand_initValidators, _OneNotePageListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const spo_1 = require("../../../../utils/spo");
 class OneNotePageListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.PAGE_LIST;
@@ -56,7 +56,7 @@ class OneNotePageListCommand extends GraphCommand_1.default {
                 endpoint += `groups/${groupId}`;
             }
             else if (args.options.webUrl) {
-                const siteId = yield this.getSpoSiteId(args.options.webUrl);
+                const siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.webUrl);
                 endpoint += `sites/${siteId}`;
             }
             else {
@@ -72,20 +72,6 @@ class OneNotePageListCommand extends GraphCommand_1.default {
             return group.id;
         });
     }
-    getSpoSiteId(webUrl) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const url = new URL(webUrl);
-            const requestOptions = {
-                url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const site = yield request_1.default.get(requestOptions);
-            return site.id;
-        });
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/dist/m365/outlook/commands/mail/mail-send.js

@@ -22,6 +22,7 @@ const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const formatting_1 = require("../../../../utils/formatting");
+const accessToken_1 = require("../../../../utils/accessToken");
 class OutlookMailSendCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.MAIL_SEND;
@@ -40,8 +41,8 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
-                if (isAppOnlyAuth === true && !args.options.sender) {
+                const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
+                if (isAppOnlyAccessToken === true && !args.options.sender) {
                     throw `Specify a upn or user id in the 'sender' option when using app only authentication.`;
                 }
                 const requestOptions = {

package/dist/m365/outlook/commands/message/message-get.js

@@ -17,6 +17,7 @@ var _OutlookMessageGetCommand_instances, _OutlookMessageGetCommand_initTelemetry
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
+const accessToken_1 = require("../../../../utils/accessToken");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class OutlookMessageGetCommand extends GraphCommand_1.default {
@@ -35,12 +36,12 @@ class OutlookMessageGetCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
+                const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
                 if (this.verbose) {
-                    logger.logToStderr(`Retrieving message with id ${args.options.id} using ${isAppOnlyAuth ? 'app only permissions' : 'delegated permissions'}`);
+                    logger.logToStderr(`Retrieving message with id ${args.options.id} using ${isAppOnlyAccessToken ? 'app only permissions' : 'delegated permissions'}`);
                 }
                 let requestUrl = '';
-                if (isAppOnlyAuth) {
+                if (isAppOnlyAccessToken) {
                     if (!args.options.userId && !args.options.userPrincipalName) {
                         throw `The option 'userId' or 'userPrincipalName' is required when retrieving an email using app only credentials`;
                     }

package/dist/m365/pa/commands/environment/environment-get.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _PaEnvironmentGetCommand_instances, _PaEnvironmentGetCommand_initOptions;
+var _PaEnvironmentGetCommand_instances, _PaEnvironmentGetCommand_initTelemetry, _PaEnvironmentGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -32,15 +32,17 @@ class PaEnvironmentGetCommand extends PowerAppsCommand_1.default {
     constructor() {
         super();
         _PaEnvironmentGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaEnvironmentGetCommand_instances, "m", _PaEnvironmentGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PaEnvironmentGetCommand_instances, "m", _PaEnvironmentGetCommand_initOptions).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name}...`);
+                logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name || 'default'}...`);
             }
+            const environmentName = args.options.name ? formatting_1.formatting.encodeQueryParameter(args.options.name) : '~default';
             const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.PowerApps/environments/${formatting_1.formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+                url: `${this.resource}/providers/Microsoft.PowerApps/environments/${environmentName}?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -61,9 +63,15 @@ class PaEnvironmentGetCommand extends PowerAppsCommand_1.default {
         });
     }
 }
-_PaEnvironmentGetCommand_instances = new WeakSet(), _PaEnvironmentGetCommand_initOptions = function _PaEnvironmentGetCommand_initOptions() {
+_PaEnvironmentGetCommand_instances = new WeakSet(), _PaEnvironmentGetCommand_initTelemetry = function _PaEnvironmentGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            name: typeof args.options.name !== 'undefined'
+        });
+    });
+}, _PaEnvironmentGetCommand_initOptions = function _PaEnvironmentGetCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --name <name>'
+        option: '-n, --name [name]'
     });
 };
 module.exports = new PaEnvironmentGetCommand();