@pnp/cli-microsoft365 11.0.0-beta.88d51e6 → 11.0.0

package/dist/m365/spo/commands/homesite/homesite-add.js

@@ -6,16 +6,18 @@ import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import request from '../../../../request.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 const options = globalOptionsZod
     .extend({
     url: zod.alias('u', z.string()
         .refine((url) => validation.isValidSharePointUrl(url) === true, url => ({
         message: `'${url}' is not a valid SharePoint Online site URL.`
     }))),
-    audiences: z.string()
+    audienceIds: z.string()
         .refine(audiences => validation.isValidGuidArray(audiences) === true, audiences => ({
         message: `The following GUIDs are invalid: ${validation.isValidGuidArray(audiences)}.`
     })).optional(),
+    audienceNames: z.string().optional(),
     vivaConnectionsDefaultStart: z.boolean().optional(),
     isInDraftMode: z.boolean().optional(),
     order: z.number()
@@ -34,7 +36,20 @@ class SpoHomeSiteAddCommand extends SpoCommand {
     get schema() {
         return options;
     }
+    getRefinedSchema(schema) {
+        return schema
+            .refine((options) => [options.audienceIds, options.audienceNames].filter(o => o !== undefined).length <= 1, {
+            message: 'You must specify either audienceIds or audienceNames but not both.'
+        });
+    }
     async commandAction(logger, args) {
+        let audiences = [];
+        if (args.options.audienceIds) {
+            audiences = args.options.audienceIds.split(',').map(id => id.trim());
+        }
+        else if (args.options.audienceNames) {
+            audiences = await this.transformAudienceNamesToIds(args.options.audienceNames);
+        }
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
             const requestOptions = {
@@ -45,7 +60,7 @@ class SpoHomeSiteAddCommand extends SpoCommand {
                 responseType: 'json',
                 data: {
                     siteUrl: args.options.url,
-                    audiences: args.options.audiences?.split(','),
+                    audiences: audiences,
                     vivaConnectionsDefaultStart: args.options.vivaConnectionsDefaultStart ?? true,
                     isInDraftMode: args.options.isInDraftMode ?? false,
                     order: args.options.order
@@ -61,6 +76,15 @@ class SpoHomeSiteAddCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async transformAudienceNamesToIds(audienceNames) {
+        const names = audienceNames.split(',');
+        const ids = [];
+        for (const name of names) {
+            const id = await entraGroup.getGroupIdByDisplayName(name.trim());
+            ids.push(id);
+        }
+        return ids;
+    }
 }
 export default new SpoHomeSiteAddCommand();
 //# sourceMappingURL=homesite-add.js.map

package/dist/m365/spo/commands/homesite/homesite-get.js

@@ -1,28 +1,42 @@
-import request from '../../../../request.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { validation } from '../../../../utils/validation.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { odata } from '../../../../utils/odata.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+const options = globalOptionsZod
+    .extend({
+    url: zod.alias('u', z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
+        message: `'${url}' is not a valid SharePoint Online site URL.`
+    })))
+})
+    .strict();
 class SpoHomeSiteGetCommand extends SpoCommand {
     get name() {
         return commands.HOMESITE_GET;
     }
     get description() {
-        return 'Gets information about the Home Site';
+        return 'Gets information about a home site';
     }
-    async commandAction(logger) {
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
         try {
-            const spoUrl = await spo.getSpoUrl(logger, this.debug);
-            const requestOptions = {
-                url: `${spoUrl}/_api/SP.SPHSite/Details`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            if (!res["odata.null"]) {
-                await logger.log(res);
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
+            if (this.verbose) {
+                await logger.log(`Retrieving home sites...`);
+            }
+            const homeSites = await odata.getAllItems(`${spoAdminUrl}/_api/SPO.Tenant/GetTargetedSitesDetails`);
+            const homeSite = homeSites.find(hs => urlUtil.removeTrailingSlashes(hs.Url).toLowerCase() === urlUtil.removeTrailingSlashes(args.options.url).toLowerCase());
+            if (homeSite === undefined) {
+                throw `Home site with URL '${args.options.url}' not found.`;
             }
+            await logger.log(homeSite);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/homesite/homesite-list.js

@@ -9,27 +9,16 @@ class SpoHomeSiteListCommand extends SpoCommand {
     get description() {
         return 'Lists all home sites';
     }
-    alias() {
-        return [commands.TENANT_HOMESITE_LIST];
-    }
     defaultProperties() {
         return ['Url', 'Title'];
     }
     async commandAction(logger) {
-        await this.showDeprecationWarning(logger, commands.TENANT_HOMESITE_LIST, commands.HOMESITE_LIST);
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
-            const requestOptions = {
-                url: `${spoAdminUrl}/_api/SPO.Tenant/GetTargetedSitesDetails`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving all home sites...`);
             }
-            const res = await odata.getAllItems(requestOptions);
+            const res = await odata.getAllItems(`${spoAdminUrl}/_api/SPO.Tenant/GetTargetedSitesDetails`);
             await logger.log(res);
         }
         catch (err) {

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

@@ -3,7 +3,6 @@ import { zod } from '../../../../utils/zod.js';
 import { globalOptionsZod } from '../../../../Command.js';
 import { validation } from '../../../../utils/validation.js';
 import { cli } from '../../../../cli/cli.js';
-import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -13,7 +12,7 @@ const options = globalOptionsZod
     url: zod.alias('u', z.string()
         .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
         message: `'${url}' is not a valid SharePoint Online site URL.`
-    })).optional()),
+    }))),
     force: zod.alias('f', z.boolean().optional())
 })
     .strict();
@@ -30,34 +29,8 @@ class SpoHomeSiteRemoveCommand extends SpoCommand {
     async commandAction(logger, args) {
         const removeHomeSite = async () => {
             try {
-                if (this.verbose) {
-                    await logger.logToStderr(`Removing ${args.options.url ? `'${args.options.url}' as home site` : 'the current home site'}...`);
-                }
                 const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = await spo.getRequestDigest(spoAdminUrl);
-                if (args.options.url) {
-                    await this.removeHomeSiteByUrl(args.options.url, spoAdminUrl, logger);
-                    await logger.log(`${args.options.url} has been removed as a Home Site. It may take some time for the change to apply. Check aka.ms/homesites for details.`);
-                }
-                else {
-                    await this.warn(logger, `The current way this command works is deprecated and will change in the next major release. The '--url' option will become required.`);
-                    const requestOptions = {
-                        url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                        headers: {
-                            'X-RequestDigest': reqDigest.FormDigestValue
-                        },
-                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="28" ObjectPathId="27" /><Method Name="RemoveSPHSite" Id="29" ObjectPathId="27" /></Actions><ObjectPaths><Constructor Id="27" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                    };
-                    const res = await request.post(requestOptions);
-                    const json = JSON.parse(res);
-                    const response = json[0];
-                    if (response.ErrorInfo) {
-                        throw response.ErrorInfo.ErrorMessage;
-                    }
-                    else {
-                        await logger.log(json[json.length - 1]);
-                    }
-                }
+                await this.removeHomeSiteByUrl(args.options.url, spoAdminUrl, logger);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -67,11 +40,7 @@ class SpoHomeSiteRemoveCommand extends SpoCommand {
             await removeHomeSite();
         }
         else {
-            const result = await cli.promptForConfirmation({
-                message: args.options.url
-                    ? `Are you sure you want to remove '${args.options.url}' as home site?`
-                    : `Are you sure you want to remove the current home site?`
-            });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove '${args.options.url}' as home site?` });
             if (result) {
                 await removeHomeSite();
             }
@@ -79,6 +48,9 @@ class SpoHomeSiteRemoveCommand extends SpoCommand {
     }
     async removeHomeSiteByUrl(siteUrl, spoAdminUrl, logger) {
         const siteAdminProperties = await spo.getSiteAdminPropertiesByUrl(siteUrl, false, logger, this.verbose);
+        if (this.verbose) {
+            await logger.logToStderr(`Removing '${siteUrl}' as home site...`);
+        }
         const requestOptions = {
             url: `${spoAdminUrl}/_api/SPO.Tenant/RemoveTargetedSite`,
             headers: {

package/dist/m365/spo/commands/hubsite/hubsite-get.js

@@ -29,20 +29,12 @@ class SpoHubSiteGetCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            if (args.options.includeAssociatedSites) {
-                await this.warn(logger, `Parameter 'includeAssociatedSites' is deprecated. Please use 'withAssociatedSites' instead`);
-            }
             const spoUrl = await spo.getSpoUrl(logger, this.debug);
             const hubSite = args.options.id ? await this.getHubSiteById(spoUrl, args.options) : await this.getHubSite(spoUrl, args.options);
-            if ((args.options.includeAssociatedSites || args.options.withAssociatedSites) && (args.options.output && args.options.output !== 'json')) {
-                if (args.options.includeAssociatedSites) {
-                    throw 'includeAssociatedSites option is only allowed with json output mode';
-                }
-                else {
-                    throw 'withAssociatedSites option is only allowed with json output mode';
-                }
+            if (args.options.withAssociatedSites && (args.options.output && args.options.output !== 'json')) {
+                throw 'withAssociatedSites option is only allowed with json output mode';
             }
-            if ((args.options.includeAssociatedSites === true || args.options.withAssociatedSites === true) && args.options.output && !cli.shouldTrimOutput(args.options.output)) {
+            if (args.options.withAssociatedSites === true && args.options.output && !cli.shouldTrimOutput(args.options.output)) {
                 const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
                 const associatedSitesCommandOutput = await this.getAssociatedSites(spoAdminUrl, hubSite.SiteId, logger, args);
                 const associatedSites = JSON.parse(associatedSitesCommandOutput.stdout);
@@ -108,12 +100,11 @@ _SpoHubSiteGetCommand_instances = new WeakSet(), _SpoHubSiteGetCommand_initTelem
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
             url: typeof args.options.url !== 'undefined',
-            includeAssociatedSites: args.options.includeAssociatedSites === true,
             withAssociatedSites: args.options.withAssociatedSites === true
         });
     });
 }, _SpoHubSiteGetCommand_initOptions = function _SpoHubSiteGetCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '-u, --url [url]' }, { option: '--includeAssociatedSites' }, { option: '--withAssociatedSites' });
+    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '-u, --url [url]' }, { option: '--withAssociatedSites' });
 }, _SpoHubSiteGetCommand_initValidators = function _SpoHubSiteGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.id && !validation.isValidGuid(args.options.id)) {

package/dist/m365/spo/commands/hubsite/hubsite-list.js

@@ -29,14 +29,10 @@ class SpoHubSiteListCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            if (args.options.includeAssociatedSites) {
-                await this.warn(logger, `Parameter 'includeAssociatedSites' is deprecated. Please use 'withAssociatedSites' instead`);
-            }
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const hubSitesResult = await odata.getAllItems(`${spoAdminUrl}/_api/hubsites`);
             const hubSites = hubSitesResult;
-            const shouldIncludeAssociatedSites = args.options.includeAssociatedSites || args.options.withAssociatedSites;
-            if (!(shouldIncludeAssociatedSites !== true || args.options.output && args.options.output !== 'json')) {
+            if (!(args.options.withAssociatedSites !== true || args.options.output && args.options.output !== 'json')) {
                 if (this.debug) {
                     await logger.logToStderr('Retrieving associated sites...');
                     await logger.logToStderr('');
@@ -108,14 +104,11 @@ class SpoHubSiteListCommand extends SpoCommand {
 _SpoHubSiteListCommand_instances = new WeakSet(), _SpoHubSiteListCommand_initTelemetry = function _SpoHubSiteListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            includeAssociatedSites: args.options.includeAssociatedSites === true,
             withAssociatedSites: args.options.withAssociatedSites === true
         });
     });
 }, _SpoHubSiteListCommand_initOptions = function _SpoHubSiteListCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --includeAssociatedSites'
-    }, {
         option: '--withAssociatedSites'
     });
 };

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-list.js

@@ -1,9 +1,11 @@
-import config from '../../../../config.js';
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
-import SpoCommand from '../../../base/SpoCommand.js';
+import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class SpoServicePrincipalGrantListCommand extends SpoCommand {
+class SpoServicePrincipalGrantListCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.spoServicePrincipalDisplayName = 'SharePoint Online Web Client Extensibility';
+    }
     get name() {
         return commands.SERVICEPRINCIPAL_GRANT_LIST;
     }
@@ -15,36 +17,26 @@ class SpoServicePrincipalGrantListCommand extends SpoCommand {
     }
     async commandAction(logger) {
         try {
-            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             if (this.verbose) {
-                await logger.logToStderr(`Retrieving request digest...`);
+                await logger.logToStderr(`Retrieving permissions granted to the service principal '${this.spoServicePrincipalDisplayName}'...`);
             }
-            const reqDigest = await spo.getRequestDigest(spoAdminUrl);
             const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                url: `${this.resource}/v1.0/servicePrincipals?$filter=displayName eq '${this.spoServicePrincipalDisplayName}'&$select=id`,
                 headers: {
-                    'X-RequestDigest': reqDigest.FormDigestValue
+                    accept: 'application/json;odata.metadata=none'
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="5"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="5" ParentId="3" Name="PermissionGrants" /></ObjectPaths></Request>`
+                responseType: 'json'
             };
-            const res = await request.post(requestOptions);
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                throw response.ErrorInfo.ErrorMessage;
-            }
-            else {
-                const result = json[json.length - 1]._Child_Items_;
-                await logger.log(result.map(r => {
-                    delete r._ObjectType_;
-                    delete r.ClientId;
-                    delete r.ConsentType;
-                    return r;
-                }));
+            const response = await request.get(requestOptions);
+            if (response.value.length === 0) {
+                throw `Service principal '${this.spoServicePrincipalDisplayName}' not found`;
             }
+            requestOptions.url = `${this.resource}/v1.0/servicePrincipals/${response.value[0].id}/oauth2PermissionGrants`;
+            const result = await request.get(requestOptions);
+            await logger.log(result.value);
         }
         catch (err) {
-            this.handleRejectedPromise(err);
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

package/dist/m365/spo/commands/{tenant/tenant-site-archive.js → site/site-archive.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 _SpoTenantSiteArchiveCommand_instances, _SpoTenantSiteArchiveCommand_initTelemetry, _SpoTenantSiteArchiveCommand_initOptions, _SpoTenantSiteArchiveCommand_initValidators, _SpoTenantSiteArchiveCommand_initTypes;
+var _SpoSiteArchiveCommand_instances, _SpoSiteArchiveCommand_initTelemetry, _SpoSiteArchiveCommand_initOptions, _SpoSiteArchiveCommand_initValidators, _SpoSiteArchiveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
@@ -11,20 +11,20 @@ import { validation } from '../../../../utils/validation.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-class SpoTenantSiteArchiveCommand extends SpoCommand {
+class SpoSiteArchiveCommand extends SpoCommand {
     get name() {
-        return commands.TENANT_SITE_ARCHIVE;
+        return commands.SITE_ARCHIVE;
     }
     get description() {
         return 'Archives a site collection';
     }
     constructor() {
         super();
-        _SpoTenantSiteArchiveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initTypes).call(this);
+        _SpoSiteArchiveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteArchiveCommand_instances, "m", _SpoSiteArchiveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteArchiveCommand_instances, "m", _SpoSiteArchiveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteArchiveCommand_instances, "m", _SpoSiteArchiveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteArchiveCommand_instances, "m", _SpoSiteArchiveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const archiveSite = async () => {
@@ -81,19 +81,19 @@ class SpoTenantSiteArchiveCommand extends SpoCommand {
         }
     }
 }
-_SpoTenantSiteArchiveCommand_instances = new WeakSet(), _SpoTenantSiteArchiveCommand_initTelemetry = function _SpoTenantSiteArchiveCommand_initTelemetry() {
+_SpoSiteArchiveCommand_instances = new WeakSet(), _SpoSiteArchiveCommand_initTelemetry = function _SpoSiteArchiveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: !!args.options.force
         });
     });
-}, _SpoTenantSiteArchiveCommand_initOptions = function _SpoTenantSiteArchiveCommand_initOptions() {
+}, _SpoSiteArchiveCommand_initOptions = function _SpoSiteArchiveCommand_initOptions() {
     this.options.unshift({ option: '-u, --url <url>' }, { option: '-f, --force' });
-}, _SpoTenantSiteArchiveCommand_initValidators = function _SpoTenantSiteArchiveCommand_initValidators() {
+}, _SpoSiteArchiveCommand_initValidators = function _SpoSiteArchiveCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-}, _SpoTenantSiteArchiveCommand_initTypes = function _SpoTenantSiteArchiveCommand_initTypes() {
+}, _SpoSiteArchiveCommand_initTypes = function _SpoSiteArchiveCommand_initTypes() {
     this.types.string.push('url');
     this.types.boolean.push('force');
 };
-export default new SpoTenantSiteArchiveCommand();
-//# sourceMappingURL=tenant-site-archive.js.map
+export default new SpoSiteArchiveCommand();
+//# sourceMappingURL=site-archive.js.map

package/dist/m365/spo/commands/{tenant/tenant-site-list.js → site/site-list.js}

@@ -3,16 +3,16 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoTenantSiteListCommand_instances, _SpoTenantSiteListCommand_initTelemetry, _SpoTenantSiteListCommand_initOptions, _SpoTenantSiteListCommand_initValidators;
+var _SpoSiteListCommand_instances, _SpoSiteListCommand_initTelemetry, _SpoSiteListCommand_initOptions, _SpoSiteListCommand_initValidators;
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-class SpoTenantSiteListCommand extends SpoCommand {
+class SpoSiteListCommand extends SpoCommand {
     get name() {
-        return commands.TENANT_SITE_LIST;
+        return commands.SITE_LIST;
     }
     get description() {
         return 'Lists sites of the given type';
@@ -22,20 +22,17 @@ class SpoTenantSiteListCommand extends SpoCommand {
     }
     constructor() {
         super();
-        _SpoTenantSiteListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteListCommand_instances, "m", _SpoTenantSiteListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteListCommand_instances, "m", _SpoTenantSiteListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteListCommand_instances, "m", _SpoTenantSiteListCommand_initValidators).call(this);
+        _SpoSiteListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteListCommand_instances, "m", _SpoSiteListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteListCommand_instances, "m", _SpoSiteListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteListCommand_instances, "m", _SpoSiteListCommand_initValidators).call(this);
     }
     alias() {
         return [commands.SITE_LIST];
     }
     async commandAction(logger, args) {
-        if (args.options.includeOneDriveSites) {
-            await this.warn(logger, `Parameter 'includeOneDriveSites' is deprecated. Please use 'withOneDriveSites' instead`);
-        }
         const webTemplate = this.getWebTemplateId(args.options);
-        const includeOneDriveSites = (args.options.includeOneDriveSites || args.options.withOneDriveSites) || false;
+        const includeOneDriveSites = args.options.withOneDriveSites || false;
         const personalSite = includeOneDriveSites === false ? '0' : '1';
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
@@ -79,7 +76,7 @@ class SpoTenantSiteListCommand extends SpoCommand {
         if (options.webTemplate) {
             return options.webTemplate;
         }
-        if (options.includeOneDriveSites || options.withOneDriveSites) {
+        if (options.withOneDriveSites) {
             return '';
         }
         switch (options.type) {
@@ -92,17 +89,16 @@ class SpoTenantSiteListCommand extends SpoCommand {
         }
     }
 }
-_SpoTenantSiteListCommand_instances = new WeakSet(), _SpoTenantSiteListCommand_initTelemetry = function _SpoTenantSiteListCommand_initTelemetry() {
+_SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry = function _SpoSiteListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             webTemplate: args.options.webTemplate,
             type: args.options.type,
             filter: (!(!args.options.filter)).toString(),
-            includeOneDriveSites: typeof args.options.includeOneDriveSites !== 'undefined',
             withOneDriveSites: typeof args.options.withOneDriveSites !== 'undefined'
         });
     });
-}, _SpoTenantSiteListCommand_initOptions = function _SpoTenantSiteListCommand_initOptions() {
+}, _SpoSiteListCommand_initOptions = function _SpoSiteListCommand_initOptions() {
     this.options.unshift({
         option: '-t, --type [type]',
         autocomplete: ['TeamSite', 'CommunicationSite']
@@ -110,12 +106,10 @@ _SpoTenantSiteListCommand_instances = new WeakSet(), _SpoTenantSiteListCommand_i
         option: '--webTemplate [webTemplate]'
     }, {
         option: '--filter [filter]'
-    }, {
-        option: '--includeOneDriveSites'
     }, {
         option: '--withOneDriveSites'
     });
-}, _SpoTenantSiteListCommand_initValidators = function _SpoTenantSiteListCommand_initValidators() {
+}, _SpoSiteListCommand_initValidators = function _SpoSiteListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.type && args.options.webTemplate) {
             return 'Specify either type or webTemplate, but not both';
@@ -125,17 +119,12 @@ _SpoTenantSiteListCommand_instances = new WeakSet(), _SpoTenantSiteListCommand_i
             typeValues.indexOf(args.options.type) < 0) {
             return `${args.options.type} is not a valid value for the type option. Allowed values are ${typeValues.join('|')}`;
         }
-        if (args.options.includeOneDriveSites || args.options.withOneDriveSites
+        if (args.options.withOneDriveSites
             && (args.options.type || args.options.webTemplate)) {
-            if (args.options.includeOneDriveSites) {
-                return 'When using includeOneDriveSites, don\'t specify the type or webTemplate options';
-            }
-            else {
-                return 'When using withOneDriveSites, don\'t specify the type or webTemplate options';
-            }
+            return 'When using withOneDriveSites, don\'t specify the type or webTemplate options';
         }
         return true;
     });
 };
-export default new SpoTenantSiteListCommand();
-//# sourceMappingURL=tenant-site-list.js.map
+export default new SpoSiteListCommand();
+//# sourceMappingURL=site-list.js.map

package/dist/m365/spo/commands/{tenant/tenant-site-membership-list.js → site/site-membership-list.js}

@@ -3,15 +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 _SpoTenantSiteMembershipListCommand_instances, _a, _SpoTenantSiteMembershipListCommand_initTelemetry, _SpoTenantSiteMembershipListCommand_initOptions, _SpoTenantSiteMembershipListCommand_initValidators, _SpoTenantSiteMembershipListCommand_initTypes;
+var _SpoSiteMembershipListCommand_instances, _a, _SpoSiteMembershipListCommand_initTelemetry, _SpoSiteMembershipListCommand_initOptions, _SpoSiteMembershipListCommand_initValidators, _SpoSiteMembershipListCommand_initTypes;
 import { odata } from '../../../../utils/odata.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 SpoTenantSiteMembershipListCommand extends SpoCommand {
+class SpoSiteMembershipListCommand extends SpoCommand {
     get name() {
-        return commands.TENANT_SITE_MEMBERSHIP_LIST;
+        return commands.SITE_MEMBERSHIP_LIST;
     }
     get description() {
         return `Retrieves information about default site groups' membership`;
@@ -21,11 +21,11 @@ class SpoTenantSiteMembershipListCommand extends SpoCommand {
     }
     constructor() {
         super();
-        _SpoTenantSiteMembershipListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteMembershipListCommand_instances, "m", _SpoTenantSiteMembershipListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteMembershipListCommand_instances, "m", _SpoTenantSiteMembershipListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteMembershipListCommand_instances, "m", _SpoTenantSiteMembershipListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteMembershipListCommand_instances, "m", _SpoTenantSiteMembershipListCommand_initTypes).call(this);
+        _SpoSiteMembershipListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteMembershipListCommand_instances, "m", _SpoSiteMembershipListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteMembershipListCommand_instances, "m", _SpoSiteMembershipListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteMembershipListCommand_instances, "m", _SpoSiteMembershipListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteMembershipListCommand_instances, "m", _SpoSiteMembershipListCommand_initTypes).call(this);
     }
     ;
     async commandAction(logger, args) {
@@ -90,29 +90,29 @@ class SpoTenantSiteMembershipListCommand extends SpoCommand {
         }
     }
 }
-_a = SpoTenantSiteMembershipListCommand, _SpoTenantSiteMembershipListCommand_instances = new WeakSet(), _SpoTenantSiteMembershipListCommand_initTelemetry = function _SpoTenantSiteMembershipListCommand_initTelemetry() {
+_a = SpoSiteMembershipListCommand, _SpoSiteMembershipListCommand_instances = new WeakSet(), _SpoSiteMembershipListCommand_initTelemetry = function _SpoSiteMembershipListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             role: typeof args.options.role !== 'undefined'
         });
     });
