@pnp/cli-microsoft365 7.0.0-beta.f1037e1 → 7.0.0

package/dist/m365/pa/commands/app/app-export.js

@@ -69,7 +69,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
             },
             data: {
                 baseResourceIds: [
-                    `/providers/Microsoft.PowerApps/apps/${args.options.id}`
+                    `/providers/Microsoft.PowerApps/apps/${args.options.name}`
                 ]
             },
             responseType: 'json'
@@ -82,7 +82,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
     }
     async exportPackage(args, logger) {
         if (this.verbose) {
-            await logger.logToStderr(`Initiating package export for Microsoft Power App ${args.options.id}...`);
+            await logger.logToStderr(`Initiating package export for Microsoft Power App ${args.options.name}...`);
         }
         const resources = await this.getPackageResources(args, logger);
         const requestOptions = {
@@ -93,7 +93,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
             responseType: 'json',
             data: {
                 includedResourceIds: [
-                    `/providers/Microsoft.PowerApps/apps/${args.options.id}`
+                    `/providers/Microsoft.PowerApps/apps/${args.options.name}`
                 ],
                 details: {
                     creator: args.options.packageCreatedBy,
@@ -148,11 +148,11 @@ _PaAppExportCommand_instances = new WeakSet(), _PaAppExportCommand_initTelemetry
     });
 }, _PaAppExportCommand_initOptions = function _PaAppExportCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-n, --name <name>'
     }, {
         option: '-e, --environmentName <environmentName>'
     }, {
-        option: '-n, --packageDisplayName [packageDisplayName]'
+        option: '--packageDisplayName [packageDisplayName]'
     }, {
         option: '-d, --packageDescription [packageDescription]'
     }, {
@@ -164,8 +164,8 @@ _PaAppExportCommand_instances = new WeakSet(), _PaAppExportCommand_initTelemetry
     });
 }, _PaAppExportCommand_initValidators = function _PaAppExportCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!validation.isValidGuid(args.options.name)) {
+            return `${args.options.name} is not a valid GUID for option name`;
         }
         if (args.options.path && !fs.existsSync(path.dirname(args.options.path))) {
             return 'Specified path where to save the file does not exist';

package/dist/m365/pa/commands/app/app-owner-set.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 _PaAppOwnerSetCommand_instances, _PaAppOwnerSetCommand_initTelemetry, _PaAppOwnerSetCommand_initOptions, _PaAppOwnerSetCommand_initValidators, _PaAppOwnerSetCommand_initOptionSets;
+var _PaAppOwnerSetCommand_instances, _a, _PaAppOwnerSetCommand_initTelemetry, _PaAppOwnerSetCommand_initOptions, _PaAppOwnerSetCommand_initValidators, _PaAppOwnerSetCommand_initOptionSets;
 import request from '../../../../request.js';
 import { aadUser } from '../../../../utils/aadUser.js';
 import { validation } from '../../../../utils/validation.js';
@@ -55,7 +55,7 @@ class PaAppOwnerSetCommand extends PowerAppsCommand {
         return aadUser.getUserIdByUpn(options.userName);
     }
 }
-_PaAppOwnerSetCommand_instances = new WeakSet(), _PaAppOwnerSetCommand_initTelemetry = function _PaAppOwnerSetCommand_initTelemetry() {
+_a = PaAppOwnerSetCommand, _PaAppOwnerSetCommand_instances = new WeakSet(), _PaAppOwnerSetCommand_initTelemetry = function _PaAppOwnerSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             userId: typeof args.options.userId !== 'undefined',
@@ -74,7 +74,7 @@ _PaAppOwnerSetCommand_instances = new WeakSet(), _PaAppOwnerSetCommand_initTelem
         option: '--userName [userName]'
     }, {
         option: '--roleForOldAppOwner [roleForOldAppOwner]',
-        autocomplete: PaAppOwnerSetCommand.roleForOldAppOwner
+        autocomplete: _a.roleForOldAppOwner
     });
 }, _PaAppOwnerSetCommand_initValidators = function _PaAppOwnerSetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -87,8 +87,8 @@ _PaAppOwnerSetCommand_instances = new WeakSet(), _PaAppOwnerSetCommand_initTelem
         if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
             return `${args.options.userName} is not a valid UPN for userName`;
         }
