@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.bc15f2b

package/dist/m365/spo/commands/term/term-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 _SpoTermAddCommand_instances, _SpoTermAddCommand_initTelemetry, _SpoTermAddCommand_initOptions, _SpoTermAddCommand_initValidators;
+var _SpoTermAddCommand_instances, _SpoTermAddCommand_initTelemetry, _SpoTermAddCommand_initOptions, _SpoTermAddCommand_initValidators, _SpoTermAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
 const Command_1 = require("../../../../Command");
@@ -29,6 +29,7 @@ class SpoTermAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_ADD;
@@ -191,12 +192,6 @@ _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry =
                 return 'Specify either parentTermId, termSetId or termSetName but not both';
             }
         }
-        if (!args.options.termGroupId && !args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName';
-        }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName but not both';
-        }
         if (args.options.termGroupId) {
             if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
@@ -231,6 +226,8 @@ _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry =
         }
         return true;
     }));
+}, _SpoTermAddCommand_initOptionSets = function _SpoTermAddCommand_initOptionSets() {
+    this.optionSets.push(['termGroupId', 'termGroupName']);
 };
 module.exports = new SpoTermAddCommand();
 //# sourceMappingURL=term-add.js.map

package/dist/m365/spo/commands/term/term-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 _SpoTermGetCommand_instances, _SpoTermGetCommand_initTelemetry, _SpoTermGetCommand_initOptions, _SpoTermGetCommand_initValidators;
+var _SpoTermGetCommand_instances, _SpoTermGetCommand_initTelemetry, _SpoTermGetCommand_initOptions, _SpoTermGetCommand_initValidators, _SpoTermGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -28,6 +28,7 @@ class SpoTermGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_GET;
@@ -114,12 +115,6 @@ _SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry =
     });
 }, _SpoTermGetCommand_initValidators = function _SpoTermGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either id or name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either id or name but not both';
-        }
         if (args.options.id) {
             if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
@@ -151,6 +146,8 @@ _SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry =
         }
         return true;
     }));
+}, _SpoTermGetCommand_initOptionSets = function _SpoTermGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new SpoTermGetCommand();
 //# sourceMappingURL=term-get.js.map

package/dist/m365/spo/commands/term/term-group-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 _SpoTermGroupGetCommand_instances, _SpoTermGroupGetCommand_initTelemetry, _SpoTermGroupGetCommand_initOptions, _SpoTermGroupGetCommand_initValidators;
+var _SpoTermGroupGetCommand_instances, _SpoTermGroupGetCommand_initTelemetry, _SpoTermGroupGetCommand_initOptions, _SpoTermGroupGetCommand_initValidators, _SpoTermGroupGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -28,6 +28,7 @@ class SpoTermGroupGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_GROUP_GET;
@@ -90,12 +91,6 @@ _SpoTermGroupGetCommand_instances = new WeakSet(), _SpoTermGroupGetCommand_initT
     });
 }, _SpoTermGroupGetCommand_initValidators = function _SpoTermGroupGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either id or name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either id or name but not both';
-        }
         if (args.options.id) {
             if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
@@ -103,6 +98,8 @@ _SpoTermGroupGetCommand_instances = new WeakSet(), _SpoTermGroupGetCommand_initT
         }
         return true;
     }));
+}, _SpoTermGroupGetCommand_initOptionSets = function _SpoTermGroupGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new SpoTermGroupGetCommand();
 //# sourceMappingURL=term-group-get.js.map

package/dist/m365/spo/commands/term/term-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 _SpoTermListCommand_instances, _SpoTermListCommand_initTelemetry, _SpoTermListCommand_initOptions, _SpoTermListCommand_initValidators;
+var _SpoTermListCommand_instances, _SpoTermListCommand_initTelemetry, _SpoTermListCommand_initOptions, _SpoTermListCommand_initValidators, _SpoTermListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -28,6 +28,7 @@ class SpoTermListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_LIST;
@@ -102,23 +103,11 @@ _SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry
     });
 }, _SpoTermListCommand_initValidators = function _SpoTermListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.termGroupId && !args.options.termGroupName) {
-            return 'Specify either termGroupId or termGroupName';
-        }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify either termGroupId or termGroupName but not both';
-        }
         if (args.options.termGroupId) {
             if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
             }
         }
