@pnp/cli-microsoft365 9.1.0-beta.9a7d76f → 9.1.0-beta.acd25f7

package/dist/Auth.js

@@ -353,7 +353,9 @@ export class Auth {
             await logger.logToStderr(response);
             await logger.logToStderr('');
         }
-        await logger.logToStderr(`🌶️  ${response.message}`);
+        if (response.message) {
+            await logger.logToStderr(`🌶️  ${response.message}`);
+        }
         if (cli.getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false)) {
             await browserUtil.open(response.verificationUri);
         }

package/dist/m365/file/commands/file-move.js

@@ -0,0 +1,135 @@
+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 _FileMoveCommand_instances, _FileMoveCommand_initTelemetry, _FileMoveCommand_initOptions, _FileMoveCommand_initValidators;
+import GraphCommand from '../../base/GraphCommand.js';
+import { setTimeout } from 'timers/promises';
+import commands from '../commands.js';
+import request from '../../../request.js';
+import { spo } from '../../../utils/spo.js';
+import { urlUtil } from '../../../utils/urlUtil.js';
+import { driveUtil } from '../../../utils/driveUtil.js';
+import { validation } from '../../../utils/validation.js';
+class FileMoveCommand extends GraphCommand {
+    get name() {
+        return commands.MOVE;
+    }
+    get description() {
+        return 'Moves a file to another location using the Microsoft Graph';
+    }
+    constructor() {
+        super();
+        _FileMoveCommand_instances.add(this);
+        this.pollingInterval = 10000;
+        this.nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
+        __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            const { webUrl, sourceUrl, targetUrl, nameConflictBehavior, newName, verbose } = args.options;
+            const sourcePath = this.getAbsoluteUrl(webUrl, sourceUrl);
+            const destinationPath = this.getAbsoluteUrl(webUrl, targetUrl);
+            const { driveId, itemId } = await this.getDriveIdAndItemId(webUrl, sourcePath, sourceUrl, logger, verbose);
+            const targetSiteUrl = urlUtil.getTargetSiteAbsoluteUrl(webUrl, targetUrl);
+            const targetFolderUrl = this.getAbsoluteUrl(targetSiteUrl, targetUrl);
+            const { driveId: targetDriveId, itemId: targetItemId } = await this.getDriveIdAndItemId(targetSiteUrl, targetFolderUrl, targetUrl, logger, verbose);
+            const requestOptions = this.getRequestOptions(driveId, itemId, targetDriveId, targetItemId, newName, sourcePath, nameConflictBehavior);
+            if (verbose) {
+                await logger.logToStderr(`Moving file '${sourcePath}' to '${destinationPath}'...`);
+            }
+            if (driveId === targetDriveId) {
+                await request.patch(requestOptions);
+            }
+            else {
+                const response = await request.post(requestOptions);
+                await this.waitUntilCopyOperationCompleted(response.headers.location, logger);
+                const itemUrl = `${this.resource}/v1.0/drives/${driveId}/items/${itemId}`;
+                await request.delete({ url: itemUrl, headers: requestOptions.headers });
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    getAbsoluteUrl(webUrl, url) {
+        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+    }
+    async getDriveIdAndItemId(webUrl, folderUrl, sourceUrl, logger, verbose) {
+        const siteId = await spo.getSiteId(webUrl, logger, verbose);
+        const drive = await driveUtil.getDriveByUrl(siteId, new URL(folderUrl));
+        const itemId = await driveUtil.getDriveItemId(drive, new URL(folderUrl));
+        return { driveId: drive.id, itemId };
+    }
+    getRequestOptions(sourceDriveId, sourceItemId, targetDriveId, targetItemId, newName, sourcePath, nameConflictBehavior) {
+        const apiUrl = sourceDriveId === targetDriveId
+            ? `${this.resource}/v1.0/drives/${sourceDriveId}/items/${sourceItemId}`
+            : `${this.resource}/v1.0/drives/${sourceDriveId}/items/${sourceItemId}/copy`;
+        const queryParameters = nameConflictBehavior && nameConflictBehavior !== 'fail'
+            ? `@microsoft.graph.conflictBehavior=${nameConflictBehavior}`
+            : '';
+        const urlWithQuery = `${apiUrl}${queryParameters ? `?${queryParameters}` : ''}`;
+        const requestOptions = {
+            url: urlWithQuery,
+            headers: { accept: 'application/json;odata.metadata=none' },
+            responseType: 'json',
+            fullResponse: true,
+            data: { parentReference: { driveId: targetDriveId, id: targetItemId } }
+        };
+        if (newName) {
+            const sourceFileName = sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            const sourceFileExtension = sourceFileName.includes('.') ? sourceFileName.substring(sourceFileName.lastIndexOf('.')) : '';
+            const newNameExtension = newName.includes('.') ? newName.substring(newName.lastIndexOf('.')) : '';
+            requestOptions.data.name = newNameExtension ? `${newName.replace(newNameExtension, "")}${sourceFileExtension}` : `${newName}${sourceFileExtension}`;
+        }
+        return requestOptions;
+    }
+    async waitUntilCopyOperationCompleted(monitorUrl, logger) {
+        const requestOptions = {
+            url: monitorUrl,
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        if (response.status === 'completed') {
+            if (this.verbose) {
+                await logger.logToStderr('Copy operation completed succesfully. Returning...');
+            }
+            return;
+        }
+        else if (response.status === 'failed') {
+            throw response.error.message;
+        }
+        else {
+            if (this.verbose) {
+                await logger.logToStderr(`Still copying. Retrying in ${this.pollingInterval / 1000} seconds...`);
+            }
+            await setTimeout(this.pollingInterval);
+            await this.waitUntilCopyOperationCompleted(monitorUrl, logger);
+        }
+    }
+}
+_FileMoveCommand_instances = new WeakSet(), _FileMoveCommand_initTelemetry = function _FileMoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            webUrl: typeof args.options.webUrl !== 'undefined',
+            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
+            targetUrl: typeof args.options.targetUrl !== 'undefined',
+            newName: typeof args.options.newName !== 'undefined',
+            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined'
+        });
+    });
+}, _FileMoveCommand_initOptions = function _FileMoveCommand_initOptions() {
+    this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '-s, --sourceUrl <sourceUrl>' }, { option: '-t, --targetUrl <targetUrl>' }, { option: '--newName [newName]' }, { option: '--nameConflictBehavior [nameConflictBehavior]', autocomplete: this.nameConflictBehaviorOptions });
+}, _FileMoveCommand_initValidators = function _FileMoveCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
+            return `${args.options.nameConflictBehavior} is not a valid nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}.`;
+        }
+        return validation.isValidSharePointUrl(args.options.webUrl);
+    });
+};
+export default new FileMoveCommand();
+//# sourceMappingURL=file-move.js.map

