@pnp/cli-microsoft365 6.4.0-beta.3946b02 → 6.4.0-beta.91f8cd3

package/README.md

@@ -15,7 +15,7 @@
       alt="GitHub" />
   </a>
 
-  <a href="https://discord.com/invite/7rfW4kg6B5">
+  <a href="https://discord.gg/35HTFJ544b">
     <img src="https://img.shields.io/badge/Discord-Join-7289da?style=flat-square"
       alt="Discord" />
   </a>
@@ -213,6 +213,17 @@ If you want to get involved with helping us grow the CLI, whether that is sugges
 
 Checkout our [Wiki](https://github.com/pnp/cli-microsoft365/wiki) for guides on how to contribute to this project.
 
+## Need Help?
+
+<h4 align="center">
+  Join our community
+</h4>
+<p align="center">
+  <a href="https://discord.gg/35HTFJ544b">
+    <img alt="Discord" src="./docs/docs/images/discord-logo.png" width="100"/>
+  </a>
+</p>
+
 ## Microsoft 365 Platform Community
 
 CLI for Microsoft 365 is a [Microsoft 365 Platform Community](https://pnp.github.io) (PnP) project. Microsoft 365 Platform Community is a virtual team consisting of Microsoft employees and community members focused on helping the community make the best use of Microsoft products. CLI for Microsoft 365 is an open-source project not affiliated with Microsoft and not covered by Microsoft support. If you experience any issues using the CLI, please submit an issue in the [issues list](https://github.com/pnp/cli-microsoft365/issues).

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

@@ -101,6 +101,9 @@ _AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry =
             !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
         return true;
     }));
 }, _AadUserGetCommand_initOptionSets = function _AadUserGetCommand_initOptionSets() {

package/dist/m365/aad/commands/user/user-set.js

@@ -170,6 +170,9 @@ _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry =
             !validation_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
+        if (args.options.userPrincipalName && !validation_1.validation.isValidUserPrincipalName(args.options.userPrincipalName)) {
+            return `${args.options.userPrincipalName} is not a valid userPrincipalName`;
+        }
         if (!args.options.resetPassword && ((args.options.currentPassword && !args.options.newPassword) || (args.options.newPassword && !args.options.currentPassword))) {
             return `Specify both currentPassword and newPassword when you want to change your password`;
         }

package/dist/m365/aad/commands/user/user-signin-list.js

@@ -90,6 +90,9 @@ _AadUserSigninListCommand_instances = new WeakSet(), _AadUserSigninListCommand_i
         if (args.options.appId && args.options.appDisplayName) {
             return 'Specify either appId or appDisplayName, but not both';
         }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
         if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }

package/dist/m365/flow/commands/owner/owner-add.js

@@ -0,0 +1,147 @@
+"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 _FlowOwnerAddCommand_instances, _FlowOwnerAddCommand_initTelemetry, _FlowOwnerAddCommand_initOptions, _FlowOwnerAddCommand_initOptionSets, _FlowOwnerAddCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const aadUser_1 = require("../../../../utils/aadUser");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
+const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
+const commands_1 = require("../../commands");
+class FlowOwnerAddCommand extends AzmgmtCommand_1.default {
+    get name() {
+        return commands_1.default.OWNER_ADD;
+    }
+    get description() {
+        return 'Assigns permissions to a Power Automate flow';
+    }
+    constructor() {
+        super();
+        _FlowOwnerAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowOwnerAddCommand_instances, "m", _FlowOwnerAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _FlowOwnerAddCommand_instances, "m", _FlowOwnerAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowOwnerAddCommand_instances, "m", _FlowOwnerAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _FlowOwnerAddCommand_instances, "m", _FlowOwnerAddCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Assigning permissions for ${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName} with permissions ${args.options.roleName} to Power Automate flow ${args.options.flowName}`);
+                }
+                let id = '';
+                if (args.options.userId) {
+                    id = args.options.userId;
+                }
+                else if (args.options.userName) {
+                    id = yield aadUser_1.aadUser.getUserIdByUpn(args.options.userName);
+                }
+                else if (args.options.groupId) {
+                    id = args.options.groupId;
+                }
+                else {
+                    id = yield aadGroup_1.aadGroup.getGroupIdByDisplayName(args.options.groupName);
+                }
+                let type;
+                if (args.options.userId || args.options.userName) {
+                    type = 'User';
+                }
+                else {
+                    type = 'Group';
+                }
+                const requestOptions = {
+                    url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    data: {
+                        put: [
+                            {
+                                properties: {
+                                    principal: {
+                                        id: id,
+                                        type: type
+                                    },
+                                    roleName: args.options.roleName
+                                }
+                            }
+                        ]
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_FlowOwnerAddCommand_instances = new WeakSet(), _FlowOwnerAddCommand_initTelemetry = function _FlowOwnerAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            asAdmin: !!args.options.asAdmin,
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined'
+        });
+    });
+}, _FlowOwnerAddCommand_initOptions = function _FlowOwnerAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '-f, --flowName <flowName>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--roleName <roleName>',
+        autocomplete: FlowOwnerAddCommand.allowedRoleNames
+    }, {
+        option: '--asAdmin'
+    });
+}, _FlowOwnerAddCommand_initOptionSets = function _FlowOwnerAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName'] });
+}, _FlowOwnerAddCommand_initValidators = function _FlowOwnerAddCommand_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.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID.`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName.`;
+        }
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID.`;
+        }
+        if (FlowOwnerAddCommand.allowedRoleNames.indexOf(args.options.roleName) === -1) {
+            return `${args.options.roleName} is not a valid roleName. Valid values are: ${FlowOwnerAddCommand.allowedRoleNames.join(', ')}`;
+        }
+        return true;
+    }));
+};
+FlowOwnerAddCommand.allowedRoleNames = ['CanView', 'CanEdit'];
+module.exports = new FlowOwnerAddCommand();
+//# sourceMappingURL=owner-add.js.map

