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

package/dist/m365/aad/commands/app/app-role-add.js

@@ -1,23 +1,39 @@
 "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 _AadAppRoleAddCommand_instances, _AadAppRoleAddCommand_initTelemetry, _AadAppRoleAddCommand_initOptions, _AadAppRoleAddCommand_initValidators, _AadAppRoleAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadAppRoleAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAppRoleAddCommand_instances, "m", _AadAppRoleAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAddCommand_instances, "m", _AadAppRoleAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAddCommand_instances, "m", _AadAppRoleAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAddCommand_instances, "m", _AadAppRoleAddCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.APP_ROLE_ADD;
     }
     get description() {
         return 'Adds role to the specified Azure AD app registration';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.appObjectId = typeof args.options.appObjectId !== 'undefined';
-        telemetryProps.appName = typeof args.options.appName !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         this
             .getAppObjectId(args, logger)
@@ -102,29 +118,22 @@ class AadAppRoleAddCommand extends GraphCommand_1.default {
             return Promise.reject(`Multiple Azure AD application registration with name ${appName} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`);
         });
     }
-    options() {
-        const options = [
-            { option: '--appId [appId]' },
-            { option: '--appObjectId [appObjectId]' },
-            { option: '--appName [appName]' },
-            { option: '-n, --name <name>' },
-            { option: '-d, --description <description>' },
-            { option: '-m, --allowedMembers <allowedMembers>', autocomplete: AadAppRoleAddCommand.allowedMembers },
-            { option: '-c, --claim <claim>' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        const { appId, appObjectId, appName, allowedMembers, claim } = args.options;
-        if ((appId && appObjectId) ||
-            (appId && appName) ||
-            (appObjectId && appName)) {
-            return `Specify either appId, appObjectId or appName but not multiple`;
-        }
-        if (!appId && !appObjectId && !appName) {
-            return `Specify either appId, appObjectId or appName`;
-        }
+}
+_AadAppRoleAddCommand_instances = new WeakSet(), _AadAppRoleAddCommand_initTelemetry = function _AadAppRoleAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined',
+            appName: typeof args.options.appName !== 'undefined'
+        });
+    });
+}, _AadAppRoleAddCommand_initOptions = function _AadAppRoleAddCommand_initOptions() {
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--appName [appName]' }, { option: '-n, --name <name>' }, { option: '-d, --description <description>' }, {
+        option: '-m, --allowedMembers <allowedMembers>', autocomplete: AadAppRoleAddCommand.allowedMembers
+    }, { option: '-c, --claim <claim>' });
+}, _AadAppRoleAddCommand_initValidators = function _AadAppRoleAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const { allowedMembers, claim } = args.options;
         if (AadAppRoleAddCommand.allowedMembers.indexOf(allowedMembers) < 0) {
             return `${allowedMembers} is not a valid value for allowedMembers. Valid values are ${AadAppRoleAddCommand.allowedMembers.join(', ')}`;
         }
@@ -138,8 +147,10 @@ class AadAppRoleAddCommand extends GraphCommand_1.default {
             return `Claim can contain only the following characters a-z, A-Z, 0-9, :!#$%&'()*+,-./:;<=>?@[]^+_\`{|}~]+`;
         }
         return true;
-    }
-}
+    }));
+}, _AadAppRoleAddCommand_initOptionSets = function _AadAppRoleAddCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appObjectId', 'appName']);
+};
 AadAppRoleAddCommand.allowedMembers = ['usersGroups', 'applications', 'both'];
 module.exports = new AadAppRoleAddCommand();
 //# sourceMappingURL=app-role-add.js.map

package/dist/m365/aad/commands/app/app-role-list.js

@@ -1,23 +1,29 @@
 "use strict";
+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 _AadAppRoleListCommand_instances, _AadAppRoleListCommand_initTelemetry, _AadAppRoleListCommand_initOptions, _AadAppRoleListCommand_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 AadAppRoleListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadAppRoleListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAppRoleListCommand_instances, "m", _AadAppRoleListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleListCommand_instances, "m", _AadAppRoleListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleListCommand_instances, "m", _AadAppRoleListCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.APP_ROLE_LIST;
     }
     get description() {
         return 'Gets Azure AD app registration roles';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.appObjectId = typeof args.options.appObjectId !== 'undefined';
-        telemetryProps.appName = typeof args.options.appName !== 'undefined';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['displayName', 'description', 'id'];
     }
@@ -61,27 +67,19 @@ class AadAppRoleListCommand extends GraphCommand_1.default {
             return Promise.reject(`Multiple Azure AD application registration with name ${appName} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`);
         });
     }
