@pnp/cli-microsoft365 10.0.0-beta.d54aaac → 10.0.0-beta.d92b1c2

package/dist/request.js

@@ -4,6 +4,7 @@ import auth, { Auth } from './Auth.js';
 import { app } from './utils/app.js';
 import { formatting } from './utils/formatting.js';
 import { timings } from './cli/timings.js';
+import { timersUtil } from './utils/timersUtil.js';
 class Request {
     set debug(debug) {
         // if the value to set is the same as current value return early to avoid
@@ -125,76 +126,60 @@ class Request {
         options.method = 'HEAD';
         return this.execute(options);
     }
-    execute(options, resolve, reject) {
+    async execute(options) {
         const start = process.hrtime.bigint();
         if (!this._logger) {
-            return Promise.reject('Logger not set on the request object');
+            throw 'Logger not set on the request object';
         }
         this.updateRequestForCloudType(options, auth.connection.cloudType);
-        return new Promise((_resolve, _reject) => {
-            (() => {
-                if (options.headers && options.headers['x-anonymous']) {
-                    return Promise.resolve('');
-                }
-                else {
-                    const url = options.headers && options.headers['x-resource'] ? options.headers['x-resource'] : options.url;
-                    const resource = Auth.getResourceFromUrl(url);
-                    return auth.ensureAccessToken(resource, this._logger, this._debug);
-                }
-            })()
-                .then((accessToken) => {
-                if (options.headers) {
-                    if (options.headers['x-anonymous']) {
-                        delete options.headers['x-anonymous'];
-                    }
-                    if (options.headers['x-resource']) {
-                        delete options.headers['x-resource'];
-                    }
-                    if (accessToken !== '') {
-                        options.headers.authorization = `Bearer ${accessToken}`;
-                    }
-                }
-                const proxyUrl = process.env.HTTP_PROXY || process.env.HTTPS_PROXY;
-                if (proxyUrl) {
-                    options.proxy = this.createProxyConfigFromUrl(proxyUrl);
+        try {
+            let accessToken = '';
+            if (options.headers && options.headers['x-anonymous']) {
+                accessToken = '';
+            }
+            else {
+                const url = options.headers && options.headers['x-resource'] ? options.headers['x-resource'] : options.url;
+                const resource = Auth.getResourceFromUrl(url);
+                accessToken = await auth.ensureAccessToken(resource, this._logger, this._debug);
+            }
+            if (options.headers) {
+                if (options.headers['x-anonymous']) {
+                    delete options.headers['x-anonymous'];
                 }
-                return this.req(options);
-            })
-                .then((res) => {
-                if (resolve) {
-                    resolve((options.responseType === 'stream' || options.fullResponse) ? res : res.data);
+                if (options.headers['x-resource']) {
+                    delete options.headers['x-resource'];
                 }
-                else {
-                    const end = process.hrtime.bigint();
-                    timings.api.push(Number(end - start));
-                    _resolve((options.responseType === 'stream' || options.fullResponse) ? res : res.data);
+                if (accessToken !== '') {
+                    options.headers.authorization = `Bearer ${accessToken}`;
                 }
-            }, async (error) => {
-                if (error && error.response &&
-                    (error.response.status === 429 ||
-                        error.response.status === 503)) {
-                    let retryAfter = parseInt(error.response.headers['retry-after'] || '10');
-                    if (isNaN(retryAfter)) {
-                        retryAfter = 10;
-                    }
-                    if (this._debug) {
-                        await this._logger.log(`Request throttled. Waiting ${retryAfter}sec before retrying...`);
-                    }
-                    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                    setTimeout(async () => { this.execute(options, resolve || _resolve, reject || _reject); }, retryAfter * 1000);
+            }
+            const proxyUrl = process.env.HTTP_PROXY || process.env.HTTPS_PROXY;
+            if (proxyUrl) {
+                options.proxy = this.createProxyConfigFromUrl(proxyUrl);
+            }
+            const res = await this.req(options);
+            const end = process.hrtime.bigint();
+            timings.api.push(Number(end - start));
+            return options.responseType === 'stream' || options.fullResponse ?
+                res :
+                res.data;
+        }
+        catch (error) {
+            const end = process.hrtime.bigint();
+            timings.api.push(Number(end - start));
+            if (error && error.response && (error.response.status === 429 || error.response.status === 503)) {
+                let retryAfter = parseInt(error.response.headers['retry-after'] || '10');
+                if (isNaN(retryAfter)) {
+                    retryAfter = 10;
                 }
-                else {
-                    if (reject) {
-                        reject(error);
-                    }
-                    else {
-                        const end = process.hrtime.bigint();
-                        timings.api.push(Number(end - start));
-                        _reject(error);
-                    }
+                if (this._debug) {
+                    await this._logger.log(`Request throttled. Waiting ${retryAfter} sec before retrying...`);
                 }
-            });
-        });
+                await timersUtil.setTimeout(retryAfter * 1000);
+                return this.execute(options);
+            }
+            throw error;
+        }
     }
     updateRequestForCloudType(options, cloudType) {
         const url = new URL(options.url);

package/dist/utils/spo.js

@@ -1573,8 +1573,10 @@ export const spo = {
                     AllowSchemaMismatch: true,
                     BypassSharedLock: !!options?.bypassSharedLock,
                     IgnoreVersionHistory: !!options?.ignoreVersionHistory,
+                    IncludeItemPermissions: !!options?.includeItemPermissions,
                     CustomizedItemName: options?.newName ? [options.newName] : undefined,
-                    SameWebCopyMoveOptimization: true
+                    SameWebCopyMoveOptimization: true,
+                    IsMoveMode: options?.operation === 'move'
                 }
             }
         };
@@ -1615,7 +1617,7 @@ export const spo = {
         return objectInfo;
     },
     /**
-     * Gets the site collection URL for a given web URL using SP Admin site.
+     * Gets the primary owner login from a site as admin.
      * @param adminUrl The SharePoint admin URL
      * @param siteId The site ID
      * @param logger The logger object
@@ -1629,13 +1631,12 @@ export const spo = {
         const requestOptions = {
             url: `${adminUrl}/_api/SPO.Tenant/sites('${siteId}')?$select=OwnerLoginName`,
             headers: {
-                accept: 'application/json;odata=nometadata',
-                'content-type': 'application/json;charset=utf-8'
-            }
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
         };
         const response = await request.get(requestOptions);
-        const responseContent = JSON.parse(response);
-        return responseContent.OwnerLoginName;
+        return response.OwnerLoginName;
     },
     /**
      * Gets the primary owner login from a site.
@@ -1650,7 +1651,6 @@ export const spo = {
         }
         const requestOptions = {
             url: `${siteUrl}/_api/site/owner`,
-            method: 'GET',
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },

package/dist/utils/timersUtil.js

@@ -0,0 +1,12 @@
+import { setTimeout } from "timers/promises";
+export const timersUtil = {
+    /**
+     * Timeout for a specific duration.
+     * @param duration Duration in milliseconds.
+     */
+    /* c8 ignore next 3 */
+    async setTimeout(duration) {
+        return setTimeout(duration);
+    }
+};
+//# sourceMappingURL=timersUtil.js.map

package/dist/utils/urlUtil.js

@@ -198,6 +198,14 @@ export const urlUtil = {
             return rootUrl.origin;
         }
     },
+    /**
+     * Removes leading slashes from the URL.
+     * @param url The URL to process.
+     * @returns The URL without leading slashes.
+     */
+    removeLeadingSlashes(url) {
+        return url.replace(/^\/+/, '');
+    },
     /**
      * Removes trailing slashes from the URL.
      * @param url The URL to process.

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/cli/cli-doctor.mdx

@@ -22,7 +22,7 @@ This command gets all the necessary diagnostic information needed to triage and
 
 ## Examples
 
-Retrieve diagnostic information
+Retrieve diagnostic information.
 
 ```sh
 m365 cli doctor
@@ -42,18 +42,20 @@ m365 cli doctor
     },
     "cliVersion": "6.1.0",
     "nodeVersion": "v16.13.0",
-    "cliAadAppId": "31359c7f-bd7e-475c-86db-fdb8c937548e",
-    "cliAadAppTenant": "common",
-    "authMode": "DeviceCode",
+    "cliEntraAppId": "31359c7f-bd7e-475c-86db-fdb8c937548e",
+    "cliEntraAppTenant": "common",
+    "authMode": "deviceCode",
     "cliEnvironment": "",
     "cliConfig": {
       "output": "json",
       "showHelpOnFailure": false
     },
     "roles": [],
-    "scopes": [
-      "AllSites.FullControl"
-    ]
+    "scopes": {
+      "https://graph.microsoft.com": [
+        "AllSites.FullControl"
+      ]
+    }
   }
   ```
 
@@ -61,24 +63,24 @@ m365 cli doctor
   <TabItem value="Text">
 
   ```text
-  authMode       : DeviceCode
-  cliAadAppId    : 31359c7f-bd7e-475c-86db-fdb8c937548e
-  cliAadAppTenant: common
-  cliConfig      : {"output":"json","showHelpOnFailure":false}
-  cliEnvironment :
-  cliVersion     : 6.1.0
-  nodeVersion    : v16.13.0
-  os             : {"platform":"win32","version":"Windows 10 Pro","release":"10.0.19045"}
-  roles          : []
-  scopes         : ["AllSites.FullControl"]
+  authMode         : deviceCode
+  cliConfig        : {"output":"json","showHelpOnFailure":false}
+  cliEntraAppId    : 31359c7f-bd7e-475c-86db-fdb8c937548e
+  cliEntraAppTenant: common
+  cliEnvironment   :
+  cliVersion       : 6.1.0
+  nodeVersion      : v16.13.0
+  os               : {"platform":"win32","version":"Windows 10 Pro","release":"10.0.19045"}
+  roles            : []
+  scopes           : {"https://graph.microsoft.com":["AllSites.FullControl"]}
   ```
 
   </TabItem>
   <TabItem value="CSV">
 
   ```csv
-  os,cliVersion,nodeVersion,cliAadAppId,cliAadAppTenant,authMode,cliEnvironment,cliConfig,roles,scopes
-  "{""platform"":""win32"",""version"":""Windows 10 Pro"",""release"":""10.0.19045""}",6.1.0,v16.13.0,31359c7f-bd7e-475c-86db-fdb8c937548e,common,DeviceCode,,"{""output"":""json"",""showHelpOnFailure"":false}",[],"[""AllSites.FullControl""]"
+  os,cliVersion,nodeVersion,cliEntraAppId,cliEntraAppTenant,authMode,cliEnvironment,cliConfig,roles,scopes
+  "{""platform"":""win32"",""version"":""Windows 10 Pro"",""release"":""10.0.19045""}",6.1.0,v16.13.0,31359c7f-bd7e-475c-86db-fdb8c937548e,common,deviceCode,,"{""output"":""json"",""showHelpOnFailure"":false}",[],"{""https://graph.microsoft.com"":[""AllSites.FullControl""]}"
   ```
 
   </TabItem>
@@ -93,12 +95,11 @@ m365 cli doctor
   ---------|-------
   cliVersion | 6.1.0
   nodeVersion | v16.13.0
-  cliAadAppId | 31359c7f-bd7e-475c-86db-fdb8c937548e
-  cliAadAppTenant | common
-  authMode | DeviceCode
+  cliEntraAppId | 31359c7f-bd7e-475c-86db-fdb8c937548e
+  cliEntraAppTenant | common
+  authMode | deviceCode
   cliEnvironment |
   ```
 
   </TabItem>
 </Tabs>
-

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