@pnp/cli-microsoft365 5.7.0-beta.c116041 → 6.0.0-beta.22bbec5

package/dist/Auth.js

@@ -301,8 +301,7 @@ class Auth {
             logger.logToStderr('');
         }
         logger.log(response.message);
-        if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenBrowserOnLogin, false)
-            || cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false)) {
+        if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false)) {
             // _open is never set before hitting this line, but this check
             // is implemented so that we can support lazy loading
             // but also stub it for testing

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

@@ -31,14 +31,10 @@ class AadAppRemoveCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.APP_REMOVE;
     }
-    alias() {
-        return [commands_1.default.APP_DELETE];
-    }
     get description() {
         return 'Removes an Azure AD app registration';
     }
     commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.APP_DELETE, commands_1.default.APP_REMOVE);
         const deleteApp = () => {
             this
                 .getObjectId(args, logger)

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

@@ -34,11 +34,7 @@ class AadAppRoleRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes role from the specified Azure AD app registration';
     }
-    alias() {
-        return [commands_1.default.APP_ROLE_DELETE];
-    }
     commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.APP_ROLE_DELETE, commands_1.default.APP_ROLE_REMOVE);
         const deleteAppRole = () => {
             this
                 .processAppRoleDelete(logger, args)

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;

package/dist/m365/aad/commands/sp/sp-get.js

@@ -34,12 +34,12 @@ class AadSpGetCommand extends GraphCommand_1.default {
         return 'Gets information about the specific service principal';
     }
     getSpId(args) {
-        if (args.options.objectId) {
-            return Promise.resolve(args.options.objectId);
+        if (args.options.appObjectId) {
+            return Promise.resolve(args.options.appObjectId);
         }
         let spMatchQuery = '';
-        if (args.options.displayName) {
-            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.displayName)}'`;
+        if (args.options.appDisplayName) {
+            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
         }
         else if (args.options.appId) {
             spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
@@ -59,7 +59,7 @@ class AadSpGetCommand extends GraphCommand_1.default {
                 return Promise.reject(`The specified Azure AD app does not exist`);
             }
             if (response.value.length > 1) {
-                return Promise.reject(`Multiple Azure AD apps with name ${args.options.displayName} found: ${response.value.map(x => x.id)}`);
+                return Promise.reject(`Multiple Azure AD apps with name ${args.options.appDisplayName} found: ${response.value.map(x => x.id)}`);
             }
             return Promise.resolve(spItem.id);
         });
@@ -91,32 +91,32 @@ _AadSpGetCommand_instances = new WeakSet(), _AadSpGetCommand_initTelemetry = fun
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: (!(!args.options.appId)).toString(),
-            displayName: (!(!args.options.displayName)).toString(),
-            objectId: (!(!args.options.objectId)).toString()
+            appDisplayName: (!(!args.options.appDisplayName)).toString(),
+            appObjectId: (!(!args.options.appObjectId)).toString()
         });
     });
 }, _AadSpGetCommand_initOptions = function _AadSpGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --appId [appId]'
     }, {
-        option: '-n, --displayName [displayName]'
+        option: '-n, --appDisplayName [appDisplayName]'
     }, {
-        option: '--objectId [objectId]'
+        option: '--appObjectId [appObjectId]'
     });
 }, _AadSpGetCommand_initValidators = function _AadSpGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         let optionsSpecified = 0;
         optionsSpecified += args.options.appId ? 1 : 0;
-        optionsSpecified += args.options.displayName ? 1 : 0;
-        optionsSpecified += args.options.objectId ? 1 : 0;
+        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 appId GUID`;
         }
-        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid objectId GUID`;
+        if (args.options.appObjectId && !utils_1.validation.isValidGuid(args.options.appObjectId)) {
+            return `${args.options.appObjectId} is not a valid objectId GUID`;
         }
         return true;
     }));

package/dist/m365/aad/commands.js

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

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

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

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

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

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

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

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

@@ -49,7 +49,7 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
                 return Promise.resolve();
             }
             const requestOptions = {
-                url: `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environment)}/listPackageResources?api-version=2016-11-01`,
+                url: `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environmentName)}/listPackageResources?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -71,8 +71,8 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
             }
             const requestOptions = {
                 url: formatArgument === 'json' ?
-                    `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.id)}?api-version=2016-11-01`
-                    : `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environment)}/exportPackage?api-version=2016-11-01`,
+                    `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.id)}?api-version=2016-11-01`
+                    : `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environmentName)}/exportPackage?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -117,7 +117,7 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
             }
             const requestOptions = {
                 url: formatArgument === 'json' ?
-                    `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.id)}/exportToARMTemplate?api-version=2016-11-01`
+                    `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.id)}/exportToARMTemplate?api-version=2016-11-01`
                     : downloadFileUrl,
                 // Set responseType to arraybuffer, otherwise binary data will be encoded
                 // to utf8 and binary data is corrupt
@@ -163,7 +163,7 @@ _FlowExportCommand_instances = new WeakSet(), _FlowExportCommand_initTelemetry =
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-n, --packageDisplayName [packageDisplayName]'
     }, {

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

@@ -29,7 +29,7 @@ class FlowGetCommand extends AzmgmtCommand_1.default {
             logger.logToStderr(`Retrieving information about Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },
@@ -51,7 +51,7 @@ _FlowGetCommand_instances = new WeakSet(), _FlowGetCommand_initOptions = functio
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

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

@@ -25,7 +25,7 @@ class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
         return ['name', 'displayName'];
     }
     commandAction(logger, args, cb) {
-        const url = `${this.resource}providers/Microsoft.ProcessSimple${args.options.asAdmin ? '/scopes/admin' : ''}/environments/${encodeURIComponent(args.options.environment)}/flows?api-version=2016-11-01`;
+        const url = `${this.resource}providers/Microsoft.ProcessSimple${args.options.asAdmin ? '/scopes/admin' : ''}/environments/${encodeURIComponent(args.options.environmentName)}/flows?api-version=2016-11-01`;
         this
             .getAllItems(url, logger, true)
             .then(() => {
@@ -52,7 +52,7 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
     });
 }, _FlowListCommand_initOptions = function _FlowListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

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

@@ -41,7 +41,7 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
         }
         const removeFlow = () => {
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
                 resolveWithFullResponse: true,
                 headers: {
                     accept: 'application/json'
@@ -54,7 +54,7 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
                 // handle 204 and throw error message to cmd when invalid flow id is passed
                 // https://github.com/pnp/cli-microsoft365/issues/1063#issuecomment-537218957
                 if (rawRes.statusCode === 204) {
-                    logger.log(chalk.red(`Error: Resource '${args.options.name}' does not exist in environment '${args.options.environment}'`));
+                    logger.log(chalk.red(`Error: Resource '${args.options.name}' does not exist in environment '${args.options.environmentName}'`));
                     cb();
                 }
                 else {
@@ -93,7 +93,7 @@ _FlowRemoveCommand_instances = new WeakSet(), _FlowRemoveCommand_initTelemetry =
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     }, {