@pnp/cli-microsoft365 6.0.0-beta.dc71aa3 → 6.0.0-beta.dc8d53d

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

@@ -15,8 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoEventreceiverListCommand_instances, _SpoEventreceiverListCommand_initTelemetry, _SpoEventreceiverListCommand_initOptions, _SpoEventreceiverListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -58,16 +58,9 @@ class SpoEventreceiverListCommand extends SpoCommand_1.default {
             else {
                 requestUrl += 'site/eventreceivers';
             }
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const res = yield request_1.default.get(requestOptions);
-                logger.log(res.value);
+                const res = yield odata_1.odata.getAllItems(requestUrl);
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

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

@@ -103,14 +103,8 @@ class SpoEventreceiverRemoveCommand extends SpoCommand_1.default {
                 verbose: this.verbose
             };
             const commandOutput = yield Cli_1.Cli.executeCommandWithOutput(getCommand, { options: Object.assign(Object.assign({}, getOptions), { _: [] }) });
-            const eventReceivers = JSON.parse(commandOutput.stdout);
-            if (!eventReceivers.length) {
-                throw Error(`Specified event receiver with name '${options.name}' cannot be found`);
-            }
-            if (eventReceivers.length > 1) {
-                throw Error(`Multiple eventreceivers with name '${options.name}' found: ${eventReceivers.map(x => x.ReceiverId)}`);
-            }
-            return eventReceivers[0].ReceiverId;
+            const eventReceiver = JSON.parse(commandOutput.stdout);
+            return eventReceiver.ReceiverId;
         });
     }
 }
@@ -167,7 +161,7 @@ _SpoEventreceiverRemoveCommand_instances = new WeakSet(), _SpoEventreceiverRemov
         return true;
     }));
 }, _SpoEventreceiverRemoveCommand_initOptionSets = function _SpoEventreceiverRemoveCommand_initOptionSets() {
-    this.optionSets.push(['name', 'id']);
+    this.optionSets.push({ options: ['name', 'id'] });
 };
 module.exports = new SpoEventreceiverRemoveCommand();
 //# sourceMappingURL=eventreceiver-remove.js.map

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFeatureListCommand_instances, _SpoFeatureListCommand_initTelemetry, _SpoFeatureListCommand_initOptions, _SpoFeatureListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -36,17 +36,10 @@ class SpoFeatureListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const scope = (args.options.scope) ? args.options.scope : 'Web';
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/${scope}/Features?$select=DisplayName,DefinitionId`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const features = yield request_1.default.get(requestOptions);
-                if (features.value && features.value.length > 0) {
-                    logger.log(features.value);
+                const features = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/${scope}/Features?$select=DisplayName,DefinitionId`);
+                if (features && features.length > 0) {
+                    logger.log(features);
                 }
                 else {
                     if (this.verbose) {

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

@@ -112,7 +112,7 @@ _SpoFieldGetCommand_instances = new WeakSet(), _SpoFieldGetCommand_initTelemetry
         return true;
     }));
 }, _SpoFieldGetCommand_initOptionSets = function _SpoFieldGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title']);
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new SpoFieldGetCommand();
 //# sourceMappingURL=field-get.js.map

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

@@ -15,8 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFieldListCommand_instances, _SpoFieldListCommand_initTelemetry, _SpoFieldListCommand_initOptions, _SpoFieldListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -51,16 +51,9 @@ class SpoFieldListCommand extends SpoCommand_1.default {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 listUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
             }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/${listUrl}fields`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const res = yield request_1.default.get(requestOptions);
-                logger.log(res.value);
+                const res = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/${listUrl}fields`);
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

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

@@ -181,7 +181,7 @@ _SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTel
         return true;
     }));
 }, _SpoFieldRemoveCommand_initOptionSets = function _SpoFieldRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title', 'group']);
+    this.optionSets.push({ options: ['id', 'title', 'group'] });
 };
 module.exports = new SpoFieldRemoveCommand();
 //# sourceMappingURL=field-remove.js.map

