@pnp/cli-microsoft365 5.8.0-beta.40c8ac8 → 6.0.0-beta.076a3a5

package/dist/m365/aad/commands/o365group/o365group-add.js

@@ -71,7 +71,7 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
                 mailNickname: args.options.mailNickname,
                 resourceBehaviorOptions: resourceBehaviorOptionsCollection,
                 securityEnabled: false,
-                visibility: args.options.isPrivate === 'true' ? 'Private' : 'Public'
+                visibility: args.options.isPrivate ? 'Private' : 'Public'
             }
         };
         this
@@ -228,7 +228,7 @@ _AadO365GroupAddCommand_instances = new WeakSet(), _AadO365GroupAddCommand_initT
     }, {
         option: '--members [members]'
     }, {
-        option: '--isPrivate [isPrivate]'
+        option: '--isPrivate'
     }, {
         option: '--allowMembersToPost [allowMembersToPost]'
     }, {
@@ -258,11 +258,6 @@ _AadO365GroupAddCommand_instances = new WeakSet(), _AadO365GroupAddCommand_initT
                 }
             }
         }
-        if (typeof args.options.isPrivate !== 'undefined' &&
-            args.options.isPrivate !== 'true' &&
-            args.options.isPrivate !== 'false') {
-            return `${args.options.isPrivate} is not a valid boolean value`;
-        }
         if (args.options.logoPath) {
             const fullPath = path.resolve(args.options.logoPath);
             if (!fs.existsSync(fullPath)) {

package/dist/m365/aad/commands/o365group/o365group-conversation-post-list.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AadO365GroupConversationPostListCommand_instances, _AadO365GroupConversationPostListCommand_initTelemetry, _AadO365GroupConversationPostListCommand_initOptions, _AadO365GroupConversationPostListCommand_initValidators;
+var _AadO365GroupConversationPostListCommand_instances, _AadO365GroupConversationPostListCommand_initTelemetry, _AadO365GroupConversationPostListCommand_initOptions, _AadO365GroupConversationPostListCommand_initValidators, _AadO365GroupConversationPostListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const aadGroup_1 = require("../../../../utils/aadGroup");
@@ -26,6 +26,7 @@ class AadO365GroupConversationPostListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadO365GroupConversationPostListCommand_instances, "m", _AadO365GroupConversationPostListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadO365GroupConversationPostListCommand_instances, "m", _AadO365GroupConversationPostListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadO365GroupConversationPostListCommand_instances, "m", _AadO365GroupConversationPostListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupConversationPostListCommand_instances, "m", _AadO365GroupConversationPostListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.O365GROUP_CONVERSATION_POST_LIST;
@@ -73,18 +74,13 @@ _AadO365GroupConversationPostListCommand_instances = new WeakSet(), _AadO365Grou
     });
 }, _AadO365GroupConversationPostListCommand_initValidators = function _AadO365GroupConversationPostListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.groupId &&
-            !args.options.groupDisplayName) {
-            return 'Specify either groupId or groupDisplayName';
-        }
-        if (args.options.groupId && args.options.groupDisplayName) {
-            return 'Specify either groupId or groupDisplayName, but not both';
-        }
         if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;
     }));
+}, _AadO365GroupConversationPostListCommand_initOptionSets = function _AadO365GroupConversationPostListCommand_initOptionSets() {
+    this.optionSets.push(['groupId', 'groupDisplayName']);
 };
 module.exports = new AadO365GroupConversationPostListCommand();
 //# sourceMappingURL=o365group-conversation-post-list.js.map

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-list.js

@@ -27,8 +27,8 @@ class AadO365GroupRecycleBinItemListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
-        const displayNameFilter = args.options.displayName ? ` and startswith(DisplayName,'${encodeURIComponent(args.options.displayName).replace(/'/g, `''`)}')` : '';
-        const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${encodeURIComponent(args.options.mailNickname).replace(/'/g, `''`)}')` : '';
+        const displayNameFilter = args.options.groupDisplayName ? ` and startswith(DisplayName,'${encodeURIComponent(args.options.groupDisplayName).replace(/'/g, `''`)}')` : '';
+        const mailNicknameFilter = args.options.groupMailNickname ? ` and startswith(MailNickname,'${encodeURIComponent(args.options.groupMailNickname).replace(/'/g, `''`)}')` : '';
         const topCount = '&$top=100';
         const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
         utils_1.odata