-    options() {
-        const options = [
-            { option: '--appId [appId]' },
-            { option: '--appObjectId [appObjectId]' },
-            { option: '--appName [appName]' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        const { appId, appObjectId, appName } = args.options;
-        if ((appId && appObjectId) ||
-            (appId && appName) ||
-            (appObjectId && appName)) {
-            return `Specify either appId, appObjectId or appName but not multiple`;
-        }
-        if (!appId && !appObjectId && !appName) {
-            return `Specify either appId, appObjectId or appName`;
-        }
-        return true;
-    }
 }
+_AadAppRoleListCommand_instances = new WeakSet(), _AadAppRoleListCommand_initTelemetry = function _AadAppRoleListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined',
+            appName: typeof args.options.appName !== 'undefined'
+        });
+    });
+}, _AadAppRoleListCommand_initOptions = function _AadAppRoleListCommand_initOptions() {
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--appName [appName]' });
+}, _AadAppRoleListCommand_initOptionSets = function _AadAppRoleListCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appObjectId', 'appName']);
+};
 module.exports = new AadAppRoleListCommand();
 //# sourceMappingURL=app-role-list.js.map

package/dist/m365/aad/commands/app/app-role-remove.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 _AadAppRoleRemoveCommand_instances, _AadAppRoleRemoveCommand_initTelemetry, _AadAppRoleRemoveCommand_initOptions, _AadAppRoleRemoveCommand_initValidators, _AadAppRoleRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -6,22 +21,20 @@ const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleRemoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadAppRoleRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAppRoleRemoveCommand_instances, "m", _AadAppRoleRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleRemoveCommand_instances, "m", _AadAppRoleRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleRemoveCommand_instances, "m", _AadAppRoleRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleRemoveCommand_instances, "m", _AadAppRoleRemoveCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.APP_ROLE_REMOVE;
     }
     get description() {
         return 'Removes role from the specified Azure AD app registration';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.appObjectId = typeof args.options.appObjectId !== 'undefined';
-        telemetryProps.appName = typeof args.options.appName !== 'undefined';
-        telemetryProps.claim = typeof args.options.claim !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const deleteAppRole = () => {
             this
@@ -158,48 +171,31 @@ class AadAppRoleRemoveCommand extends GraphCommand_1.default {
             return Promise.reject(`Multiple Azure AD application registration with name ${appName} found. Please disambiguate using app object IDs: ${res.value.map(a => a.id).join(', ')}`);
         });
     }
-    options() {
-        const options = [
-            { option: '--appId [appId]' },
-            { option: '--appObjectId [appObjectId]' },
-            { option: '--appName [appName]' },
-            { option: '-n, --name [name]' },
-            { option: '-i, --id [id]' },
-            { option: '-c, --claim [claim]' },
-            { option: '--confirm' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        const { appId, appObjectId, appName, name, id, claim } = args.options;
-        if ((appId && appObjectId) ||
-            (appId && appName) ||
-            (appObjectId && appName)) {
-            return `Specify either appId, appObjectId or appName but not multiple`;
-        }
-        if ((name && claim) ||
-            (name && id) ||
-            (claim && id)) {
-            return `Specify either name, claim or id of the role but not multiple`;
-        }
-        if (!appId &&
-            !appObjectId &&
-            !appName) {
-            return `Specify either appId, appObjectId or appName`;
-        }
-        if (!name &&
-            !claim &&
-            !id) {
-            return `Specify either name, claim or id of the role`;
-        }
+}
+_AadAppRoleRemoveCommand_instances = new WeakSet(), _AadAppRoleRemoveCommand_initTelemetry = function _AadAppRoleRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined',
+            appName: typeof args.options.appName !== 'undefined',
+            claim: typeof args.options.claim !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            id: typeof args.options.id !== 'undefined'
+        });
+    });
+}, _AadAppRoleRemoveCommand_initOptions = function _AadAppRoleRemoveCommand_initOptions() {
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--appName [appName]' }, { option: '-n, --name [name]' }, { option: '-i, --id [id]' }, { option: '-c, --claim [claim]' }, { option: '--confirm' });
+}, _AadAppRoleRemoveCommand_initValidators = function _AadAppRoleRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
             if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }
         return true;
-    }
-}
+    }));
+}, _AadAppRoleRemoveCommand_initOptionSets = function _AadAppRoleRemoveCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appObjectId', 'appName'], ['name', 'claim', 'id']);
+};
 module.exports = new AadAppRoleRemoveCommand();
 //# sourceMappingURL=app-role-remove.js.map

package/dist/m365/aad/commands/app/app-set.js

