@pnp/cli-microsoft365 6.11.0-beta.7edcad2 → 6.11.0-beta.b75e15f

package/dist/Auth.js

@@ -588,7 +588,8 @@ class Auth {
             resource = resource.substr(0, pos);
         }
         if (resource === 'https://api.bap.microsoft.com' ||
-            resource === 'https://api.powerapps.com') {
+            resource === 'https://api.powerapps.com' ||
+            resource.endsWith('.api.bap.microsoft.com')) {
             resource = 'https://service.powerapps.com/';
         }
         if (resource === 'https://api.powerbi.com') {

package/dist/Command.js

@@ -168,7 +168,7 @@ class Command {
             const resultOptionValue = yield inquirer
                 .prompt({
                 name: 'missingRequiredOptionValue',
-                message: `Value for '${missingRequiredOptionName}':`
+                message: `${missingRequiredOptionName}:`
             });
             args.options[missingRequiredOptionName] = resultOptionValue.missingRequiredOptionValue;
             Cli_1.Cli.log();

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

@@ -0,0 +1,29 @@
+"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 Cli_1 = require("../../../../cli/Cli");
+const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
+const commands_1 = require("../../commands");
+class CliConfigListCommand extends AnonymousCommand_1.default {
+    get name() {
+        return commands_1.default.CONFIG_LIST;
+    }
+    get description() {
+        return 'List all self set CLI for Microsoft 365 configurations';
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            logger.log(Cli_1.Cli.getInstance().config.all);
+        });
+    }
+}
+module.exports = new CliConfigListCommand();
+//# sourceMappingURL=config-list.js.map

package/dist/m365/cli/commands.js