package/dist/m365/spo/commands/field/field-set.js

@@ -181,7 +181,7 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
         return true;
     }));
 }, _SpoFieldSetCommand_initOptionSets = function _SpoFieldSetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title']);
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new SpoFieldSetCommand();
 //# sourceMappingURL=field-set.js.map

package/dist/m365/spo/commands/file/file-checkin.js

@@ -126,7 +126,7 @@ _SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTel
         return true;
     }));
 }, _SpoFileCheckinCommand_initOptionSets = function _SpoFileCheckinCommand_initOptionSets() {
-    this.optionSets.push(['url', 'id']);
+    this.optionSets.push({ options: ['url', 'id'] });
 };
 module.exports = new SpoFileCheckinCommand();
 //# sourceMappingURL=file-checkin.js.map

package/dist/m365/spo/commands/file/file-checkout.js

@@ -89,7 +89,7 @@ _SpoFileCheckoutCommand_instances = new WeakSet(), _SpoFileCheckoutCommand_initT
         return true;
     }));
 }, _SpoFileCheckoutCommand_initOptionSets = function _SpoFileCheckoutCommand_initOptionSets() {
-    this.optionSets.push(['id', 'url']);
+    this.optionSets.push({ options: ['id', 'url'] });
 };
 module.exports = new SpoFileCheckoutCommand();
 //# sourceMappingURL=file-checkout.js.map

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

@@ -21,7 +21,9 @@ const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
+const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
+const RoleType_1 = require("../roledefinition/RoleType");
 class SpoFileGetCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -102,6 +104,15 @@ class SpoFileGetCommand extends SpoCommand_1.default {
                     }
                     else {
                         const fileProperties = JSON.parse(JSON.stringify(file));
+                        if (args.options.withPermissions) {
+                            requestOptions.url = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${file.ServerRelativeUrl}')/ListItemAllFields/RoleAssignments?$expand=Member,RoleDefinitionBindings`;
+                            const response = yield request_1.default.get(requestOptions);
+                            const roleAssignments = this.setFriendlyPermissions(response.value);
+                            fileProperties.RoleAssignments = roleAssignments;
+                            if (args.options.asListItem) {
+                                fileProperties.ListItemAllFields.RoleAssignments = roleAssignments;
+                            }
+                        }
                         logger.log(args.options.asListItem ? fileProperties.ListItemAllFields : fileProperties);
                     }
                 }
@@ -111,6 +122,18 @@ class SpoFileGetCommand extends SpoCommand_1.default {
             }
         });
     }
+    setFriendlyPermissions(response) {
+        response.forEach((r) => {
+            r.RoleDefinitionBindings.forEach((r) => {
+                const permissions = new base_permissions_1.BasePermissions();
+                permissions.high = r.BasePermissions.High;
+                permissions.low = r.BasePermissions.Low;
+                r.BasePermissionsValue = permissions.parse();
+                r.RoleTypeKindValue = RoleType_1.RoleType[r.RoleTypeKind];
+            });
+        });
+        return response;
+    }
 }
 _SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry = function _SpoFileGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -120,7 +143,8 @@ _SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry =
             asString: args.options.asString || false,
             asListItem: args.options.asListItem || false,
             asFile: args.options.asFile || false,
-            path: (!(!args.options.path)).toString()
+            path: (!(!args.options.path)).toString(),
+            withPermissions: !!args.options.withPermissions
         });
     });
 }, _SpoFileGetCommand_initOptions = function _SpoFileGetCommand_initOptions() {
@@ -138,6 +162,8 @@ _SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry =
         option: '--asFile'
     }, {
         option: '-p, --path [path]'
+    }, {
+        option: '--withPermissions'
     });
 }, _SpoFileGetCommand_initValidators = function _SpoFileGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -169,7 +195,7 @@ _SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry =
         return true;
     }));
 }, _SpoFileGetCommand_initOptionSets = function _SpoFileGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'url']);