@@ -1,30 +1,39 @@
 "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 _AadAppSetCommand_instances, _AadAppSetCommand_initTelemetry, _AadAppSetCommand_initOptions, _AadAppSetCommand_initValidators, _AadAppSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppSetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadAppSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAppSetCommand_instances, "m", _AadAppSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAppSetCommand_instances, "m", _AadAppSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAppSetCommand_instances, "m", _AadAppSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppSetCommand_instances, "m", _AadAppSetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.APP_SET;
     }
     get description() {
         return 'Updates Azure AD app registration';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.objectId = typeof args.options.objectId !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        telemetryProps.platform = typeof args.options.platform !== 'undefined';
-        telemetryProps.redirectUris = typeof args.options.redirectUris !== 'undefined';
-        telemetryProps.redirectUrisToRemove = typeof args.options.redirectUrisToRemove !== 'undefined';
-        telemetryProps.uri = typeof args.options.uri !== 'undefined';
-        telemetryProps.certificateFile = typeof args.options.certificateFile !== 'undefined';
-        telemetryProps.certificateBase64Encoded = typeof args.options.certificateBase64Encoded !== 'undefined';
-        telemetryProps.certificateDisplayName = typeof args.options.certificateDisplayName !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         this
             .getAppObjectId(args, logger)
@@ -238,36 +247,29 @@ class AadAppSetCommand extends GraphCommand_1.default {
         };
         return request_1.default.patch(requestOptions);
     }
-    options() {
-        const options = [
-            { option: '--appId [appId]' },
-            { option: '--objectId [objectId]' },
-            { option: '-n, --name [name]' },
-            { option: '-u, --uri [uri]' },
-            { option: '-r, --redirectUris [redirectUris]' },
-            { option: '--certificateFile [certificateFile]' },
-            { option: '--certificateBase64Encoded [certificateBase64Encoded]' },
-            { option: '--certificateDisplayName [certificateDisplayName]' },
-            {
-                option: '--platform [platform]',
-                autocomplete: AadAppSetCommand.aadApplicationPlatform
-            },
-            { option: '--redirectUrisToRemove [redirectUrisToRemove]' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.appId &&
-            !args.options.objectId &&
-            !args.options.name) {
-            return 'Specify either appId, objectId or name';
-        }
-        if ((args.options.appId && args.options.objectId) ||
-            (args.options.appId && args.options.name) ||
-            (args.options.objectId && args.options.name)) {
-            return 'Specify either appId, objectId or name but not both';
-        }
+}
+_AadAppSetCommand_instances = new WeakSet(), _AadAppSetCommand_initTelemetry = function _AadAppSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            objectId: typeof args.options.objectId !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            platform: typeof args.options.platform !== 'undefined',
+            redirectUris: typeof args.options.redirectUris !== 'undefined',
+            redirectUrisToRemove: typeof args.options.redirectUrisToRemove !== 'undefined',
+            uri: typeof args.options.uri !== 'undefined',
+            certificateFile: typeof args.options.certificateFile !== 'undefined',
+            certificateBase64Encoded: typeof args.options.certificateBase64Encoded !== 'undefined',
+            certificateDisplayName: typeof args.options.certificateDisplayName !== 'undefined'
+        });
+    });
+}, _AadAppSetCommand_initOptions = function _AadAppSetCommand_initOptions() {
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '-n, --name [name]' }, { option: '-u, --uri [uri]' }, { option: '-r, --redirectUris [redirectUris]' }, { option: '--certificateFile [certificateFile]' }, { option: '--certificateBase64Encoded [certificateBase64Encoded]' }, { option: '--certificateDisplayName [certificateDisplayName]' }, {
+        option: '--platform [platform]',
+        autocomplete: AadAppSetCommand.aadApplicationPlatform
+    }, { option: '--redirectUrisToRemove [redirectUrisToRemove]' });
+}, _AadAppSetCommand_initValidators = function _AadAppSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.certificateFile && args.options.certificateBase64Encoded) {
             return 'Specify either certificateFile or certificateBase64Encoded but not both';
         }
@@ -285,8 +287,10 @@ class AadAppSetCommand extends GraphCommand_1.default {
             return `${args.options.platform} is not a valid value for platform. Allowed values are ${AadAppSetCommand.aadApplicationPlatform.join(', ')}`;
         }
         return true;
-    }
-}
+    }));
+}, _AadAppSetCommand_initOptionSets = function _AadAppSetCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'objectId', 'name']);
+};
 AadAppSetCommand.aadApplicationPlatform = ['spa', 'web', 'publicClient'];
 module.exports = new AadAppSetCommand();
 //# sourceMappingURL=app-set.js.map

