@pnp/cli-microsoft365 6.7.0 → 6.8.0-beta.00c3a00

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

@@ -37,18 +37,18 @@ class SpoFolderCopyCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initValidators).call(this);
     }
     getExcludedOptionsWithUrls() {
-        return ['targetUrl'];
+        return ['targetUrl', 'sourceUrl'];
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const webUrl = args.options.webUrl;
             const parsedUrl = url.parse(webUrl);
             const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+            const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
+            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(tenantUrl, serverRelativePath);
             const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-            const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
             const requestOptions = {
-                url: requestUrl,
+                url: urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs'),
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },

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

@@ -38,6 +38,9 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initOptionSets).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['url'];
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
@@ -48,8 +51,8 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
                 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 += `/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                requestUrl += `/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')`;
             }
             if (args.options.withPermissions) {
                 requestUrl += `?$expand=ListItemAllFields/HasUniqueRoleAssignments,ListItemAllFields/RoleAssignments/Member,ListItemAllFields/RoleAssignments/RoleDefinitionBindings`;

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

@@ -37,14 +37,15 @@ class SpoFolderMoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initValidators).call(this);
     }
     getExcludedOptionsWithUrls() {
-        return ['targetUrl'];
+        return ['targetUrl', 'sourceUrl'];
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const webUrl = args.options.webUrl;
             const parsedUrl = url.parse(webUrl);
             const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+            const sourceRelUrl = urlUtil_1.urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
+            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(tenantUrl, sourceRelUrl);
             const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
             const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
             const requestOptions = {

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

@@ -35,6 +35,9 @@ class SpoFolderRenameCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFolderRenameCommand_instances, "m", _SpoFolderRenameCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderRenameCommand_instances, "m", _SpoFolderRenameCommand_initValidators).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['url'];
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -45,8 +48,8 @@ class SpoFolderRenameCommand extends SpoCommand_1.default {
                 if (this.verbose) {
                     logger.logToStderr(`Renaming folder ${args.options.url} to ${args.options.name}`);
                 }
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                const serverRelativeUrlWithoutOldFolder = serverRelativeUrl.substring(0, serverRelativeUrl.lastIndexOf('/'));
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                const serverRelativeUrlWithoutOldFolder = serverRelativePath.substring(0, serverRelativePath.lastIndexOf('/'));
                 const renamedServerRelativeUrl = `${serverRelativeUrlWithoutOldFolder}/${args.options.name}`;
                 const requestOptions = {
                     url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,

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

@@ -53,10 +53,17 @@ class SpoListGetCommand extends SpoCommand_1.default {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
                 requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
-            let propertiesSelect = args.options.properties ? `?$select=${formatting_1.formatting.encodeQueryParameter(args.options.properties)}` : ``;
-            propertiesSelect += args.options.withPermissions ? `${args.options.properties ? '&' : '?'}$expand=HasUniqueRoleAssignments,RoleAssignments/Member,RoleAssignments/RoleDefinitionBindings` : ``;
+            const fieldsProperties = this.formatSelectProperties(args.options.properties, args.options.withPermissions);
+            const queryParams = [];
+            if (fieldsProperties.selectProperties.length > 0) {
+                queryParams.push(`$select=${fieldsProperties.selectProperties.join(',')}`);
+            }
+            if (fieldsProperties.expandProperties.length > 0) {
+                queryParams.push(`$expand=${fieldsProperties.expandProperties.join(',')}`);
+            }
+            const querystring = queryParams.length > 0 ? `?${queryParams.join('&')}` : ``;
             const requestOptions = {
-                url: requestUrl + propertiesSelect,
+                url: `${requestUrl}${querystring}`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -76,6 +83,26 @@ class SpoListGetCommand extends SpoCommand_1.default {
             }
         });
     }
+    formatSelectProperties(properties, withPermissions) {
+        const selectProperties = [];
+        let expandProperties = [];
+        if (withPermissions) {
+            expandProperties = ['HasUniqueRoleAssignments', 'RoleAssignments/Member', 'RoleAssignments/RoleDefinitionBindings'];
+        }
+        if (properties) {
+            properties.split(',').forEach((property) => {
+                const subparts = property.trim().split('/');
+                if (subparts.length > 1) {
+                    expandProperties.push(subparts[0]);
+                }
+                selectProperties.push(property.trim());
+            });
+        }
+        return {
+            selectProperties: [...new Set(selectProperties)],
+            expandProperties: [...new Set(expandProperties)]
+        };
+    }
 }
 _SpoListGetCommand_instances = new WeakSet(), _SpoListGetCommand_initTelemetry = function _SpoListGetCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -13,7 +13,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 _SpoListListCommand_instances, _SpoListListCommand_initOptions, _SpoListListCommand_initValidators;
+var _SpoListListCommand_instances, _SpoListListCommand_initOptions, _SpoListListCommand_initValidators, _SpoListListCommand_initTelemetry;
 Object.defineProperty(exports, "__esModule", { value: true });
 const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
@@ -34,6 +34,7 @@ class SpoListListCommand extends SpoCommand_1.default {
         _SpoListListCommand_instances.add(this);
         __classPrivateFieldGet(this, _SpoListListCommand_instances, "m", _SpoListListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListListCommand_instances, "m", _SpoListListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListListCommand_instances, "m", _SpoListListCommand_initTelemetry).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -41,7 +42,12 @@ class SpoListListCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving all lists in site at ${args.options.webUrl}...`);
             }
             try {
-                const listInstances = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/lists?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl,*`);
+                const fieldProperties = this.formatSelectProperties(args.options.properties);
+                const queryParams = [`$expand=${fieldProperties.expandProperties.join(',')}`, `$select=${fieldProperties.selectProperties.join(',')}`];
+                if (args.options.filter) {
+                    queryParams.push(`$filter=${args.options.filter}`);
+                }
+                const listInstances = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/lists?${queryParams.join('&')}`);
                 listInstances.forEach(l => {
                     l.Url = l.RootFolder.ServerRelativeUrl;
                 });
@@ -52,13 +58,44 @@ class SpoListListCommand extends SpoCommand_1.default {
             }
         });
     }
+    formatSelectProperties(fields) {
+        const selectProperties = ['RootFolder/ServerRelativeUrl'];
+        const expandProperties = ['RootFolder'];
+        if (!fields) {
+            selectProperties.push('*');
+        }
+        if (fields) {
+            fields.split(',').forEach((field) => {
+                const subparts = field.trim().split('/');
+                if (subparts.length > 1) {
+                    expandProperties.push(subparts[0]);
+                }
+                selectProperties.push(field.trim());
+            });
+        }
+        return {
+            selectProperties: [...new Set(selectProperties)],
+            expandProperties: [...new Set(expandProperties)]
+        };
+    }
 }
 _SpoListListCommand_instances = new WeakSet(), _SpoListListCommand_initOptions = function _SpoListListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-p, --properties [properties]'
+    }, {
+        option: '-f, --filter [filter]'
     });
 }, _SpoListListCommand_initValidators = function _SpoListListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+}, _SpoListListCommand_initTelemetry = function _SpoListListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            properties: typeof args.options.properties !== 'undefined',
+            filter: typeof args.options.filter !== 'undefined'
+        });
+    });
 };
 module.exports = new SpoListListCommand();
 //# sourceMappingURL=list-list.js.map

package/dist/m365/spo/commands/listitem/listitem-batch-set.js

@@ -0,0 +1,308 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
+var _SpoListItemBatchSetCommand_instances, _SpoListItemBatchSetCommand_initTelemetry, _SpoListItemBatchSetCommand_initOptions, _SpoListItemBatchSetCommand_initValidators, _SpoListItemBatchSetCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const config_1 = require("../../../../config");
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoListItemBatchSetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.LISTITEM_BATCH_SET;
+    }
+    get description() {
+        return 'Updates list items in a batch';
+    }
+    constructor() {
+        super();
+        _SpoListItemBatchSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListItemBatchSetCommand_instances, "m", _SpoListItemBatchSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListItemBatchSetCommand_instances, "m", _SpoListItemBatchSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListItemBatchSetCommand_instances, "m", _SpoListItemBatchSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemBatchSetCommand_instances, "m", _SpoListItemBatchSetCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Starting to create batch items from csv at path ${args.options.filePath}`);
+                }
+                const csvContent = fs.readFileSync(args.options.filePath, 'utf8');
+                const jsonContent = formatting_1.formatting.parseCsvToJson(csvContent);
+                const amountOfRows = jsonContent.length;
+                const idColumn = args.options.idColumn || 'ID';
+                if (!jsonContent[0].hasOwnProperty(idColumn)) {
+                    throw `The specified value for idColumn does not exist in the array. Specified idColumn is '${args.options.idColumn || 'ID'}'. Please specify the correct value.`;
+                }
+                const listId = yield this.getListId(args.options, logger);
+                const fields = yield this.getListFields(args.options, listId, jsonContent, idColumn, logger);
+                const userFields = fields.filter(field => field.TypeAsString === 'UserMulti' || field.TypeAsString === 'User');
+                const resolvedUsers = yield this.getUsersFromCsv(args.options.webUrl, jsonContent, userFields);
+                const formDigestValue = (yield spo_1.spo.getRequestDigest(args.options.webUrl)).FormDigestValue;
+                const objectIdentity = (yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue)).objectIdentity;
+                let counter = 0;
+                while (jsonContent.length > 0) {
+                    const entriesToProcess = jsonContent.splice(0, 50);
+                    const objectPaths = [], actions = [];
+                    let index = 1;
+                    for (const row of entriesToProcess) {
+                        counter += 1;
+                        objectPaths.push(`<Identity Id="${index}" Name="${objectIdentity}:list:${listId}:item:${row[idColumn]},1" />`);
+                        const [actionString, updatedIndex] = this.mapActions(index, row, fields, resolvedUsers, args.options.systemUpdate);
+                        index = updatedIndex;
+                        actions.push(actionString);
+                    }
+                    if (this.verbose) {
+                        logger.logToStderr(`Writing away batch of items, currently at: ${counter}/${amountOfRows}.`);
+                    }
+                    yield this.sendBatchRequest(args.options.webUrl, this.getRequestBody(objectPaths, actions));
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getRequestBody(objectPaths, actions) {
+        return `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${actions.join('')}</Actions><ObjectPaths>${objectPaths.join('')}</ObjectPaths></Request>`;
+    }
+    sendBatchRequest(webUrl, requestBody) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'Content-Type': 'text/xml'
+                },
+                data: requestBody
+            };
+            const res = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(res);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                throw response.ErrorInfo.ErrorMessage + ' - ' + response.ErrorInfo.ErrorValue;
+            }
+        });
+    }
+    mapActions(index, row, fields, users, systemUpdate) {
+        const objectPathId = index;
+        let actionString = '';
+        fields.forEach((field) => {
+            if (row[field.InternalName] === undefined || row[field.InternalName] === '') {
+                actionString += `<Method Name="ParseAndSetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="String"></Parameter></Parameters></Method>`;
+            }
+            else {
+                switch (field.TypeAsString) {
+                    case 'User':
+                        const userDetail = users.find(us => us.email === row[field.InternalName]);
+                        actionString += `<Method Name="ParseAndSetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="String">${userDetail.id}</Parameter></Parameters></Method>`;
+                        break;
+                    case 'UserMulti':
+                        const userMultiString = row[field.InternalName].toString().split(';').map((element) => {
+                            const userDetail = users.find(us => us.email === element);
+                            return `<Object TypeId="{c956ab54-16bd-4c18-89d2-996f57282a6f}"><Property Name="Email" Type="Null" /><Property Name="LookupId" Type="Int32">${userDetail.id}</Property><Property Name="LookupValue" Type="Null" /></Object>`;
+                        });
+                        actionString += `<Method Name="SetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="Array">${userMultiString.join('')}</Parameter></Parameters></Method>`;
+                        break;
+                    case 'Lookup':
+                        actionString += `<Method Name="SetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter TypeId="{f1d34cc0-9b50-4a78-be78-d5facfcccfb7}"><Property Name="LookupId" Type="Int32">${row[field.InternalName]}</Property><Property Name="LookupValue" Type="Null"/></Parameter></Parameters></Method>`;
+                        break;
+                    case 'LookupMulti':
+                        const lookupMultiString = row[field.InternalName].toString().split(';').map((element) => {
+                            return `<Object TypeId="{f1d34cc0-9b50-4a78-be78-d5facfcccfb7}"><Property Name="LookupId" Type="Int32">${element}</Property><Property Name="LookupValue" Type="Null" /></Object>`;
+                        });
+                        actionString += `<Method Name="SetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="Array">${lookupMultiString.join('')}</Parameter></Parameters></Method>`;
+                        break;
+                    default:
+                        actionString += `<Method Name="ParseAndSetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="String">${row[field.InternalName].toString()}</Parameter></Parameters></Method>`;
+                        break;
+                }
+            }
+        });
+        actionString += `<Method Name="${systemUpdate ? 'System' : ''}Update" Id="${index += 1}" ObjectPathId="${objectPathId}"/>`;
+        return [actionString, index];
+    }
+    getListFields(options, listId, jsonContent, idColumn, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving fields for list with id ${listId}`);
+            }
+            const filterFields = [];
+            const objectKeys = Object.keys(jsonContent[0]);
+            const index = objectKeys.indexOf(idColumn, 0);
+            if (index > -1) {
+                objectKeys.splice(index, 1);
+            }
+            objectKeys.map(objectKey => {
+                filterFields.push(`InternalName eq '${objectKey}'`);
+            });
+            const fields = yield odata_1.odata.getAllItems(`${options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(listId)}')/fields?$select=InternalName,TypeAsString&$filter=${filterFields.join(' or ')}`);
+            if (fields.length !== objectKeys.length) {
+                const fieldsThatDontExist = [];
+                objectKeys.forEach(key => {
+                    const field = fields.find(field => field.InternalName === key);
+                    if (!field) {
+                        fieldsThatDontExist.push(key);
+                    }
+                });
+                throw `Following fields specified in the csv do not exist on the list: ${fieldsThatDontExist.join(', ')}`;
+            }
+            return fields;
+        });
+    }
+    getListId(options, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.listId) {
+                return options.listId;
+            }
+            if (this.verbose) {
+                logger.logToStderr('Retrieving list id');
+            }
+            let listUrl = `${options.webUrl}/_api/web`;
+            if (options.listTitle) {
+                listUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')`;
+            }
+            else {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                listUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
+            const requestOptions = {
+                url: `${listUrl}?$select=Id`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const listResult = yield request_1.default.get(requestOptions);
+            return listResult.Id;
+        });
+    }
+    getUsersFromCsv(webUrl, jsonContent, userFields) {
+        var _a, e_1, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (userFields.length === 0) {
+                return [];
+            }
+            const userFieldValues = [];
+            const emailsToResolve = this.getEmailsToEnsure(jsonContent, userFields);
+            try {
+                for (var _d = true, emailsToResolve_1 = __asyncValues(emailsToResolve), emailsToResolve_1_1; emailsToResolve_1_1 = yield emailsToResolve_1.next(), _a = emailsToResolve_1_1.done, !_a;) {
+                    _c = emailsToResolve_1_1.value;
+                    _d = false;
+                    try {
+                        const email = _c;
+                        const requestOptions = {
+                            url: `${webUrl}/_api/web/ensureUser('${email}')?$select=Id`,
+                            headers: {
+                                accept: 'application/json',
+                                'content-type': 'application/json'
+                            },
+                            responseType: 'json'
+                        };
+                        const response = yield request_1.default.post(requestOptions);
+                        userFieldValues.push({ email: email, id: response.Id });
+                    }
+                    finally {
+                        _d = true;
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (!_d && !_a && (_b = emailsToResolve_1.return)) yield _b.call(emailsToResolve_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            return userFieldValues;
+        });
+    }
+    getEmailsToEnsure(jsonContent, userFields) {
+        const emailsToResolve = [];
+        userFields.forEach((userField) => {
+            jsonContent.forEach(row => {
+                const fieldValue = row[userField.InternalName];
+                if (fieldValue !== undefined && fieldValue !== '') {
+                    const emailsSplitted = fieldValue.split(';');
+                    emailsSplitted.forEach((email) => {
+                        if (!emailsToResolve.some(existingMail => existingMail === email)) {
+                            emailsToResolve.push(email);
+                        }
+                    });
+                }
+            });
+        });
+        return emailsToResolve;
+    }
+}
+_SpoListItemBatchSetCommand_instances = new WeakSet(), _SpoListItemBatchSetCommand_initTelemetry = function _SpoListItemBatchSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            idColumn: typeof args.options.idColumn !== 'undefined',
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            systemUpdate: !!args.options.systemUpdate
+        });
+    });
+}, _SpoListItemBatchSetCommand_initOptions = function _SpoListItemBatchSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-p, --filePath <filePath>'
+    }, {
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-l, --listId [listId]'
+    }, {
+        option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '--idColumn [idColumn]'
+    }, {
+        option: '-s, --systemUpdate'
+    });
+}, _SpoListItemBatchSetCommand_initValidators = function _SpoListItemBatchSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.listId &&
+            !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} in option listId is not a valid GUID`;
+        }
+        if (!fs.existsSync(args.options.filePath)) {
+            return `File with path ${args.options.filePath} does not exist`;
+        }
+        return true;
+    }));
+}, _SpoListItemBatchSetCommand_initOptionSets = function _SpoListItemBatchSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+};
+module.exports = new SpoListItemBatchSetCommand();
+//# sourceMappingURL=listitem-batch-set.js.map

package/dist/m365/spo/commands/page/page-section-add.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageSectionAddCommand_instances, _SpoPageSectionAddCommand_initTelemetry, _SpoPageSectionAddCommand_initOptions, _SpoPageSectionAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const util_1 = require("util");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
@@ -64,7 +63,7 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
                         },
                         responseType: 'json'
                     };
-                    return request_1.default.post(requestOptions);
+                    yield request_1.default.post(requestOptions);
                 }
                 // get columns
                 const columns = canvasContent
@@ -187,7 +186,7 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
             return `${args.options.sectionTemplate} is not a valid section template. Allowed values are OneColumn|OneColumnFullWidth|TwoColumn|ThreeColumn|TwoColumnLeft|TwoColumnRight`;
         }
         if (typeof args.options.order !== 'undefined') {
-            if (!(0, util_1.isNumber)(args.options.order) || args.options.order < 1) {
+            if (!Number.isInteger(args.options.order) || args.options.order < 1) {
                 return 'The value of parameter order must be 1 or higher';
             }
         }

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-list.js

@@ -46,8 +46,21 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand_1.defau
                     throw response.ErrorInfo.ErrorMessage;
                 }
                 else {
+                    let spoWebAppServicePrincipalPermissionRequestResult = [];
                     const result = json[json.length - 1]._Child_Items_;
-                    logger.log(result.map(r => {
+                    if (result.length > 0) {
+                        const spoClientExtensibilityWebApplicationPrincipalId = yield this.getSPOClientExtensibilityWebApplicationPrincipalId();
+                        if (spoClientExtensibilityWebApplicationPrincipalId !== null) {
+                            const oAuth2PermissionGrants = yield this.getOAuth2PermissionGrants(spoClientExtensibilityWebApplicationPrincipalId);
+                            if (oAuth2PermissionGrants) {
+                                spoWebAppServicePrincipalPermissionRequestResult = result.filter(x => oAuth2PermissionGrants.indexOf(x.Scope) === -1);
+                            }
+                        }
+                    }
+                    if (spoWebAppServicePrincipalPermissionRequestResult.length === 0) {
+                        spoWebAppServicePrincipalPermissionRequestResult = result;
+                    }
+                    logger.log(spoWebAppServicePrincipalPermissionRequestResult.map(r => {
                         return {
                             Id: r.Id.replace('/Guid(', '').replace(')/', ''),
                             Resource: r.Resource,
@@ -62,6 +75,38 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand_1.defau
             }
         });
     }
+    getOAuth2PermissionGrants(spoClientExtensibilityWebApplicationPrincipalId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `https://graph.microsoft.com/v1.0/oAuth2Permissiongrants/?$filter=clientId eq '${spoClientExtensibilityWebApplicationPrincipalId}' and consentType eq 'AllPrincipals'`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            if (response.value && response.value.length > 0) {
+                return response.value[0].scope.split(' ');
+            }
+            return null;
+        });
+    }
+    getSPOClientExtensibilityWebApplicationPrincipalId() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `https://graph.microsoft.com/v1.0/servicePrincipals/?$filter=displayName eq 'SharePoint Online Client Extensibility Web Application Principal'`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            if (response.value && response.value.length > 0) {
+                return response.value[0].id;
+            }
+            return null;
+        });
+    }
 }
 module.exports = new SpoServicePrincipalPermissionRequestListCommand();
 //# sourceMappingURL=serviceprincipal-permissionrequest-list.js.map