@@ -8,6 +8,7 @@ exports.default = {
     COMPLETION_SH_SETUP: `${prefix} completion sh setup`,
     COMPLETION_SH_UPDATE: `${prefix} completion sh update`,
     CONFIG_GET: `${prefix} config get`,
+    CONFIG_LIST: `${prefix} config list`,
     CONFIG_RESET: `${prefix} config reset`,
     CONFIG_SET: `${prefix} config set`,
     CONSENT: `${prefix} consent`,

package/dist/m365/pa/commands/app/app-permission-ensure.js

@@ -0,0 +1,177 @@
+"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 _PaAppPermissionEnsureCommand_instances, _PaAppPermissionEnsureCommand_initTelemetry, _PaAppPermissionEnsureCommand_initOptions, _PaAppPermissionEnsureCommand_initValidators, _PaAppPermissionEnsureCommand_initOptionSets, _PaAppPermissionEnsureCommand_initTypes;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const validation_1 = require("../../../../utils/validation");
+const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
+const commands_1 = require("../../commands");
+const aadUser_1 = require("../../../../utils/aadUser");
+const accessToken_1 = require("../../../../utils/accessToken");
+const Auth_1 = require("../../../../Auth");
+class PaAppPermissionEnsureCommand extends PowerAppsCommand_1.default {
+    get name() {
+        return commands_1.default.APP_PERMISSION_ENSURE;
+    }
+    get description() {
+        return 'Assigns/updates permissions to a Power Apps app';
+    }
+    constructor() {
+        super();
+        _PaAppPermissionEnsureCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initTypes).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Assigning/updating permissions for '${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || (args.options.tenant && 'everyone')}' to the Power Apps app '${args.options.appName}'...`);
+            }
+            try {
+                const principalId = yield this.getPrincipalId(args.options);
+                const requestOptions = {
+                    url: `${this.resource}/providers/Microsoft.PowerApps/${args.options.asAdmin ? `scopes/admin/environments/${args.options.environmentName}/` : ''}apps/${args.options.appName}/modifyPermissions?api-version=2022-11-01`,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    data: {
+                        put: [
+                            {
+                                properties: {
+                                    principal: {
+                                        id: principalId,
+                                        type: this.getPrincipalType(args.options)
+                                    },
+                                    NotifyShareTargetOption: args.options.sendInvitationMail ? 'Notify' : 'DoNotNotify',
+                                    roleName: args.options.roleName
+                                }
+                            }
+                        ]
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getPrincipalType(options) {
+        if (options.userId || options.userName) {
+            return 'User';
+        }
+        if (options.groupId || options.groupName) {
+            return 'Group';
+        }
+        return 'Tenant';
+    }
+    getPrincipalId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.groupId) {
+                return options.groupId;
+            }
+            if (options.userId) {
+                return options.userId;
+            }
+            if (options.groupName) {
+                const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(options.groupName);
+                return group.id;
+            }
+            if (options.userName) {
+                const userId = yield aadUser_1.aadUser.getUserIdByUpn(options.userName);
+                return userId;
+            }
+            return accessToken_1.accessToken.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+        });
+    }
+}
+_PaAppPermissionEnsureCommand_instances = new WeakSet(), _PaAppPermissionEnsureCommand_initTelemetry = function _PaAppPermissionEnsureCommand_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',
+            tenant: !!args.options.tenant,
+            sendInvitationMail: !!args.options.sendInvitationMail,
+            environmentName: typeof args.options.environmentName !== 'undefined',
+            asAdmin: !!args.options.asAdmin
+        });
+    });
+}, _PaAppPermissionEnsureCommand_initOptions = function _PaAppPermissionEnsureCommand_initOptions() {
+    this.options.unshift({
+        option: '--appName <appName>'
+    }, {
+        option: '--roleName <roleName>',
+        autocomplete: PaAppPermissionEnsureCommand.roleNames
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--tenant'
+    }, {
+        option: '-e, --environmentName [environmentName]'
+    }, {
+        option: '--sendInvitationMail'
+    }, {
+        option: '--asAdmin'
+    });
+}, _PaAppPermissionEnsureCommand_initValidators = function _PaAppPermissionEnsureCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.appName)) {
+            return `${args.options.appName} is not a valid GUID for appName.`;
+        }
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID for userId.`;
+        }
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID for groupId.`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid user principal name (UPN) for userName.`;
+        }
+        if (PaAppPermissionEnsureCommand.roleNames.indexOf(args.options.roleName) < 0) {
+            return `${args.options.roleName} is not a valid roleName. Allowed values are: ${PaAppPermissionEnsureCommand.roleNames.join(', ')}.`;
+        }
+        if (args.options.environmentName && !args.options.asAdmin) {
+            return 'Specifying environmentName is only allowed when using asAdmin.';
+        }
+        if (args.options.asAdmin && !args.options.environmentName) {
+            return 'Specifying asAdmin is only allowed when using environmentName.';
+        }
+        if (args.options.tenant && args.options.roleName !== 'CanView') {
+            return 'Sharing with the entire tenant is only supported with CanView role.';
+        }
+        return true;
+    }));
+}, _PaAppPermissionEnsureCommand_initOptionSets = function _PaAppPermissionEnsureCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName', 'tenant'] });
+}, _PaAppPermissionEnsureCommand_initTypes = function _PaAppPermissionEnsureCommand_initTypes() {
+    this.types.string.push('appName', 'roleName', 'userId', 'userName', 'groupId', 'groupName', 'environmentName');
+};
+PaAppPermissionEnsureCommand.roleNames = ['CanEdit', 'CanView'];
+module.exports = new PaAppPermissionEnsureCommand();
+//# sourceMappingURL=app-permission-ensure.js.map

package/dist/m365/pa/commands/app/app-permission-remove.js