package/dist/m365/flow/commands/owner/owner-remove.js

@@ -0,0 +1,147 @@
+"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 _FlowOwnerRemoveCommand_instances, _FlowOwnerRemoveCommand_initTelemetry, _FlowOwnerRemoveCommand_initOptions, _FlowOwnerRemoveCommand_initValidators, _FlowOwnerRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const aadUser_1 = require("../../../../utils/aadUser");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
+const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
+const commands_1 = require("../../commands");
+class FlowOwnerRemoveCommand extends AzmgmtCommand_1.default {
+    get name() {
+        return commands_1.default.OWNER_REMOVE;
+    }
+    get description() {
+        return 'Removes owner permissions to a Power Automate flow';
+    }
+    constructor() {
+        super();
+        _FlowOwnerRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowOwnerRemoveCommand_instances, "m", _FlowOwnerRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _FlowOwnerRemoveCommand_instances, "m", _FlowOwnerRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowOwnerRemoveCommand_instances, "m", _FlowOwnerRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _FlowOwnerRemoveCommand_instances, "m", _FlowOwnerRemoveCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing owner ${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName} from flow ${args.options.flowName} in environment ${args.options.environmentName}`);
+                }
+                const removeFlowOwner = () => __awaiter(this, void 0, void 0, function* () {
+                    let idToRemove = '';
+                    if (args.options.userId) {
+                        idToRemove = args.options.userId;
+                    }
+                    else if (args.options.userName) {
+                        idToRemove = yield aadUser_1.aadUser.getUserIdByUpn(args.options.userName);
+                    }
+                    else if (args.options.groupId) {
+                        idToRemove = args.options.groupId;
+                    }
+                    else {
+                        idToRemove = yield aadGroup_1.aadGroup.getGroupIdByDisplayName(args.options.groupName);
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
+                        headers: {
+                            accept: 'application/json'
+                        },
+                        data: {
+                            delete: [
+                                {
+                                    id: idToRemove
+                                }
+                            ]
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                });
+                if (args.options.confirm) {
+                    yield removeFlowOwner();
+                }
+                else {
+                    const result = yield Cli_1.Cli.prompt({
+                        type: 'confirm',
+                        name: 'continue',
+                        default: false,
+                        message: `Are you sure you want to remove owner '${args.options.groupId || args.options.groupName || args.options.userId || args.options.userName}' from the specified flow?`
+                    });
+                    if (result.continue) {
+                        yield removeFlowOwner();
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_FlowOwnerRemoveCommand_instances = new WeakSet(), _FlowOwnerRemoveCommand_initTelemetry = function _FlowOwnerRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            asAdmin: !!args.options.asAdmin,
+            confirm: !!args.options.confirm
+        });
+    });
+}, _FlowOwnerRemoveCommand_initOptions = function _FlowOwnerRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '-f, --flowName <flowName>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--asAdmin'
+    }, {
+        option: '--confirm'
+    });
+}, _FlowOwnerRemoveCommand_initValidators = function _FlowOwnerRemoveCommand_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.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID.`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName.`;
+        }
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID.`;
+        }
+        return true;
+    }));
+}, _FlowOwnerRemoveCommand_initOptionSets = function _FlowOwnerRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName'] });
+};
+module.exports = new FlowOwnerRemoveCommand();
+//# sourceMappingURL=owner-remove.js.map

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