-        if (!args.options.termSetId && !args.options.termSetName) {
-            return 'Specify either termSetId or termSetName';
-        }
-        if (args.options.termSetId && args.options.termSetName) {
-            return 'Specify either termSetId or termSetName but not both';
-        }
         if (args.options.termSetId) {
             if (!utils_1.validation.isValidGuid(args.options.termSetId)) {
                 return `${args.options.termSetId} is not a valid GUID`;
@@ -126,6 +115,8 @@ _SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry
         }
         return true;
     }));
+}, _SpoTermListCommand_initOptionSets = function _SpoTermListCommand_initOptionSets() {
+    this.optionSets.push(['termGroupId', 'termGroupName'], ['termSetId', 'termSetName']);
 };
 module.exports = new SpoTermListCommand();
 //# sourceMappingURL=term-list.js.map

package/dist/m365/spo/commands/term/term-set-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 _SpoTermSetAddCommand_instances, _SpoTermSetAddCommand_initTelemetry, _SpoTermSetAddCommand_initOptions, _SpoTermSetAddCommand_initValidators;
+var _SpoTermSetAddCommand_instances, _SpoTermSetAddCommand_initTelemetry, _SpoTermSetAddCommand_initOptions, _SpoTermSetAddCommand_initValidators, _SpoTermSetAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
 const Command_1 = require("../../../../Command");
@@ -29,6 +29,7 @@ class SpoTermSetAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermSetAddCommand_instances, "m", _SpoTermSetAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermSetAddCommand_instances, "m", _SpoTermSetAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermSetAddCommand_instances, "m", _SpoTermSetAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermSetAddCommand_instances, "m", _SpoTermSetAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_SET_ADD;
@@ -159,12 +160,6 @@ _SpoTermSetAddCommand_instances = new WeakSet(), _SpoTermSetAddCommand_initTelem
                 return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (!args.options.termGroupId && !args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName';
-        }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName but not both';
-        }
         if (args.options.termGroupId) {
             if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
@@ -180,6 +175,8 @@ _SpoTermSetAddCommand_instances = new WeakSet(), _SpoTermSetAddCommand_initTelem
         }
         return true;
     }));
+}, _SpoTermSetAddCommand_initOptionSets = function _SpoTermSetAddCommand_initOptionSets() {
+    this.optionSets.push(['termGroupId', 'termGroupName']);
 };
 module.exports = new SpoTermSetAddCommand();
 //# sourceMappingURL=term-set-add.js.map

package/dist/m365/spo/commands/term/term-set-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 _SpoTermSetGetCommand_instances, _SpoTermSetGetCommand_initTelemetry, _SpoTermSetGetCommand_initOptions, _SpoTermSetGetCommand_initValidators;
+var _SpoTermSetGetCommand_instances, _SpoTermSetGetCommand_initTelemetry, _SpoTermSetGetCommand_initOptions, _SpoTermSetGetCommand_initValidators, _SpoTermSetGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -28,6 +28,7 @@ class SpoTermSetGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermSetGetCommand_instances, "m", _SpoTermSetGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermSetGetCommand_instances, "m", _SpoTermSetGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermSetGetCommand_instances, "m", _SpoTermSetGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermSetGetCommand_instances, "m", _SpoTermSetGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_SET_GET;
@@ -97,23 +98,11 @@ _SpoTermSetGetCommand_instances = new WeakSet(), _SpoTermSetGetCommand_initTelem
     });
 }, _SpoTermSetGetCommand_initValidators = function _SpoTermSetGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either id or name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either id or name but not both';
-        }
         if (args.options.id) {
             if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (!args.options.termGroupId && !args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName';
-        }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName but not both';
-        }
         if (args.options.termGroupId) {
             if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
@@ -121,6 +110,8 @@ _SpoTermSetGetCommand_instances = new WeakSet(), _SpoTermSetGetCommand_initTelem
         }
         return true;
     }));
+}, _SpoTermSetGetCommand_initOptionSets = function _SpoTermSetGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name'], ['termGroupId', 'termGroupName']);
 };
 module.exports = new SpoTermSetGetCommand();
 //# sourceMappingURL=term-set-get.js.map