-        if (args.options.roleForOldAppOwner && PaAppOwnerSetCommand.roleForOldAppOwner.indexOf(args.options.roleForOldAppOwner) < 0) {
-            return `${args.options.roleForOldAppOwner} is not a valid roleForOldAppOwner. Allowed values are: ${PaAppOwnerSetCommand.roleForOldAppOwner.join(', ')}`;
+        if (args.options.roleForOldAppOwner && _a.roleForOldAppOwner.indexOf(args.options.roleForOldAppOwner) < 0) {
+            return `${args.options.roleForOldAppOwner} is not a valid roleForOldAppOwner. Allowed values are: ${_a.roleForOldAppOwner.join(', ')}`;
         }
         return true;
     });

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, _a, _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);
+    }
+}
+_a = PaAppPermissionEnsureCommand, _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: _a.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 (_a.roleNames.indexOf(args.options.roleName) < 0) {
+            return `${args.options.roleName} is not a valid roleName. Allowed values are: ${_a.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/connector/connector-export.js

@@ -29,9 +29,9 @@ class PaConnectorExportCommand extends PowerAppsCommand {
         __classPrivateFieldGet(this, _PaConnectorExportCommand_instances, "m", _PaConnectorExportCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.connector);
+        const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.name);
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.PowerApps/apis/${formatting.encodeQueryParameter(args.options.connector)}?api-version=2016-11-01&$filter=environment%20eq%20%27${formatting.encodeQueryParameter(args.options.environmentName)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
+            url: `${this.resource}/providers/Microsoft.PowerApps/apis/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01&$filter=environment%20eq%20%27${formatting.encodeQueryParameter(args.options.environmentName)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
             headers: {
                 accept: 'application/json'
             },
@@ -53,7 +53,7 @@ class PaConnectorExportCommand extends PowerAppsCommand {
             const settings = {
                 apiDefinition: "apiDefinition.swagger.json",
                 apiProperties: "apiProperties.json",
-                connectorId: args.options.connector,
+                connectorId: args.options.name,
                 environment: args.options.environmentName,
                 icon: "icon.png",
                 powerAppsApiVersion: "2016-11-01",
@@ -157,7 +157,7 @@ _PaConnectorExportCommand_instances = new WeakSet(), _PaConnectorExportCommand_i
     this.options.unshift({
         option: '-e, --environmentName <environmentName>'
     }, {
-        option: '-c, --connector <connector>'
+        option: '-n, --name <name>'
     }, {
         option: '--outputFolder [outputFolder]'
     });
@@ -167,7 +167,7 @@ _PaConnectorExportCommand_instances = new WeakSet(), _PaConnectorExportCommand_i
             !fs.existsSync(path.resolve(args.options.outputFolder))) {
             return `Specified output folder ${args.options.outputFolder} doesn't exist`;
         }
-        const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.connector);
+        const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.name);
         if (fs.existsSync(outputFolder)) {
             return `Connector output folder ${outputFolder} already exists`;
         }

package/dist/m365/pa/commands.js

@@ -6,13 +6,12 @@ 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`,
-    ENVIRONMENT_LIST: `${prefix} environment list`,
-    PCF_INIT: `${prefix} pcf init`,
-    SOLUTION_INIT: `${prefix} solution init`,
-    SOLUTION_REFERENCE_ADD: `${prefix} solution reference add`
+    ENVIRONMENT_LIST: `${prefix} environment list`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/planner/commands/bucket/bucket-add.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 _PlannerBucketAddCommand_instances, _PlannerBucketAddCommand_initTelemetry, _PlannerBucketAddCommand_initOptions, _PlannerBucketAddCommand_initValidators, _PlannerBucketAddCommand_initOptionSets;
+var _PlannerBucketAddCommand_instances, _PlannerBucketAddCommand_initTelemetry, _PlannerBucketAddCommand_initOptions, _PlannerBucketAddCommand_initValidators, _PlannerBucketAddCommand_initOptionSets, _PlannerBucketAddCommand_initTypes;
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { planner } from '../../../../utils/planner.js';
@@ -27,6 +27,7 @@ class PlannerBucketAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -59,8 +60,8 @@ class PlannerBucketAddCommand extends GraphCommand {
             const plan = await planner.getPlanByTitle(args.options.planTitle, groupId);
             return plan.id;
         }
-        const plans = await planner.getPlansByRosterId(args.options.rosterId);
-        return plans[0].id;
+        const plan = await planner.getPlanByRosterId(args.options.rosterId);
+        return plan.id;
     }
     async getGroupId(args) {
         if (args.options.ownerGroupId) {
@@ -109,6 +110,8 @@ _PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_ini
         options: ['ownerGroupId', 'ownerGroupName'],
         runsWhen: (args) => args.options.planTitle !== undefined
     });
+}, _PlannerBucketAddCommand_initTypes = function _PlannerBucketAddCommand_initTypes() {
+    this.types.string.push('name', 'planId', 'planTitle', 'ownerGroupId', 'ownerGroupName', 'orderHint', 'rosterId ');
 };
 export default new PlannerBucketAddCommand();
 //# sourceMappingURL=bucket-add.js.map

package/dist/m365/planner/commands/bucket/bucket-get.js

@@ -3,13 +3,15 @@ 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 _PlannerBucketGetCommand_instances, _PlannerBucketGetCommand_initTelemetry, _PlannerBucketGetCommand_initOptions, _PlannerBucketGetCommand_initValidators, _PlannerBucketGetCommand_initOptionSets;
+var _PlannerBucketGetCommand_instances, _PlannerBucketGetCommand_initTelemetry, _PlannerBucketGetCommand_initOptions, _PlannerBucketGetCommand_initValidators, _PlannerBucketGetCommand_initOptionSets, _PlannerBucketGetCommand_initTypes;
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
+import { formatting } from '../../../../utils/formatting.js';
 class PlannerBucketGetCommand extends GraphCommand {
     get name() {
         return commands.BUCKET_GET;
@@ -24,6 +26,7 @@ class PlannerBucketGetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -54,7 +57,9 @@ class PlannerBucketGetCommand extends GraphCommand {
             throw `The specified bucket ${name} does not exist`;
         }
         if (filteredBuckets.length > 1) {
-            throw `Multiple buckets with name ${name} found: ${filteredBuckets.map(x => x.id)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', filteredBuckets);
+            const result = await Cli.handleMultipleResultsFound(`Multiple buckets with name '${name}' found.`, resultAsKeyValuePair);
+            return result.id.toString();
         }
         return filteredBuckets[0].id.toString();
     }
@@ -68,8 +73,8 @@ class PlannerBucketGetCommand extends GraphCommand {
             const plan = await planner.getPlanByTitle(planTitle, groupId);
             return plan.id;
         }
-        const plans = await planner.getPlansByRosterId(rosterId);
-        return plans[0].id;
+        const plan = await planner.getPlanByRosterId(rosterId);
+        return plan.id;
     }
     async getBucketById(id) {
         const requestOptions = {
@@ -152,6 +157,8 @@ _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_ini
         options: ['ownerGroupId', 'ownerGroupName'],
         runsWhen: (args) => args.options.planTitle !== undefined
     });
+}, _PlannerBucketGetCommand_initTypes = function _PlannerBucketGetCommand_initTypes() {
+    this.types.string.push('id', 'name', 'planId', 'planTitle', 'ownerGroupId', 'ownerGroupName', 'rosterId ');
 };
 export default new PlannerBucketGetCommand();
 //# sourceMappingURL=bucket-get.js.map

package/dist/m365/planner/commands/bucket/bucket-list.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 _PlannerBucketListCommand_instances, _PlannerBucketListCommand_initTelemetry, _PlannerBucketListCommand_initOptions, _PlannerBucketListCommand_initValidators, _PlannerBucketListCommand_initOptionSets;
+var _PlannerBucketListCommand_instances, _PlannerBucketListCommand_initTelemetry, _PlannerBucketListCommand_initOptions, _PlannerBucketListCommand_initValidators, _PlannerBucketListCommand_initOptionSets, _PlannerBucketListCommand_initTypes;
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { odata } from '../../../../utils/odata.js';
 import { planner } from '../../../../utils/planner.js';
@@ -27,6 +27,7 @@ class PlannerBucketListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -47,8 +48,8 @@ class PlannerBucketListCommand extends GraphCommand {
             const plan = await planner.getPlanByTitle(args.options.planTitle, groupId);
             return plan.id;
         }
-        const plans = await planner.getPlansByRosterId(args.options.rosterId);
-        return plans[0].id;
+        const plan = await planner.getPlanByRosterId(args.options.rosterId);
+        return plan.id;
     }
     async getGroupId(args) {
         if (args.options.ownerGroupId) {
@@ -92,6 +93,8 @@ _PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_i
         options: ['ownerGroupId', 'ownerGroupName'],
         runsWhen: (args) => args.options.planTitle !== undefined
     });
+}, _PlannerBucketListCommand_initTypes = function _PlannerBucketListCommand_initTypes() {
+    this.types.string.push('planId', 'planTitle', 'ownerGroupId', 'ownerGroupName', 'rosterId ');
 };
 export default new PlannerBucketListCommand();
 //# sourceMappingURL=bucket-list.js.map