@pnp/cli-microsoft365 7.0.0-beta.9229cf8 → 7.0.0-beta.99e75a7

package/dist/m365/aad/commands/{o365group/o365group-user-remove.js → m365group/m365group-user-remove.js}

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AadO365GroupUserRemoveCommand_instances, _AadO365GroupUserRemoveCommand_initTelemetry, _AadO365GroupUserRemoveCommand_initOptions, _AadO365GroupUserRemoveCommand_initValidators, _AadO365GroupUserRemoveCommand_initOptionSets;
+var _AadM365GroupUserRemoveCommand_instances, _AadM365GroupUserRemoveCommand_initTelemetry, _AadM365GroupUserRemoveCommand_initOptions, _AadM365GroupUserRemoveCommand_initValidators, _AadM365GroupUserRemoveCommand_initOptionSets;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,9 +11,9 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
 import commands from '../../commands.js';
-class AadO365GroupUserRemoveCommand extends GraphCommand {
+class AadM365GroupUserRemoveCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_USER_REMOVE;
+        return commands.M365GROUP_USER_REMOVE;
     }
     get description() {
         return 'Removes the specified user from specified Microsoft 365 Group or Microsoft Teams team';
@@ -23,11 +23,11 @@ class AadO365GroupUserRemoveCommand extends GraphCommand {
     }
     constructor() {
         super();
-        _AadO365GroupUserRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initOptionSets).call(this);
+        _AadM365GroupUserRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
@@ -99,7 +99,7 @@ class AadO365GroupUserRemoveCommand extends GraphCommand {
         }
     }
 }
-_AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemoveCommand_initTelemetry = function _AadO365GroupUserRemoveCommand_initTelemetry() {
+_AadM365GroupUserRemoveCommand_instances = new WeakSet(), _AadM365GroupUserRemoveCommand_initTelemetry = function _AadM365GroupUserRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: (!(!args.options.force)).toString(),
@@ -107,7 +107,7 @@ _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemov
             groupId: typeof args.options.groupId !== 'undefined'
         });
     });
-}, _AadO365GroupUserRemoveCommand_initOptions = function _AadO365GroupUserRemoveCommand_initOptions() {
+}, _AadM365GroupUserRemoveCommand_initOptions = function _AadM365GroupUserRemoveCommand_initOptions() {
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
@@ -117,7 +117,7 @@ _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemov
     }, {
         option: '-f, --force'
     });
-}, _AadO365GroupUserRemoveCommand_initValidators = function _AadO365GroupUserRemoveCommand_initValidators() {
+}, _AadM365GroupUserRemoveCommand_initValidators = function _AadM365GroupUserRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
@@ -127,8 +127,8 @@ _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemov
         }
         return true;
     });
-}, _AadO365GroupUserRemoveCommand_initOptionSets = function _AadO365GroupUserRemoveCommand_initOptionSets() {
+}, _AadM365GroupUserRemoveCommand_initOptionSets = function _AadM365GroupUserRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'teamId'] });
 };
-export default new AadO365GroupUserRemoveCommand();
-//# sourceMappingURL=o365group-user-remove.js.map
+export default new AadM365GroupUserRemoveCommand();
+//# sourceMappingURL=m365group-user-remove.js.map

package/dist/m365/aad/commands/{o365group/o365group-user-set.js → m365group/m365group-user-set.js}

@@ -3,16 +3,16 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AadO365GroupUserSetCommand_instances, _AadO365GroupUserSetCommand_initTelemetry, _AadO365GroupUserSetCommand_initOptions, _AadO365GroupUserSetCommand_initValidators, _AadO365GroupUserSetCommand_initOptionSets;
+var _AadM365GroupUserSetCommand_instances, _AadM365GroupUserSetCommand_initTelemetry, _AadM365GroupUserSetCommand_initOptions, _AadM365GroupUserSetCommand_initValidators, _AadM365GroupUserSetCommand_initOptionSets;
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
 import commands from '../../commands.js';
