@pnp/cli-microsoft365 10.0.0-beta.e925c1c → 10.0.0-beta.fd332f4

package/dist/m365/spo/commands/group/group-member-add.js

@@ -31,14 +31,6 @@ class SpoGroupMemberAddCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            if (args.options.aadGroupIds) {
-                args.options.entraGroupIds = args.options.aadGroupIds;
-                await this.warn(logger, `Option 'aadGroupIds' is deprecated. Please use 'entraGroupIds' instead.`);
-            }
-            if (args.options.aadGroupNames) {
-                args.options.entraGroupNames = args.options.aadGroupNames;
-                await this.warn(logger, `Option 'aadGroupNames' is deprecated. Please use 'entraGroupNames' instead.`);
-            }
             const loginNames = await this.getLoginNames(logger, args.options);
             let apiUrl = `${args.options.webUrl}/_api/web/SiteGroups`;
             if (args.options.groupId) {
@@ -132,9 +124,7 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
             emails: typeof args.options.emails !== 'undefined',
             userIds: typeof args.options.userIds !== 'undefined',
             entraGroupIds: typeof args.options.entraGroupIds !== 'undefined',
-            aadGroupIds: typeof args.options.aadGroupIds !== 'undefined',
-            entraGroupNames: typeof args.options.entraGroupNames !== 'undefined',
-            aadGroupNames: typeof args.options.aadGroupNames !== 'undefined'
+            entraGroupNames: typeof args.options.entraGroupNames !== 'undefined'
         });
     });
 }, _SpoGroupMemberAddCommand_initOptions = function _SpoGroupMemberAddCommand_initOptions() {
@@ -152,12 +142,8 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         option: '--userIds [userIds]'
     }, {
         option: '--entraGroupIds [entraGroupIds]'
-    }, {
-        option: '--aadGroupIds [aadGroupIds]'
     }, {
         option: '--entraGroupNames [entraGroupNames]'
-    }, {
-        option: '--aadGroupNames [aadGroupNames]'
     });
 }, _SpoGroupMemberAddCommand_initValidators = function _SpoGroupMemberAddCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -192,18 +178,12 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
                 return `Option 'entraGroupIds' contains one or more invalid GUIDs: ${isValidArray}.`;
             }
         }
-        if (args.options.aadGroupIds) {
-            const isValidArray = validation.isValidGuidArray(args.options.aadGroupIds);
-            if (isValidArray !== true) {
-                return `Option 'aadGroupIds' contains one or more invalid GUIDs: ${isValidArray}.`;
-            }
-        }
         return true;
     });
 }, _SpoGroupMemberAddCommand_initOptionSets = function _SpoGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userNames', 'emails', 'userIds', 'entraGroupIds', 'aadGroupIds', 'entraGroupNames', 'aadGroupNames'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userNames', 'emails', 'userIds', 'entraGroupIds', 'entraGroupNames'] });
 }, _SpoGroupMemberAddCommand_initTypes = function _SpoGroupMemberAddCommand_initTypes() {
-    this.types.string.push('webUrl', 'groupName', 'userNames', 'emails', 'userIds', 'entraGroupIds', 'aadGroupIds', 'entraGroupNames', 'aadGroupNames');
+    this.types.string.push('webUrl', 'groupName', 'userNames', 'emails', 'userIds', 'entraGroupIds', 'entraGroupNames');
 };
 export default new SpoGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map

package/dist/m365/spo/commands/group/group-member-remove.js

@@ -45,14 +45,6 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
         return userOutput.userPrincipalName;
     }
     async commandAction(logger, args) {
-        if (args.options.aadGroupId) {
-            args.options.entraGroupId = args.options.aadGroupId;
-            await this.warn(logger, `Option 'aadGroupId' is deprecated. Please use 'entraGroupId' instead`);
-        }
-        if (args.options.aadGroupName) {
-            args.options.entraGroupName = args.options.aadGroupName;
-            await this.warn(logger, `Option 'aadGroupName' is deprecated. Please use 'entraGroupName' instead`);
-        }
         if (args.options.force) {
             if (this.debug) {
                 await logger.logToStderr('Confirmation bypassed by entering confirm option. Removing the user from SharePoint Group...');
@@ -136,9 +128,7 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
             email: (!(!args.options.email)).toString(),
             userId: (!(!args.options.userId)).toString(),
             entraGroupId: (!(!args.options.entraGroupId)).toString(),
-            aadGroupId: (!(!args.options.groupId)).toString(),
             entraGroupName: (!(!args.options.entraGroupName)).toString(),
-            aadGroupName: (!(!args.options.aadGroupName)).toString(),
             force: (!(!args.options.force)).toString()
         });
     });
@@ -157,12 +147,8 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         option: '--userId [userId]'
     }, {
         option: '--entraGroupId [entraGroupId]'
-    }, {
-        option: '--aadGroupId [aadGroupId]'
     }, {
         option: '--entraGroupName [entraGroupName]'
-    }, {
-        option: '--aadGroupName [aadGroupName]'
     }, {
         option: '-f, --force'
     });