@@ -0,0 +1,170 @@
+"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 _PaAppPermissionRemoveCommand_instances, _PaAppPermissionRemoveCommand_initTelemetry, _PaAppPermissionRemoveCommand_initOptions, _PaAppPermissionRemoveCommand_initValidators, _PaAppPermissionRemoveCommand_initOptionSets, _PaAppPermissionRemoveCommand_initTypes;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const validation_1 = require("../../../../utils/validation");
+const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
+const commands_1 = require("../../commands");
+const aadUser_1 = require("../../../../utils/aadUser");
+const accessToken_1 = require("../../../../utils/accessToken");
+const Auth_1 = require("../../../../Auth");
+const Cli_1 = require("../../../../cli/Cli");
+class PaAppPermissionRemoveCommand extends PowerAppsCommand_1.default {
+    get name() {
+        return commands_1.default.APP_PERMISSION_REMOVE;
+    }
+    get description() {
+        return 'Removes permissions to a Power Apps app';
+    }
+    constructor() {
+        super();
+        _PaAppPermissionRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initTypes).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (args.options.confirm) {
+                    yield this.removeAppPermission(logger, args.options);
+                }
+                else {
+                    const result = yield Cli_1.Cli.prompt({
+                        type: 'confirm',
+                        name: 'continue',
+                        default: false,
+                        message: `Are you sure you want to remove the permissions of '${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || (args.options.tenant && 'everyone')}' from the Power App '${args.options.appName}'?`
+                    });
+                    if (result.continue) {
+                        yield this.removeAppPermission(logger, args.options);
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    removeAppPermission(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing permissions for '${options.userId || options.userName || options.groupId || options.groupName || (options.tenant && 'everyone')}' for the Power Apps app ${options.appName}...`);
+            }
+            const principalId = yield this.getPrincipalId(options);
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.PowerApps/${options.asAdmin ? `scopes/admin/environments/${options.environmentName}/` : ''}apps/${options.appName}/modifyPermissions?api-version=2022-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                data: {
+                    delete: [
+                        {
+                            id: principalId
+                        }
+                    ]
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+    getPrincipalId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.groupId) {
+                return options.groupId;
+            }
+            if (options.userId) {
+                return options.userId;
+            }
+            if (options.groupName) {
+                const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(options.groupName);
+                return group.id;
+            }
+            if (options.userName) {
+                const userId = yield aadUser_1.aadUser.getUserIdByUpn(options.userName);
+                return userId;
+            }
+            return `tenant-${accessToken_1.accessToken.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)}`;
+        });
+    }
+}
+_PaAppPermissionRemoveCommand_instances = new WeakSet(), _PaAppPermissionRemoveCommand_initTelemetry = function _PaAppPermissionRemoveCommand_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',
+            tenant: !!args.options.tenant,
+            asAdmin: !!args.options.asAdmin,
+            environmentName: typeof args.options.environmentName !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _PaAppPermissionRemoveCommand_initOptions = function _PaAppPermissionRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--appName <appName>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--tenant'
+    }, {
+        option: '--asAdmin'
+    }, {
+        option: '-e, --environmentName [environmentName]'
+    }, {
+        option: '--confirm'
+    });
+}, _PaAppPermissionRemoveCommand_initValidators = function _PaAppPermissionRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.appName)) {
+            return `${args.options.appName} is not a valid GUID for appName.`;
+        }
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID for userId.`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid user principal name (UPN) for userName.`;
+        }
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID for groupId.`;
+        }
+        if (args.options.environmentName && !args.options.asAdmin) {
+            return 'Specifying environmentName is only allowed when using asAdmin';
+        }
+        if (args.options.asAdmin && !args.options.environmentName) {
+            return 'Specifying asAdmin is only allowed when using environmentName';
+        }
+        return true;
+    }));
+}, _PaAppPermissionRemoveCommand_initOptionSets = function _PaAppPermissionRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName', 'tenant'] });
+}, _PaAppPermissionRemoveCommand_initTypes = function _PaAppPermissionRemoveCommand_initTypes() {
+    this.types.string.push('appName', 'userId', 'userName', 'groupId', 'groupName', 'environmentName');
+};
+module.exports = new PaAppPermissionRemoveCommand();
+//# sourceMappingURL=app-permission-remove.js.map

package/dist/m365/pa/commands.js

@@ -8,7 +8,9 @@ exports.default = {
     APP_REMOVE: `${prefix} app remove`,
     APP_CONSENT_SET: `${prefix} app consent set`,
     APP_OWNER_SET: `${prefix} app owner set`,
+    APP_PERMISSION_ENSURE: `${prefix} app permission ensure`,
     APP_PERMISSION_LIST: `${prefix} app permission list`,
+    APP_PERMISSION_REMOVE: `${prefix} app permission remove`,
     CONNECTOR_EXPORT: `${prefix} connector export`,
     CONNECTOR_LIST: `${prefix} connector list`,
     ENVIRONMENT_GET: `${prefix} environment get`,

package/dist/m365/planner/commands/bucket/bucket-add.js

@@ -73,8 +73,8 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
                 const plan = yield planner_1.planner.getPlanByTitle(args.options.planTitle, groupId);
                 return plan.id;
             }