-class AadO365GroupUserSetCommand extends GraphCommand {
+class AadM365GroupUserSetCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_USER_SET;
+        return commands.M365GROUP_USER_SET;
     }
     get description() {
         return 'Updates role of the specified user in the specified Microsoft 365 Group or Microsoft Teams team';
@@ -22,11 +22,11 @@ class AadO365GroupUserSetCommand extends GraphCommand {
     }
     constructor() {
         super();
-        _AadO365GroupUserSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initOptionSets).call(this);
+        _AadM365GroupUserSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -43,7 +43,7 @@ class AadO365GroupUserSetCommand extends GraphCommand {
             }
             if (users.filter(i => args.options.userName.toUpperCase() === i.userPrincipalName.toUpperCase()).length <= 0) {
                 const userNotInGroup = (typeof args.options.groupId !== 'undefined') ?
-                    'The specified user does not belong to the given Microsoft 365 Group. Please use the \'o365group user add\' command to add new users.' :
+                    'The specified user does not belong to the given Microsoft 365 Group. Please use the \'m365group user add\' command to add new users.' :
                     'The specified user does not belong to the given Microsoft Teams team. Please use the \'graph teams user add\' command to add new users.';
                 throw new Error(userNotInGroup);
             }
@@ -113,7 +113,7 @@ class AadO365GroupUserSetCommand extends GraphCommand {
         return await odata.getAllItems(endpoint);
     }
 }
-_AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetCommand_initTelemetry = function _AadO365GroupUserSetCommand_initTelemetry() {
+_AadM365GroupUserSetCommand_instances = new WeakSet(), _AadM365GroupUserSetCommand_initTelemetry = function _AadM365GroupUserSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             teamId: typeof args.options.teamId !== 'undefined',
@@ -121,7 +121,7 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
             role: args.options.role
         });
     });
-}, _AadO365GroupUserSetCommand_initOptions = function _AadO365GroupUserSetCommand_initOptions() {
+}, _AadM365GroupUserSetCommand_initOptions = function _AadM365GroupUserSetCommand_initOptions() {
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
@@ -132,7 +132,7 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
         option: '-r, --role <role>',
         autocomplete: ['Owner', 'Member']
     });
-}, _AadO365GroupUserSetCommand_initValidators = function _AadO365GroupUserSetCommand_initValidators() {
+}, _AadM365GroupUserSetCommand_initValidators = function _AadM365GroupUserSetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
@@ -145,8 +145,8 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
         }
         return true;
     });
-}, _AadO365GroupUserSetCommand_initOptionSets = function _AadO365GroupUserSetCommand_initOptionSets() {
+}, _AadM365GroupUserSetCommand_initOptionSets = function _AadM365GroupUserSetCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'teamId'] });
 };
-export default new AadO365GroupUserSetCommand();
-//# sourceMappingURL=o365group-user-set.js.map
+export default new AadM365GroupUserSetCommand();
+//# sourceMappingURL=m365group-user-set.js.map

package/dist/m365/aad/commands.js