@@ -42,15 +42,15 @@ class AadO365GroupRecycleBinItemListCommand extends GraphCommand_1.default {
 _AadO365GroupRecycleBinItemListCommand_instances = new WeakSet(), _AadO365GroupRecycleBinItemListCommand_initTelemetry = function _AadO365GroupRecycleBinItemListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            displayName: typeof args.options.displayName !== 'undefined',
-            mailNickname: typeof args.options.mailNickname !== 'undefined'
+            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            groupMailNickname: typeof args.options.groupMailNickname !== 'undefined'
         });
     });
 }, _AadO365GroupRecycleBinItemListCommand_initOptions = function _AadO365GroupRecycleBinItemListCommand_initOptions() {
     this.options.unshift({
-        option: '-d, --displayName [displayName]'
+        option: '-d, --groupDisplayName [groupDisplayName]'
     }, {
-        option: '-m, --mailNickname [mailNickname]'
+        option: '-m, --groupMailNickname [groupMailNickname]'
     });
 };
 module.exports = new AadO365GroupRecycleBinItemListCommand();

package/dist/m365/aad/commands/o365group/o365group-teamify.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 _AadO365GroupTeamifyCommand_instances, _AadO365GroupTeamifyCommand_initTelemetry, _AadO365GroupTeamifyCommand_initOptions, _AadO365GroupTeamifyCommand_initValidators;
+var _AadO365GroupTeamifyCommand_instances, _AadO365GroupTeamifyCommand_initTelemetry, _AadO365GroupTeamifyCommand_initOptions, _AadO365GroupTeamifyCommand_initValidators, _AadO365GroupTeamifyCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadO365GroupTeamifyCommand_instances, "m", _AadO365GroupTeamifyCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadO365GroupTeamifyCommand_instances, "m", _AadO365GroupTeamifyCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadO365GroupTeamifyCommand_instances, "m", _AadO365GroupTeamifyCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupTeamifyCommand_instances, "m", _AadO365GroupTeamifyCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.O365GROUP_TEAMIFY;
@@ -34,8 +35,8 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
         return 'Creates a new Microsoft Teams team under existing Microsoft 365 group';
     }
     getGroupId(args) {
-        if (args.options.groupId) {
-            return Promise.resolve(args.options.groupId);
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
         }
         const requestOptions = {
             url: `${this.resource}/v1.0/groups?$filter=mailNickname eq '${encodeURIComponent(args.options.mailNickname)}'`,
@@ -74,9 +75,9 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
         };
         this
             .getGroupId(args)
-            .then((groupId) => {
+            .then((id) => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${encodeURIComponent(groupId)}/team`,
+                url: `${this.resource}/v1.0/groups/${encodeURIComponent(id)}/team`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -91,29 +92,25 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
 _AadO365GroupTeamifyCommand_instances = new WeakSet(), _AadO365GroupTeamifyCommand_initTelemetry = function _AadO365GroupTeamifyCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            groupId: typeof args.options.groupId !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
             mailNickname: typeof args.options.mailNickname !== 'undefined'
         });
     });
 }, _AadO365GroupTeamifyCommand_initOptions = function _AadO365GroupTeamifyCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --groupId [groupId]'
+        option: '-i, --id [id]'
     }, {
         option: '--mailNickname [mailNickname]'
     });
 }, _AadO365GroupTeamifyCommand_initValidators = function _AadO365GroupTeamifyCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.groupId && args.options.mailNickname) {
-            return 'Specify either groupId or mailNickname, but not both.';
-        }
-        if (!args.options.groupId && !args.options.mailNickname) {
-            return 'Specify groupId or mailNickname, one is required';
-        }
-        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
+}, _AadO365GroupTeamifyCommand_initOptionSets = function _AadO365GroupTeamifyCommand_initOptionSets() {
+    this.optionSets.push(['id', 'mailNickname']);
 };
 module.exports = new AadO365GroupTeamifyCommand();
 //# sourceMappingURL=o365group-teamify.js.map

package/dist/m365/aad/commands/o365group/o365group-user-add.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 _AadO365GroupUserAddCommand_instances, _AadO365GroupUserAddCommand_initTelemetry, _AadO365GroupUserAddCommand_initOptions, _AadO365GroupUserAddCommand_initValidators;
+var _AadO365GroupUserAddCommand_instances, _AadO365GroupUserAddCommand_initTelemetry, _AadO365GroupUserAddCommand_initOptions, _AadO365GroupUserAddCommand_initValidators, _AadO365GroupUserAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -27,6 +27,7 @@ class AadO365GroupUserAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadO365GroupUserAddCommand_instances, "m", _AadO365GroupUserAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadO365GroupUserAddCommand_instances, "m", _AadO365GroupUserAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadO365GroupUserAddCommand_instances, "m", _AadO365GroupUserAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupUserAddCommand_instances, "m", _AadO365GroupUserAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_2.default.O365GROUP_USER_ADD;
@@ -84,12 +85,6 @@ _AadO365GroupUserAddCommand_instances = new WeakSet(), _AadO365GroupUserAddComma
     });
 }, _AadO365GroupUserAddCommand_initValidators = function _AadO365GroupUserAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.groupId && !args.options.teamId) {
-            return 'Please provide one of the following parameters: groupId or teamId';
-        }
-        if (args.options.groupId && args.options.teamId) {
-            return 'You cannot provide both a groupId and teamId parameter, please provide only one';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
@@ -103,6 +98,8 @@ _AadO365GroupUserAddCommand_instances = new WeakSet(), _AadO365GroupUserAddComma
         }
         return true;
     }));
+}, _AadO365GroupUserAddCommand_initOptionSets = function _AadO365GroupUserAddCommand_initOptionSets() {
+    this.optionSets.push(['groupId', 'teamId']);
 };
 module.exports = new AadO365GroupUserAddCommand();
 //# sourceMappingURL=o365group-user-add.js.map

package/dist/m365/aad/commands/o365group/o365group-user-remove.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 _AadO365GroupUserRemoveCommand_instances, _AadO365GroupUserRemoveCommand_initTelemetry, _AadO365GroupUserRemoveCommand_initOptions, _AadO365GroupUserRemoveCommand_initValidators;
+var _AadO365GroupUserRemoveCommand_instances, _AadO365GroupUserRemoveCommand_initTelemetry, _AadO365GroupUserRemoveCommand_initOptions, _AadO365GroupUserRemoveCommand_initValidators, _AadO365GroupUserRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -28,6 +28,7 @@ class AadO365GroupUserRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_2.default.O365GROUP_USER_REMOVE;
@@ -133,12 +134,6 @@ _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemov
     });
 }, _AadO365GroupUserRemoveCommand_initValidators = function _AadO365GroupUserRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.groupId && !args.options.teamId) {
-            return 'Please provide one of the following parameters: groupId or teamId';
-        }
-        if (args.options.groupId && args.options.teamId) {
-            return 'You cannot provide both a groupId and teamId parameter, please provide only one';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
@@ -147,6 +142,8 @@ _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemov
         }
         return true;
     }));
+}, _AadO365GroupUserRemoveCommand_initOptionSets = function _AadO365GroupUserRemoveCommand_initOptionSets() {
+    this.optionSets.push(['groupId', 'teamId']);
 };
 module.exports = new AadO365GroupUserRemoveCommand();
 //# sourceMappingURL=o365group-user-remove.js.map

package/dist/m365/aad/commands/o365group/o365group-user-set.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 _AadO365GroupUserSetCommand_instances, _AadO365GroupUserSetCommand_initTelemetry, _AadO365GroupUserSetCommand_initOptions, _AadO365GroupUserSetCommand_initValidators;
+var _AadO365GroupUserSetCommand_instances, _AadO365GroupUserSetCommand_initTelemetry, _AadO365GroupUserSetCommand_initOptions, _AadO365GroupUserSetCommand_initValidators, _AadO365GroupUserSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -27,6 +27,7 @@ class AadO365GroupUserSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_2.default.O365GROUP_USER_SET;
@@ -143,12 +144,6 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
     });
 }, _AadO365GroupUserSetCommand_initValidators = function _AadO365GroupUserSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.groupId && !args.options.teamId) {
-            return 'Please provide one of the following parameters: groupId or teamId';
-        }
-        if (args.options.groupId && args.options.teamId) {
-            return 'You cannot provide both a groupId and teamId parameter, please provide only one';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
@@ -160,6 +155,8 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
         }
         return true;
     }));
+}, _AadO365GroupUserSetCommand_initOptionSets = function _AadO365GroupUserSetCommand_initOptionSets() {
+    this.optionSets.push(['groupId', 'teamId']);
 };
 module.exports = new AadO365GroupUserSetCommand();
 //# sourceMappingURL=o365group-user-set.js.map

package/dist/m365/aad/commands/policy/policy-list.js

@@ -45,7 +45,7 @@ class AadPolicyListCommand extends GraphCommand_1.default {
         return ['id', 'displayName', 'isOrganizationDefault'];
     }
     commandAction(logger, args, cb) {
-        const policyType = args.options.policyType ? args.options.policyType.toLowerCase() : 'all';
+        const policyType = args.options.type ? args.options.type.toLowerCase() : 'all';
         if (policyType && policyType !== "all") {
             this
                 .getPolicies(policyType)
@@ -93,20 +93,20 @@ class AadPolicyListCommand extends GraphCommand_1.default {
 _AadPolicyListCommand_instances = new WeakSet(), _AadPolicyListCommand_initTelemetry = function _AadPolicyListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            policyType: args.options.policyType || 'all'
+            policyType: args.options.type || 'all'
         });
     });
 }, _AadPolicyListCommand_initOptions = function _AadPolicyListCommand_initOptions() {
     this.options.unshift({
-        option: '-p, --policyType [policyType]',
+        option: '-t, --type [type]',
         autocomplete: AadPolicyListCommand.supportedPolicyTypes
     });
 }, _AadPolicyListCommand_initValidators = function _AadPolicyListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.policyType) {
-            const policyType = args.options.policyType.toLowerCase();
+        if (args.options.type) {
+            const policyType = args.options.type.toLowerCase();
             if (!AadPolicyListCommand.supportedPolicyTypes.find(p => p.toLowerCase() === policyType)) {
-                return `${args.options.policyType} is not a valid policyType. Allowed values are ${AadPolicyListCommand.supportedPolicyTypes.join(', ')}`;
+                return `${args.options.type} is not a valid type. Allowed values are ${AadPolicyListCommand.supportedPolicyTypes.join(', ')}`;
             }
         }
         return true;

package/dist/m365/aad/commands/sp/sp-add.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 _AadSpAddCommand_instances, _AadSpAddCommand_initTelemetry, _AadSpAddCommand_initOptions, _AadSpAddCommand_initValidators;
+var _AadSpAddCommand_instances, _AadSpAddCommand_initTelemetry, _AadSpAddCommand_initOptions, _AadSpAddCommand_initValidators, _AadSpAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class AadSpAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadSpAddCommand_instances, "m", _AadSpAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadSpAddCommand_instances, "m", _AadSpAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadSpAddCommand_instances, "m", _AadSpAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadSpAddCommand_instances, "m", _AadSpAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SP_ADD;
@@ -105,13 +106,6 @@ _AadSpAddCommand_instances = new WeakSet(), _AadSpAddCommand_initTelemetry = fun
     });
 }, _AadSpAddCommand_initValidators = function _AadSpAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        let optionsSpecified = 0;
-        optionsSpecified += args.options.appId ? 1 : 0;
-        optionsSpecified += args.options.appName ? 1 : 0;
-        optionsSpecified += args.options.objectId ? 1 : 0;
-        if (optionsSpecified !== 1) {
-            return 'Specify either appId, appName, or objectId';
-        }
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
@@ -120,6 +114,8 @@ _AadSpAddCommand_instances = new WeakSet(), _AadSpAddCommand_initTelemetry = fun
         }
         return true;
     }));
+}, _AadSpAddCommand_initOptionSets = function _AadSpAddCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appName', 'objectId']);
 };
 module.exports = new AadSpAddCommand();
 //# sourceMappingURL=sp-add.js.map

package/dist/m365/aad/commands/sp/sp-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 _AadSpGetCommand_instances, _AadSpGetCommand_initTelemetry, _AadSpGetCommand_initOptions, _AadSpGetCommand_initValidators;
+var _AadSpGetCommand_instances, _AadSpGetCommand_initTelemetry, _AadSpGetCommand_initOptions, _AadSpGetCommand_initValidators, _AadSpGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class AadSpGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadSpGetCommand_instances, "m", _AadSpGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadSpGetCommand_instances, "m", _AadSpGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadSpGetCommand_instances, "m", _AadSpGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadSpGetCommand_instances, "m", _AadSpGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SP_GET;
@@ -34,12 +35,12 @@ class AadSpGetCommand extends GraphCommand_1.default {
         return 'Gets information about the specific service principal';
     }
     getSpId(args) {
-        if (args.options.objectId) {
-            return Promise.resolve(args.options.objectId);
+        if (args.options.appObjectId) {
+            return Promise.resolve(args.options.appObjectId);
         }
         let spMatchQuery = '';
-        if (args.options.displayName) {
-            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.displayName)}'`;
+        if (args.options.appDisplayName) {
+            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
         }
         else if (args.options.appId) {
             spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
@@ -59,7 +60,7 @@ class AadSpGetCommand extends GraphCommand_1.default {
                 return Promise.reject(`The specified Azure AD app does not exist`);
             }
             if (response.value.length > 1) {
-                return Promise.reject(`Multiple Azure AD apps with name ${args.options.displayName} found: ${response.value.map(x => x.id)}`);
+                return Promise.reject(`Multiple Azure AD apps with name ${args.options.appDisplayName} found: ${response.value.map(x => x.id)}`);
             }
             return Promise.resolve(spItem.id);
         });
@@ -91,35 +92,30 @@ _AadSpGetCommand_instances = new WeakSet(), _AadSpGetCommand_initTelemetry = fun
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: (!(!args.options.appId)).toString(),
-            displayName: (!(!args.options.displayName)).toString(),
-            objectId: (!(!args.options.objectId)).toString()
+            appDisplayName: (!(!args.options.appDisplayName)).toString(),
+            appObjectId: (!(!args.options.appObjectId)).toString()
         });
     });
 }, _AadSpGetCommand_initOptions = function _AadSpGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --appId [appId]'
     }, {
-        option: '-n, --displayName [displayName]'
+        option: '-n, --appDisplayName [appDisplayName]'
     }, {
-        option: '--objectId [objectId]'
+        option: '--appObjectId [appObjectId]'
     });
 }, _AadSpGetCommand_initValidators = function _AadSpGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        let optionsSpecified = 0;