-            const plans = yield planner_1.planner.getPlansByRosterId(args.options.rosterId);
-            return plans[0].id;
+            const plan = yield planner_1.planner.getPlanByRosterId(args.options.rosterId);
+            return plan.id;
         });
     }
     getGroupId(args) {

package/dist/m365/planner/commands/bucket/bucket-get.js

@@ -84,8 +84,8 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
                 const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
                 return plan.id;
             }
-            const plans = yield planner_1.planner.getPlansByRosterId(rosterId);
-            return plans[0].id;
+            const plan = yield planner_1.planner.getPlanByRosterId(rosterId);
+            return plan.id;
         });
     }
     getBucketById(id) {

package/dist/m365/planner/commands/bucket/bucket-list.js

@@ -61,8 +61,8 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
                 const plan = yield planner_1.planner.getPlanByTitle(args.options.planTitle, groupId);
                 return plan.id;
             }
-            const plans = yield planner_1.planner.getPlansByRosterId(args.options.rosterId);
-            return plans[0].id;
+            const plan = yield planner_1.planner.getPlanByRosterId(args.options.rosterId);
+            return plan.id;
         });
     }
     getGroupId(args) {

package/dist/m365/planner/commands/bucket/bucket-remove.js

@@ -114,8 +114,8 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
                 const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
                 return plan.id;
             }
-            const plans = yield planner_1.planner.getPlansByRosterId(rosterId);
-            return plans[0].id;
+            const plan = yield planner_1.planner.getPlanByRosterId(rosterId);
+            return plan.id;
         });
     }
     getGroupId(args) {

package/dist/m365/planner/commands/bucket/bucket-set.js

@@ -105,8 +105,8 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
                 const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
                 return plan.id;
             }
