@pnp/cli-microsoft365 6.0.0-beta.d4d33ed → 6.0.0-beta.dee678a

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

@@ -1,10 +1,33 @@
 "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 _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");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadO365GroupTeamifyCommand_instances.add(this);
+        __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;
     }
@@ -12,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)}'`,
@@ -52,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'
                 },
@@ -65,30 +88,29 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
         })
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --groupId [groupId]'
-            },
-            {
-                option: '--mailNickname [mailNickname]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        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`;
+}
+_AadO365GroupTeamifyCommand_instances = new WeakSet(), _AadO365GroupTeamifyCommand_initTelemetry = function _AadO365GroupTeamifyCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            mailNickname: typeof args.options.mailNickname !== 'undefined'
+        });
+    });
+}, _AadO365GroupTeamifyCommand_initOptions = function _AadO365GroupTeamifyCommand_initOptions() {
+    this.options.unshift({
+        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.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

@@ -1,4 +1,19 @@
 "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 _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");
@@ -6,6 +21,14 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../../teams/commands");
 const commands_2 = require("../../commands");
 class AadO365GroupUserAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadO365GroupUserAddCommand_instances.add(this);
+        __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;
     }
@@ -15,13 +38,6 @@ class AadO365GroupUserAddCommand extends GraphCommand_1.default {
     alias() {
         return [commands_1.default.USER_ADD];
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.role = args.options.role;
-        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
-        telemetryProps.groupId = typeof args.options.groupId !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const providedGroupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
         const requestOptions = {
@@ -47,32 +63,28 @@ class AadO365GroupUserAddCommand extends GraphCommand_1.default {
         })
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-n, --userName <userName>'
-            },
-            {
-                option: "-i, --groupId [groupId]"
-            },
-            {
-                option: "--teamId [teamId]"
-            },
-            {
-                option: '-r, --role [role]',
-                autocomplete: ['Owner', 'Member']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        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';
-        }
+}
+_AadO365GroupUserAddCommand_instances = new WeakSet(), _AadO365GroupUserAddCommand_initTelemetry = function _AadO365GroupUserAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            role: args.options.role,
+            teamId: typeof args.options.teamId !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined'
+        });
+    });
+}, _AadO365GroupUserAddCommand_initOptions = function _AadO365GroupUserAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --userName <userName>'
+    }, {
+        option: "-i, --groupId [groupId]"
+    }, {
+        option: "--teamId [teamId]"
+    }, {
+        option: '-r, --role [role]',
+        autocomplete: ['Owner', 'Member']
+    });
+}, _AadO365GroupUserAddCommand_initValidators = function _AadO365GroupUserAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
@@ -85,7 +97,9 @@ class AadO365GroupUserAddCommand extends GraphCommand_1.default {
             }
         }
         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-list.js

@@ -1,20 +1,37 @@
 "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 _AadO365GroupUserListCommand_instances, _AadO365GroupUserListCommand_initTelemetry, _AadO365GroupUserListCommand_initOptions, _AadO365GroupUserListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupUserListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadO365GroupUserListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadO365GroupUserListCommand_instances, "m", _AadO365GroupUserListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupUserListCommand_instances, "m", _AadO365GroupUserListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupUserListCommand_instances, "m", _AadO365GroupUserListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.O365GROUP_USER_LIST;
     }
     get description() {
         return "Lists users for the specified Microsoft 365 group";
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.role = args.options.role;
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let users = [];
         this
@@ -52,20 +69,22 @@ class AadO365GroupUserListCommand extends GraphCommand_1.default {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
         return utils_1.odata.getAllItems(endpoint);
     }
-    options() {
-        const options = [
-            {
-                option: "-i, --groupId <groupId>"
-            },
-            {
-                option: "-r, --role [type]",
-                autocomplete: ["Owner", "Member", "Guest"]
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_AadO365GroupUserListCommand_instances = new WeakSet(), _AadO365GroupUserListCommand_initTelemetry = function _AadO365GroupUserListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            role: args.options.role
+        });
+    });
+}, _AadO365GroupUserListCommand_initOptions = function _AadO365GroupUserListCommand_initOptions() {
+    this.options.unshift({
+        option: "-i, --groupId <groupId>"
+    }, {
+        option: "-r, --role [type]",
+        autocomplete: ["Owner", "Member", "Guest"]
+    });
+}, _AadO365GroupUserListCommand_initValidators = function _AadO365GroupUserListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!utils_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
@@ -75,7 +94,7 @@ class AadO365GroupUserListCommand extends GraphCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new AadO365GroupUserListCommand();
 //# sourceMappingURL=o365group-user-list.js.map

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

@@ -8,6 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 _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");
@@ -16,6 +22,14 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../../teams/commands");
 const commands_2 = require("../../commands");
 class AadO365GroupUserRemoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadO365GroupUserRemoveCommand_instances.add(this);
+        __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;
     }