-        optionsSpecified += args.options.appId ? 1 : 0;
-        optionsSpecified += args.options.displayName ? 1 : 0;
-        optionsSpecified += args.options.objectId ? 1 : 0;
-        if (optionsSpecified !== 1) {
-            return 'Specify either appId, objectId or displayName';
-        }
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
-        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid objectId GUID`;
+        if (args.options.appObjectId && !utils_1.validation.isValidGuid(args.options.appObjectId)) {
+            return `${args.options.appObjectId} is not a valid objectId GUID`;
         }
         return true;
     }));
+}, _AadSpGetCommand_initOptionSets = function _AadSpGetCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appDisplayName', 'appObjectId']);
 };
 module.exports = new AadSpGetCommand();
 //# sourceMappingURL=sp-get.js.map

package/dist/m365/aad/commands/user/user-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 _AadUserGetCommand_instances, _AadUserGetCommand_initTelemetry, _AadUserGetCommand_initOptions, _AadUserGetCommand_initValidators;
+var _AadUserGetCommand_instances, _AadUserGetCommand_initTelemetry, _AadUserGetCommand_initOptions, _AadUserGetCommand_initValidators, _AadUserGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class AadUserGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadUserGetCommand_instances, "m", _AadUserGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadUserGetCommand_instances, "m", _AadUserGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadUserGetCommand_instances, "m", _AadUserGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadUserGetCommand_instances, "m", _AadUserGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.USER_GET;
@@ -94,20 +95,14 @@ _AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry =
     });
 }, _AadUserGetCommand_initValidators = function _AadUserGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.userName && !args.options.email) {
-            return 'Specify id, userName or email, one is required';
-        }
-        if ((args.options.id && args.options.email) ||
-            (args.options.id && args.options.userName) ||
-            (args.options.userName && args.options.email)) {
-            return 'Use either id, userName or email, but not all';
-        }
         if (args.options.id &&
             !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
+}, _AadUserGetCommand_initOptionSets = function _AadUserGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'userName', 'email']);
 };
 module.exports = new AadUserGetCommand();
 //# sourceMappingURL=user-get.js.map

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

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadUserListCommand_instances, _AadUserListCommand_initTelemetry, _AadUserListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Command_1 = require("../../../../Command");
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -26,10 +27,17 @@ class AadUserListCommand extends GraphCommand_1.default {
         return true;
     }
     commandAction(logger, args, cb) {
+        let filter = '';
         const properties = args.options.properties ?
             args.options.properties.split(',').map(p => p.trim()) :
             ['userPrincipalName', 'displayName'];
-        const filter = this.getFilter(args.options);
+        try {
+            filter = this.getFilter(args.options);
+        }
+        catch (ex) {
+            cb(new Command_1.CommandError(ex));
+            return;
+        }
         const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.user' : 'users';
         const url = `${this.resource}/v1.0/${endpoint}?$select=${properties.join(',')}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
         utils_1.odata