@@ -42,7 +42,7 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
             if (this.verbose) {
                 logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flowName}...`);
             }
-            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`;
+            let url = `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}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 ')}`;
@@ -86,7 +86,8 @@ _FlowRunListCommand_instances = new WeakSet(), _FlowRunListCommand_initTelemetry
         Object.assign(this.telemetryProperties, {
             status: typeof args.options.status !== 'undefined',
             triggerStartTime: typeof args.options.triggerStartTime !== 'undefined',
-            triggerEndTime: typeof args.options.triggerEndTime !== 'undefined'
+            triggerEndTime: typeof args.options.triggerEndTime !== 'undefined',
+            asAdmin: !!args.options.asAdmin
         });
     });
 }, _FlowRunListCommand_initOptions = function _FlowRunListCommand_initOptions() {
@@ -101,6 +102,8 @@ _FlowRunListCommand_instances = new WeakSet(), _FlowRunListCommand_initTelemetry
         option: '--triggerStartTime [triggerStartTime]'
     }, {
         option: '--triggerEndTime [triggerEndTime]'
+    }, {
+        option: '--asAdmin'
     });
 }, _FlowRunListCommand_initValidators = function _FlowRunListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/flow/commands.js

@@ -11,7 +11,9 @@ exports.default = {
     EXPORT: `${prefix} export`,
     GET: `${prefix} get`,
     LIST: `${prefix} list`,
+    OWNER_ADD: `${prefix} owner add`,
     OWNER_LIST: `${prefix} owner list`,
+    OWNER_REMOVE: `${prefix} owner remove`,
     REMOVE: `${prefix} remove`,
     RUN_CANCEL: `${prefix} run cancel`,
     RUN_GET: `${prefix} run get`,

package/dist/m365/planner/commands/roster/roster-member-add.js

@@ -106,6 +106,9 @@ _PlannerRosterMemberAddCommand_instances = new WeakSet(), _PlannerRosterMemberAd
         if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid user principal name (UPN)`;
+        }
         return true;
     }));
 };

package/dist/m365/planner/commands/roster/roster-member-get.js

@@ -0,0 +1,98 @@
+"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 _PlannerRosterMemberGetCommand_instances, _PlannerRosterMemberGetCommand_initTelemetry, _PlannerRosterMemberGetCommand_initOptions, _PlannerRosterMemberGetCommand_initOptionSets, _PlannerRosterMemberGetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const aadUser_1 = require("../../../../utils/aadUser");
+class PlannerRosterMemberGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.ROSTER_MEMBER_GET;
+    }
+    get description() {
+        return 'Gets a member of the specified Microsoft Planner Roster';
+    }
+    constructor() {
+        super();
+        _PlannerRosterMemberGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving member ${args.options.userName || args.options.userId} from the Microsoft Planner Roster`);
+            }
+            try {
+                const userId = yield this.getUserId(args);
+                const requestOptions = {
+                    url: `${this.resource}/beta/planner/rosters/${args.options.rosterId}/members/${userId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const response = yield request_1.default.get(requestOptions);
+                logger.log(response);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getUserId(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.userId) {
+                return args.options.userId;
+            }
+            return aadUser_1.aadUser.getUserIdByUpn(args.options.userName);
+        });
+    }
+}
+_PlannerRosterMemberGetCommand_instances = new WeakSet(), _PlannerRosterMemberGetCommand_initTelemetry = function _PlannerRosterMemberGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _PlannerRosterMemberGetCommand_initOptions = function _PlannerRosterMemberGetCommand_initOptions() {
+    this.options.unshift({
+        option: '--rosterId <rosterId>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _PlannerRosterMemberGetCommand_initOptionSets = function _PlannerRosterMemberGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName'] });
+}, _PlannerRosterMemberGetCommand_initValidators = function _PlannerRosterMemberGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
+        return true;
+    }));
+};
+module.exports = new PlannerRosterMemberGetCommand();
+//# sourceMappingURL=roster-member-get.js.map

package/dist/m365/planner/commands.js

@@ -15,6 +15,7 @@ exports.default = {
     ROSTER_ADD: `${prefix} roster add`,
     ROSTER_GET: `${prefix} roster get`,
     ROSTER_MEMBER_ADD: `${prefix} roster member add`,
+    ROSTER_MEMBER_GET: `${prefix} roster member get`,
     ROSTER_MEMBER_LIST: `${prefix} roster member list`,
     ROSTER_MEMBER_REMOVE: `${prefix} roster member remove`,
     ROSTER_REMOVE: `${prefix} roster remove`,

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -18,8 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const child_process = require("child_process");
 const semver_1 = require("semver");
-const AnonymousCommand_1 = require("../../base/AnonymousCommand");
 const commands_1 = require("../commands");
+const base_project_command_1 = require("./project/base-project-command");
 /**
  * Has the particular check passed or failed
  */
@@ -64,7 +64,7 @@ var SharePointVersion;
     SharePointVersion[SharePointVersion["SPO"] = 4] = "SPO";
     SharePointVersion[SharePointVersion["All"] = 7] = "All";
 })(SharePointVersion || (SharePointVersion = {}));
-class SpfxDoctorCommand extends AnonymousCommand_1.default {
+class SpfxDoctorCommand extends base_project_command_1.BaseProjectCommand {
     get allowedOutputs() {
         return ['text'];
     }
@@ -479,6 +479,7 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             if (!args.options.output) {
                 args.options.output = 'text';
             }
+            this.projectRootPath = this.getProjectRoot(process.cwd());
             logger.log(' ');
             logger.log('CLI for Microsoft 365 SharePoint Framework doctor');
             logger.log('Verifying configuration of your system for working with the SharePoint Framework');
@@ -557,9 +558,11 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
         });
     }
     checkSharePointFrameworkVersion(spfxVersionRequested, fixes, logger) {
-        return this
-            .getPackageVersion('@microsoft/generator-sharepoint', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
-            .then((spfxVersionDetected) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            let spfxVersionDetected = this.getSPFxVersionFromYoRcFile(logger);
+            if (!spfxVersionDetected) {
+                spfxVersionDetected = yield this.getPackageVersion('@microsoft/generator-sharepoint', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger);
+            }
             const versionCheck = {
                 range: spfxVersionRequested,
                 fix: `npm i -g @microsoft/generator-sharepoint@${spfxVersionRequested}`
@@ -625,39 +628,50 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
     spVersionStringToEnum(sp) {
         return SharePointVersion[sp.toUpperCase()];
     }
+    getSPFxVersionFromYoRcFile(logger) {
+        if (this.projectRootPath !== null) {
+            const spfxVersion = this.getProjectVersion();
+            if (spfxVersion) {
+                if (this.debug) {
+                    logger.logToStderr(`SPFx version retrieved from .yo-rc.json file. Retrieved version: ${spfxVersion}`);
+                }
+                return spfxVersion;
+            }
+        }
+        return undefined;
+    }
     getSharePointFrameworkVersion(logger) {
-        return new Promise((resolve, reject) => {
-            if (this.debug) {
-                logger.logToStderr('Detecting SharePoint Framework version based on @microsoft/sp-core-library local...');
+        return __awaiter(this, void 0, void 0, function* () {
+            let spfxVersion = this.getSPFxVersionFromYoRcFile(logger);
+            if (spfxVersion) {
+                return spfxVersion;
             }
-            this
-                .getPackageVersion('@microsoft/sp-core-library', PackageSearchMode.LocalOnly, HandlePromise.Fail, logger)
-                .then((version) => {
+            try {
+                spfxVersion = yield this.getPackageVersion('@microsoft/sp-core-library', PackageSearchMode.LocalOnly, HandlePromise.Fail, logger);
                 if (this.debug) {
-                    logger.logToStderr(`Found @microsoft/sp-core-library@${version}`);
+                    logger.logToStderr(`Found @microsoft/sp-core-library@${spfxVersion}`);
                 }
-                return Promise.resolve(version);
-            })
-                .catch(() => {
+                return spfxVersion;
+            }
+            catch (_a) {
                 if (this.debug) {
                     logger.logToStderr(`@microsoft/sp-core-library not found. Search for @microsoft/generator-sharepoint local or global...`);
                 }
-                return this.getPackageVersion('@microsoft/generator-sharepoint', PackageSearchMode.LocalAndGlobal, HandlePromise.Fail, logger);
-            })
-                .then((version) => {
-                resolve(version);
-            })
-                .catch((error) => {
-                if (this.debug) {
-                    logger.logToStderr('@microsoft/generator-sharepoint not found');
-                }
-                if (error && error.indexOf('ENOENT') > -1) {
-                    reject('npm not found');
+                try {
+                    return yield this.getPackageVersion('@microsoft/generator-sharepoint', PackageSearchMode.LocalAndGlobal, HandlePromise.Fail, logger);
                 }
-                else {
-                    resolve('');
+                catch (error) {
+                    if (this.debug) {
+                        logger.logToStderr('@microsoft/generator-sharepoint not found');
+                    }
+                    if (error && error.indexOf('ENOENT') > -1) {
+                        throw 'npm not found';
+                    }
+                    else {
+                        return '';
+                    }
                 }
-            });
+            }
         });
     }
     getPackageVersion(packageName, searchMode, handlePromise, logger) {