@@ -21,28 +21,28 @@ export default {
     GROUPSETTINGTEMPLATE_GET: `${prefix} groupsettingtemplate get`,
     GROUPSETTINGTEMPLATE_LIST: `${prefix} groupsettingtemplate list`,
     LICENSE_LIST: `${prefix} license list`,
-    O365GROUP_ADD: `${prefix} o365group add`,
-    O365GROUP_GET: `${prefix} o365group get`,
-    O365GROUP_LIST: `${prefix} o365group list`,
-    O365GROUP_CONVERSATION_LIST: `${prefix} o365group conversation list`,
-    O365GROUP_CONVERSATION_POST_LIST: `${prefix} o365group conversation post list`,
-    O365GROUP_RECYCLEBINITEM_CLEAR: `${prefix} o365group recyclebinitem clear`,
-    O365GROUP_RECYCLEBINITEM_LIST: `${prefix} o365group recyclebinitem list`,
-    O365GROUP_RECYCLEBINITEM_REMOVE: `${prefix} o365group recyclebinitem remove`,
-    O365GROUP_RECYCLEBINITEM_RESTORE: `${prefix} o365group recyclebinitem restore`,
-    O365GROUP_SET: `${prefix} o365group set`,
-    O365GROUP_TEAMIFY: `${prefix} o365group teamify`,
-    O365GROUP_REMOVE: `${prefix} o365group remove`,
-    O365GROUP_RENEW: `${prefix} o365group renew`,
-    O365GROUP_REPORT_ACTIVITYCOUNTS: `${prefix} o365group report activitycounts`,
-    O365GROUP_REPORT_ACTIVITYDETAIL: `${prefix} o365group report activitydetail`,
-    O365GROUP_REPORT_ACTIVITYFILECOUNTS: `${prefix} o365group report activityfilecounts`,
-    O365GROUP_REPORT_ACTIVITYGROUPCOUNTS: `${prefix} o365group report activitygroupcounts`,
-    O365GROUP_REPORT_ACTIVITYSTORAGE: `${prefix} o365group report activitystorage`,
-    O365GROUP_USER_ADD: `${prefix} o365group user add`,
-    O365GROUP_USER_LIST: `${prefix} o365group user list`,
-    O365GROUP_USER_REMOVE: `${prefix} o365group user remove`,
-    O365GROUP_USER_SET: `${prefix} o365group user set`,
+    M365GROUP_ADD: `${prefix} m365group add`,
+    M365GROUP_GET: `${prefix} m365group get`,
+    M365GROUP_LIST: `${prefix} m365group list`,
+    M365GROUP_CONVERSATION_LIST: `${prefix} m365group conversation list`,
+    M365GROUP_CONVERSATION_POST_LIST: `${prefix} m365group conversation post list`,
+    M365GROUP_RECYCLEBINITEM_CLEAR: `${prefix} m365group recyclebinitem clear`,
+    M365GROUP_RECYCLEBINITEM_LIST: `${prefix} m365group recyclebinitem list`,
+    M365GROUP_RECYCLEBINITEM_REMOVE: `${prefix} m365group recyclebinitem remove`,
+    M365GROUP_RECYCLEBINITEM_RESTORE: `${prefix} m365group recyclebinitem restore`,
+    M365GROUP_SET: `${prefix} m365group set`,
+    M365GROUP_TEAMIFY: `${prefix} m365group teamify`,
+    M365GROUP_REMOVE: `${prefix} m365group remove`,
+    M365GROUP_RENEW: `${prefix} m365group renew`,
+    M365GROUP_REPORT_ACTIVITYCOUNTS: `${prefix} m365group report activitycounts`,
+    M365GROUP_REPORT_ACTIVITYDETAIL: `${prefix} m365group report activitydetail`,
+    M365GROUP_REPORT_ACTIVITYFILECOUNTS: `${prefix} m365group report activityfilecounts`,
+    M365GROUP_REPORT_ACTIVITYGROUPCOUNTS: `${prefix} m365group report activitygroupcounts`,
+    M365GROUP_REPORT_ACTIVITYSTORAGE: `${prefix} m365group report activitystorage`,
+    M365GROUP_USER_ADD: `${prefix} m365group user add`,
+    M365GROUP_USER_LIST: `${prefix} m365group user list`,
+    M365GROUP_USER_REMOVE: `${prefix} m365group user remove`,
+    M365GROUP_USER_SET: `${prefix} m365group user set`,
     OAUTH2GRANT_ADD: `${prefix} oauth2grant add`,
     OAUTH2GRANT_LIST: `${prefix} oauth2grant list`,
     OAUTH2GRANT_REMOVE: `${prefix} oauth2grant remove`,

package/dist/m365/pa/commands/app/app-permission-ensure.js

@@ -0,0 +1,162 @@
+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 _PaAppPermissionEnsureCommand_instances, _PaAppPermissionEnsureCommand_initTelemetry, _PaAppPermissionEnsureCommand_initOptions, _PaAppPermissionEnsureCommand_initValidators, _PaAppPermissionEnsureCommand_initOptionSets, _PaAppPermissionEnsureCommand_initTypes;
+import Auth from '../../../../Auth.js';
+import request from '../../../../request.js';
+import { aadGroup } from '../../../../utils/aadGroup.js';
+import { aadUser } from '../../../../utils/aadUser.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import { validation } from '../../../../utils/validation.js';
+import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
+import commands from '../../commands.js';
+class PaAppPermissionEnsureCommand extends PowerAppsCommand {
+    get name() {
+        return commands.APP_PERMISSION_ENSURE;
+    }
+    get description() {
+        return 'Assigns/updates permissions to a Power Apps app';
+    }
+    constructor() {
+        super();
+        _PaAppPermissionEnsureCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr(`Assigning/updating permissions for '${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || (args.options.tenant && 'everyone')}' to the Power Apps app '${args.options.appName}'...`);
+        }
+        try {
+            const principalId = await this.getPrincipalId(args.options);
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.PowerApps/${args.options.asAdmin ? `scopes/admin/environments/${args.options.environmentName}/` : ''}apps/${args.options.appName}/modifyPermissions?api-version=2022-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                data: {
+                    put: [
+                        {
+                            properties: {
+                                principal: {
+                                    id: principalId,
+                                    type: this.getPrincipalType(args.options)
+                                },
+                                NotifyShareTargetOption: args.options.sendInvitationMail ? 'Notify' : 'DoNotNotify',
+                                roleName: args.options.roleName
+                            }
+                        }
+                    ]
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    getPrincipalType(options) {
+        if (options.userId || options.userName) {
+            return 'User';
+        }
+        if (options.groupId || options.groupName) {
+            return 'Group';
+        }
+        return 'Tenant';
+    }
+    async getPrincipalId(options) {
+        if (options.groupId) {
+            return options.groupId;
+        }
+        if (options.userId) {
+            return options.userId;
+        }
+        if (options.groupName) {
+            const group = await aadGroup.getGroupByDisplayName(options.groupName);
+            return group.id;
+        }
+        if (options.userName) {
+            const userId = await aadUser.getUserIdByUpn(options.userName);
+            return userId;
+        }
+        return accessToken.getTenantIdFromAccessToken(Auth.service.accessTokens[Auth.defaultResource].accessToken);
+    }
+}
+_PaAppPermissionEnsureCommand_instances = new WeakSet(), _PaAppPermissionEnsureCommand_initTelemetry = function _PaAppPermissionEnsureCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            tenant: !!args.options.tenant,
+            sendInvitationMail: !!args.options.sendInvitationMail,
+            environmentName: typeof args.options.environmentName !== 'undefined',
+            asAdmin: !!args.options.asAdmin
+        });
+    });
+}, _PaAppPermissionEnsureCommand_initOptions = function _PaAppPermissionEnsureCommand_initOptions() {
+    this.options.unshift({
+        option: '--appName <appName>'
+    }, {
+        option: '--roleName <roleName>',
+        autocomplete: PaAppPermissionEnsureCommand.roleNames
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--tenant'
+    }, {
+        option: '-e, --environmentName [environmentName]'
+    }, {
+        option: '--sendInvitationMail'
+    }, {
+        option: '--asAdmin'
+    });
+}, _PaAppPermissionEnsureCommand_initValidators = function _PaAppPermissionEnsureCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (!validation.isValidGuid(args.options.appName)) {
+            return `${args.options.appName} is not a valid GUID for appName.`;
+        }
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID for userId.`;
+        }
+        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID for groupId.`;
+        }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid user principal name (UPN) for userName.`;
+        }
+        if (PaAppPermissionEnsureCommand.roleNames.indexOf(args.options.roleName) < 0) {
+            return `${args.options.roleName} is not a valid roleName. Allowed values are: ${PaAppPermissionEnsureCommand.roleNames.join(', ')}.`;
+        }
+        if (args.options.environmentName && !args.options.asAdmin) {
+            return 'Specifying environmentName is only allowed when using asAdmin.';
+        }
+        if (args.options.asAdmin && !args.options.environmentName) {
+            return 'Specifying asAdmin is only allowed when using environmentName.';
+        }
+        if (args.options.tenant && args.options.roleName !== 'CanView') {
+            return 'Sharing with the entire tenant is only supported with CanView role.';
+        }
+        return true;
+    });
+}, _PaAppPermissionEnsureCommand_initOptionSets = function _PaAppPermissionEnsureCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName', 'tenant'] });
+}, _PaAppPermissionEnsureCommand_initTypes = function _PaAppPermissionEnsureCommand_initTypes() {
+    this.types.string.push('appName', 'roleName', 'userId', 'userName', 'groupId', 'groupName', 'environmentName');
+};
+PaAppPermissionEnsureCommand.roleNames = ['CanEdit', 'CanView'];
+export default new PaAppPermissionEnsureCommand();
+//# sourceMappingURL=app-permission-ensure.js.map

package/dist/m365/pa/commands/app/app-permission-list.js

@@ -29,7 +29,7 @@ class PaAppPermissionListCommand extends PowerAppsCommand {
     }
     async commandAction(logger, args) {
         if (this.verbose) {
-            logger.logToStderr(`Retrieving permissions for app ${args.options.appName}${args.options.roleName !== undefined ? ` with role name ${args.options.roleName}` : ''}`);
+            await logger.logToStderr(`Retrieving permissions for app ${args.options.appName}${args.options.roleName !== undefined ? ` with role name ${args.options.roleName}` : ''}`);
         }
         const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environmentName ? '/environments/' + formatting.encodeQueryParameter(args.options.environmentName) : ''}/apps/${args.options.appName}/permissions?api-version=2022-11-01`;
         try {
@@ -44,7 +44,7 @@ class PaAppPermissionListCommand extends PowerAppsCommand {
                     permission.principalType = permission.properties.principal.type;
                 });
             }
