@pnp/cli-microsoft365 10.0.0-beta.66db729 → 10.0.0-beta.67e608f

package/dist/m365/spo/commands/user/user-ensure.js

@@ -25,10 +25,6 @@ class SpoUserEnsureCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoUserEnsureCommand_instances, "m", _SpoUserEnsureCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.aadId) {
-            args.options.entraId = args.options.aadId;
-            await this.warn(logger, `Option 'aadId' is deprecated. Please use 'entraId' instead`);
-        }
         if (this.verbose) {
             await logger.logToStderr(`Ensuring user ${args.options.entraId || args.options.userName} at site ${args.options.webUrl}`);
         }
@@ -62,7 +58,6 @@ _SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelem
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             entraId: typeof args.options.entraId !== 'undefined',
-            aadId: typeof args.options.aadId !== 'undefined',
             userName: typeof args.options.userName !== 'undefined'
         });
     });
@@ -71,8 +66,6 @@ _SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelem
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '--entraId [entraId]'
-    }, {
-        option: '--aadId [aadId]'
     }, {
         option: '--userName [userName]'
     });
@@ -85,16 +78,13 @@ _SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelem
         if (args.options.entraId && !validation.isValidGuid(args.options.entraId)) {
             return `${args.options.entraId} is not a valid GUID.`;
         }
-        if (args.options.aadId && !validation.isValidGuid(args.options.aadId)) {
-            return `${args.options.aadId} is not a valid GUID.`;
-        }
         if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
             return `${args.options.userName} is not a valid userName.`;
         }
         return true;
     });
 }, _SpoUserEnsureCommand_initOptionSets = function _SpoUserEnsureCommand_initOptionSets() {
-    this.optionSets.push({ options: ['entraId', 'aadId', 'userName'] });
+    this.optionSets.push({ options: ['entraId', 'userName'] });
 };
 export default new SpoUserEnsureCommand();
 //# sourceMappingURL=user-ensure.js.map

package/dist/utils/spo.js

@@ -11,17 +11,20 @@ import { odata } from './odata.js';
 import { RoleType } from '../m365/spo/commands/roledefinition/RoleType.js';
 import { entraGroup } from './entraGroup.js';
 import { SharingCapabilities } from '../m365/spo/commands/site/SharingCapabilities.js';
-import { setTimeout } from 'timers/promises';
-export var CreateCopyJobsNameConflictBehavior;
-(function (CreateCopyJobsNameConflictBehavior) {
-    CreateCopyJobsNameConflictBehavior[CreateCopyJobsNameConflictBehavior["Fail"] = 0] = "Fail";
-    CreateCopyJobsNameConflictBehavior[CreateCopyJobsNameConflictBehavior["Replace"] = 1] = "Replace";
-    CreateCopyJobsNameConflictBehavior[CreateCopyJobsNameConflictBehavior["Rename"] = 2] = "Rename";
-})(CreateCopyJobsNameConflictBehavior || (CreateCopyJobsNameConflictBehavior = {}));
+import { timersUtil } from './timersUtil.js';
+export var CreateFileCopyJobsNameConflictBehavior;
+(function (CreateFileCopyJobsNameConflictBehavior) {
+    CreateFileCopyJobsNameConflictBehavior[CreateFileCopyJobsNameConflictBehavior["Fail"] = 0] = "Fail";
+    CreateFileCopyJobsNameConflictBehavior[CreateFileCopyJobsNameConflictBehavior["Replace"] = 1] = "Replace";
+    CreateFileCopyJobsNameConflictBehavior[CreateFileCopyJobsNameConflictBehavior["Rename"] = 2] = "Rename";
+})(CreateFileCopyJobsNameConflictBehavior || (CreateFileCopyJobsNameConflictBehavior = {}));
+export var CreateFolderCopyJobsNameConflictBehavior;
+(function (CreateFolderCopyJobsNameConflictBehavior) {
+    CreateFolderCopyJobsNameConflictBehavior[CreateFolderCopyJobsNameConflictBehavior["Fail"] = 0] = "Fail";
+    CreateFolderCopyJobsNameConflictBehavior[CreateFolderCopyJobsNameConflictBehavior["Rename"] = 2] = "Rename";
+})(CreateFolderCopyJobsNameConflictBehavior || (CreateFolderCopyJobsNameConflictBehavior = {}));
 // Wrapping this into a settings object so we can alter the values in tests