@@ -55,7 +63,10 @@ class AadUserListCommand extends GraphCommand_1.default {
         ];
         Object.keys(options).forEach(key => {
             if (excludeOptions.indexOf(key) === -1) {
-                filters[key] = encodeURIComponent(options[key].replace(/'/g, `''`));
+                if (typeof options[key] === 'boolean') {
+                    throw `Specify value for the ${key} property`;
+                }
+                filters[key] = encodeURIComponent(options[key].toString().replace(/'/g, `''`));
             }
         });
         let filter = Object.keys(filters).map(key => `startsWith(${key}, '${filters[key]}')`).join(' and ');

package/dist/m365/aad/commands/user/user-set.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 _AadUserSetCommand_instances, _AadUserSetCommand_initTelemetry, _AadUserSetCommand_initOptions, _AadUserSetCommand_initValidators;
+var _AadUserSetCommand_instances, _AadUserSetCommand_initTelemetry, _AadUserSetCommand_initOptions, _AadUserSetCommand_initValidators, _AadUserSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class AadUserSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadUserSetCommand_instances, "m", _AadUserSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadUserSetCommand_instances, "m", _AadUserSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadUserSetCommand_instances, "m", _AadUserSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadUserSetCommand_instances, "m", _AadUserSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.USER_SET;
@@ -91,18 +92,14 @@ _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry =
     });
 }, _AadUserSetCommand_initValidators = function _AadUserSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.objectId && !args.options.userPrincipalName) {
-            return 'Specify either objectId or userPrincipalName';
-        }
-        if (args.options.objectId && args.options.userPrincipalName) {
-            return 'Specify either objectId or userPrincipalName but not both';
-        }
         if (args.options.objectId &&
             !utils_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;
     }));