package/dist/m365/spo/commands/term/term-set-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 _SpoTermSetListCommand_instances, _SpoTermSetListCommand_initTelemetry, _SpoTermSetListCommand_initOptions, _SpoTermSetListCommand_initValidators;
+var _SpoTermSetListCommand_instances, _SpoTermSetListCommand_initTelemetry, _SpoTermSetListCommand_initOptions, _SpoTermSetListCommand_initValidators, _SpoTermSetListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -28,6 +28,7 @@ class SpoTermSetListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermSetListCommand_instances, "m", _SpoTermSetListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermSetListCommand_instances, "m", _SpoTermSetListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermSetListCommand_instances, "m", _SpoTermSetListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermSetListCommand_instances, "m", _SpoTermSetListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_SET_LIST;
@@ -96,12 +97,6 @@ _SpoTermSetListCommand_instances = new WeakSet(), _SpoTermSetListCommand_initTel
     });
 }, _SpoTermSetListCommand_initValidators = function _SpoTermSetListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.termGroupId && !args.options.termGroupName) {
-            return 'Specify either termGroupId or termGroupName';
-        }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify either termGroupId or termGroupName but not both';
-        }
         if (args.options.termGroupId) {
             if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
@@ -109,6 +104,8 @@ _SpoTermSetListCommand_instances = new WeakSet(), _SpoTermSetListCommand_initTel
         }
         return true;
     }));
+}, _SpoTermSetListCommand_initOptionSets = function _SpoTermSetListCommand_initOptionSets() {
+    this.optionSets.push(['termGroupId', 'termGroupName']);
 };
 module.exports = new SpoTermSetListCommand();
 //# sourceMappingURL=term-set-list.js.map

package/dist/m365/spo/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 _SpoUserGetCommand_instances, _SpoUserGetCommand_initTelemetry, _SpoUserGetCommand_initOptions, _SpoUserGetCommand_initValidators;
+var _SpoUserGetCommand_instances, _SpoUserGetCommand_initTelemetry, _SpoUserGetCommand_initOptions, _SpoUserGetCommand_initValidators, _SpoUserGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoUserGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoUserGetCommand_instances, "m", _SpoUserGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoUserGetCommand_instances, "m", _SpoUserGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoUserGetCommand_instances, "m", _SpoUserGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoUserGetCommand_instances, "m", _SpoUserGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.USER_GET;
@@ -83,20 +84,14 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
     });
 }, _SpoUserGetCommand_initValidators = function _SpoUserGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.email && !args.options.loginName) {
-            return 'Specify id, email or loginName, one is required';
-        }
-        if ((args.options.id && args.options.email) ||
-            (args.options.id && args.options.loginName) ||
-            (args.options.loginName && args.options.email)) {
-            return 'Use either email, id or loginName, but not all';
-        }
         if (args.options.id &&
             typeof args.options.id !== 'number') {
             return `Specified id ${args.options.id} is not a number`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
+}, _SpoUserGetCommand_initOptionSets = function _SpoUserGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'email', 'loginName']);
 };
 module.exports = new SpoUserGetCommand();
 //# sourceMappingURL=user-get.js.map

package/dist/m365/spo/commands/user/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 _SpoUserRemoveCommand_instances, _SpoUserRemoveCommand_initTelemetry, _SpoUserRemoveCommand_initOptions, _SpoUserRemoveCommand_initValidators;
+var _SpoUserRemoveCommand_instances, _SpoUserRemoveCommand_initTelemetry, _SpoUserRemoveCommand_initOptions, _SpoUserRemoveCommand_initValidators, _SpoUserRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class SpoUserRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.USER_REMOVE;
@@ -97,14 +98,10 @@ _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelem
     });
 }, _SpoUserRemoveCommand_initValidators = function _SpoUserRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.loginName) {
-            return 'Required option id or loginName missing, one is required';
-        }
-        if (args.options.id && args.options.loginName) {
-            return 'Use either id or loginName, but not both';
-        }
         return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
+}, _SpoUserRemoveCommand_initOptionSets = function _SpoUserRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'loginName']);
 };
 module.exports = new SpoUserRemoveCommand();
 //# sourceMappingURL=user-remove.js.map

package/dist/m365/spo/commands/web/web-roleassignment-add.js