@@ -183,13 +169,10 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
             return `${args.options.entraGroupId} is not a valid GUID`;
         }
-        if (args.options.aadGroupId && !validation.isValidGuid(args.options.aadGroupId)) {
-            return `${args.options.aadGroupId} is not a valid GUID`;
-        }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });
 }, _SpoGroupMemberRemoveCommand_initOptionSets = function _SpoGroupMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupName', 'groupId'] }, { options: ['userName', 'email', 'userId', 'entraGroupId', 'aadGroupId', 'entraGroupName', 'aadGroupName'] });
+    this.optionSets.push({ options: ['groupName', 'groupId'] }, { options: ['userName', 'email', 'userId', 'entraGroupId', 'entraGroupName'] });
 };
 export default new SpoGroupMemberRemoveCommand();
 //# sourceMappingURL=group-member-remove.js.map

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

@@ -22,6 +22,7 @@ class SpoListGetCommand extends SpoCommand {
     constructor() {
         super();
         _SpoListGetCommand_instances.add(this);
+        this.supportedBaseTemplates = [101, 109, 110, 111, 113, 114, 115, 116, 117, 119, 121, 122, 123, 126, 130, 175];
         __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initValidators).call(this);
@@ -50,11 +51,8 @@ class SpoListGetCommand extends SpoCommand {
         if (fieldsProperties.expandProperties.length > 0) {
             queryParams.push(`$expand=${fieldsProperties.expandProperties.join(',')}`);
         }
-        if (queryParams.length === 0) {
-            queryParams.push(`$expand=VersionPolicies`);
-        }
         const requestOptions = {
-            url: `${requestUrl}?${queryParams.join('&')}`,
+            url: `${requestUrl}${queryParams.length > 0 ? `?${queryParams.join('&')}` : ''}`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -67,6 +65,9 @@ class SpoListGetCommand extends SpoCommand {
                     r.Member.PrincipalTypeString = ListPrincipalType[r.Member.PrincipalType];
                 });
             }
+            if (this.supportedBaseTemplates.some(template => template === listInstance.BaseTemplate)) {
+                await this.retrieveVersionPolicies(requestUrl, listInstance);
+            }
             if (listInstance.VersionPolicies) {
                 listInstance.VersionPolicies.DefaultTrimModeValue = DefaultTrimModeType[listInstance.VersionPolicies.DefaultTrimMode];
             }
@@ -96,6 +97,18 @@ class SpoListGetCommand extends SpoCommand {
             expandProperties: [...new Set(expandProperties)]
         };
     }
+    async retrieveVersionPolicies(requestUrl, listInstance) {
+        const requestOptions = {
+            url: `${requestUrl}?$select=VersionPolicies&$expand=VersionPolicies`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const { VersionPolicies } = await request.get(requestOptions);
+        listInstance.VersionPolicies = VersionPolicies;
+        listInstance.VersionPolicies.DefaultTrimModeValue = DefaultTrimModeType[listInstance.VersionPolicies.DefaultTrimMode];
+    }
 }
 _SpoListGetCommand_instances = new WeakSet(), _SpoListGetCommand_initTelemetry = function _SpoListGetCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoListRemoveCommand_instances, _SpoListRemoveCommand_initTelemetry, _SpoListRemoveCommand_initOptions, _SpoListRemoveCommand_initValidators, _SpoListRemoveCommand_initOptionSets;
+var _SpoListRemoveCommand_instances, _SpoListRemoveCommand_initTelemetry, _SpoListRemoveCommand_initOptions, _SpoListRemoveCommand_initValidators, _SpoListRemoveCommand_initOptionSets, _SpoListRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -22,6 +22,7 @@ class SpoListRemoveCommand extends SpoCommand {
         _SpoListRemoveCommand_instances.add(this);
         __classPrivateFieldGet(this, _SpoListRemoveCommand_instances, "m", _SpoListRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListRemoveCommand_instances, "m", _SpoListRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListRemoveCommand_instances, "m", _SpoListRemoveCommand_initTypes).call(this);
         __classPrivateFieldGet(this, _SpoListRemoveCommand_instances, "m", _SpoListRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListRemoveCommand_instances, "m", _SpoListRemoveCommand_initOptionSets).call(this);
     }
@@ -37,6 +38,9 @@ class SpoListRemoveCommand extends SpoCommand {
             else {
                 requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting.encodeQueryParameter(args.options.title)}')`;
             }
+            if (args.options.recycle) {
+                requestUrl += `/recycle`;
+            }
             const requestOptions = {
                 url: requestUrl,
                 method: 'POST',
@@ -68,9 +72,10 @@ class SpoListRemoveCommand extends SpoCommand {
 _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelemetry = function _SpoListRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            title: (!(!args.options.title)).toString(),
-            force: (!(!args.options.force)).toString()
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            force: !!args.options.force,
+            recycle: !!args.options.recycle
         });
     });
 }, _SpoListRemoveCommand_initOptions = function _SpoListRemoveCommand_initOptions() {
@@ -80,6 +85,8 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
         option: '-i, --id [id]'
     }, {
         option: '-t, --title [title]'
+    }, {
+        option: '--recycle'
     }, {
         option: '-f, --force'
     });