package/dist/m365/file/commands.js

@@ -3,6 +3,7 @@ export default {
     ADD: `${prefix} add`,
     CONVERT_PDF: `${prefix} convert pdf`,
     COPY: `${prefix} copy`,
-    LIST: `${prefix} list`
+    LIST: `${prefix} list`,
+    MOVE: `${prefix} move`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.20.0-rc.1.js

@@ -0,0 +1,25 @@
+import { FN001008_DEP_react } from './rules/FN001008_DEP_react.js';
+import { FN001009_DEP_react_dom } from './rules/FN001009_DEP_react_dom.js';
+import { FN001035_DEP_fluentui_react } from './rules/FN001035_DEP_fluentui_react.js';
+import { FN002004_DEVDEP_gulp } from './rules/FN002004_DEVDEP_gulp.js';
+import { FN002007_DEVDEP_ajv } from './rules/FN002007_DEVDEP_ajv.js';
+import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types_webpack_env.js';
+import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
+import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
+import { FN002019_DEVDEP_microsoft_rush_stack_compiler } from './rules/FN002019_DEVDEP_microsoft_rush_stack_compiler.js';
+import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
+import { FN021013_PKG_spfx_devdeps_match_version } from './rules/FN021013_PKG_spfx_devdeps_match_version.js';
+export default [
+    new FN001008_DEP_react('17'),
+    new FN001009_DEP_react_dom('17'),
+    new FN001035_DEP_fluentui_react('^8.106.4'),
+    new FN002004_DEVDEP_gulp('4.0.2'),
+    new FN002007_DEVDEP_ajv('^6.12.5'),
+    new FN002013_DEVDEP_types_webpack_env('~1.15.2'),
+    new FN002015_DEVDEP_types_react('17'),
+    new FN002016_DEVDEP_types_react_dom('17'),
+    new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.7']),
+    new FN021001_PKG_spfx_deps_versions_match_project_version(false),
+    new FN021013_PKG_spfx_devdeps_match_version('1.20.1')
+];
+//# sourceMappingURL=doctor-1.20.0-rc.1.js.map

package/dist/m365/spfx/commands/project/project-doctor.js

@@ -70,7 +70,8 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.18.0',
             '1.18.1',
             '1.18.2',
-            '1.19.0'
+            '1.19.0',
+            '1.20.0-rc.1'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.20.0-rc.1.js

@@ -0,0 +1,57 @@
+import { FN001001_DEP_microsoft_sp_core_library } from './rules/FN001001_DEP_microsoft_sp_core_library.js';
+import { FN001002_DEP_microsoft_sp_lodash_subset } from './rules/FN001002_DEP_microsoft_sp_lodash_subset.js';
+import { FN001003_DEP_microsoft_sp_office_ui_fabric_core } from './rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core.js';
+import { FN001004_DEP_microsoft_sp_webpart_base } from './rules/FN001004_DEP_microsoft_sp_webpart_base.js';
+import { FN001011_DEP_microsoft_sp_dialog } from './rules/FN001011_DEP_microsoft_sp_dialog.js';
+import { FN001012_DEP_microsoft_sp_application_base } from './rules/FN001012_DEP_microsoft_sp_application_base.js';
+import { FN001013_DEP_microsoft_decorators } from './rules/FN001013_DEP_microsoft_decorators.js';
+import { FN001014_DEP_microsoft_sp_listview_extensibility } from './rules/FN001014_DEP_microsoft_sp_listview_extensibility.js';
+import { FN001021_DEP_microsoft_sp_property_pane } from './rules/FN001021_DEP_microsoft_sp_property_pane.js';
+import { FN001023_DEP_microsoft_sp_component_base } from './rules/FN001023_DEP_microsoft_sp_component_base.js';
+import { FN001024_DEP_microsoft_sp_diagnostics } from './rules/FN001024_DEP_microsoft_sp_diagnostics.js';
+import { FN001025_DEP_microsoft_sp_dynamic_data } from './rules/FN001025_DEP_microsoft_sp_dynamic_data.js';
+import { FN001026_DEP_microsoft_sp_extension_base } from './rules/FN001026_DEP_microsoft_sp_extension_base.js';
+import { FN001027_DEP_microsoft_sp_http } from './rules/FN001027_DEP_microsoft_sp_http.js';
+import { FN001028_DEP_microsoft_sp_list_subscription } from './rules/FN001028_DEP_microsoft_sp_list_subscription.js';
+import { FN001029_DEP_microsoft_sp_loader } from './rules/FN001029_DEP_microsoft_sp_loader.js';
+import { FN001030_DEP_microsoft_sp_module_interfaces } from './rules/FN001030_DEP_microsoft_sp_module_interfaces.js';
+import { FN001031_DEP_microsoft_sp_odata_types } from './rules/FN001031_DEP_microsoft_sp_odata_types.js';
+import { FN001032_DEP_microsoft_sp_page_context } from './rules/FN001032_DEP_microsoft_sp_page_context.js';
+import { FN001034_DEP_microsoft_sp_adaptive_card_extension_base } from './rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base.js';
+import { FN002001_DEVDEP_microsoft_sp_build_web } from './rules/FN002001_DEVDEP_microsoft_sp_build_web.js';
+import { FN002002_DEVDEP_microsoft_sp_module_interfaces } from './rules/FN002002_DEVDEP_microsoft_sp_module_interfaces.js';
+import { FN002022_DEVDEP_microsoft_eslint_plugin_spfx } from './rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx.js';
+import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_DEVDEP_microsoft_eslint_config_spfx.js';
+import { FN002024_DEVDEP_eslint } from './rules/FN002024_DEVDEP_eslint.js';
+import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
+import { FN010010_YORC_sdkVersions_teams_js } from './rules/FN010010_YORC_sdkVersions_teams_js.js';
+export default [
+    new FN001001_DEP_microsoft_sp_core_library('1.20.0-rc.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.20.0-rc.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.20.0-rc.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.20.0-rc.1'),
+    new FN001011_DEP_microsoft_sp_dialog('1.20.0-rc.1'),
+    new FN001012_DEP_microsoft_sp_application_base('1.20.0-rc.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.20.0-rc.1'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.20.0-rc.1'),
+    new FN001023_DEP_microsoft_sp_component_base('1.20.0-rc.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.20.0-rc.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.20.0-rc.1'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.20.0-rc.1'),
+    new FN001027_DEP_microsoft_sp_http('1.20.0-rc.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.20.0-rc.1'),
+    new FN001029_DEP_microsoft_sp_loader('1.20.0-rc.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.20.0-rc.1'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.20.0-rc.1'),
+    new FN001032_DEP_microsoft_sp_page_context('1.20.0-rc.1'),
+    new FN001013_DEP_microsoft_decorators('1.20.0-rc.1'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.20.0-rc.1'),
+    new FN002001_DEVDEP_microsoft_sp_build_web('1.20.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.20.1'),
+    new FN002024_DEVDEP_eslint('8.57.0'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.20.1'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.20.1'),
+    new FN010001_YORC_version('1.20.0-rc.1'),
+    new FN010010_YORC_sdkVersions_teams_js('2.24.0')
+];
+//# sourceMappingURL=upgrade-1.20.0-rc.1.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -7,6 +7,8 @@ var _SpfxProjectUpgradeCommand_instances, _a, _SpfxProjectUpgradeCommand_initTel
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
+// uncomment to support upgrading to preview releases
+import { prerelease } from 'semver';
 import { CommandError } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
 import { packageManager } from '../../../../utils/packageManager.js';
@@ -72,7 +74,8 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.18.0',
             '1.18.1',
             '1.18.2',
-            '1.19.0'
+            '1.19.0',
+            '1.20.0-rc.1'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -85,15 +88,15 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
         }
         this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
         // uncomment to support upgrading to preview releases
-        // if (!args.options.toVersion &&
-        //   !args.options.preview &&
-        //   prerelease(this.toVersion)) {
-        //   // no version and no preview specified while the current version to
-        //   // upgrade to is a prerelease so let's grab the first non-preview version
-        //   // since we're supporting only one preview version, it's sufficient for
-        //   // us to take second to last version
-        //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if (!args.options.toVersion &&
+            !args.options.preview &&
+            prerelease(this.toVersion)) {
+            // no version and no preview specified while the current version to
+            // upgrade to is a prerelease so let's grab the first non-preview version
+            // since we're supporting only one preview version, it's sufficient for
+            // us to take second to last version
+            this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
         this.packageManager = args.options.packageManager || 'npm';
         this.shell = args.options.shell || 'bash';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {
@@ -482,9 +485,9 @@ _a = SpfxProjectUpgradeCommand, _SpfxProjectUpgradeCommand_instances = new WeakS
             preview: args.options.preview
         });
         // uncomment to support upgrading to preview releases
-        // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
-        //   this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
+            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
     });
 }, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
     this.options.unshift({

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -575,6 +575,21 @@ class SpfxDoctorCommand extends BaseProjectCommand {
                     range: '^4 || ^5',
                     fix: 'npm i -g yo@5'
                 }
+            },
+            '1.20.0-rc.1': {
+                gulpCli: {
+                    range: '^1 || ^2 || ^3',
+                    fix: 'npm i -g gulp-cli@3'
+                },
+                node: {
+                    range: '>=18.17.1 <19.0.0',
+                    fix: 'Install Node.js >=18.17.1 <19.0.0'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4 || ^5',
+                    fix: 'npm i -g yo@5'
+                }
             }
         };
         this.output = '';

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