@@ -25,13 +39,6 @@ class AadO365GroupUserRemoveCommand extends GraphCommand_1.default {
     alias() {
         return [commands_1.default.USER_REMOVE];
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
-        telemetryProps.groupId = typeof args.options.groupId !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
         const removeUser = () => __awaiter(this, void 0, void 0, function* () {
@@ -106,31 +113,27 @@ class AadO365GroupUserRemoveCommand extends GraphCommand_1.default {
             });
         }
     }
-    options() {
-        const options = [
-            {
-                option: "-i, --groupId [groupId]"
-            },
-            {
-                option: "--teamId [teamId]"
-            },
-            {
-                option: '-n, --userName <userName>'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        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';
-        }
+}
+_AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemoveCommand_initTelemetry = function _AadO365GroupUserRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: (!(!args.options.confirm)).toString(),
+            teamId: typeof args.options.teamId !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined'
+        });
+    });
+}, _AadO365GroupUserRemoveCommand_initOptions = function _AadO365GroupUserRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: "-i, --groupId [groupId]"
+    }, {
+        option: "--teamId [teamId]"
+    }, {
+        option: '-n, --userName <userName>'
+    }, {
+        option: '--confirm'
+    });
+}, _AadO365GroupUserRemoveCommand_initValidators = function _AadO365GroupUserRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
@@ -138,7 +141,9 @@ class AadO365GroupUserRemoveCommand extends GraphCommand_1.default {
             return `${args.options.groupId} is not a valid GUID`;
         }
         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

@@ -1,4 +1,19 @@
 "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 _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");
@@ -6,6 +21,14 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../../teams/commands");
 const commands_2 = require("../../commands");
 class AadO365GroupUserSetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadO365GroupUserSetCommand_instances.add(this);
+        __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;
     }
@@ -15,13 +38,6 @@ class AadO365GroupUserSetCommand extends GraphCommand_1.default {
     alias() {
         return [commands_1.default.USER_SET];
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
-        telemetryProps.groupId = typeof args.options.groupId !== 'undefined';
-        telemetryProps.role = args.options.role;
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
         let users = [];
@@ -106,32 +122,28 @@ class AadO365GroupUserSetCommand extends GraphCommand_1.default {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
         return utils_1.odata.getAllItems(endpoint);
     }
-    options() {
-        const options = [
-            {
-                option: "-i, --groupId [groupId]"
-            },
-            {
-                option: "--teamId [teamId]"
-            },
-            {
-                option: '-n, --userName <userName>'
-            },
-            {
-                option: '-r, --role <role>',
-                autocomplete: ['Owner', 'Member']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        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';
-        }
+}
+_AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetCommand_initTelemetry = function _AadO365GroupUserSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            teamId: typeof args.options.teamId !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            role: args.options.role
+        });
+    });
+}, _AadO365GroupUserSetCommand_initOptions = function _AadO365GroupUserSetCommand_initOptions() {
+    this.options.unshift({
+        option: "-i, --groupId [groupId]"
+    }, {
+        option: "--teamId [teamId]"
+    }, {
+        option: '-n, --userName <userName>'
+    }, {
+        option: '-r, --role <role>',
+        autocomplete: ['Owner', 'Member']
+    });
+}, _AadO365GroupUserSetCommand_initValidators = function _AadO365GroupUserSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
@@ -142,7 +154,9 @@ class AadO365GroupUserSetCommand extends GraphCommand_1.default {
             return `${args.options.role} is not a valid role value. Allowed values Owner|Member`;
         }
         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/oauth2grant/oauth2grant-add.js

@@ -1,10 +1,31 @@
 "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 _AadOAuth2GrantAddCommand_instances, _AadOAuth2GrantAddCommand_initOptions, _AadOAuth2GrantAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadOAuth2GrantAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadOAuth2GrantAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadOAuth2GrantAddCommand_instances, "m", _AadOAuth2GrantAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadOAuth2GrantAddCommand_instances, "m", _AadOAuth2GrantAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.OAUTH2GRANT_ADD;
     }
@@ -33,22 +54,17 @@ class AadOAuth2GrantAddCommand extends GraphCommand_1.default {
             .post(requestOptions)
             .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --clientId <clientId>'
-            },
-            {
-                option: '-r, --resourceId <resourceId>'
-            },
-            {
-                option: '-s, --scope <scope>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_AadOAuth2GrantAddCommand_instances = new WeakSet(), _AadOAuth2GrantAddCommand_initOptions = function _AadOAuth2GrantAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --clientId <clientId>'
+    }, {
+        option: '-r, --resourceId <resourceId>'
+    }, {
+        option: '-s, --scope <scope>'
+    });
+}, _AadOAuth2GrantAddCommand_initValidators = function _AadOAuth2GrantAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!utils_1.validation.isValidGuid(args.options.clientId)) {
             return `${args.options.clientId} is not a valid GUID`;
         }
@@ -56,7 +72,7 @@ class AadOAuth2GrantAddCommand extends GraphCommand_1.default {
             return `${args.options.resourceId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new AadOAuth2GrantAddCommand();
 //# sourceMappingURL=oauth2grant-add.js.map