-export const settings = {
-    pollingInterval: 3000
-};
+const pollingInterval = 3000;
 export const spo = {
     async getRequestDigest(siteUrl) {
         const requestOptions = {
@@ -79,7 +82,7 @@ export const spo = {
                 }
                 return;
             }
-            await setTimeout(operation.PollingInterval);
+            await timersUtil.setTimeout(pollingInterval);
             await spo.waitUntilFinished({
                 operationId: JSON.stringify(operation._ObjectIdentity_),
                 siteUrl,
@@ -691,7 +694,7 @@ export const spo = {
                 if (!wait || isComplete) {
                     return;
                 }
-                await setTimeout(operation.PollingInterval);
+                await timersUtil.setTimeout(pollingInterval);
                 await spo.waitUntilFinished({
                     operationId: JSON.stringify(operation._ObjectIdentity_),
                     siteUrl: spoAdminUrl,
@@ -905,7 +908,7 @@ export const spo = {
         if (!wait || isComplete) {
             return;
         }
-        await setTimeout(operation.PollingInterval);
+        await timersUtil.setTimeout(pollingInterval);
         await spo.waitUntilFinished({
             operationId: JSON.stringify(operation._ObjectIdentity_),
             siteUrl: spoAdminUrl,
@@ -1051,7 +1054,7 @@ export const spo = {
                 const operation = json[json.length - 1];
                 const isComplete = operation.IsComplete;
                 if (!isComplete) {
-                    await setTimeout(operation.PollingInterval);
+                    await timersUtil.setTimeout(pollingInterval);
                     await spo.waitUntilFinished({
                         operationId: JSON.stringify(operation._ObjectIdentity_),
                         siteUrl: spoAdminUrl,
@@ -1551,14 +1554,14 @@ export const spo = {
         return file;
     },
     /**
-     * Create a SharePoint copy job to copy a file/folder to another location.
-     * @param webUrl Absolute web URL where the source file/folder is located.
-     * @param sourceUrl Absolute URL of the source file/folder.
+     * Create a SharePoint copy job to copy a file to another location.
+     * @param webUrl Absolute web URL where the source file is located.
+     * @param sourceUrl Absolute URL of the source file.
      * @param destinationUrl Absolute URL of the destination folder.
      * @param options Options for the copy job.
      * @returns Copy job information. Use {@link spo.getCopyJobResult} to get the result of the copy job.
      */
-    async createCopyJob(webUrl, sourceUrl, destinationUrl, options) {
+    async createFileCopyJob(webUrl, sourceUrl, destinationUrl, options) {
         const requestOptions = {
             url: `${webUrl}/_api/Site/CreateCopyJobs`,
             headers: {
@@ -1569,7 +1572,7 @@ export const spo = {
                 destinationUri: destinationUrl,
                 exportObjectUris: [sourceUrl],
                 options: {
-                    NameConflictBehavior: options?.nameConflictBehavior ?? CreateCopyJobsNameConflictBehavior.Fail,
+                    NameConflictBehavior: options?.nameConflictBehavior ?? CreateFileCopyJobsNameConflictBehavior.Fail,
                     AllowSchemaMismatch: true,
                     BypassSharedLock: !!options?.bypassSharedLock,
                     IgnoreVersionHistory: !!options?.ignoreVersionHistory,
@@ -1583,6 +1586,36 @@ export const spo = {
         const response = await request.post(requestOptions);
         return response.value[0];
     },
+    /**
+     * Create a SharePoint copy job to copy a folder to another location.
+     * @param webUrl Absolute web URL where the source folder is located.
+     * @param sourceUrl Absolute URL of the source folder.
+     * @param destinationUrl Absolute URL of the destination folder.
+     * @param options Options for the copy job.
+     * @returns Copy job information. Use {@link spo.getCopyJobResult} to get the result of the copy job.
+     */
+    async createFolderCopyJob(webUrl, sourceUrl, destinationUrl, options) {
+        const requestOptions = {
+            url: `${webUrl}/_api/Site/CreateCopyJobs`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json',
+            data: {
+                destinationUri: destinationUrl,
+                exportObjectUris: [sourceUrl],
+                options: {
+                    NameConflictBehavior: options?.nameConflictBehavior ?? CreateFolderCopyJobsNameConflictBehavior.Fail,
+                    AllowSchemaMismatch: true,
+                    CustomizedItemName: options?.newName ? [options.newName] : undefined,
+                    SameWebCopyMoveOptimization: true,
+                    IsMoveMode: options?.operation === 'move'
+                }
+            }
+        };
+        const response = await request.post(requestOptions);
+        return response.value[0];
+    },
     /**
      * Poll until the copy job is finished and return the result.
      * @param webUrl Absolute web URL where the copy job was created.
@@ -1601,12 +1634,20 @@ export const spo = {
                 copyJobInfo: copyJobInfo
             }
         };
+        const logs = [];
         let progress = await request.post(requestOptions);
+        const newLogs = progress.Logs?.map(l => JSON.parse(l));
+        if (newLogs?.length > 0) {
+            logs.push(...newLogs);
+        }
         while (progress.JobState !== 0) {
-            await setTimeout(settings.pollingInterval);
+            await timersUtil.setTimeout(pollingInterval);
             progress = await request.post(requestOptions);
+            const newLogs = progress.Logs?.map(l => JSON.parse(l));
+            if (newLogs?.length > 0) {
+                logs.push(...newLogs);
+            }
         }
-        const logs = progress.Logs.map(l => JSON.parse(l));
         // Check if the job has failed
         const errorLog = logs.find(l => l.Event === 'JobError');
         if (errorLog) {

package/dist/utils/timersUtil.js

@@ -4,7 +4,8 @@ export const timersUtil = {
      * Timeout for a specific duration.
      * @param duration Duration in milliseconds.
      */
-    /* c8 ignore next 3 */
+    /* c8 ignore next 4 */
+    // Function is created so we can easily mock it in our tests
     async setTimeout(duration) {
         return setTimeout(duration);
     }

package/dist/utils/zod.js

@@ -67,7 +67,7 @@ function parseEnum(def, _options, currentOption) {
 function parseNativeEnum(def, _options, currentOption) {
     if (currentOption) {
         currentOption.type = 'string';
-        currentOption.autocomplete = Object.getOwnPropertyNames(def.values);
+        currentOption.autocomplete = Object.values(def.values).map(v => String(v));
     }
     return;
 }
@@ -119,6 +119,15 @@ export const zod = {
         const options = [];
         parseDef(schema._def, options);
         return options;
-    }
+    },
+    coercedEnum: (e) => z.preprocess(val => {
+        const target = String(val)?.toLowerCase();
+        for (const k of Object.values(e)) {
+            if (String(k)?.toLowerCase() === target) {
+                return k;
+            }
+        }
+        return null;
+    }, z.nativeEnum(e))
 };
 //# sourceMappingURL=zod.js.map

package/docs/docs/cmd/entra/administrativeunit/administrativeunit-add.mdx

@@ -12,12 +12,6 @@ Creates a new administrative unit
 m365 entra administrativeunit add [options]
 ```
 
-## Alias
-
-```sh
-m365 aad administrativeunit add [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/administrativeunit/administrativeunit-get.mdx

@@ -12,12 +12,6 @@ Gets information about a specific administrative unit
 m365 entra administrativeunit get [options]
 ```
 
-## Alias
-
-```sh
-m365 aad administrativeunit get [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/administrativeunit/administrativeunit-list.mdx

@@ -12,12 +12,6 @@ Retrieves a list of administrative units
 m365 entra administrativeunit list [options]
 ```
 
-## Alias
-
-```sh
-m365 aad administrativeunit list [options]
-```
-
 ## Options
 
 <Global />

package/docs/docs/cmd/entra/administrativeunit/administrativeunit-member-add.mdx

@@ -10,12 +10,6 @@ Add a member (user, group, or device) to an administrative unit
 m365 entra administrativeunit member add [options]
 ```
 
-## Alias
-
-```sh
-m365 aad administrativeunit member add [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/administrativeunit/administrativeunit-member-get.mdx

@@ -12,12 +12,6 @@ Retrieves info about a specific member of an administrative unit
 m365 entra administrativeunit member get [options]
 ```
 
-## Alias
-
-```sh
-m365 aad administrativeunit member get [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/administrativeunit/administrativeunit-member-list.mdx

@@ -12,12 +12,6 @@ Retrieves members (users, groups, or devices) of an administrative unit
 m365 entra administrativeunit member list [options]
 ```
 
-## Alias
-
-```sh
-m365 aad administrativeunit member list [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/administrativeunit/administrativeunit-remove.mdx

@@ -10,12 +10,6 @@ Removes an administrative unit
 m365 entra administrativeunit remove [options]
 ```
 
-## Alias
-
-```sh
-m365 aad administrativeunit remove [options]
-```
-
 ## options
 
 ```md definition-list

package/docs/docs/cmd/entra/app/app-add.mdx

@@ -15,7 +15,6 @@ m365 entra app add [options]
 ## Alias
 
 ```sh
-m365 aad app add [options]
 m365 entra appregistration add [options]
 ```
 

package/docs/docs/cmd/entra/app/app-get.mdx

@@ -15,7 +15,6 @@ m365 entra app get [options]
 ## Alias
 
 ```sh
-m365 aad app get [options]
 m365 entra appregistration get [options]
 ```
 

package/docs/docs/cmd/entra/app/app-list.mdx

@@ -15,7 +15,6 @@ m365 entra app list [options]
 ## Alias
 
 ```sh
-m365 aad app list [options]
 m365 entra appregistration list [options]
 ```
 

package/docs/docs/cmd/entra/app/app-permission-add.mdx

@@ -15,7 +15,6 @@ m365 entra app permission add [options]
 ## Alias
 
 ```sh
-m365 aad app permission add [options]
 m365 entra appregistration permission add [options]
 ```
 

package/docs/docs/cmd/entra/app/app-permission-list.mdx

@@ -12,12 +12,6 @@ Lists the application and delegated permissions for a specified Entra Applicatio
 m365 entra app permission list [options]
 ```
 
-## Alias
-
-```sh
-m365 aad app permission list [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/app/app-remove.mdx

@@ -13,7 +13,6 @@ m365 entra app remove [options]
 ## Alias
 
 ```sh
-m365 aad app remove [options]
 m365 entra appregistration remove [options]
 ```
 

package/docs/docs/cmd/entra/app/app-role-add.mdx

@@ -13,7 +13,6 @@ m365 entra app role add [options]
 ## Alias
 
 ```sh
-m365 aad app role add [options]
 m365 entra appregistration role add [options]
 ```
 

package/docs/docs/cmd/entra/app/app-role-list.mdx

@@ -15,7 +15,6 @@ m365 entra app role list [options]
 ## Alias
 
 ```sh
-m365 aad app role list [options]
 m365 entra appregistration role list [options]
 ```
 

package/docs/docs/cmd/entra/app/app-role-remove.mdx

@@ -13,7 +13,6 @@ m365 entra app role remove [options]
 ## Alias
 
 ```sh
-m365 aad app role remove [options]
 m365 entra appregistration role remove [options]
 ```
 

package/docs/docs/cmd/entra/app/app-set.mdx

@@ -13,7 +13,6 @@ m365 entra app set [options]
 ## Alias
 
 ```sh
-m365 aad app set [options]
 m365 entra appregistration set [options]
 ```
 

package/docs/docs/cmd/entra/approleassignment/approleassignment-add.mdx

@@ -12,12 +12,6 @@ Adds service principal permissions also known as scopes and app role assignments
 m365 entra approleassignment add [options]
 ```
 
-## Alias
-
-```sh
-m365 aad approleassignment add [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/approleassignment/approleassignment-list.mdx

@@ -12,12 +12,6 @@ Lists app role assignments for the specified application registration
 m365 entra approleassignment list [options]
 ```
 
-## Alias
-
-```sh
-m365 aad approleassignment list [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/approleassignment/approleassignment-remove.mdx

@@ -10,12 +10,6 @@ Deletes an app role assignment for the specified Entra application registration
 m365 entra approleassignment remove [options]
 ```
 
-## Alias
-
-```sh
-m365 aad approleassignment remove [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/enterpriseapp/enterpriseapp-add.mdx

@@ -15,7 +15,6 @@ m365 entra enterpriseapp add [options]
 ## Alias
 
 ```sh
-m365 aad sp add [options]
 m365 entra sp add [options]
 ```
 

package/docs/docs/cmd/entra/enterpriseapp/enterpriseapp-get.mdx

@@ -15,7 +15,6 @@ m365 entra enterpriseapp get [options]
 ## Alias
 
 ```sh
-m365 aad sp get [options]
 m365 entra sp get [options]
 ```
 

package/docs/docs/cmd/entra/enterpriseapp/enterpriseapp-list.mdx

@@ -15,7 +15,6 @@ m365 entra enterpriseapp list [options]
 ## Alias
 
 ```sh
-m365 aad sp list [options]
 m365 entra sp list [options]
 ```
 

package/docs/docs/cmd/entra/group/group-add.mdx

@@ -12,12 +12,6 @@ Creates a Microsoft Entra group
 m365 entra group add [options]
 ```
 
-## Alias
-
-```sh
-m365 aad group add [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/group/group-get.mdx

@@ -12,12 +12,6 @@ Gets information about the specified Entra group
 m365 entra group get [options]
 ```
 
-## Alias
-
-```sh
-m365 aad group get [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/group/group-list.mdx

@@ -12,12 +12,6 @@ Lists Entra groups
 m365 entra group list [options]
 ```
 
-## Alias
-
-```sh
-m365 aad group list [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/group/group-member-list.mdx

@@ -12,12 +12,6 @@ Lists members of a specific Entra group
 m365 entra group member list [options]
 ```
 
-## Alias
-
-```sh
-m365 aad group user list [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/group/group-remove.mdx

@@ -10,12 +10,6 @@ Removes an Entra group
 m365 entra group remove [options]
 ```
 
-## Alias
-
-```sh
-m365 aad group remove [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/groupsetting/groupsetting-add.mdx

@@ -12,12 +12,6 @@ Creates a group setting
 m365 entra groupsetting add [options]
 ```
 
-## Alias
-
-```sh
-m365 aad groupsetting add [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/groupsetting/groupsetting-get.mdx

@@ -12,12 +12,6 @@ Gets information about the particular group setting
 m365 entra groupsetting get [options]
 ```
 
-## Alias
-
-```sh
-m365 aad groupsetting get [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/groupsetting/groupsetting-list.mdx

@@ -12,12 +12,6 @@ Lists Entra group settings
 m365 entra groupsetting list [options]
 ```
 
-## Alias
-
-```sh
-m365 aad groupsetting list [options]
-```
-
 ## Options
 
 <Global />

package/docs/docs/cmd/entra/groupsetting/groupsetting-remove.mdx

@@ -10,12 +10,6 @@ Removes the particular group setting
 m365 entra groupsetting remove [options]
 ```
 
-## Alias
-
-```sh
-m365 aad groupsetting remove [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/groupsetting/groupsetting-set.mdx

@@ -10,12 +10,6 @@ Updates the particular group setting
 m365 entra groupsetting set [options]
 ```
 
-## Alias
-
-```sh
-m365 aad groupsetting set [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/groupsettingtemplate/groupsettingtemplate-get.mdx

@@ -12,12 +12,6 @@ Gets information about the specified Entra group settings template
 m365 entra groupsettingtemplate get [options]
 ```
 
-## Alias
-
-```sh
-m365 aad groupsettingtemplate get [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/groupsettingtemplate/groupsettingtemplate-list.mdx

@@ -12,12 +12,6 @@ Lists Entra group settings templates
 m365 entra groupsettingtemplate list [options]
 ```
 
-## Alias
-
-```sh
-m365 aad groupsettingtemplate list [options]
-```
-
 ## Options
 
 <Global />