@pnp/cli-microsoft365 10.10.0-beta.1bb5ba0 → 10.10.0-beta.2cb88d5

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

@@ -1,48 +1,62 @@
-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 _SpoHomeSiteRemoveCommand_instances, _SpoHomeSiteRemoveCommand_initTelemetry, _SpoHomeSiteRemoveCommand_initOptions;
+import { z } from 'zod';
+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';
 import commands from '../../commands.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.`
+    })).optional()),
+    force: zod.alias('f', z.boolean().optional())
+})
+    .strict();
 class SpoHomeSiteRemoveCommand extends SpoCommand {
     get name() {
         return commands.HOMESITE_REMOVE;
     }
     get description() {
-        return 'Removes the current Home Site';
+        return 'Removes a Home Site';
     }
-    constructor() {
-        super();
-        _SpoHomeSiteRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHomeSiteRemoveCommand_instances, "m", _SpoHomeSiteRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHomeSiteRemoveCommand_instances, "m", _SpoHomeSiteRemoveCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     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);
-                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;
+                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 logger.log(json[json.length - 1]);
+                    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]);
+                    }
                 }
             }
             catch (err) {
@@ -53,23 +67,29 @@ class SpoHomeSiteRemoveCommand extends SpoCommand {
             await removeHomeSite();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the Home Site?` });
+            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?`
+            });
             if (result) {
                 await removeHomeSite();
             }
         }
     }
+    async removeHomeSiteByUrl(siteUrl, spoAdminUrl, logger) {
+        const siteAdminProperties = await spo.getSiteAdminPropertiesByUrl(siteUrl, false, logger, this.verbose);
+        const requestOptions = {
+            url: `${spoAdminUrl}/_api/SPO.Tenant/RemoveTargetedSite`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            data: {
+                siteId: siteAdminProperties.SiteId
+            }
+        };
+        await request.post(requestOptions);
+    }
 }
-_SpoHomeSiteRemoveCommand_instances = new WeakSet(), _SpoHomeSiteRemoveCommand_initTelemetry = function _SpoHomeSiteRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: args.options.force || false
-        });
-    });
-}, _SpoHomeSiteRemoveCommand_initOptions = function _SpoHomeSiteRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-f, --force'
-    });
-};
 export default new SpoHomeSiteRemoveCommand();
 //# sourceMappingURL=homesite-remove.js.map

package/docs/docs/cmd/spo/homesite/homesite-remove.mdx

@@ -4,7 +4,7 @@ import TabItem from '@theme/TabItem';
 
 # spo homesite remove
 
-Removes the current Home Site
+Removes a Home Site
 
 ## Usage
 
@@ -15,6 +15,9 @@ m365 spo homesite remove [options]
 ## Options
 
 ```md definition-list
+`-u, --url [url]`
+: URL of the home site to remove.
+
 `-f, --force`
 : Do not prompt for confirmation before removing the Home Site.
 ```
@@ -31,10 +34,10 @@ To use this command you must be either **SharePoint Administrator** or **Global
 
 ## Examples
 
-Removes the current Home Site without confirmation.
+Removes a Home site specified by URL without prompting for confirmation.
 
 ```sh
-m365 spo homesite remove --force
+m365 spo homesite remove --url "https://contoso.sharepoint.com/sites/testcomms" --force
 ```
 
 ## Response

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "10.10.0-beta.1bb5ba0",
+  "version": "10.10.0-beta.2cb88d5",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",