+}, _AadUserSetCommand_initOptionSets = function _AadUserSetCommand_initOptionSets() {
+    this.optionSets.push(['objectId', 'userPrincipalName']);
 };
 module.exports = new AadUserSetCommand();
 //# sourceMappingURL=user-set.js.map

package/dist/m365/aad/commands.js

@@ -3,11 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'aad';
 exports.default = {
     APP_ADD: `${prefix} app add`,
-    APP_DELETE: `${prefix} app delete`,
     APP_GET: `${prefix} app get`,
     APP_REMOVE: `${prefix} app remove`,
     APP_ROLE_ADD: `${prefix} app role add`,
-    APP_ROLE_DELETE: `${prefix} app role delete`,
     APP_ROLE_LIST: `${prefix} app role list`,
     APP_ROLE_REMOVE: `${prefix} app role remove`,
     APP_SET: `${prefix} app set`,

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

@@ -36,7 +36,6 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
     commandAction(logger, args, cb) {
         let value = undefined;
         switch (args.options.key) {
-            case settingsNames_1.settingsNames.autoOpenBrowserOnLogin:
             case settingsNames_1.settingsNames.autoOpenLinksInBrowser:
             case settingsNames_1.settingsNames.copyDeviceCodeToClipboard:
             case settingsNames_1.settingsNames.csvHeader:

package/dist/m365/flow/commands/flow-disable.js

@@ -26,7 +26,7 @@ class FlowDisableCommand extends AzmgmtCommand_1.default {
             logger.logToStderr(`Disables Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.name)}/stop?api-version=2016-11-01`,
+            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.name)}/stop?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },
@@ -41,7 +41,7 @@ _FlowDisableCommand_instances = new WeakSet(), _FlowDisableCommand_initOptions =
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });