@pnp/cli-microsoft365 7.2.0-beta.a021bb1 → 7.2.0-beta.c7e1c03

package/dist/m365/spo/commands/site/site-apppermission-remove.js

@@ -72,13 +72,8 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
             await this.removeSiteAppPermission(logger, args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?` });
+            if (result) {
                 await this.removeSiteAppPermission(logger, args.options);
             }
         }

package/dist/m365/spo/commands/site/site-hubsite-disconnect.js

@@ -29,13 +29,8 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand {
             await this.disconnectHubSite(logger, args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?` });
+            if (result) {
                 await this.disconnectHubSite(logger, args);
             }
         }

package/dist/m365/spo/commands/site/site-recyclebinitem-clear.js

@@ -28,13 +28,8 @@ class SpoSiteRecycleBinItemClearCommand extends SpoCommand {
             await this.clearRecycleBin(args, logger);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to clear the recycle bin of site ${args.options.siteUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to clear the recycle bin of site ${args.options.siteUrl}?` });
+            if (result) {
                 await this.clearRecycleBin(args, logger);
             }
         }

package/dist/m365/spo/commands/site/site-recyclebinitem-move.js

@@ -29,13 +29,8 @@ class SpoSiteRecycleBinItemMoveCommand extends SpoCommand {
             await this.moveRecycleBinItem(args, logger);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: 'Are you sure you want to move these items to the second-stage recycle bin?'
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: 'Are you sure you want to move these items to the second-stage recycle bin?' });
+            if (result) {
                 await this.moveRecycleBinItem(args, logger);
             }
         }

package/dist/m365/spo/commands/site/site-recyclebinitem-remove.js

@@ -28,13 +28,8 @@ class SpoSiteRecycleBinItemRemoveCommand extends SpoCommand {
             await this.removeRecycleBinItem(args, logger);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to permanently delete ${args.options.ids.split(',').length} item(s) from the site recycle bin?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to permanently delete ${args.options.ids.split(',').length} item(s) from the site recycle bin?` });
+            if (result) {
                 await this.removeRecycleBinItem(args, logger);
             }
         }

package/dist/m365/spo/commands/site/site-remove.js

@@ -33,13 +33,8 @@ class SpoSiteRemoveCommand extends SpoCommand {
             await this.removeSite(logger, args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the site ${args.options.url}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the site ${args.options.url}?` });
+            if (result) {
                 await this.removeSite(logger, args);
             }
         }

package/dist/m365/spo/commands/site/site-set.js

@@ -49,6 +49,7 @@ class SpoSiteSetCommand extends SpoCommand {
             await this.waitForSiteUpdateCompletion(logger, args, siteProps);
             await this.applySiteDesign(logger, args);
             await this.setLogo(logger, args);
+            await this.setThumbnail(logger, args);
             const lockState = await this.updateSiteLockState(logger, args);
             await this.waitForSiteUpdateCompletion(logger, args, lockState);
         }
@@ -73,7 +74,31 @@ class SpoSiteSetCommand extends SpoCommand {
                 accept: 'application/json;odata=nometadata'
             },
             data: {
-                relativeLogoUrl: logoUrl
+                aspect: 1,
+                relativeLogoUrl: logoUrl,
+                type: 0
+            },
+            responseType: 'json'
+        };
+        return request.post(requestOptions);
+    }
+    async setThumbnail(logger, args) {
+        if (typeof args.options.siteThumbnailUrl === 'undefined') {
+            return;
+        }
+        if (this.debug) {
+            await logger.logToStderr(`Setting the site thumbnail...`);
+        }
+        const thumbnailUrl = args.options.siteThumbnailUrl ? urlUtil.getServerRelativePath(args.options.url, args.options.siteThumbnailUrl) : "";
+        const requestOptions = {
+            url: `${args.options.url}/_api/siteiconmanager/setsitelogo`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            data: {
+                aspect: 0,
+                relativeLogoUrl: thumbnailUrl,
+                type: 0
             },
             responseType: 'json'
         };
@@ -420,6 +445,7 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
             siteDesignId: typeof args.options.siteDesignId !== undefined,
             sharingCapabilities: args.options.sharingCapability,
             siteLogoUrl: typeof args.options.siteLogoUrl !== 'undefined',
+            siteThumbnailUrl: typeof args.options.siteThumbnailUrl !== 'undefined',
             resourceQuota: args.options.resourceQuota,
             resourceQuotaWarningLevel: args.options.resourceQuotaWarningLevel,
             storageQuota: args.options.storageQuota,
@@ -459,6 +485,8 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
         option: '--description [description]'
     }, {
         option: '--siteLogoUrl [siteLogoUrl]'
+    }, {
+        option: '--siteThumbnailUrl [siteThumbnailUrl]'
     }, {
         option: '--sharingCapability [sharingCapability]',
         autocomplete: this.sharingCapabilities
@@ -499,6 +527,7 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
             typeof args.options.siteDesignId === 'undefined' &&
             typeof args.options.sharingCapability === 'undefined' &&
             typeof args.options.siteLogoUrl === 'undefined' &&
+            typeof args.options.siteThumbnailUrl === 'undefined' &&
             typeof args.options.resourceQuota === 'undefined' &&
             typeof args.options.resourceQuotaWarningLevel === 'undefined' &&
             typeof args.options.storageQuota === 'undefined' &&
@@ -511,6 +540,9 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
         if (typeof args.options.siteLogoUrl !== 'undefined' && typeof args.options.siteLogoUrl !== 'string') {
             return `${args.options.siteLogoUrl} is not a valid value for the siteLogoUrl option. Specify the logo URL or an empty string "" to unset the logo.`;
         }
+        if (typeof args.options.siteThumbnailUrl !== 'undefined' && typeof args.options.siteThumbnailUrl !== 'string') {
+            return `${args.options.siteThumbnailUrl} is not a valid value for the siteThumbnailUrl option. Specify the logo URL or an empty string "" to unset the logo.`;
+        }
         if (args.options.siteDesignId) {
             if (!validation.isValidGuid(args.options.siteDesignId)) {
                 return `${args.options.siteDesignId} is not a valid GUID`;

package/dist/m365/spo/commands/sitedesign/sitedesign-remove.js

@@ -29,13 +29,8 @@ class SpoSiteDesignRemoveCommand extends SpoCommand {
             await this.removeSiteDesign(logger, args.options.id);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the site design ${args.options.id}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the site design ${args.options.id}?` });
+            if (result) {
                 await this.removeSiteDesign(logger, args.options.id);
             }
         }

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-revoke.js

@@ -52,13 +52,8 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand {
             await revokePermissions();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to revoke access to site design ${args.options.siteDesignId} from the specified users?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to revoke access to site design ${args.options.siteDesignId} from the specified users?` });
+            if (result) {
                 await revokePermissions();
             }
         }

package/dist/m365/spo/commands/sitedesign/sitedesign-task-remove.js

@@ -29,13 +29,8 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand {
             await this.removeSiteDesignTask(logger, args.options.id);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the site design task ${args.options.id}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the site design task ${args.options.id}?` });
+            if (result) {
                 await this.removeSiteDesignTask(logger, args.options.id);
             }
         }

package/dist/m365/spo/commands/sitescript/sitescript-remove.js

@@ -29,13 +29,8 @@ class SpoSiteScriptRemoveCommand extends SpoCommand {
             await this.removeSiteScript(logger, args.options.id);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the site script ${args.options.id}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the site script ${args.options.id}?` });
+            if (result) {
                 await this.removeSiteScript(logger, args.options.id);
             }
         }

package/dist/m365/spo/commands/storageentity/storageentity-remove.js

@@ -31,13 +31,8 @@ class SpoStorageEntityRemoveCommand extends SpoCommand {
             await this.removeTenantProperty(logger, args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to delete the ${args.options.key} tenant property?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to delete the ${args.options.key} tenant property?` });
+            if (result) {
                 await this.removeTenantProperty(logger, args);
             }
         }

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-remove.js

@@ -33,13 +33,8 @@ class SpoTenantApplicationCustomizerRemoveCommand extends SpoCommand {
             if (args.options.force) {
                 return await this.removeTenantApplicationCustomizer(logger, args);
             }
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the tenant applicationcustomizer ${args.options.id || args.options.title || args.options.clientSideComponentId}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the tenant applicationcustomizer ${args.options.id || args.options.title || args.options.clientSideComponentId}?` });
+            if (result) {
                 await this.removeTenantApplicationCustomizer(logger, args);
             }
         }

package/dist/m365/spo/commands/tenant/tenant-commandset-remove.js

@@ -33,13 +33,8 @@ class SpoTenantCommandSetRemoveCommand extends SpoCommand {
             if (args.options.force) {
                 return await this.removeTenantCommandSet(logger, args);
             }
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the tenant commandset ${args.options.id || args.options.title || args.options.clientSideComponentId}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the tenant commandset ${args.options.id || args.options.title || args.options.clientSideComponentId}?` });
+            if (result) {
                 await this.removeTenantCommandSet(logger, args);
             }
         }

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-remove.js

@@ -31,13 +31,8 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand {
             await this.removeDeletedSite(logger, args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the deleted site collection ${args.options.siteUrl} from tenant recycle bin?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the deleted site collection ${args.options.siteUrl} from tenant recycle bin?` });
+            if (result) {
                 await this.removeDeletedSite(logger, args);
             }
         }

package/dist/m365/spo/commands/theme/theme-remove.js

@@ -27,13 +27,8 @@ class SpoThemeRemoveCommand extends SpoCommand {
             await this.removeTheme(logger, args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the theme`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the theme` });
+            if (result) {
                 await this.removeTheme(logger, args.options);
             }
         }

package/dist/m365/spo/commands/user/user-remove.js

@@ -30,13 +30,8 @@ class SpoUserRemoveCommand extends SpoCommand {
             await this.removeUser(logger, args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove specified user from the site ${args.options.webUrl}`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove specified user from the site ${args.options.webUrl}?` });
+            if (result) {
                 await this.removeUser(logger, args.options);
             }
         }

package/dist/m365/spo/commands/web/web-remove.js

@@ -28,13 +28,8 @@ class SpoWebRemoveCommand extends SpoCommand {
             await this.removeWeb(logger, args.options.url);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the subsite ${args.options.url}`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the subsite ${args.options.url}?` });
+            if (result) {
                 await this.removeWeb(logger, args.options.url);
             }
         }

package/dist/m365/spo/commands/web/web-roleassignment-remove.js

@@ -31,13 +31,8 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
             await this.removeRoleAssignment(logger, args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?` });
+            if (result) {
                 await this.removeRoleAssignment(logger, args.options);
             }
         }

package/dist/m365/spo/commands/web/web-roleinheritance-break.js

@@ -31,13 +31,8 @@ class SpoWebRoleInheritanceBreakCommand extends SpoCommand {
             await this.breakRoleInheritance(args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to break the role inheritance of subsite ${args.options.webUrl}`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to break the role inheritance of subsite ${args.options.webUrl}?` });
+            if (result) {
                 await this.breakRoleInheritance(args.options);
             }
         }

package/dist/m365/spo/commands/web/web-roleinheritance-reset.js

@@ -31,13 +31,8 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand {
             await this.resetWebRoleInheritance(args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to reset the role inheritance of ${args.options.webUrl}`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to reset the role inheritance of ${args.options.webUrl}?` });
+            if (result) {
                 await this.resetWebRoleInheritance(args.options);
             }
         }

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

@@ -48,13 +48,8 @@ class TeamsAppRemoveCommand extends GraphCommand {
             await removeApp();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the Teams app ${args.options.id || args.options.name} from the app catalog?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the Teams app ${args.options.id || args.options.name} from the app catalog?` });
+            if (result) {
                 await removeApp();
             }
         }

package/dist/m365/teams/commands/app/app-uninstall.js

@@ -45,13 +45,8 @@ class TeamsAppUninstallCommand extends GraphCommand {
             await uninstallApp();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to uninstall the app with id ${args.options.id} from the Microsoft Teams team ${args.options.teamId}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to uninstall the app with id ${args.options.id} from the Microsoft Teams team ${args.options.teamId}?` });
+            if (result) {
                 await uninstallApp();
             }
         }

package/dist/m365/teams/commands/cache/cache-remove.js

@@ -36,13 +36,8 @@ class TeamsCacheRemoveCommand extends AnonymousCommand {
                 await logger.logToStderr('This command will execute the following steps.');
                 await logger.logToStderr('- Stop the Microsoft Teams client.');
                 await logger.logToStderr('- Clear the Microsoft Teams cached files.');
-                const result = await Cli.prompt({
-                    type: 'confirm',
-                    name: 'continue',
-                    default: false,
-                    message: `Are you sure you want to clear your Microsoft Teams cache?`
-                });
-                if (result.continue) {
+                const result = await Cli.promptForConfirmation({ message: `Are you sure you want to clear your Microsoft Teams cache?` });
+                if (result) {
                     await this.clearTeamsCache(logger);
                 }
             }

package/dist/m365/teams/commands/channel/channel-member-remove.js

@@ -47,13 +47,8 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand {
             const userName = args.options.userName || args.options.userId || args.options.id;
             const teamName = args.options.teamName || args.options.teamId;
             const channelName = args.options.channelName || args.options.channelId;
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the member ${userName} from the channel ${channelName} in team ${teamName}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the member ${userName} from the channel ${channelName} in team ${teamName}?` });
+            if (result) {
                 await removeMember();
             }
         }

package/dist/m365/teams/commands/channel/channel-remove.js

@@ -53,13 +53,8 @@ class TeamsChannelRemoveCommand extends GraphCommand {
         }
         else {
             const channel = args.options.name ? args.options.name : args.options.id;
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the channel ${channel} from team ${args.options.teamId || args.options.teamName}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the channel ${channel} from team ${args.options.teamId || args.options.teamName}?` });
+            if (result) {
                 await removeChannel();
             }
         }

