@pnp/cli-microsoft365 6.3.0-beta.655c566 → 6.3.0-beta.82f99fc

package/dist/cli/Cli.js

@@ -118,6 +118,8 @@ class Cli {
             }
             try {
                 // process options before passing them on to validation stage
+                const contextCommandOptions = this.loadOptionsFromContext(this.commandToExecute.options, optionsWithoutShorts.options.debug);
+                optionsWithoutShorts.options = Object.assign(Object.assign({}, contextCommandOptions), optionsWithoutShorts.options);
                 yield this.commandToExecute.command.processOptions(optionsWithoutShorts.options);
             }
             catch (e) {
@@ -283,6 +285,42 @@ class Cli {
         }
         this.loadCommandFromFile(commandFilePath);
     }
+    loadOptionsFromContext(commandOptions, debug) {
+        const filePath = '.m365rc.json';
+        let m365rc = {};
+        if (!fs.existsSync(filePath)) {
+            return;
+        }
+        if (debug) {
+            Cli.error('found .m365rc.json file');
+        }
+        try {
+            const fileContents = fs.readFileSync(filePath, 'utf8');
+            if (fileContents) {
+                m365rc = JSON.parse(fileContents);
+            }
+        }
+        catch (e) {
+            this.closeWithError(`Error parsing ${filePath}`, { options: {} });
+        }
+        if (!m365rc.context) {
+            return;
+        }
+        if (debug) {
+            Cli.error('found context in .m365rc.json file');
+        }
+        const context = m365rc.context;
+        const foundOptions = {};
+        commandOptions.forEach(option => {
+            if (context[option.name]) {
+                foundOptions[option.name] = context[option.name];
+                if (debug) {
+                    Cli.error(`returning ${option.name} option from context`);
+                }
+            }
+        });
+        return foundOptions;
+    }
     /**
      * Loads command from the specified file into CLI. If can't find the file
      * or the file doesn't contain a command, loads all available commands.

package/dist/m365/aad/commands/user/user-recyclebinitem-clear.js

@@ -0,0 +1,103 @@
+"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 _AadUserRecycleBinItemClearCommand_instances, _AadUserRecycleBinItemClearCommand_initTelemetry, _AadUserRecycleBinItemClearCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadUserRecycleBinItemClearCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.USER_RECYCLEBINITEM_CLEAR;
+    }
+    get description() {
+        return 'Removes all users from the tenant recycle bin';
+    }
+    constructor() {
+        super();
+        _AadUserRecycleBinItemClearCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserRecycleBinItemClearCommand_instances, "m", _AadUserRecycleBinItemClearCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserRecycleBinItemClearCommand_instances, "m", _AadUserRecycleBinItemClearCommand_initOptions).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const clearRecycleBinUsers = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const users = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/directory/deletedItems/microsoft.graph.user?$select=id`);
+                    if (this.verbose) {
+                        logger.logToStderr(`Amount of users to permanently delete: ${users.length}`);
+                    }
+                    const batchRequests = users.map((user, index) => {
+                        return {
+                            id: index,
+                            method: 'DELETE',
+                            url: `/directory/deletedItems/${user.id}`
+                        };
+                    });
+                    for (let i = 0; i < batchRequests.length; i += 20) {
+                        const batchRequestChunk = batchRequests.slice(i, i + 20);
+                        if (this.verbose) {
+                            logger.logToStderr(`Deleting users: ${i + batchRequestChunk.length}/${users.length}`);
+                        }
+                        const requestOptions = {
+                            url: `${this.resource}/v1.0/$batch`,
+                            headers: {
+                                accept: 'application/json',
+                                'content-type': 'application/json'
+                            },
+                            responseType: 'json',
+                            data: {
+                                requests: batchRequestChunk
+                            }
+                        };
+                        yield request_1.default.post(requestOptions);
+                    }
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield clearRecycleBinUsers();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: 'Are you sure you want to permanently delete all deleted users?'
+                });
+                if (result.continue) {
+                    yield clearRecycleBinUsers();
+                }
+            }
+        });
+    }
+}
+_AadUserRecycleBinItemClearCommand_instances = new WeakSet(), _AadUserRecycleBinItemClearCommand_initTelemetry = function _AadUserRecycleBinItemClearCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: !!args.options.confirm
+        });
+    });
+}, _AadUserRecycleBinItemClearCommand_initOptions = function _AadUserRecycleBinItemClearCommand_initOptions() {
+    this.options.unshift({
+        option: '--confirm'
+    });
+};
+module.exports = new AadUserRecycleBinItemClearCommand();
+//# sourceMappingURL=user-recyclebinitem-clear.js.map

package/dist/m365/aad/commands/user/user-recyclebinitem-remove.js

@@ -0,0 +1,92 @@
+"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 _AadUserRecycleBinItemRemoveCommand_instances, _AadUserRecycleBinItemRemoveCommand_initTelemetry, _AadUserRecycleBinItemRemoveCommand_initOptions, _AadUserRecycleBinItemRemoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadUserRecycleBinItemRemoveCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.USER_RECYCLEBINITEM_REMOVE;
+    }
+    get description() {
+        return 'Removes a user from the recycle bin in the current tenant';
+    }
+    constructor() {
+        super();
+        _AadUserRecycleBinItemRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserRecycleBinItemRemoveCommand_instances, "m", _AadUserRecycleBinItemRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserRecycleBinItemRemoveCommand_instances, "m", _AadUserRecycleBinItemRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadUserRecycleBinItemRemoveCommand_instances, "m", _AadUserRecycleBinItemRemoveCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const clearRecycleBinItem = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Permanently deleting user with id ${args.options.id} from Azure Active Directory`);
+                }
+                try {
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/directory/deletedItems/${args.options.id}`,
+                        headers: {}
+                    };
+                    yield request_1.default.delete(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield clearRecycleBinItem();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to permanently delete the user with id ${args.options.id}?`
+                });
+                if (result.continue) {
+                    yield clearRecycleBinItem();
+                }
+            }
+        });
+    }
+}
+_AadUserRecycleBinItemRemoveCommand_instances = new WeakSet(), _AadUserRecycleBinItemRemoveCommand_initTelemetry = function _AadUserRecycleBinItemRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: !!args.options.confirm
+        });
+    });
+}, _AadUserRecycleBinItemRemoveCommand_initOptions = function _AadUserRecycleBinItemRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--id <id>'
+    }, {
+        option: '--confirm'
+    });
+}, _AadUserRecycleBinItemRemoveCommand_initValidators = function _AadUserRecycleBinItemRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    }));
+};
+module.exports = new AadUserRecycleBinItemRemoveCommand();
+//# sourceMappingURL=user-recyclebinitem-remove.js.map

package/dist/m365/aad/commands.js

@@ -60,6 +60,8 @@ exports.default = {
     USER_HIBP: `${prefix} user hibp`,
     USER_LIST: `${prefix} user list`,
     USER_PASSWORD_VALIDATE: `${prefix} user password validate`,
+    USER_RECYCLEBINITEM_CLEAR: `${prefix} user recyclebinitem clear`,
+    USER_RECYCLEBINITEM_REMOVE: `${prefix} user recyclebinitem remove`,
     USER_SET: `${prefix} user set`,
     USER_SIGNIN_LIST: `${prefix} user signin list`
 };

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/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();

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

@@ -48,11 +48,18 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
                     logger.log(result);
                 }
                 else {
-                    let groupId = undefined;
-                    if (args.options.ownerGroupId || args.options.ownerGroupName) {
-                        groupId = yield this.getGroupId(args);
+                    let plan = {};
+                    if (args.options.rosterId) {
+                        const plans = yield planner_1.planner.getPlansByRosterId(args.options.rosterId);
+                        plan = plans[0];
+                    }
+                    else {
+                        let groupId = undefined;
+                        if (args.options.ownerGroupId || args.options.ownerGroupName) {
+                            groupId = yield this.getGroupId(args);
+                        }
+                        plan = yield planner_1.planner.getPlanByTitle(args.options.title, groupId);
                     }
-                    const plan = yield planner_1.planner.getPlanByTitle(args.options.title, groupId, args.options.rosterId);
                     const result = yield this.getPlanDetails(plan);
                     if (result) {
                         logger.log(result);
@@ -93,9 +100,9 @@ _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTel
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
-            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
-            rosterId: typeof args.options.rosterId !== 'undefined'
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
         });
     });
 }, _PlannerPlanGetCommand_initOptions = function _PlannerPlanGetCommand_initOptions() {
@@ -103,12 +110,12 @@ _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTel
         option: '-i, --id [id]'
     }, {
         option: '-t, --title [title]'
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--ownerGroupId [ownerGroupId]'
     }, {
         option: '--ownerGroupName [ownerGroupName]'
-    }, {
-        option: '--rosterId [rosterId]'
     });
 }, _PlannerPlanGetCommand_initValidators = function _PlannerPlanGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -119,9 +126,9 @@ _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTel
     }));
 }, _PlannerPlanGetCommand_initOptionSets = function _PlannerPlanGetCommand_initOptionSets() {
     this.optionSets.push({
-        options: ['id', 'title']
+        options: ['id', 'title', 'rosterId']
     }, {
-        options: ['ownerGroupId', 'ownerGroupName', 'rosterId'],
+        options: ['ownerGroupId', 'ownerGroupName'],
         runsWhen: (args) => {
             return args.options.title !== undefined;
         }

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

@@ -79,7 +79,7 @@ class PlannerPlanRemoveCommand extends GraphCommand_1.default {
                 return planner_1.planner.getPlanById(id, 'minimal');
             }
             const groupId = yield this.getGroupId(args);
-            return yield planner_1.planner.getPlanByTitle(title, groupId, undefined, 'minimal');
+            return yield planner_1.planner.getPlanByTitle(title, groupId, 'minimal');
         });
     }
     getGroupId(args) {

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

@@ -0,0 +1,140 @@
+"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 _PlannerRosterMemberRemoveCommand_instances, _PlannerRosterMemberRemoveCommand_initTelemetry, _PlannerRosterMemberRemoveCommand_initOptions, _PlannerRosterMemberRemoveCommand_initOptionSets, _PlannerRosterMemberRemoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const odata_1 = require("../../../../utils/odata");
+const aadUser_1 = require("../../../../utils/aadUser");
+class PlannerRosterMemberRemoveCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.ROSTER_MEMBER_REMOVE;
+    }
+    get description() {
+        return 'Removes a member from a Microsoft Planner Roster';
+    }
+    constructor() {
+        super();
+        _PlannerRosterMemberRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberRemoveCommand_instances, "m", _PlannerRosterMemberRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberRemoveCommand_instances, "m", _PlannerRosterMemberRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberRemoveCommand_instances, "m", _PlannerRosterMemberRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberRemoveCommand_instances, "m", _PlannerRosterMemberRemoveCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing member ${args.options.userName || args.options.userId} from the Microsoft Planner Roster`);
+            }
+            if (args.options.confirm) {
+                yield this.removeRosterMember(args);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove member '${args.options.userId || args.options.userName}'?`
+                });
+                if (result.continue) {
+                    yield this.removeRosterMember(args);
+                }
+            }
+        });
+    }
+    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);
+        });
+    }
+    removeRosterMember(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const rosterMembersContinue = yield this.removeLastMemberConfirmation(args);
+                if (rosterMembersContinue) {
+                    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'
+                    };
+                    yield request_1.default.delete(requestOptions);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    removeLastMemberConfirmation(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.confirm) {
+                const rosterMembers = yield odata_1.odata.getAllItems(`${this.resource}/beta/planner/rosters/${args.options.rosterId}/members?$select=Id`);
+                if (rosterMembers.length === 1) {
+                    const result = yield Cli_1.Cli.prompt({
+                        type: 'confirm',
+                        name: 'continue',
+                        default: false,
+                        message: `You are about to remove the last member of this Roster. When this happens, the Roster and all its contents will be deleted within 30 days. Are you sure you want to proceed?`
+                    });
+                    return result.continue;
+                }
+            }
+            return true;
+        });
+    }
+}
+_PlannerRosterMemberRemoveCommand_instances = new WeakSet(), _PlannerRosterMemberRemoveCommand_initTelemetry = function _PlannerRosterMemberRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _PlannerRosterMemberRemoveCommand_initOptions = function _PlannerRosterMemberRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--rosterId <rosterId>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--confirm'
+    });
+}, _PlannerRosterMemberRemoveCommand_initOptionSets = function _PlannerRosterMemberRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName'] });
+}, _PlannerRosterMemberRemoveCommand_initValidators = function _PlannerRosterMemberRemoveCommand_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 PlannerRosterMemberRemoveCommand();
+//# sourceMappingURL=roster-member-remove.js.map

package/dist/m365/planner/commands.js

@@ -16,6 +16,7 @@ exports.default = {
     ROSTER_GET: `${prefix} roster get`,
     ROSTER_MEMBER_ADD: `${prefix} roster member add`,
     ROSTER_MEMBER_LIST: `${prefix} roster member list`,
+    ROSTER_MEMBER_REMOVE: `${prefix} roster member remove`,
     ROSTER_REMOVE: `${prefix} roster remove`,
     TASK_ADD: `${prefix} task add`,
     TASK_CHECKLISTITEM_ADD: `${prefix} task checklistitem add`,

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PpEnvironmentGetCommand_instances, _PpEnvironmentGetCommand_initTelemetry, _PpEnvironmentGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const odata_1 = require("../../../../utils/odata");
 const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
 const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 class PpEnvironmentGetCommand extends PowerPlatformCommand_1.default {
     get name() {
         return commands_1.default.ENVIRONMENT_GET;
@@ -36,16 +37,24 @@ class PpEnvironmentGetCommand extends PowerPlatformCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let url = `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments`;
-            if (args.options.asAdmin) {
-                url = `${this.resource}/providers/Microsoft.BusinessAppPlatform/scopes/admin/environments`;
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving environment: ${args.options.name || 'default'}`);
             }
-            const res = yield odata_1.odata.getAllItems(`${url}?api-version=2020-10-01`);
-            const environmentItem = res.filter((env) => args.options.name ? env.name === args.options.name : env.properties.isDefault === true)[0];
-            if (!environmentItem) {
-                throw `The specified Power Platform environment does not exist`;
+            let url = `${this.resource}/providers/Microsoft.BusinessAppPlatform`;
+            if (args.options.asAdmin) {
+                url += '/scopes/admin';
             }
-            logger.log(environmentItem);
+            const envName = args.options.name ? formatting_1.formatting.encodeQueryParameter(args.options.name) : '~Default';
+            url += `/environments/${envName}?api-version=2020-10-01`;
+            const requestOptions = {
+                url: url,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            logger.log(response);
         });
     }
 }