+    this.optionSets.push({ options: ['id', 'url'] });
 };
 module.exports = new SpoFileGetCommand();
 //# sourceMappingURL=file-get.js.map

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

@@ -134,7 +134,7 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
         return true;
     }));
 }, _SpoFileRemoveCommand_initOptionSets = function _SpoFileRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'url']);
+    this.optionSets.push({ options: ['id', 'url'] });
 };
 module.exports = new SpoFileRemoveCommand();
 //# sourceMappingURL=file-remove.js.map

package/dist/m365/spo/commands/file/file-roleassignment-add.js

@@ -211,7 +211,7 @@ _SpoFileRoleAssignmentAddCommand_instances = new WeakSet(), _SpoFileRoleAssignme
         return true;
     }));
 }, _SpoFileRoleAssignmentAddCommand_initOptionSets = function _SpoFileRoleAssignmentAddCommand_initOptionSets() {
-    this.optionSets.push(['fileId', 'fileUrl'], ['principalId', 'upn', 'groupName'], ['roleDefinitionId', 'roleDefinitionName']);
+    this.optionSets.push({ options: ['fileId', 'fileUrl'] }, { options: ['principalId', 'upn', 'groupName'] }, { options: ['roleDefinitionId', 'roleDefinitionName'] });
 };
 module.exports = new SpoFileRoleAssignmentAddCommand();
 //# sourceMappingURL=file-roleassignment-add.js.map

package/dist/m365/spo/commands/file/file-roleassignment-remove.js

@@ -174,7 +174,7 @@ _SpoFileRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFileRoleAssig
         return true;
     }));
 }, _SpoFileRoleAssignmentRemoveCommand_initOptionSets = function _SpoFileRoleAssignmentRemoveCommand_initOptionSets() {
-    this.optionSets.push(['fileUrl', 'fileId'], ['upn', 'groupName', 'principalId']);
+    this.optionSets.push({ options: ['fileUrl', 'fileId'] }, { options: ['upn', 'groupName', 'principalId'] });
 };
 module.exports = new SpoFileRoleAssignmentRemoveCommand();
 //# sourceMappingURL=file-roleassignment-remove.js.map

package/dist/m365/spo/commands/file/file-roleinheritance-break.js

@@ -123,7 +123,7 @@ _SpoFileRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoFileRoleInher
         return true;
     }));
 }, _SpoFileRoleInheritanceBreakCommand_initOptionSets = function _SpoFileRoleInheritanceBreakCommand_initOptionSets() {
-    this.optionSets.push(['fileId', 'fileUrl']);
+    this.optionSets.push({ options: ['fileId', 'fileUrl'] });
 };
 module.exports = new SpoFileRoleInheritanceBreakCommand();
 //# sourceMappingURL=file-roleinheritance-break.js.map

package/dist/m365/spo/commands/file/file-roleinheritance-reset.js

@@ -119,7 +119,7 @@ _SpoFileRoleInheritanceResetCommand_instances = new WeakSet(), _SpoFileRoleInher
         return true;
     }));
 }, _SpoFileRoleInheritanceResetCommand_initOptionSets = function _SpoFileRoleInheritanceResetCommand_initOptionSets() {
-    this.optionSets.push(['fileId', 'fileUrl']);
+    this.optionSets.push({ options: ['fileId', 'fileUrl'] });
 };
 module.exports = new SpoFileRoleInheritanceResetCommand();
 //# sourceMappingURL=file-roleinheritance-reset.js.map

package/dist/m365/spo/commands/file/file-sharinginfo-get.js

@@ -142,7 +142,7 @@ _SpoFileSharinginfoGetCommand_instances = new WeakSet(), _SpoFileSharinginfoGetC
         return true;
     }));
 }, _SpoFileSharinginfoGetCommand_initOptionSets = function _SpoFileSharinginfoGetCommand_initOptionSets() {
-    this.optionSets.push(['fileId', 'fileUrl']);
+    this.optionSets.push({ options: ['fileId', 'fileUrl'] });
 };
 module.exports = new SpoFileSharinginfoGetCommand();
 //# sourceMappingURL=file-sharinginfo-get.js.map