-            const plans = yield planner_1.planner.getPlansByRosterId(rosterId);
-            return plans[0].id;
+            const plan = yield planner_1.planner.getPlanByRosterId(rosterId);
+            return plan.id;
         });
     }
     getGroupId(args) {

package/dist/m365/planner/commands/plan/plan-get.js

@@ -50,8 +50,7 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
                 else {
                     let plan = {};
                     if (args.options.rosterId) {
-                        const plans = yield planner_1.planner.getPlansByRosterId(args.options.rosterId);
-                        plan = plans[0];
+                        plan = yield planner_1.planner.getPlanByRosterId(args.options.rosterId);
                     }
                     else {
                         let groupId = undefined;

package/dist/m365/planner/commands/plan/plan-list.js

@@ -41,17 +41,16 @@ class PlannerPlanListCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                let plannerPlans = null;
+                let plannerPlans = [];
                 if (args.options.ownerGroupId || args.options.ownerGroupName) {
                     const groupId = yield this.getGroupId(args);
                     plannerPlans = yield planner_1.planner.getPlansByGroupId(groupId);
                 }
                 else {
-                    plannerPlans = yield planner_1.planner.getPlansByRosterId(args.options.rosterId);
-                }
-                if (plannerPlans && plannerPlans.length > 0) {
-                    logger.log(plannerPlans);
+                    const plan = yield planner_1.planner.getPlanByRosterId(args.options.rosterId);
+                    plannerPlans.push(plan);
                 }
+                logger.log(plannerPlans);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

package/dist/m365/planner/commands/plan/plan-set.js

@@ -61,8 +61,8 @@ class PlannerPlanSetCommand extends GraphCommand_1.default {
             }
             let groupId = '';
             if (args.options.rosterId) {
-                const plans = yield planner_1.planner.getPlansByRosterId(args.options.rosterId);
-                return plans[0].id;
+                const plan = yield planner_1.planner.getPlanByRosterId(args.options.rosterId);
+                return plan.id;
             }
             else {
                 groupId = yield this.getGroupId(args);

package/dist/m365/spfx/commands/project/project-doctor/{doctor-1.18.0-beta.1.js → doctor-1.18.0-beta.5.js}

@@ -20,4 +20,4 @@ module.exports = [
     new FN002016_DEVDEP_types_react_dom_1.FN002016_DEVDEP_types_react_dom('17'),
     new FN002019_DEVDEP_microsoft_rush_stack_compiler_1.FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.5'])
 ];
-//# sourceMappingURL=doctor-1.18.0-beta.1.js.map
+//# sourceMappingURL=doctor-1.18.0-beta.5.js.map

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

@@ -78,7 +78,7 @@ class SpfxProjectDoctorCommand extends base_project_command_1.BaseProjectCommand
             '1.17.2',
             '1.17.3',
             '1.17.4',
-            '1.18.0-beta.1'
+            '1.18.0-beta.5'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);

package/dist/m365/spfx/commands/project/project-externalize/rules/PnPJsRule.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PnPJsRule = void 0;
 const BasicDependencyRule_1 = require("./BasicDependencyRule");
@@ -46,31 +55,33 @@ class PnPJsRule extends BasicDependencyRule_1.BasicDependencyRule {
         ];
     }
     visit(project) {
-        const findings = this.pnpModules
-            .map(x => this.getModuleAndParents(project, x.key))
-            .reduce((x, y) => [...x, ...y]);
-        const files = this.getEntryFilesList(project);
-        const rawFileEdits = this.pnpModules.filter(x => findings.find(y => y.key === x.key) !== undefined)
-            .filter(x => x.shadowRequire !== undefined)
-            .map(x => files.map(y => ({
-            action: "add",
-            path: y,
-            targetValue: x.shadowRequire
-        })));
-        const fileEdits = rawFileEdits.length > 0 ? rawFileEdits.reduce((x, y) => [...x, ...y]) : [];
-        if (findings.filter(x => x.key && x.key !== '@pnp/pnpjs').length > 0) { // we're adding tslib only if we found other packages that are not the bundle which already contains tslib
-            findings.push({
-                key: 'tslib',
-                globalName: 'tslib',
-                path: `https://unpkg.com/tslib@^1.10.0/tslib.js`
-            });
-            fileEdits.push(...files.map(x => ({
+        return __awaiter(this, void 0, void 0, function* () {
+            const findings = this.pnpModules
+                .map(x => this.getModuleAndParents(project, x.key))
+                .reduce((x, y) => [...x, ...y]);
+            const files = this.getEntryFilesList(project);
+            const rawFileEdits = this.pnpModules.filter(x => findings.find(y => y.key === x.key) !== undefined)
+                .filter(x => x.shadowRequire !== undefined)
+                .map(x => files.map(y => ({
                 action: "add",
-                path: x,
-                targetValue: 'require(\"tslib\");'
+                path: y,
+                targetValue: x.shadowRequire
             })));
-        }
-        return Promise.resolve({ entries: findings, suggestions: fileEdits });
+            const fileEdits = rawFileEdits.length > 0 ? rawFileEdits.reduce((x, y) => [...x, ...y]) : [];
+            if (findings.filter(x => x.key && x.key !== '@pnp/pnpjs').length > 0) { // we're adding tslib only if we found other packages that are not the bundle which already contains tslib
+                findings.push({
+                    key: 'tslib',
+                    globalName: 'tslib',
+                    path: `https://unpkg.com/tslib@^1.10.0/tslib.js`
+                });
+                fileEdits.push(...files.map(x => ({
+                    action: "add",
+                    path: x,
+                    targetValue: 'require(\"tslib\");'
+                })));
+            }
+            return { entries: findings, suggestions: fileEdits };
+        });
     }
     getEntryFilesList(project) {
         return project && project.manifests ? project.manifests.map(x => x.path.replace('.manifest.json', '.ts')) : [];

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.15.2.js

@@ -105,7 +105,7 @@ module.exports = [
                 'fixWith': 'symbol'
               },
               'Function': {
-                'message': 'The \\'Function\\' type accepts any function-like value.\nIt provides no type safety when calling the function, which can be a common source of bugs.\nIt also accepts things like class declarations, which will throw at runtime as they will not be called with \'new\'.\nIf you are expecting the function to accept certain arguments, you should explicitly define the function shape.'
+                'message': 'The \\'Function\\' type accepts any function-like value.\\nIt provides no type safety when calling the function, which can be a common source of bugs.\\nIt also accepts things like class declarations, which will throw at runtime as they will not be called with \\'new\\'.\\nIf you are expecting the function to accept certain arguments, you should explicitly define the function shape.'
               }
             }
           }