@pnp/cli-microsoft365 11.5.0-beta.083a680 → 11.5.0-beta.9dbb2e8

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

@@ -1,14 +1,21 @@
-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 _SpoSiteHubSiteConnectCommand_instances, _SpoSiteHubSiteConnectCommand_initOptions, _SpoSiteHubSiteConnectCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { spo } from '../../../../utils/spo.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    siteUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    id: z.uuid().alias('i'),
+    asAdmin: z.boolean().optional()
+});
 class SpoSiteHubSiteConnectCommand extends SpoCommand {
     get name() {
         return commands.SITE_HUBSITE_CONNECT;
@@ -16,11 +23,8 @@ class SpoSiteHubSiteConnectCommand extends SpoCommand {
     get description() {
         return 'Connects the specified site collection to the given hub site';
     }
-    constructor() {
-        super();
-        _SpoSiteHubSiteConnectCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteHubSiteConnectCommand_instances, "m", _SpoSiteHubSiteConnectCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteHubSiteConnectCommand_instances, "m", _SpoSiteHubSiteConnectCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -28,12 +32,22 @@ class SpoSiteHubSiteConnectCommand extends SpoCommand {
                 await logger.logToStderr(`Connecting site collection ${args.options.siteUrl} to hub site ${args.options.id}...`);
             }
             const requestOptions = {
-                url: `${args.options.siteUrl}/_api/site/JoinHubSite('${formatting.encodeQueryParameter(args.options.id)}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
                 responseType: 'json'
             };
+            if (!args.options.asAdmin) {
+                requestOptions.url = `${args.options.siteUrl}/_api/site/JoinHubSite('${formatting.encodeQueryParameter(args.options.id)}')`;
+            }
+            else {
+                const tenantAdminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
+                requestOptions.url = `${tenantAdminUrl}/_api/SPO.Tenant/ConnectSiteToHubSiteById`;
+                requestOptions.data = {
+                    siteUrl: args.options.siteUrl,
+                    hubSiteId: args.options.id
+                };
+            }
             await request.post(requestOptions);
         }
         catch (err) {
@@ -41,23 +55,5 @@ class SpoSiteHubSiteConnectCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteHubSiteConnectCommand_instances = new WeakSet(), _SpoSiteHubSiteConnectCommand_initOptions = function _SpoSiteHubSiteConnectCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
-    }, {
-        option: '-i, --id <id>'
-    });
-}, _SpoSiteHubSiteConnectCommand_initValidators = function _SpoSiteHubSiteConnectCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.siteUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new SpoSiteHubSiteConnectCommand();
 //# sourceMappingURL=site-hubsite-connect.js.map

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

@@ -1,14 +1,21 @@
-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 _SpoSiteHubSiteDisconnectCommand_instances, _SpoSiteHubSiteDisconnectCommand_initTelemetry, _SpoSiteHubSiteDisconnectCommand_initOptions, _SpoSiteHubSiteDisconnectCommand_initValidators;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { spo } from '../../../../utils/spo.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    siteUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    asAdmin: z.boolean().optional(),
+    force: z.boolean().alias('f').optional()
+});
 class SpoSiteHubSiteDisconnectCommand extends SpoCommand {
     get name() {
         return commands.SITE_HUBSITE_DISCONNECT;
@@ -16,12 +23,8 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand {
     get description() {
         return 'Disconnects the specified site collection from its hub site';
     }
-    constructor() {
-        super();
-        _SpoSiteHubSiteDisconnectCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteHubSiteDisconnectCommand_instances, "m", _SpoSiteHubSiteDisconnectCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteHubSiteDisconnectCommand_instances, "m", _SpoSiteHubSiteDisconnectCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteHubSiteDisconnectCommand_instances, "m", _SpoSiteHubSiteDisconnectCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -40,12 +43,22 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand {
                 await logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hub site...`);
             }
             const requestOptions = {
-                url: `${args.options.siteUrl}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
                 responseType: 'json'
             };
+            if (!args.options.asAdmin) {
+                requestOptions.url = `${args.options.siteUrl}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`;
+            }
+            else {
+                const tenantAdminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
+                requestOptions.url = `${tenantAdminUrl}/_api/SPO.Tenant/ConnectSiteToHubSiteById`;
+                requestOptions.data = {
+                    siteUrl: args.options.siteUrl,
+                    hubSiteId: '00000000-0000-0000-0000-000000000000'
+                };
+            }
             await request.post(requestOptions);
         }
         catch (err) {
@@ -53,20 +66,5 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteHubSiteDisconnectCommand_instances = new WeakSet(), _SpoSiteHubSiteDisconnectCommand_initTelemetry = function _SpoSiteHubSiteDisconnectCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: args.options.force || false
-        });
-    });
-}, _SpoSiteHubSiteDisconnectCommand_initOptions = function _SpoSiteHubSiteDisconnectCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoSiteHubSiteDisconnectCommand_initValidators = function _SpoSiteHubSiteDisconnectCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.siteUrl));
-};
 export default new SpoSiteHubSiteDisconnectCommand();
 //# sourceMappingURL=site-hubsite-disconnect.js.map

package/docs/docs/cmd/spo/site/site-hubsite-connect.mdx

@@ -1,4 +1,6 @@
 import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
 
 # spo site hubsite connect
 
@@ -14,10 +16,13 @@ m365 spo site hubsite connect [options]
 
 ```md definition-list
 `-u, --siteUrl <siteUrl>`
-: The URL of the site collection to connect to the hub site
+: The URL of the site collection to connect to the hub site.
 
 `-i, --id <id>`
-: The ID of the hub site to which to connect the site collection
+: The ID of the hub site to which to connect the site collection.
+
+`--asAdmin`
+: Connect the site to a hub site as SharePoint admin.
 ```
 
 <Global />
@@ -28,6 +33,25 @@ If the specified site collection is already connected to a hub site, it will be
 
 If the specified `id` doesn't point to a valid hub site, you will get a `ResourceNotFoundException` error.
 
+## Permissions
+
+<Tabs>
+  <TabItem value="Delegated">
+
+  | Resource   | Permissions          |
+  |------------|----------------------|
+  | SharePoint | AllSites.FullControl |
+
+  </TabItem>
+  <TabItem value="Application">
+
+  | Resource   | Permissions           |
+  |------------|-----------------------|
+  | SharePoint | Sites.FullControl.All |
+
+  </TabItem>
+</Tabs>
+
 ## Examples
 
 Connect a specific site collection to a hub site
@@ -36,6 +60,12 @@ Connect a specific site collection to a hub site
 m365 spo site hubsite connect --siteUrl https://contoso.sharepoint.com/sites/contoso-sales --id 255a50b2-527f-4413-8485-57f4c17a24d1
 ```
 
+Connect a specific site collection to a hub site as SharePoint admin
+
+```sh
+m365 spo site hubsite connect --siteUrl https://contoso.sharepoint.com/sites/contoso-sales --id 255a50b2-527f-4413-8485-57f4c17a24d1 --asAdmin
+```
+
 ## Response
 
 The command won't return a response on success.

package/docs/docs/cmd/spo/site/site-hubsite-disconnect.mdx

@@ -1,4 +1,6 @@
 import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
 
 # spo site hubsite disconnect
 
@@ -14,14 +16,36 @@ m365 spo site hubsite disconnect [options]
 
 ```md definition-list
 `-u, --siteUrl <siteUrl>`
-: URL of the site collection to disconnect from its hub site
+: URL of the site collection to disconnect from its hub site.
+
+`--asAdmin`
+: Disconnect the site from a hub site as SharePoint admin.
 
 `-f, --force`
-: Don't prompt for confirmation
+: Don't prompt for confirmation.
 ```
 
 <Global />
 
+## Permissions
+
+<Tabs>
+  <TabItem value="Delegated">
+
+  | Resource   | Permissions          |
+  |------------|----------------------|
+  | SharePoint | AllSites.FullControl |
+
+  </TabItem>
+  <TabItem value="Application">
+
+  | Resource   | Permissions           |
+  |------------|-----------------------|
+  | SharePoint | Sites.FullControl.All |
+
+  </TabItem>
+</Tabs>
+
 ## Examples
 
 Disconnect a specific site collection from its hub site. Will prompt for confirmation before disconnecting from the hub site.
@@ -30,6 +54,12 @@ Disconnect a specific site collection from its hub site. Will prompt for confirm
 m365 spo site hubsite disconnect --siteUrl https://contoso.sharepoint.com/sites/sales
 ```
 
+Disconnect a specific site collection from its hub site as SharePoint admin.
+
+```sh
+m365 spo site hubsite disconnect --siteUrl https://contoso.sharepoint.com/sites/sales --asAdmin
+```
+
 Disconnect a specific site collection from its hub site without prompting for confirmation.
 
 ```sh