-            logger.log(permissions);
+            await logger.log(permissions);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pa/commands/app/app-permission-remove.js

@@ -0,0 +1,153 @@
+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 _PaAppPermissionRemoveCommand_instances, _PaAppPermissionRemoveCommand_initTelemetry, _PaAppPermissionRemoveCommand_initOptions, _PaAppPermissionRemoveCommand_initValidators, _PaAppPermissionRemoveCommand_initOptionSets, _PaAppPermissionRemoveCommand_initTypes;
+import Auth from '../../../../Auth.js';
+import { Cli } from '../../../../cli/Cli.js';
+import request from '../../../../request.js';
+import { aadGroup } from '../../../../utils/aadGroup.js';
+import { aadUser } from '../../../../utils/aadUser.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import { validation } from '../../../../utils/validation.js';
+import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
+import commands from '../../commands.js';
+class PaAppPermissionRemoveCommand extends PowerAppsCommand {
+    get name() {
+        return commands.APP_PERMISSION_REMOVE;
+    }
+    get description() {
+        return 'Removes permissions to a Power Apps app';
+    }
+    constructor() {
+        super();
+        _PaAppPermissionRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            if (args.options.force) {
+                await this.removeAppPermission(logger, args.options);
+            }
+            else {
+                const result = await Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the permissions of '${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || (args.options.tenant && 'everyone')}' from the Power App '${args.options.appName}'?`
+                });
+                if (result.continue) {
+                    await this.removeAppPermission(logger, args.options);
+                }
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async removeAppPermission(logger, options) {
+        if (this.verbose) {
+            await logger.logToStderr(`Removing permissions for '${options.userId || options.userName || options.groupId || options.groupName || (options.tenant && 'everyone')}' for the Power Apps app ${options.appName}...`);
+        }
+        const principalId = await this.getPrincipalId(options);
+        const requestOptions = {
+            url: `${this.resource}/providers/Microsoft.PowerApps/${options.asAdmin ? `scopes/admin/environments/${options.environmentName}/` : ''}apps/${options.appName}/modifyPermissions?api-version=2022-11-01`,
+            headers: {
+                accept: 'application/json'
+            },
+            data: {
+                delete: [
+                    {
+                        id: principalId
+                    }
+                ]
+            },
+            responseType: 'json'
+        };
+        await request.post(requestOptions);
+    }
+    async getPrincipalId(options) {
+        if (options.groupId) {
+            return options.groupId;
+        }
+        if (options.userId) {
+            return options.userId;
+        }
+        if (options.groupName) {
+            const group = await aadGroup.getGroupByDisplayName(options.groupName);
+            return group.id;
+        }
+        if (options.userName) {
+            const userId = await aadUser.getUserIdByUpn(options.userName);
+            return userId;
+        }
+        return `tenant-${accessToken.getTenantIdFromAccessToken(Auth.service.accessTokens[Auth.defaultResource].accessToken)}`;
+    }
+}
+_PaAppPermissionRemoveCommand_instances = new WeakSet(), _PaAppPermissionRemoveCommand_initTelemetry = function _PaAppPermissionRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            tenant: !!args.options.tenant,
+            asAdmin: !!args.options.asAdmin,
+            environmentName: typeof args.options.environmentName !== 'undefined',
+            force: !!args.options.force
+        });
+    });
+}, _PaAppPermissionRemoveCommand_initOptions = function _PaAppPermissionRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--appName <appName>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--tenant'
+    }, {
+        option: '--asAdmin'
+    }, {
+        option: '-e, --environmentName [environmentName]'
+    }, {
+        option: '-f, --force'
+    });
+}, _PaAppPermissionRemoveCommand_initValidators = function _PaAppPermissionRemoveCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (!validation.isValidGuid(args.options.appName)) {
+            return `${args.options.appName} is not a valid GUID for appName.`;
+        }
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID for userId.`;
+        }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid user principal name (UPN) for userName.`;
+        }
+        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID for groupId.`;
+        }
+        if (args.options.environmentName && !args.options.asAdmin) {
+            return 'Specifying environmentName is only allowed when using asAdmin';
+        }
+        if (args.options.asAdmin && !args.options.environmentName) {
+            return 'Specifying asAdmin is only allowed when using environmentName';
+        }
+        return true;
+    });
+}, _PaAppPermissionRemoveCommand_initOptionSets = function _PaAppPermissionRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName', 'tenant'] });
+}, _PaAppPermissionRemoveCommand_initTypes = function _PaAppPermissionRemoveCommand_initTypes() {
+    this.types.string.push('appName', 'userId', 'userName', 'groupId', 'groupName', 'environmentName');
+};
+export default new PaAppPermissionRemoveCommand();
+//# sourceMappingURL=app-permission-remove.js.map