package/dist/m365/teams/commands/chat/chat-member-remove.js

@@ -48,13 +48,8 @@ class TeamsChatMemberRemoveCommand extends GraphCommand {
             await removeUserFromChat();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove member ${args.options.id || args.options.userId || args.options.userName} from chat with id ${args.options.chatId}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove member ${args.options.id || args.options.userId || args.options.userName} from chat with id ${args.options.chatId}?` });
+            if (result) {
                 await removeUserFromChat();
             }
         }

package/dist/m365/teams/commands/tab/tab-remove.js

@@ -44,13 +44,8 @@ class TeamsTabRemoveCommand extends GraphCommand {
             await removeTab();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the tab with id ${args.options.id} from channel ${args.options.channelId} in team ${args.options.teamId}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the tab with id ${args.options.id} from channel ${args.options.channelId} in team ${args.options.teamId}?` });
+            if (result) {
                 await removeTab();
             }
         }

package/dist/m365/teams/commands/team/team-remove.js

@@ -57,13 +57,8 @@ class TeamsTeamRemoveCommand extends GraphCommand {
             await removeTeam();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the team ${args.options.id ? args.options.id : args.options.name}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the team ${args.options.id ? args.options.id : args.options.name}?` });
+            if (result) {
                 await removeTeam();
             }
         }

package/dist/m365/teams/commands/user/user-app-remove.js

@@ -3,9 +3,10 @@ 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 _TeamsUserAppRemoveCommand_instances, _TeamsUserAppRemoveCommand_initTelemetry, _TeamsUserAppRemoveCommand_initOptions, _TeamsUserAppRemoveCommand_initValidators;
+var _TeamsUserAppRemoveCommand_instances, _TeamsUserAppRemoveCommand_initTelemetry, _TeamsUserAppRemoveCommand_initOptions, _TeamsUserAppRemoveCommand_initValidators, _TeamsUserAppRemoveCommand_initOptionSets;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -22,12 +23,15 @@ class TeamsUserAppRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TeamsUserAppRemoveCommand_instances, "m", _TeamsUserAppRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsUserAppRemoveCommand_instances, "m", _TeamsUserAppRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsUserAppRemoveCommand_instances, "m", _TeamsUserAppRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppRemoveCommand_instances, "m", _TeamsUserAppRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         const removeApp = async () => {
+            // validation ensures that here we have either userId or userName
+            const userId = (args.options.userId ?? args.options.userName);
             const endpoint = `${this.resource}/v1.0`;
             const requestOptions = {
-                url: `${endpoint}/users/${args.options.userId}/teamwork/installedApps/${args.options.id}`,
+                url: `${endpoint}/users/${formatting.encodeQueryParameter(userId)}/teamwork/installedApps/${args.options.id}`,
                 headers: {
                     'accept': 'application/json;odata.metadata=none'
                 },
@@ -44,13 +48,8 @@ class TeamsUserAppRemoveCommand extends GraphCommand {
             await removeApp();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the app with id ${args.options.id} for user ${args.options.userId}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the app with id ${args.options.id} for user ${args.options.userId ?? args.options.userName}?` });
+            if (result) {
                 await removeApp();
             }
         }
@@ -59,6 +58,8 @@ class TeamsUserAppRemoveCommand extends GraphCommand {
 _TeamsUserAppRemoveCommand_instances = new WeakSet(), _TeamsUserAppRemoveCommand_initTelemetry = function _TeamsUserAppRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
             force: (!!args.options.force).toString()
         });
     });
@@ -66,17 +67,24 @@ _TeamsUserAppRemoveCommand_instances = new WeakSet(), _TeamsUserAppRemoveCommand
     this.options.unshift({
         option: '--id <id>'
     }, {
-        option: '--userId <userId>'
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
     }, {
         option: '-f, --force'
     });
 }, _TeamsUserAppRemoveCommand_initValidators = function _TeamsUserAppRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.userId)) {
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
         return true;
     });
+}, _TeamsUserAppRemoveCommand_initOptionSets = function _TeamsUserAppRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName'] });
 };
 export default new TeamsUserAppRemoveCommand();
 //# sourceMappingURL=user-app-remove.js.map