package/dist/m365/spo/commands/file/file-version-clear.js

@@ -108,7 +108,7 @@ _SpoFileVersionClearCommand_instances = new WeakSet(), _SpoFileVersionClearComma
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoFileVersionClearCommand_initOptionSets = function _SpoFileVersionClearCommand_initOptionSets() {
-    this.optionSets.push(['fileUrl', 'fileId']);
+    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
 };
 module.exports = new SpoFileVersionClearCommand();
 //# sourceMappingURL=file-version-clear.js.map

package/dist/m365/spo/commands/file/file-version-get.js

@@ -96,7 +96,7 @@ _SpoFileVersionGetCommand_instances = new WeakSet(), _SpoFileVersionGetCommand_i
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoFileVersionGetCommand_initOptionSets = function _SpoFileVersionGetCommand_initOptionSets() {
-    this.optionSets.push(['fileUrl', 'fileId']);
+    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
 }, _SpoFileVersionGetCommand_initTypes = function _SpoFileVersionGetCommand_initTypes() {
     this.types.string.push('label');
 };

package/dist/m365/spo/commands/file/file-version-list.js

@@ -15,8 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileVersionListCommand_instances, _SpoFileVersionListCommand_initTelemetry, _SpoFileVersionListCommand_initOptions, _SpoFileVersionListCommand_initValidators, _SpoFileVersionListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -36,6 +36,9 @@ class SpoFileVersionListCommand extends SpoCommand_1.default {
     get description() {
         return 'Retrieves all versions of a file';
     }
+    defaultProperties() {
+        return ['Created', 'ID', 'IsCurrentVersion', 'VersionLabel'];
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
@@ -51,15 +54,8 @@ class SpoFileVersionListCommand extends SpoCommand_1.default {
                     requestUrl += `/GetFileById('${args.options.fileId}')`;
                 }
                 requestUrl += `/versions`;
-                const requestOptions = {
-                    url: requestUrl,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const response = yield request_1.default.get(requestOptions);
-                logger.log(response.value);
+                const response = yield odata_1.odata.getAllItems(requestUrl);
+                logger.log(response);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -90,7 +86,7 @@ _SpoFileVersionListCommand_instances = new WeakSet(), _SpoFileVersionListCommand
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoFileVersionListCommand_initOptionSets = function _SpoFileVersionListCommand_initOptionSets() {
-    this.optionSets.push(['fileUrl', 'fileId']);
+    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
 };
 module.exports = new SpoFileVersionListCommand();
 //# sourceMappingURL=file-version-list.js.map

package/dist/m365/spo/commands/file/file-version-remove.js

@@ -111,7 +111,7 @@ _SpoFileVersionRemoveCommand_instances = new WeakSet(), _SpoFileVersionRemoveCom
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoFileVersionRemoveCommand_initOptionSets = function _SpoFileVersionRemoveCommand_initOptionSets() {
-    this.optionSets.push(['fileUrl', 'fileId']);
+    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
 }, _SpoFileVersionRemoveCommand_initTypes = function _SpoFileVersionRemoveCommand_initTypes() {
     this.types.string.push('label');
 };

package/dist/m365/spo/commands/file/file-version-restore.js

@@ -111,7 +111,7 @@ _SpoFileVersionRestoreCommand_instances = new WeakSet(), _SpoFileVersionRestoreC
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoFileVersionRestoreCommand_initOptionSets = function _SpoFileVersionRestoreCommand_initOptionSets() {
-    this.optionSets.push(['fileUrl', 'fileId']);
+    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
 }, _SpoFileVersionRestoreCommand_initTypes = function _SpoFileVersionRestoreCommand_initTypes() {
     this.types.string.push('label');
 };

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

@@ -22,6 +22,9 @@ const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const ListPrincipalType_1 = require("../list/ListPrincipalType");
+const base_permissions_1 = require("../../base-permissions");
+const RoleType_1 = require("../../commands/roledefinition/RoleType");
 class SpoFolderGetCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -42,13 +45,16 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving folder from site ${args.options.webUrl}...`);
             }
-            let requestUrl = '';
+            let requestUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFolderById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+                requestUrl += `/GetFolderById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
             else if (args.options.url) {
                 const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                requestUrl += `/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            }
+            if (args.options.withPermissions) {
+                requestUrl += `?$expand=ListItemAllFields/HasUniqueRoleAssignments,ListItemAllFields/RoleAssignments/Member,ListItemAllFields/RoleAssignments/RoleDefinitionBindings`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -59,6 +65,22 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
             };
             try {
                 const folder = yield request_1.default.get(requestOptions);
+                if (args.options.withPermissions) {
+                    const listItemAllFields = folder.ListItemAllFields;
+                    if (!(listItemAllFields !== null && listItemAllFields !== void 0 ? listItemAllFields : false)) {
+                        throw Error('Please ensure the specified folder URL or folder Id does not refer to a root folder. Use \'spo list get\' with withPermissions instead.');
+                    }
+                    listItemAllFields.RoleAssignments.forEach(r => {
+                        r.Member.PrincipalTypeString = ListPrincipalType_1.ListPrincipalType[r.Member.PrincipalType];
+                        r.RoleDefinitionBindings.forEach(rb => {
+                            const permissions = new base_permissions_1.BasePermissions();
+                            permissions.high = rb.BasePermissions.High;
+                            permissions.low = rb.BasePermissions.Low;
+                            rb.BasePermissionsValue = permissions.parse();
+                            rb.RoleTypeKindValue = RoleType_1.RoleType[rb.RoleTypeKind];
+                        });
+                    });
+                }
                 logger.log(folder);
             }
             catch (err) {
@@ -74,7 +96,8 @@ _SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initTelemet
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
-            url: typeof args.options.url !== 'undefined'
+            url: typeof args.options.url !== 'undefined',
+            withPermissions: typeof args.options.withPermissions !== 'undefined'
         });
     });
 }, _SpoFolderGetCommand_initOptions = function _SpoFolderGetCommand_initOptions() {
@@ -84,6 +107,8 @@ _SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initTelemet
         option: '-f, --url [url]'
     }, {
         option: '-i, --id [id]'
+    }, {
+        option: '--withPermissions'
     });
 }, _SpoFolderGetCommand_initValidators = function _SpoFolderGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -99,7 +124,7 @@ _SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initTelemet
         return true;
     }));
 }, _SpoFolderGetCommand_initOptionSets = function _SpoFolderGetCommand_initOptionSets() {
-    this.optionSets.push(['url', 'id']);
+    this.optionSets.push({ options: ['url', 'id'] });
 };
 module.exports = new SpoFolderGetCommand();
 //# sourceMappingURL=folder-get.js.map

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

@@ -15,8 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFolderListCommand_instances, _SpoFolderListCommand_initTelemetry, _SpoFolderListCommand_initOptions, _SpoFolderListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -55,16 +55,9 @@ class SpoFolderListCommand extends SpoCommand_1.default {
     getFolderList(webUrl, parentFolderUrl, recursive, folders = []) {
         return __awaiter(this, void 0, void 0, function* () {
             const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(webUrl, parentFolderUrl);
-            const requestOptions = {
-                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/folders`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const resp = yield request_1.default.get(requestOptions);
-            if (resp.value.length > 0) {
-                for (const folder of resp.value) {
+            const resp = yield odata_1.odata.getAllItems(`${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/folders`);
+            if (resp.length > 0) {
+                for (const folder of resp) {
                     folders.push(folder);
                     if (recursive) {
                         yield this.getFolderList(webUrl, folder.ServerRelativeUrl, recursive, folders);

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

@@ -109,7 +109,7 @@ _SpoGroupAddCommand_instances = new WeakSet(), _SpoGroupAddCommand_initTelemetry
         return true;
     }));
 }, _SpoGroupAddCommand_initOptionSets = function _SpoGroupAddCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoGroupAddCommand();
 //# sourceMappingURL=group-add.js.map

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

@@ -108,7 +108,7 @@ _SpoGroupGetCommand_instances = new WeakSet(), _SpoGroupGetCommand_initTelemetry
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoGroupGetCommand_initOptionSets = function _SpoGroupGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name', 'associatedGroup']);
+    this.optionSets.push({ options: ['id', 'name', 'associatedGroup'] });
 };
 module.exports = new SpoGroupGetCommand();
 //# sourceMappingURL=group-get.js.map

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoGroupListCommand_instances, _SpoGroupListCommand_initTelemetry, _SpoGroupListCommand_initOptions, _SpoGroupListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -57,15 +58,8 @@ class SpoGroupListCommand extends SpoCommand_1.default {
     }
     getSiteGroups(baseUrl, logger) {
         return __awaiter(this, void 0, void 0, function* () {
-            const requestOptions = {
-                url: baseUrl + '/sitegroups',
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const groupProperties = yield request_1.default.get(requestOptions);
-            logger.log(groupProperties.value);
+            const groupProperties = yield odata_1.odata.getAllItems(`${baseUrl}/sitegroups`);
+            logger.log(groupProperties);
         });
     }
     getAssociatedGroups(baseUrl, options, logger) {
@@ -78,6 +72,7 @@ class SpoGroupListCommand extends SpoCommand_1.default {
                 responseType: 'json'
             };
             const groupProperties = yield request_1.default.get(requestOptions);
+            logger.log(groupProperties);
             if (!options.output || options.output === 'json') {
                 logger.log(groupProperties);
             }

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

@@ -175,7 +175,7 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         return true;
     }));
 }, _SpoGroupMemberAddCommand_initOptionSets = function _SpoGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push(['groupId', 'groupName'], ['userName', 'email']);
+    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userName', 'email'] });
 };
 module.exports = new SpoGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map

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

@@ -15,8 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoGroupMemberListCommand_instances, _SpoGroupMemberListCommand_initTelemetry, _SpoGroupMemberListCommand_initOptions, _SpoGroupMemberListCommand_initValidators, _SpoGroupMemberListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -46,16 +46,9 @@ class SpoGroupMemberListCommand extends SpoCommand_1.default {
             const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
                 ? `GetById('${args.options.groupId}')`
                 : `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')`}/users`;
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const response = yield request_1.default.get(requestOptions);
-                logger.log(response.value);
+                const response = yield odata_1.odata.getAllItems(requestUrl);
+                logger.log(response);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -86,7 +79,7 @@ _SpoGroupMemberListCommand_instances = new WeakSet(), _SpoGroupMemberListCommand
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoGroupMemberListCommand_initOptionSets = function _SpoGroupMemberListCommand_initOptionSets() {
-    this.optionSets.push(['groupName', 'groupId']);
+    this.optionSets.push({ options: ['groupName', 'groupId'] });
 };
 module.exports = new SpoGroupMemberListCommand();
 //# sourceMappingURL=group-member-list.js.map

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

@@ -108,7 +108,7 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoGroupMemberRemoveCommand_initOptionSets = function _SpoGroupMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push(['groupName', 'groupId']);
+    this.optionSets.push({ options: ['groupName', 'groupId'] });
 };
 module.exports = new SpoGroupMemberRemoveCommand();
 //# sourceMappingURL=group-member-remove.js.map

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

@@ -121,7 +121,7 @@ _SpoGroupRemoveCommand_instances = new WeakSet(), _SpoGroupRemoveCommand_initTel
         return true;
     }));
 }, _SpoGroupRemoveCommand_initOptionSets = function _SpoGroupRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoGroupRemoveCommand();
 //# sourceMappingURL=group-remove.js.map