-}, _SpoTenantSiteMembershipListCommand_initOptions = function _SpoTenantSiteMembershipListCommand_initOptions() {
+}, _SpoSiteMembershipListCommand_initOptions = function _SpoSiteMembershipListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '-r, --role [role]',
         autocomplete: _a.RoleNames
     });
-}, _SpoTenantSiteMembershipListCommand_initValidators = function _SpoTenantSiteMembershipListCommand_initValidators() {
+}, _SpoSiteMembershipListCommand_initValidators = function _SpoSiteMembershipListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.role && !_a.RoleNames.some(roleName => roleName.toLocaleLowerCase() === args.options.role.toLocaleLowerCase())) {
             return `'${args.options.role}' is not a valid value for option 'role'. Valid values are: ${_a.RoleNames.join(', ')}`;
         }
         return validation.isValidSharePointUrl(args.options.siteUrl);
     });
-}, _SpoTenantSiteMembershipListCommand_initTypes = function _SpoTenantSiteMembershipListCommand_initTypes() {
+}, _SpoSiteMembershipListCommand_initTypes = function _SpoSiteMembershipListCommand_initTypes() {
     this.types.string.push('role', 'siteUrl');
 };
-SpoTenantSiteMembershipListCommand.RoleNames = ['Owner', 'Member', 'Visitor'];
-export default new SpoTenantSiteMembershipListCommand();
-//# sourceMappingURL=tenant-site-membership-list.js.map
+SpoSiteMembershipListCommand.RoleNames = ['Owner', 'Member', 'Visitor'];
+export default new SpoSiteMembershipListCommand();
+//# sourceMappingURL=site-membership-list.js.map