@@ -0,0 +1,187 @@
+"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 _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoUserGetCommand = require("../user/user-get");
+const SpoGroupGetCommand = require("../group/group-get");
+const SpoRoleDefinitionListCommand = require("../roledefinition/roledefinition-list");
+class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoWebRoleAssignmentAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.WEB_ROLEASSIGNMENT_ADD;
+    }
+    get description() {
+        return 'Adds a role assignment to web';
+    }
+    commandAction(logger, args, cb) {
+        if (this.verbose) {
+            logger.logToStderr(`Adding role assignment to web ${args.options.webUrl}...`);
+        }
+        this.GetRoleDefinitionId(args.options)
+            .then((roleDefinitionId) => {
+            args.options.roleDefinitionId = roleDefinitionId;
+            if (args.options.upn) {
+                this.GetUserPrincipalId(args.options)
+                    .then((userPrincipalId) => {
+                    args.options.principalId = userPrincipalId;
+                    this.AddRoleAssignment(logger, args.options, cb);
+                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            }
+            else if (args.options.groupName) {
+                this.GetGroupPrincipalId(args.options)
+                    .then((groupPrincipalId) => {
+                    args.options.principalId = groupPrincipalId;
+                    this.AddRoleAssignment(logger, args.options, cb);
+                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            }
+            else {
+                this.AddRoleAssignment(logger, args.options, cb);
+            }
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    AddRoleAssignment(logger, options, cb) {
+        const requestOptions = {
+            url: `${options.webUrl}/_api/web/roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
+            method: 'POST',
+            headers: {
+                'accept': 'application/json;odata=nometadata',
+                'content-type': 'application/json'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .post(requestOptions)
+            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    GetRoleDefinitionId(options) {
+        if (!options.roleDefinitionName) {
+            return Promise.resolve(options.roleDefinitionId);
+        }
+        const roleDefinitionListCommandOptions = {
+            webUrl: options.webUrl,
+            output: 'json',
+            debug: this.debug,
+            verbose: this.verbose
+        };
+        return cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) })
+            .then((output) => {
+            const getRoleDefinitionListOutput = JSON.parse(output.stdout);
+            const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
+            return Promise.resolve(roleDefinitionId);
+        }, (err) => {
+            return Promise.reject(err);
+        });
+    }
+    GetGroupPrincipalId(options) {
+        const groupGetCommandOptions = {
+            webUrl: options.webUrl,
+            name: options.groupName,
+            output: 'json',
+            debug: this.debug,
+            verbose: this.verbose
+        };
+        return cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
+            .then((output) => {
+            const getGroupOutput = JSON.parse(output.stdout);
+            return Promise.resolve(getGroupOutput.Id);
+        }, (err) => {
+            return Promise.reject(err);
+        });
+    }
+    GetUserPrincipalId(options) {
+        const userGetCommandOptions = {
+            webUrl: options.webUrl,
+            email: options.upn,
+            id: undefined,
+            output: 'json',
+            debug: this.debug,
+            verbose: this.verbose
+        };
+        return cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
+            .then((output) => {
+            const getUserOutput = JSON.parse(output.stdout);
+            return Promise.resolve(getUserOutput.Id);
+        }, (err) => {
+            return Promise.reject(err);
+        });
+    }
+}
+_SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignmentAddCommand_initTelemetry = function _SpoWebRoleAssignmentAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            principalId: typeof args.options.principalId !== 'undefined',
+            upn: typeof args.options.upn !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
+            roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined'
+        });
+    });
+}, _SpoWebRoleAssignmentAddCommand_initOptions = function _SpoWebRoleAssignmentAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--principalId [principalId]'
+    }, {
+        option: '--upn [upn]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--roleDefinitionId [roleDefinitionId]'
+    }, {
+        option: '--roleDefinitionName [roleDefinitionName]'
+    });
+}, _SpoWebRoleAssignmentAddCommand_initValidators = function _SpoWebRoleAssignmentAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.principalId && isNaN(args.options.principalId)) {
+            return `Specified principalId ${args.options.principalId} is not a number`;
+        }
+        if (args.options.roleDefinitionId && isNaN(args.options.roleDefinitionId)) {
+            return `Specified roleDefinitionId ${args.options.roleDefinitionId} is not a number`;
+        }
+        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
+        if (principalOptions.some(item => item !== undefined) && principalOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either principalId id or upn or groupName`;
+        }
+        if (principalOptions.filter(item => item !== undefined).length === 0) {
+            return `Specify at least principalId id or upn or groupName`;
+        }
+        const roleDefinitionOptions = [args.options.roleDefinitionId, args.options.roleDefinitionName];
+        if (roleDefinitionOptions.some(item => item !== undefined) && roleDefinitionOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either roleDefinitionId id or roleDefinitionName`;
+        }
+        if (roleDefinitionOptions.filter(item => item !== undefined).length === 0) {
+            return `Specify at least roleDefinitionId id or roleDefinitionName`;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoWebRoleAssignmentAddCommand();
+//# sourceMappingURL=web-roleassignment-add.js.map