@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.80d195f

package/.devcontainer/Dockerfile

@@ -27,7 +27,9 @@ RUN apt-get update && apt-get install -y \
   && apt-get install nodejs -y \
   && rm -rf /var/lib/apt/lists/*
 
-RUN pip3 install mkdocs-material==7.1.7 pymdown-extensions==9.0 pygments==2.11
+COPY ../docs/pip_requirements.txt .
+
+RUN pip install -r pip_requirements.txt
 
 RUN useradd \
   --user-group \

package/.devcontainer/devcontainer.json

@@ -1,6 +1,7 @@
 {
   "name": "CLI for Microsoft 365",
   "dockerFile": "Dockerfile",
+  "context": "..",
   "settings": {
     "terminal.integrated.profiles.linux": {
       "zsh": {

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

@@ -27,6 +27,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
         super();
         _AadAppAddCommand_instances.add(this);
         this.appName = '';
+        this.appPermissions = [];
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initValidators).call(this);
@@ -50,6 +51,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
             return Promise.resolve(appInfo);
         })
             .then(appInfo => this.updateAppFromManifest(args, appInfo))
+            .then(appInfo => this.grantAdminConsent(appInfo, args.options.grantAdminConsent, logger))
             .then(appInfo => this.configureUri(args, appInfo, logger))
             .then(appInfo => this.configureSecret(args, appInfo, logger))
             .then(appInfo => this.saveAppInfo(args, appInfo, logger))
@@ -120,6 +122,81 @@ class AadAppAddCommand extends GraphCommand_1.default {
             return request_1.default.post(createApplicationRequestOptions);
         });
     }
+    grantAdminConsent(appInfo, adminConsent, logger) {
+        if (!adminConsent || this.appPermissions.length === 0) {
+            return Promise.resolve(appInfo);
+        }
+        return this.createServicePrincipal(appInfo.appId)
+            .then((sp) => {
+            if (this.debug) {
+                logger.logToStderr("Service principal created, returned object id: " + sp.id);
+            }
+            const tasks = [];
+            this.appPermissions.forEach(permission => {
+                if (permission.scope.length > 0) {
+                    tasks.push(this.grantOAuth2Permission(sp.id, permission.resourceId, permission.scope.join(' ')));
+                    if (this.debug) {
+                        logger.logToStderr(`Admin consent granted for following resource ${permission.resourceId}, with delegated permissions: ${permission.scope.join(',')}`);
+                    }
+                }
+                permission.resourceAccess.filter(access => access.type === "Role").forEach((access) => {
+                    tasks.push(this.addRoleToServicePrincipal(sp.id, permission.resourceId, access.id));
+                    if (this.debug) {
+                        logger.logToStderr(`Admin consent granted for following resource ${permission.resourceId}, with application permission: ${access.id}`);
+                    }
+                });
+            });
+            return Promise.all(tasks)
+                .then(_ => {
+                return appInfo;
+            });
+        });
+    }
+    addRoleToServicePrincipal(objectId, resourceId, appRoleId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/myorganization/servicePrincipals/${objectId}/appRoleAssignments`,
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            responseType: 'json',
+            data: {
+                appRoleId: appRoleId,
+                principalId: objectId,
+                resourceId: resourceId
+            }
+        };
+        return request_1.default.post(requestOptions);
+    }
+    grantOAuth2Permission(appId, resourceId, scopeName) {
+        const grantAdminConsentApplicationRequestOptions = {
+            url: `${this.resource}/v1.0/myorganization/oauth2PermissionGrants`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                clientId: appId,
+                consentType: "AllPrincipals",
+                principalId: null,
+                resourceId: resourceId,
+                scope: scopeName
+            }
+        };
+        return request_1.default.post(grantAdminConsentApplicationRequestOptions);
+    }
+    createServicePrincipal(appId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/myorganization/servicePrincipals`,
+            headers: {
+                'content-type': 'application/json'
+            },
+            data: {
+                appId: appId
+            },
+            responseType: 'json'
+        };
+        return request_1.default.post(requestOptions);
+    }
     updateAppFromManifest(args, appInfo) {
         if (!args.options.manifest) {
             return Promise.resolve(appInfo);
@@ -135,6 +212,11 @@ class AadAppAddCommand extends GraphCommand_1.default {
         // separately
         const secrets = this.getSecretsFromManifest(v2Manifest);
         // Azure Portal returns v2 manifest whereas the Graph API expects a v1.6
+        if (args.options.apisApplication || args.options.apisDelegated) {
+            // take submitted delegated / application permissions as options
+            // otherwise, they will be skipped in the app update
+            v2Manifest.requiredResourceAccess = appInfo.requiredResourceAccess;
+        }
         const graphManifest = this.transformManifest(v2Manifest);
         const updateAppRequestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
@@ -334,36 +416,69 @@ class AadAppAddCommand extends GraphCommand_1.default {
             .then(_ => appInfo);
     }
     resolveApis(args, logger) {
-        if (!args.options.apisDelegated && !args.options.apisApplication) {
+        var _a;
+        if (!args.options.apisDelegated && !args.options.apisApplication
+            && (typeof ((_a = this.manifest) === null || _a === void 0 ? void 0 : _a.requiredResourceAccess) === 'undefined' || this.manifest.requiredResourceAccess.length === 0)) {
             return Promise.resolve([]);
         }
         if (this.verbose) {
             logger.logToStderr('Resolving requested APIs...');
         }
         return utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=servicePrincipalNames,appId,oauth2PermissionScopes,appRoles`)
+            .getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`)
             .then(servicePrincipals => {
+            var _a;
+            let resolvedApis = [];
             try {
-                const resolvedApis = this.getRequiredResourceAccessForApis(servicePrincipals, args.options.apisDelegated, 'Scope', logger);
-                if (this.debug) {
-                    logger.logToStderr(`Resolved delegated permissions: ${JSON.stringify(resolvedApis, null, 2)}`);
-                }
-                const resolvedApplicationApis = this.getRequiredResourceAccessForApis(servicePrincipals, args.options.apisApplication, 'Role', logger);
-                if (this.debug) {
-                    logger.logToStderr(`Resolved application permissions: ${JSON.stringify(resolvedApplicationApis, null, 2)}`);
-                }
-                // merge resolved application APIs onto resolved delegated APIs
-                resolvedApplicationApis.forEach(resolvedRequiredResource => {
-                    const requiredResource = resolvedApis.find(api => api.resourceAppId === resolvedRequiredResource.resourceAppId);
-                    if (requiredResource) {
-                        requiredResource.resourceAccess.push(...resolvedRequiredResource.resourceAccess);
+                if (args.options.apisDelegated || args.options.apisApplication) {
+                    resolvedApis = this.getRequiredResourceAccessForApis(servicePrincipals, args.options.apisDelegated, 'Scope', logger);
+                    if (this.verbose) {
+                        logger.logToStderr(`Resolved delegated permissions: ${JSON.stringify(resolvedApis, null, 2)}`);
                     }
-                    else {
-                        resolvedApis.push(resolvedRequiredResource);
+                    const resolvedApplicationApis = this.getRequiredResourceAccessForApis(servicePrincipals, args.options.apisApplication, 'Role', logger);
+                    if (this.verbose) {
+                        logger.logToStderr(`Resolved application permissions: ${JSON.stringify(resolvedApplicationApis, null, 2)}`);
                     }
-                });
-                if (this.debug) {
+                    // merge resolved application APIs onto resolved delegated APIs
+                    resolvedApplicationApis.forEach(resolvedRequiredResource => {
+                        const requiredResource = resolvedApis.find(api => api.resourceAppId === resolvedRequiredResource.resourceAppId);
+                        if (requiredResource) {
+                            requiredResource.resourceAccess.push(...resolvedRequiredResource.resourceAccess);
+                        }
+                        else {
+                            resolvedApis.push(resolvedRequiredResource);
+                        }
+                    });
+                }
+                if (typeof ((_a = this.manifest) === null || _a === void 0 ? void 0 : _a.requiredResourceAccess) !== 'undefined' && this.manifest.requiredResourceAccess.length > 0) {
+                    const manifestApis = this.manifest.requiredResourceAccess;
+                    manifestApis.forEach(manifestApi => {
+                        const requiredResource = resolvedApis.find(api => api.resourceAppId === manifestApi.resourceAppId);
+                        if (requiredResource) {
+                            // exclude if any duplicate required resources in both manifest and submitted options
+                            requiredResource.resourceAccess.push(...manifestApi.resourceAccess.filter(manRes => !requiredResource.resourceAccess.some(res => res.id === manRes.id)));
+                        }
+                        else {
+                            resolvedApis.push(manifestApi);
+                        }
+                        const app = servicePrincipals.find(servicePrincipals => servicePrincipals.appId === manifestApi.resourceAppId);
+                        if (app) {
+                            manifestApi.resourceAccess.forEach((res => {
+                                var _a;
+                                const resourceAccessPermission = {
+                                    id: res.id,
+                                    type: res.type
+                                };
+                                const oAuthValue = (_a = app.oauth2PermissionScopes.find(scp => scp.id === res.id)) === null || _a === void 0 ? void 0 : _a.value;
+                                this.updateAppPermissions(app.id, resourceAccessPermission, oAuthValue);
+                            }));
+                        }
+                    });
+                }
+                if (this.verbose) {
                     logger.logToStderr(`Merged delegated and application permissions: ${JSON.stringify(resolvedApis, null, 2)}`);
+                    logger.logToStderr(`App role assignments: ${JSON.stringify(this.appPermissions.flatMap(permission => permission.resourceAccess.filter(access => access.type === "Role")), null, 2)}`);
+                    logger.logToStderr(`OAuth2 permissions: ${JSON.stringify(this.appPermissions.flatMap(permission => permission.scope), null, 2)}`);
                 }
                 return Promise.resolve(resolvedApis);
             }
@@ -405,13 +520,34 @@ class AadAppAddCommand extends GraphCommand_1.default {
                 };
                 resolvedApis.push(resolvedApi);
             }
-            resolvedApi.resourceAccess.push({
+            const resourceAccessPermission = {
                 id: permission.id,
                 type: scopeType
-            });
+            };
+            resolvedApi.resourceAccess.push(resourceAccessPermission);
+            this.updateAppPermissions(servicePrincipal.id, resourceAccessPermission, permission.value);
         });
         return resolvedApis;
     }
+    updateAppPermissions(spId, resourceAccessPermission, oAuth2PermissionValue) {
+        // During API resolution, we store globally both app role assignments and oauth2permissions
+        // So that we'll be able to parse them during the admin consent process
+        let existingPermission = this.appPermissions.find(oauth => oauth.resourceId === spId);
+        if (!existingPermission) {
+            existingPermission = {
+                resourceId: spId,
+                resourceAccess: [],
+                scope: []
+            };
+            this.appPermissions.push(existingPermission);
+        }
+        if (resourceAccessPermission.type === 'Scope' && oAuth2PermissionValue && !existingPermission.scope.find(scp => scp === oAuth2PermissionValue)) {
+            existingPermission.scope.push(oAuth2PermissionValue);
+        }
+        if (!existingPermission.resourceAccess.find(res => res.id === resourceAccessPermission.id)) {
+            existingPermission.resourceAccess.push(resourceAccessPermission);
+        }
+    }
     configureSecret(args, appInfo, logger) {
         if (!args.options.withSecret) {
             return Promise.resolve(appInfo);
@@ -523,7 +659,8 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
             withSecret: args.options.withSecret,
             certificateFile: typeof args.options.certificateFile !== 'undefined',
             certificateBase64Encoded: typeof args.options.certificateBase64Encoded !== 'undefined',
-            certificateDisplayName: typeof args.options.certificateDisplayName !== 'undefined'
+            certificateDisplayName: typeof args.options.certificateDisplayName !== 'undefined',
+            grantAdminConsent: typeof args.options.grantAdminConsent !== 'undefined'
         });
     });
 }, _AadAppAddCommand_initOptions = function _AadAppAddCommand_initOptions() {
@@ -565,6 +702,8 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
         option: '--manifest [manifest]'
     }, {
         option: '--save'
+    }, {
+        option: '--grantAdminConsent'
     });
 }, _AadAppAddCommand_initValidators = function _AadAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -40,11 +40,11 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
         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}`,
@@ -57,7 +57,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);
@@ -160,17 +160,17 @@ _AadAppRoleAssignmentAddCommand_instances = new WeakSet(), _AadAppRoleAssignment
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
-            objectId: typeof args.options.objectId !== 'undefined',
-            displayName: typeof args.options.displayName !== '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: '--objectId [objectId]'
+        option: '--appObjectId [appObjectId]'
     }, {
-        option: '--displayName [displayName]'
+        option: '--appDisplayName [appDisplayName]'
     }, {
         option: '-r, --resource <resource>',
         autocomplete: ['Microsoft Graph', 'SharePoint', 'OneNote', 'Exchange', 'Microsoft Forms', 'Azure Active Directory Graph', 'Skype for Business']
@@ -181,16 +181,16 @@ _AadAppRoleAssignmentAddCommand_instances = new WeakSet(), _AadAppRoleAssignment
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         let optionsSpecified = 0;
         optionsSpecified += args.options.appId ? 1 : 0;
-        optionsSpecified += args.options.displayName ? 1 : 0;
-        optionsSpecified += args.options.objectId ? 1 : 0;
+        optionsSpecified += args.options.appDisplayName ? 1 : 0;
+        optionsSpecified += args.options.appObjectId ? 1 : 0;
         if (optionsSpecified !== 1) {
-            return 'Specify either appId, objectId or displayName';
+            return 'Specify either appId, appObjectId or appDisplayName';
         }
         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;
     }));

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

@@ -78,8 +78,8 @@ class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
     }
     getAppRoleAssignments(argOptions) {
         return new Promise((resolve, reject) => {
-            if (argOptions.objectId) {
-                this.getSPAppRoleAssignments(argOptions.objectId)
+            if (argOptions.appObjectId) {
+                this.getSPAppRoleAssignments(argOptions.appObjectId)
                     .then((spAppRoleAssignments) => {
                     if (!spAppRoleAssignments.value.length) {
                         reject('no app role assignments found');
@@ -97,7 +97,7 @@ class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
                     spMatchQuery = `appId eq '${encodeURIComponent(argOptions.appId)}'`;
                 }
                 else {
-                    spMatchQuery = `displayName eq '${encodeURIComponent(argOptions.displayName)}'`;
+                    spMatchQuery = `displayName eq '${encodeURIComponent(argOptions.appDisplayName)}'`;
                 }
                 this.getServicePrincipalForApp(spMatchQuery)
                     .then((resp) => {
@@ -147,35 +147,35 @@ _AadAppRoleAssignmentListCommand_instances = new WeakSet(), _AadAppRoleAssignmen
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined',
-            objectId: typeof args.options.objectId !== 'undefined'
+            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined'
         });
     });
 }, _AadAppRoleAssignmentListCommand_initOptions = function _AadAppRoleAssignmentListCommand_initOptions() {
     this.options.unshift({
         option: '-i, --appId [appId]'
     }, {
-        option: '-n, --displayName [displayName]'
+        option: '-n, --appDisplayName [appDisplayName]'
     }, {
-        option: '--objectId [objectId]'
+        option: '--appObjectId [appObjectId]'
     });
 }, _AadAppRoleAssignmentListCommand_initValidators = function _AadAppRoleAssignmentListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.appId && !args.options.displayName && !args.options.objectId) {
-            return 'Specify either appId, objectId or displayName';
+        if (!args.options.appId && !args.options.appDisplayName && !args.options.appObjectId) {
+            return 'Specify either appId, appObjectId or appDisplayName';
         }
         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`;
         }
         let optionsSpecified = 0;
         optionsSpecified += args.options.appId ? 1 : 0;
-        optionsSpecified += args.options.displayName ? 1 : 0;
-        optionsSpecified += args.options.objectId ? 1 : 0;
+        optionsSpecified += args.options.appDisplayName ? 1 : 0;
+        optionsSpecified += args.options.appObjectId ? 1 : 0;
         if (optionsSpecified > 1) {
-            return 'Specify either appId, objectId or displayName';
+            return 'Specify either appId, appObjectId or appDisplayName';
         }
         return true;
     }));

package/dist/m365/aad/commands/approleassignment/approleassignment-remove.js

@@ -43,11 +43,11 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
             if (args.options.appId) {
                 spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
             }
-            else if (args.options.objectId) {
-                spMatchQuery = `id eq '${encodeURIComponent(args.options.objectId)}'`;
+            else if (args.options.appObjectId) {
+                spMatchQuery = `id eq '${encodeURIComponent(args.options.appObjectId)}'`;
             }
             else {
-                spMatchQuery = `displayName eq '${encodeURIComponent(args.options.displayName)}'`;
+                spMatchQuery = `displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
             }
             this
                 .getServicePrincipalForApp(spMatchQuery)
@@ -160,8 +160,8 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined',
-            objectId: typeof args.options.objectId !== 'undefined',
+            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined',
             confirm: (!!args.options.confirm).toString()
         });
     });
@@ -169,9 +169,9 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
     this.options.unshift({
         option: '--appId [appId]'
     }, {
-        option: '--objectId [objectId]'
+        option: '--appObjectId [appObjectId]'
     }, {
-        option: '--displayName [displayName]'
+        option: '--appDisplayName [appDisplayName]'
     }, {
         option: '-r, --resource <resource>',
         autocomplete: ['Microsoft Graph', 'SharePoint', 'OneNote', 'Exchange', 'Microsoft Forms', 'Azure Active Directory Graph', 'Skype for Business']
@@ -184,16 +184,16 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         let optionsSpecified = 0;
         optionsSpecified += args.options.appId ? 1 : 0;
-        optionsSpecified += args.options.displayName ? 1 : 0;
-        optionsSpecified += args.options.objectId ? 1 : 0;
+        optionsSpecified += args.options.appDisplayName ? 1 : 0;
+        optionsSpecified += args.options.appObjectId ? 1 : 0;
         if (optionsSpecified !== 1) {
-            return 'Specify either appId, objectId or displayName';
+            return 'Specify either appId, appObjectId or appDisplayName';
         }
         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;
     }));

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

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

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

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

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

@@ -34,8 +34,8 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
         return 'Creates a new Microsoft Teams team under existing Microsoft 365 group';
     }
     getGroupId(args) {
-        if (args.options.groupId) {
-            return Promise.resolve(args.options.groupId);
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
         }
         const requestOptions = {
             url: `${this.resource}/v1.0/groups?$filter=mailNickname eq '${encodeURIComponent(args.options.mailNickname)}'`,
@@ -74,9 +74,9 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
         };
         this
             .getGroupId(args)
-            .then((groupId) => {
+            .then((id) => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${encodeURIComponent(groupId)}/team`,
+                url: `${this.resource}/v1.0/groups/${encodeURIComponent(id)}/team`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -91,26 +91,26 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
 _AadO365GroupTeamifyCommand_instances = new WeakSet(), _AadO365GroupTeamifyCommand_initTelemetry = function _AadO365GroupTeamifyCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            groupId: typeof args.options.groupId !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
             mailNickname: typeof args.options.mailNickname !== 'undefined'
         });
     });
 }, _AadO365GroupTeamifyCommand_initOptions = function _AadO365GroupTeamifyCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --groupId [groupId]'
+        option: '-i, --id [id]'
     }, {
         option: '--mailNickname [mailNickname]'
     });
 }, _AadO365GroupTeamifyCommand_initValidators = function _AadO365GroupTeamifyCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.groupId && args.options.mailNickname) {
-            return 'Specify either groupId or mailNickname, but not both.';
+        if (args.options.id && args.options.mailNickname) {
+            return 'Specify either id or mailNickname, but not both.';
         }
-        if (!args.options.groupId && !args.options.mailNickname) {
-            return 'Specify groupId or mailNickname, one is required';
+        if (!args.options.id && !args.options.mailNickname) {
+            return 'Specify id or mailNickname, one is required';
         }
-        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));

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

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