@pnp/cli-microsoft365 10.0.0-beta.1a88ed2 → 10.0.0-beta.303b62c

package/dist/m365/entra/commands/m365group/m365group-user-remove.js

@@ -29,9 +29,6 @@ class EntraM365GroupUserRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.userName) {
-            await this.warn(logger, `Option 'userName' is deprecated. Please use 'ids' or 'userNames' instead.`);
-        }
         const removeUser = async () => {
             try {
                 const groupId = await this.getGroupId(logger, args.options.groupId, args.options.teamId, args.options.groupName, args.options.teamName);
@@ -39,7 +36,7 @@ class EntraM365GroupUserRemoveCommand extends GraphCommand {
                 if (!isUnifiedGroup) {
                     throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
                 }
-                const userNames = args.options.userNames || args.options.userName;
+                const userNames = args.options.userNames;
                 const userIds = await this.getUserIds(logger, args.options.ids, userNames);
                 await this.removeUsersFromGroup(groupId, userIds, 'owners');
                 await this.removeUsersFromGroup(groupId, userIds, 'members');
@@ -52,7 +49,7 @@ class EntraM365GroupUserRemoveCommand extends GraphCommand {
             await removeUser();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove ${args.options.userName || args.options.userNames || args.options.ids} from ${args.options.groupId || args.options.groupName || args.options.teamId || args.options.teamName}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove ${args.options.userNames || args.options.ids} from ${args.options.groupId || args.options.groupName || args.options.teamId || args.options.teamName}?` });
             if (result) {
                 await removeUser();
             }
@@ -105,7 +102,6 @@ _EntraM365GroupUserRemoveCommand_instances = new WeakSet(), _EntraM365GroupUserR
             groupId: typeof args.options.groupId !== 'undefined',
             teamName: typeof args.options.teamName !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
             ids: typeof args.options.ids !== 'undefined',
             userNames: typeof args.options.userNames !== 'undefined'
         });
@@ -119,8 +115,6 @@ _EntraM365GroupUserRemoveCommand_instances = new WeakSet(), _EntraM365GroupUserR
         option: '--teamId [teamId]'
     }, {
         option: '--teamName [teamName]'
-    }, {
-        option: '-n, --userName [userName]'
     }, {
         option: '--ids [ids]'
     }, {
@@ -148,19 +142,16 @@ _EntraM365GroupUserRemoveCommand_instances = new WeakSet(), _EntraM365GroupUserR
                 return `The following user principal names are invalid for the option 'userNames': ${isValidUPNArrayResult}.`;
             }
         }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `The specified userName '${args.options.userName}' is not a valid user principal name.`;
-        }
         return true;
     });
 }, _EntraM365GroupUserRemoveCommand_initOptionSets = function _EntraM365GroupUserRemoveCommand_initOptionSets() {
     this.optionSets.push({
         options: ['groupId', 'teamId', 'groupName', 'teamName']
     }, {
-        options: ['userName', 'ids', 'userNames']
+        options: ['ids', 'userNames']
     });
 }, _EntraM365GroupUserRemoveCommand_initTypes = function _EntraM365GroupUserRemoveCommand_initTypes() {
-    this.types.string.push('groupId', 'groupName', 'teamId', 'teamName', 'userName', 'ids', 'userNames');
+    this.types.string.push('groupId', 'groupName', 'teamId', 'teamName', 'ids', 'userNames');
     this.types.boolean.push('force');
 };
 export default new EntraM365GroupUserRemoveCommand();

package/dist/m365/spo/commands/folder/folder-copy.js

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFolderCopyCommand_instances, _SpoFolderCopyCommand_initTelemetry, _SpoFolderCopyCommand_initOptions, _SpoFolderCopyCommand_initValidators, _SpoFolderCopyCommand_initOptionSets, _SpoFolderCopyCommand_initTypes;
 import request from '../../../../request.js';
+import { CreateFolderCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -31,45 +32,54 @@ class SpoFolderCopyCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            const sourcePath = await this.getSourcePath(logger, args.options);
+            const sourceServerRelativePath = await this.getSourcePath(logger, args.options);
+            const sourcePath = this.getAbsoluteUrl(args.options.webUrl, sourceServerRelativePath);
+            const destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl);
             if (this.verbose) {
-                await logger.logToStderr(`Copying folder ${sourcePath} to ${args.options.targetUrl}...`);
+                await logger.logToStderr(`Copying folder '${sourcePath}' to '${destinationPath}'...`);
             }
-            const absoluteSourcePath = this.getAbsoluteUrl(args.options.webUrl, sourcePath);
-            let absoluteTargetPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
-            if (args.options.newName) {
-                absoluteTargetPath += args.options.newName;
+            const copyJobResponse = await spo.createFolderCopyJob(args.options.webUrl, sourcePath, destinationPath, {
+                nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
+                newName: args.options.newName,
+                operation: 'copy'
+            });
+            if (args.options.skipWait) {
+                return;
             }
-            else {
-                // Keep the original folder name
-                absoluteTargetPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            if (this.verbose) {
+                await logger.logToStderr('Waiting for the copy job to complete...');
+            }
+            const copyJobResult = await spo.getCopyJobResult(args.options.webUrl, copyJobResponse);
+            if (this.verbose) {
+                await logger.logToStderr('Getting information about the destination folder...');
             }
+            // Get destination folder data
+            const siteRelativeDestinationFolder = '/' + copyJobResult.TargetObjectSiteRelativeUrl.substring(0, copyJobResult.TargetObjectSiteRelativeUrl.lastIndexOf('/'));
+            const absoluteWebUrl = destinationPath.substring(0, destinationPath.toLowerCase().lastIndexOf(siteRelativeDestinationFolder.toLowerCase()));
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.CopyFolderByPath`,
+                url: `${absoluteWebUrl}/_api/Web/GetFolderById('${copyJobResult.TargetObjectUniqueId}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
-                responseType: 'json',
-                data: {
-                    srcPath: {
-                        DecodedUrl: absoluteSourcePath
-                    },
-                    destPath: {
-                        DecodedUrl: absoluteTargetPath
-                    },
-                    options: {
-                        KeepBoth: args.options.nameConflictBehavior === 'rename',
-                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock,
-                        ResetAuthorAndCreatedOnCopy: !!args.options.resetAuthorAndCreated
-                    }
-                }
+                responseType: 'json'
             };
-            await request.post(requestOptions);
+            const destinationFile = await request.get(requestOptions);
+            await logger.log(destinationFile);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    getNameConflictBehaviorValue(nameConflictBehavior) {
+        switch (nameConflictBehavior?.toLowerCase()) {
+            case 'fail':
+                return CreateFolderCopyJobsNameConflictBehavior.Fail;
+            case 'rename':
+                return CreateFolderCopyJobsNameConflictBehavior.Rename;
+            default:
+                return CreateFolderCopyJobsNameConflictBehavior.Fail;
+        }
+    }
     async getSourcePath(logger, options) {
         if (options.sourceUrl) {
             return urlUtil.getServerRelativePath(options.webUrl, options.sourceUrl);
@@ -78,17 +88,18 @@ class SpoFolderCopyCommand extends SpoCommand {
             await logger.logToStderr(`Retrieving server-relative path for folder with ID '${options.sourceId}'...`);
         }
         const requestOptions = {
-            url: `${options.webUrl}/_api/Web/GetFolderById('${options.sourceId}')?$select=ServerRelativePath`,
+            url: `${options.webUrl}/_api/Web/GetFolderById('${options.sourceId}')/ServerRelativePath`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
-        const file = await request.get(requestOptions);
-        return file.ServerRelativePath.DecodedUrl;
+        const path = await request.get(requestOptions);
+        return path.DecodedUrl;
     }
     getAbsoluteUrl(webUrl, url) {
-        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        const result = url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        return urlUtil.removeTrailingSlashes(result);
     }
 }
 _SpoFolderCopyCommand_instances = new WeakSet(), _SpoFolderCopyCommand_initTelemetry = function _SpoFolderCopyCommand_initTelemetry() {
@@ -98,8 +109,7 @@ _SpoFolderCopyCommand_instances = new WeakSet(), _SpoFolderCopyCommand_initTelem
             sourceId: typeof args.options.sourceId !== 'undefined',
             newName: typeof args.options.newName !== 'undefined',
             nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
-            resetAuthorAndCreated: !!args.options.resetAuthorAndCreated,
-            bypassSharedLock: !!args.options.bypassSharedLock
+            skipWait: !!args.options.skipWait
         });
     });
 }, _SpoFolderCopyCommand_initOptions = function _SpoFolderCopyCommand_initOptions() {
@@ -117,9 +127,7 @@ _SpoFolderCopyCommand_instances = new WeakSet(), _SpoFolderCopyCommand_initTelem
         option: '--nameConflictBehavior [nameConflictBehavior]',
         autocomplete: this.nameConflictBehaviorOptions
     }, {
-        option: '--resetAuthorAndCreated'
-    }, {
-        option: '--bypassSharedLock'
+        option: '--skipWait'
     });
 }, _SpoFolderCopyCommand_initValidators = function _SpoFolderCopyCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -139,7 +147,7 @@ _SpoFolderCopyCommand_instances = new WeakSet(), _SpoFolderCopyCommand_initTelem
     this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 }, _SpoFolderCopyCommand_initTypes = function _SpoFolderCopyCommand_initTypes() {
     this.types.string.push('webUrl', 'sourceUrl', 'sourceId', 'targetUrl', 'newName', 'nameConflictBehavior');
-    this.types.boolean.push('resetAuthorAndCreated', 'bypassSharedLock');
+    this.types.boolean.push('skipWait');
 };
 export default new SpoFolderCopyCommand();
 //# sourceMappingURL=folder-copy.js.map

package/dist/m365/spo/commands/page/page-publish.js

@@ -0,0 +1,54 @@
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+const options = globalOptionsZod
+    .extend({
+    webUrl: zod.alias('u', z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
+        message: `'${url}' is not a valid SharePoint Online site URL.`
+    }))),
+    name: zod.alias('n', z.string())
+})
+    .strict();
+class SpoPagePublishCommand extends SpoCommand {
+    get name() {
+        return commands.PAGE_PUBLISH;
+    }
+    get description() {
+        return 'Publishes a modern page';
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        try {
+            // Remove leading slashes from the page name (page can be nested in folders)
+            let pageName = urlUtil.removeLeadingSlashes(args.options.name);
+            if (!pageName.toLowerCase().endsWith('.aspx')) {
+                pageName += '.aspx';
+            }
+            if (this.verbose) {
+                await logger.logToStderr(`Publishing page ${pageName}...`);
+            }
+            const filePath = `${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${pageName}`;
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(filePath)}')/Publish()`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                }
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new SpoPagePublishCommand();
+//# sourceMappingURL=page-publish.js.map

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

@@ -16,7 +16,7 @@ class SpoUserProfileGetCommand extends SpoCommand {
         return commands.USERPROFILE_GET;
     }
     get description() {
-        return 'Sets user profile property for a SharePoint user';
+        return 'Gets user profile property for a SharePoint user';
     }
     constructor() {
         super();

package/dist/m365/spo/commands.js

@@ -202,6 +202,7 @@ export default {
     PAGE_COPY: `${prefix} page copy`,
     PAGE_GET: `${prefix} page get`,
     PAGE_LIST: `${prefix} page list`,
+    PAGE_PUBLISH: `${prefix} page publish`,
     PAGE_REMOVE: `${prefix} page remove`,
     PAGE_SET: `${prefix} page set`,
     PAGE_CLIENTSIDEWEBPART_ADD: `${prefix} page clientsidewebpart add`,

package/docs/docs/cmd/entra/m365group/m365group-user-remove.mdx

@@ -25,14 +25,11 @@ m365 entra m365group user remove [options]
 `--teamName [teamName]`
 : The display name of the Microsoft Teams team. Specify only one of the following: `groupId`, `groupName`, `teamId`, or `teamName`.
 
-`-n, --userName [userName]`
-: (deprecated) User's UPN (user principal name), eg. `johndoe@example.com`.. Specify only one of the following: `userName`, `ids` or `userNames`.
-
 `--ids [ids]`
-: Microsoft Entra IDs of users. You can also pass a comma-separated list of IDs. Specify only one of the following `userName`, `ids` or `userNames`.
+: Microsoft Entra IDs of users. You can also pass a comma-separated list of IDs. Specify either `ids` or `userNames` but not both.
 
 `--userNames [userNames]`
-: The user principal names of users. You can also pass a comma-separated list of UPNs. Specify only one of the following `userName`, `ids` or `userNames`.
+: The user principal names of users. You can also pass a comma-separated list of UPNs. Specify either `ids` or `userNames` but not both.
 
 `-f, --force`
 : Don't prompt for confirming removing the user from the specified Microsoft 365 Group or Microsoft Teams team.

package/docs/docs/cmd/spo/folder/folder-copy.mdx

@@ -1,4 +1,6 @@
 import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
 
 # spo folder copy
 
@@ -31,19 +33,14 @@ m365 spo folder copy [options]
 `--nameConflictBehavior [nameConflictBehavior]`
 : Behavior when a file or folder with the same name is already present at the destination. Allowed values: `fail`, `rename`. Defaults to `fail`.
 
-`--resetAuthorAndCreated`
-: Use this option to clear the author and created date. When not specified, the values from the source folder are used.
-
-`--bypassSharedLock`
-: This indicates whether a folder with a shared lock can still be moved. Use this option to copy a folder that is locked.
+`--skipWait`
+: Don't wait for the copy operation to complete.
 ```
 
 <Global />
 
 ## Remarks
 
-When you copy a folder with documents that have version history, only the latest document version is copied.
-
 When you specify a value for `nameConflictBehavior`, consider the following:
 
 - `fail` will throw an error when the destination folder already exists.
@@ -69,16 +66,90 @@ Copy a folder to another location and use new name on conflict
 m365 spo folder copy --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl "/sites/project-x/Shared Documents/Reports" --targetUrl "/sites/project-y/Shared Documents/Project files" --nameConflictBehavior rename
 ```
 
-Copy a folder referenced by its ID to another document library and reset author and created date
+Copy a folder referenced by its ID to another document library and don't wait for the copy operation to finish
 
 ```sh
-m365 spo folder copy --webUrl https://contoso.sharepoint.com/sites/project-x --sourceId b8cc341b-9c11-4f2d-aa2b-0ce9c18bcba2 --targetUrl "/sites/project-x/Project files" --retainEditorAndModified
+m365 spo folder copy --webUrl https://contoso.sharepoint.com/sites/project-x --sourceId b8cc341b-9c11-4f2d-aa2b-0ce9c18bcba2 --targetUrl "/sites/project-x/Project files" --skipWait
 ```
 
 ## Response
 
-The command won't return a response on success.
+### Standard Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  {
+    "Exists": true,
+    "ExistsAllowThrowForPolicyFailures": true,
+    "ExistsWithException": true,
+    "IsWOPIEnabled": false,
+    "ItemCount": 6,
+    "Name": "Company",
+    "ProgID": null,
+    "ServerRelativeUrl": "/sites/Sales/Icons/Company",
+    "TimeCreated": "2024-09-26T22:08:53Z",
+    "TimeLastModified": "2024-09-26T22:09:31Z",
+    "UniqueId": "d3a37396-ca16-467b-b968-48f5fc41f2b6",
+    "WelcomePage": ""
+  }
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  Exists                           : true
+  ExistsAllowThrowForPolicyFailures: true
+  ExistsWithException              : true
+  IsWOPIEnabled                    : false
+  ItemCount                        : 6
+  Name                             : Company
+  ProgID                           : null
+  ServerRelativeUrl                : /sites/Sales/Icons/Company
+  TimeCreated                      : 2024-09-26T22:08:53Z
+  TimeLastModified                 : 2024-09-26T22:09:31Z
+  UniqueId                         : d3a37396-ca16-467b-b968-48f5fc41f2b6
+  WelcomePage                      :
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  Exists,ExistsAllowThrowForPolicyFailures,ExistsWithException,IsWOPIEnabled,ItemCount,Name,ProgID,ServerRelativeUrl,TimeCreated,TimeLastModified,UniqueId,WelcomePage
+  1,1,1,0,6,Company,,/sites/Sales/Icons/Company,2024-09-26T22:08:53Z,2024-09-26T22:09:31Z,d3a37396-ca16-467b-b968-48f5fc41f2b6,
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  # spo folder copy --webUrl "https://contoso.sharepoint.com/sites/Marketing" --sourceUrl "/Logos/Contoso" --targetUrl "/sites/Sales/Logos"
+
+  Date: 18/10/2024
+
+  ## Company (d3a37396-ca16-467b-b968-48f5fc41f2b6)
+
+  Property | Value
+  ---------|-------
+  Exists | true
+  ExistsAllowThrowForPolicyFailures | true
+  ExistsWithException | true
+  IsWOPIEnabled | false
+  ItemCount | 6
+  Name | Company
+  ServerRelativeUrl | /sites/Sales/Icons/Company
+  TimeCreated | 2024-09-26T22:08:53Z
+  TimeLastModified | 2024-09-26T22:09:31Z
+  UniqueId | d3a37396-ca16-467b-b968-48f5fc41f2b6
+  WelcomePage | 
+  ```
+
+  </TabItem>
+</Tabs>
+
+### `skipWait` response
 
-## More information
-
-- Copy items from a SharePoint document library: [https://support.office.com/en-us/article/move-or-copy-items-from-a-sharepoint-document-library-00e2f483-4df3-46be-a861-1f5f0c1a87bc](https://support.office.com/en-us/article/move-or-copy-items-from-a-sharepoint-document-library-00e2f483-4df3-46be-a861-1f5f0c1a87bc)
+The command won't return a response on success.

package/docs/docs/cmd/spo/page/page-publish.mdx

@@ -0,0 +1,41 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# spo page publish
+
+Publishes a modern page
+
+## Usage
+
+```sh
+m365 spo page publish [options]
+```
+
+## Options
+
+```md definition-list
+`-u, --webUrl <webUrl>`
+: URL of the site where the page is located.
+
+`-n, --name <name>`
+: Name of the page.
+```
+
+<Global />
+
+## Examples
+
+Publish a modern page
+
+```sh
+m365 spo page publish --webUrl https://contoso.sharepoint.com/sites/Marketing --name "Style guide.aspx"
+```
+
+Publish a modern page in a subfolder
+
+```sh
+m365 spo page publish --webUrl https://contoso.sharepoint.com/sites/Marketing --name "/Styles/Guide.aspx"
+```
+
+## Response
+
+The command won't return a response on success.

package/package.json

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