@@ -0,0 +1,193 @@
+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 _SpoSiteAdminRemoveCommand_instances, _SpoSiteAdminRemoveCommand_initTelemetry, _SpoSiteAdminRemoveCommand_initOptions, _SpoSiteAdminRemoveCommand_initValidators, _SpoSiteAdminRemoveCommand_initOptionSets, _SpoSiteAdminRemoveCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
+import request from '../../../../request.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SpoSiteAdminRemoveCommand extends SpoCommand {
+    get name() {
+        return commands.SITE_ADMIN_REMOVE;
+    }
+    get description() {
+        return 'Removes a user or group as site collection administrator';
+    }
+    constructor() {
+        super();
+        _SpoSiteAdminRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteAdminRemoveCommand_instances, "m", _SpoSiteAdminRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAdminRemoveCommand_instances, "m", _SpoSiteAdminRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAdminRemoveCommand_instances, "m", _SpoSiteAdminRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAdminRemoveCommand_instances, "m", _SpoSiteAdminRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAdminRemoveCommand_instances, "m", _SpoSiteAdminRemoveCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            if (!args.options.force) {
+                const principalToDelete = args.options.groupId || args.options.groupName ? 'group' : 'user';
+                const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove specified ${principalToDelete} from the site administrators list ${args.options.siteUrl}?` });
+                if (!result) {
+                    return;
+                }
+            }
+            const loginNameToRemove = await this.getCorrectLoginName(args.options);
+            if (args.options.asAdmin) {
+                await this.callActionAsAdmin(logger, args, loginNameToRemove);
+                return;
+            }
+            await this.callAction(logger, args, loginNameToRemove);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async callActionAsAdmin(logger, args, loginNameToRemove) {
+        if (this.verbose) {
+            await logger.logToStderr('Removing site administrator as an administrator...');
+        }
+        const adminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+        const siteId = await this.getSiteId(args.options.siteUrl, logger);
+        const primaryAdminLoginName = await spo.getPrimaryAdminLoginNameAsAdmin(adminUrl, siteId, logger, this.verbose);
+        if (loginNameToRemove === primaryAdminLoginName) {
+            throw 'You cannot remove the primary site collection administrator.';
+        }
+        const existingAdmins = await this.getSiteAdmins(adminUrl, siteId);
+        const adminsToSet = existingAdmins.filter(u => u.loginName.toLowerCase() !== loginNameToRemove.toLowerCase());
+        await this.setSiteAdminsAsAdmin(adminUrl, siteId, adminsToSet);
+    }
+    async getSiteId(siteUrl, logger) {
+        const siteGraphId = await spo.getSiteId(siteUrl, logger, this.verbose);
+        const match = siteGraphId.match(/,([a-f0-9\-]{36}),/i);
+        if (!match) {
+            throw `Site with URL ${siteUrl} not found`;
+        }
+        return match[1];
+    }
+    async getSiteAdmins(adminUrl, siteId) {
+        const requestOptions = {
+            url: `${adminUrl}/_api/SPO.Tenant/GetSiteAdministrators?siteId='${siteId}'`,
+            headers: {
+                accept: 'application/json;odata=nometadata',
+                'content-type': 'application/json;charset=utf-8'
+            }
+        };
+        const response = await request.post(requestOptions);
+        const responseContent = JSON.parse(response);
+        return responseContent.value;
+    }
+    async getCorrectLoginName(options) {
+        if (options.userId || options.userName) {
+            const userPrincipalName = options.userName ? options.userName : await entraUser.getUpnByUserId(options.userId);
+            if (userPrincipalName) {
+                return `i:0#.f|membership|${userPrincipalName}`;
+            }
+            throw 'User not found.';
+        }
+        else {
+            const group = options.groupId ? await entraGroup.getGroupById(options.groupId) : await entraGroup.getGroupByDisplayName(options.groupName);
+            //for entra groups, M365 groups have an associated email and security groups don't
+            if (group?.mail) {
+                //M365 group is prefixed with c:0o.c|federateddirectoryclaimprovider
+                return `c:0o.c|federateddirectoryclaimprovider|${group.id}`;
+            }
+            else {
+                //security group is prefixed with c:0t.c|tenant
+                return `c:0t.c|tenant|${group?.id}`;
+            }
+        }
+    }
+    async setSiteAdminsAsAdmin(adminUrl, siteId, admins) {
+        const requestOptions = {
+            url: `${adminUrl}/_api/SPOInternalUseOnly.Tenant/SetSiteSecondaryAdministrators`,
+            headers: {
+                accept: 'application/json;odata=nometadata',
+                'content-type': 'application/json;charset=utf-8'
+            },
+            data: {
+                secondaryAdministratorsFieldsData: {
+                    siteId: siteId,
+                    secondaryAdministratorLoginNames: admins.map(u => u.loginName)
+                }
+            }
+        };
+        await request.post(requestOptions);
+    }
+    async callAction(logger, args, loginNameToRemove) {
+        if (this.verbose) {
+            await logger.logToStderr('Removing site administrator...');
+        }
+        const primaryOwnerLogin = await spo.getPrimaryOwnerLoginFromSite(args.options.siteUrl, logger, this.verbose);
+        if (loginNameToRemove === primaryOwnerLogin) {
+            throw 'You cannot remove the primary site collection administrator.';
+        }
+        const requestOptions = {
+            url: `${args.options.siteUrl}/_api/web/siteusers('${formatting.encodeQueryParameter(loginNameToRemove)}')`,
+            headers: {
+                'accept': 'application/json',
+                'X-Http-Method': 'MERGE',
+                'If-Match': '*'
+            },
+            data: { IsSiteAdmin: false },
+            responseType: 'json'
+        };
+        await request.post(requestOptions);
+    }
+}
+_SpoSiteAdminRemoveCommand_instances = new WeakSet(), _SpoSiteAdminRemoveCommand_initTelemetry = function _SpoSiteAdminRemoveCommand_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',
+            force: !!args.options.force,
+            asAdmin: !!args.options.asAdmin
+        });
+    });
+}, _SpoSiteAdminRemoveCommand_initOptions = function _SpoSiteAdminRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--asAdmin'
+    }, {
+        option: '-f, --force'
+    });
+}, _SpoSiteAdminRemoveCommand_initValidators = function _SpoSiteAdminRemoveCommand_initValidators() {
+    this.validators.push(async (args) => {
+        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`;
+        }
+        if (args.options.groupId &&
+            !validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID`;
+        }
+        return validation.isValidSharePointUrl(args.options.siteUrl);
+    });
+}, _SpoSiteAdminRemoveCommand_initOptionSets = function _SpoSiteAdminRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName'] });
+}, _SpoSiteAdminRemoveCommand_initTypes = function _SpoSiteAdminRemoveCommand_initTypes() {
+    this.types.string.push('siteUrl', 'userId', 'userName', 'groupId', 'groupName');
+    this.types.boolean.push('force', 'asAdmin');
+};
+export default new SpoSiteAdminRemoveCommand();
+//# sourceMappingURL=site-admin-remove.js.map

package/dist/m365/spo/commands.js

@@ -247,6 +247,7 @@ export default {
     SITE_ADD: `${prefix} site add`,
     SITE_ADMIN_ADD: `${prefix} site admin add`,
     SITE_ADMIN_LIST: `${prefix} site admin list`,
+    SITE_ADMIN_REMOVE: `${prefix} site admin remove`,
     SITE_APPCATALOG_ADD: `${prefix} site appcatalog add`,
     SITE_APPCATALOG_LIST: `${prefix} site appcatalog list`,
     SITE_APPCATALOG_REMOVE: `${prefix} site appcatalog remove`,

package/dist/m365/teams/MeetingTranscript.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=MeetingTranscript.js.map