@@ -97,6 +104,9 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
     });
 }, _SpoListRemoveCommand_initOptionSets = function _SpoListRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'title'] });
+}, _SpoListRemoveCommand_initTypes = function _SpoListRemoveCommand_initTypes() {
+    this.types.string.push('id', 'title', 'webUrl');
+    this.types.boolean.push('force', 'recycle');
 };
 export default new SpoListRemoveCommand();
 //# sourceMappingURL=list-remove.js.map

package/dist/m365/spo/commands/list/list-webhook-list.js

@@ -49,13 +49,8 @@ class SpoListWebhookListCommand extends SpoCommand {
                 res.forEach(w => {
                     w.clientState = w.clientState || '';
                 });
-                await logger.log(res);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No webhooks found');
-                }
             }
+            await logger.log(res);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/listitem/listitem-attachment-list.js

@@ -50,14 +50,7 @@ class SpoListItemAttachmentListCommand extends SpoCommand {
         };
         try {
             const attachmentFiles = await request.get(requestOptions);
-            if (attachmentFiles.AttachmentFiles && attachmentFiles.AttachmentFiles.length > 0) {
-                await logger.log(attachmentFiles.AttachmentFiles);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No attachments found');
-                }
-            }
+            await logger.log(attachmentFiles.AttachmentFiles);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -48,8 +48,8 @@ class SpoPageListCommand extends SpoCommand {
                     return p;
                 });
                 pages.filter(p => p.ListItemAllFields).forEach(page => delete page.ListItemAllFields.ID);
-                await logger.log(pages);
             }
+            await logger.log(pages);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -3,10 +3,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoPageRemoveCommand_instances, _SpoPageRemoveCommand_initOptions, _SpoPageRemoveCommand_initValidators;
+var _SpoPageRemoveCommand_instances, _SpoPageRemoveCommand_initTelemetry, _SpoPageRemoveCommand_initOptions, _SpoPageRemoveCommand_initValidators, _SpoPageRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.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';
@@ -21,15 +21,17 @@ class SpoPageRemoveCommand extends SpoCommand {
     constructor() {
         super();
         _SpoPageRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (args.options.force) {
             await this.removePage(logger, args);
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the page '${args.options.name}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove page '${args.options.name}'?` });
             if (result) {
                 await this.removePage(logger, args);
             }
@@ -37,44 +39,63 @@ class SpoPageRemoveCommand extends SpoCommand {
     }
     async removePage(logger, args) {
         try {
-            let requestDigest = '';
-            let pageName = args.options.name;
-            const reqDigest = await spo.getRequestDigest(args.options.webUrl);
-            requestDigest = reqDigest.FormDigestValue;
-            if (!pageName.endsWith('.aspx')) {
+            // 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(`Removing page ${pageName}...`);
             }
+            const filePath = `${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${pageName}`;
             const requestOptions = {
-                url: `${args.options
-                    .webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
+                url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(filePath)}')`,
                 headers: {
-                    'X-RequestDigest': requestDigest,
-                    'X-HTTP-Method': 'DELETE',
-                    'content-type': 'application/json;odata=nometadata',
                     accept: 'application/json;odata=nometadata'
                 },
                 responseType: 'json'
             };
-            await request.post(requestOptions);
+            if (args.options.bypassSharedLock) {
+                requestOptions.headers.Prefer = 'bypass-shared-lock';
+            }
+            if (args.options.recycle) {
+                requestOptions.url += '/Recycle';
+                await request.post(requestOptions);
+            }
+            else {
+                await request.delete(requestOptions);
+            }
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
 }
-_SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initOptions = function _SpoPageRemoveCommand_initOptions() {
+_SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initTelemetry = function _SpoPageRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force,
+            recycle: !!args.options.recycle,
+            bypassSharedLock: !!args.options.bypassSharedLock
+        });
+    });
+}, _SpoPageRemoveCommand_initOptions = function _SpoPageRemoveCommand_initOptions() {
     this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
         option: '-n, --name <name>'
     }, {
-        option: '-u, --webUrl <webUrl>'
+        option: '--recycle'
+    }, {
+        option: '--bypassSharedLock'
     }, {
         option: '-f, --force'
     });
 }, _SpoPageRemoveCommand_initValidators = function _SpoPageRemoveCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+}, _SpoPageRemoveCommand_initTypes = function _SpoPageRemoveCommand_initTypes() {
+    this.types.string.push('name', 'webUrl');
+    this.types.boolean.push('force', 'bypassSharedLock', 'recycle');
 };
 export default new SpoPageRemoveCommand();
 //# sourceMappingURL=page-remove.js.map