package/dist/m365/aad/commands/approleassignment/approleassignment-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 _AadAppRoleAssignmentAddCommand_instances, _AadAppRoleAssignmentAddCommand_initTelemetry, _AadAppRoleAssignmentAddCommand_initOptions, _AadAppRoleAssignmentAddCommand_initValidators, _AadAppRoleAssignmentAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
@@ -6,30 +21,31 @@ const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadAppRoleAssignmentAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAppRoleAssignmentAddCommand_instances, "m", _AadAppRoleAssignmentAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAssignmentAddCommand_instances, "m", _AadAppRoleAssignmentAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAssignmentAddCommand_instances, "m", _AadAppRoleAssignmentAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAssignmentAddCommand_instances, "m", _AadAppRoleAssignmentAddCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.APPROLEASSIGNMENT_ADD;
     }
     get description() {
         return 'Adds service principal permissions also known as scopes and app role assignments for specified Azure AD application registration';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.objectId = typeof args.options.objectId !== 'undefined';
-        telemetryProps.displayName = typeof args.options.displayName !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let objectId = '';
         let queryFilter = '';
         if (args.options.appId) {
             queryFilter = `$filter=appId eq '${encodeURIComponent(args.options.appId)}'`;
         }
-        else if (args.options.objectId) {
-            queryFilter = `$filter=id eq '${encodeURIComponent(args.options.objectId)}'`;
+        else if (args.options.appObjectId) {
+            queryFilter = `$filter=id eq '${encodeURIComponent(args.options.appObjectId)}'`;
         }
         else {
-            queryFilter = `$filter=displayName eq '${encodeURIComponent(args.options.displayName)}'`;
+            queryFilter = `$filter=displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
         }
         const getServicePrinciplesRequestOptions = {
             url: `${this.resource}/v1.0/servicePrincipals?${queryFilter}`,
@@ -42,7 +58,7 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
             .get(getServicePrinciplesRequestOptions)
             .then((servicePrincipalResult) => {
             if (servicePrincipalResult.value.length > 1) {
-                return Promise.reject('More than one service principal found. Please use the appId or objectId option to make sure the right service principal is specified.');
+                return Promise.reject('More than one service principal found. Please use the appId or appObjectId option to make sure the right service principal is specified.');
             }
             objectId = servicePrincipalResult.value[0].id;
             let resource = encodeURIComponent(args.options.resource);
@@ -140,44 +156,40 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
         };
         return request_1.default.post(requestOptions);
     }
-    options() {
-        const options = [
-            {
-                option: '--appId [appId]'
-            },
-            {
-                option: '--objectId [objectId]'
-            },
-            {
-                option: '--displayName [displayName]'
-            },
-            {
-                option: '-r, --resource <resource>',
-                autocomplete: ['Microsoft Graph', 'SharePoint', 'OneNote', 'Exchange', 'Microsoft Forms', 'Azure Active Directory Graph', 'Skype for Business']
-            },
-            {
-                option: '-s, --scope <scope>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        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';
-        }
+}
+_AadAppRoleAssignmentAddCommand_instances = new WeakSet(), _AadAppRoleAssignmentAddCommand_initTelemetry = function _AadAppRoleAssignmentAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined',
+            appDisplayName: typeof args.options.appDisplayName !== 'undefined'
+        });
+    });
+}, _AadAppRoleAssignmentAddCommand_initOptions = function _AadAppRoleAssignmentAddCommand_initOptions() {
+    this.options.unshift({
+        option: '--appId [appId]'
+    }, {
+        option: '--appObjectId [appObjectId]'
+    }, {
+        option: '--appDisplayName [appDisplayName]'
+    }, {
+        option: '-r, --resource <resource>',
+        autocomplete: ['Microsoft Graph', 'SharePoint', 'OneNote', 'Exchange', 'Microsoft Forms', 'Azure Active Directory Graph', 'Skype for Business']
+    }, {
+        option: '-s, --scope <scope>'
+    });
+}, _AadAppRoleAssignmentAddCommand_initValidators = function _AadAppRoleAssignmentAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid GUID`;
+        if (args.options.appObjectId && !utils_1.validation.isValidGuid(args.options.appObjectId)) {
+            return `${args.options.appObjectId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _AadAppRoleAssignmentAddCommand_initOptionSets = function _AadAppRoleAssignmentAddCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appObjectId', 'appDisplayName']);
+};
 module.exports = new AadAppRoleAssignmentAddCommand();
 //# sourceMappingURL=approleassignment-add.js.map