package/dist/m365/pa/commands.js

@@ -6,7 +6,9 @@ export default {
     APP_REMOVE: `${prefix} app remove`,
     APP_CONSENT_SET: `${prefix} app consent set`,
     APP_OWNER_SET: `${prefix} app owner set`,
+    APP_PERMISSION_ENSURE: `${prefix} app permission ensure`,
     APP_PERMISSION_LIST: `${prefix} app permission list`,
+    APP_PERMISSION_REMOVE: `${prefix} app permission remove`,
     CONNECTOR_EXPORT: `${prefix} connector export`,
     CONNECTOR_LIST: `${prefix} connector list`,
     ENVIRONMENT_GET: `${prefix} environment get`,

package/dist/m365/spfx/commands/project/project-externalize/rules/PnPJsRule.js

@@ -42,7 +42,7 @@ export class PnPJsRule extends BasicDependencyRule {
             }
         ];
     }
-    visit(project) {
+    async visit(project) {
         const findings = this.pnpModules
             .map(x => this.getModuleAndParents(project, x.key))
             .reduce((x, y) => [...x, ...y]);
@@ -67,7 +67,7 @@ export class PnPJsRule extends BasicDependencyRule {
                 targetValue: 'require(\"tslib\");'
             })));
         }
-        return Promise.resolve({ entries: findings, suggestions: fileEdits });
+        return { entries: findings, suggestions: fileEdits };
     }
     getEntryFilesList(project) {
         return project && project.manifests ? project.manifests.map(x => x.path.replace('.manifest.json', '.ts')) : [];