@pnp/cli-microsoft365 6.9.0-beta.bb31388 → 6.9.0-beta.cdf4be7

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

@@ -170,7 +170,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
         });
     }
     createFieldLink(logger, args, schemaXmlWithResourceTokens) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             let requiresUpdate = false;
             const match = /(<Field[^>]+>)(.*)/.exec(schemaXmlWithResourceTokens);
             let xField = match[1];
@@ -185,120 +185,91 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                     xField = xField.replace(allowDeletion[0], 'AllowDeletion="TRUE"') + match[2];
                 }
             }
-            this
-                .updateField(xField, requiresUpdate, logger, args)
-                .then(() => {
-                if (this.verbose) {
-                    logger.logToStderr(`Retrieving site collection id...`);
-                }
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/site?$select=Id`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.get(requestOptions);
-            })
-                .then((res) => {
-                this.siteId = res.Id;
-                if (this.verbose) {
-                    logger.logToStderr(`Retrieving site id...`);
-                }
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web?$select=Id`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.get(requestOptions);
-            })
-                .then((res) => {
-                this.webId = res.Id;
-                return this.ensureRequestDigest(args.options.webUrl, logger);
-            })
-                .then(() => {
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': this.requestDigest
-                    },
-                    data: `<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><ObjectPath Id="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><Method Name="Update" Id="7" ObjectPathId="1"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="2" Name="d6667b9e-50fb-0000-2693-032ae7a0df25|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:field:${args.options.id}" /><Method Id="4" ParentId="3" Name="Add"><Parameters><Parameter TypeId="{63fb2c92-8f65-4bbb-a658-b6cd294403f4}"><Property Name="Field" ObjectPathId="2" /></Parameter></Parameters></Method><Identity Id="1" Name="d6667b9e-80f4-0000-2693-05528ff416bf|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${formatting_1.formatting.escapeXml(args.options.contentTypeId)}" /><Property Id="3" ParentId="1" Name="FieldLinks" /></ObjectPaths></Request>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                }
-                else {
-                    resolve();
-                }
-            }, (error) => {
-                reject(error);
-            });
+            yield this.updateField(xField, requiresUpdate, logger, args);
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving site collection id...`);
+            }
+            const requestOptionsSiteId = {
+                url: `${args.options.webUrl}/_api/site?$select=Id`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const resSiteId = yield request_1.default.get(requestOptionsSiteId);
+            this.siteId = resSiteId.Id;
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving site id...`);
+            }
+            const requestOptionsWebId = {
+                url: `${args.options.webUrl}/_api/web?$select=Id`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const resWebId = yield request_1.default.get(requestOptionsWebId);
+            this.webId = resWebId.Id;
+            yield this.ensureRequestDigest(args.options.webUrl, logger);
+            const requestOptions = {
+                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.requestDigest
+                },
+                data: `<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><ObjectPath Id="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><Method Name="Update" Id="7" ObjectPathId="1"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="2" Name="d6667b9e-50fb-0000-2693-032ae7a0df25|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:field:${args.options.id}" /><Method Id="4" ParentId="3" Name="Add"><Parameters><Parameter TypeId="{63fb2c92-8f65-4bbb-a658-b6cd294403f4}"><Property Name="Field" ObjectPathId="2" /></Parameter></Parameters></Method><Identity Id="1" Name="d6667b9e-80f4-0000-2693-05528ff416bf|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${formatting_1.formatting.escapeXml(args.options.contentTypeId)}" /><Property Id="3" ParentId="1" Name="FieldLinks" /></ObjectPaths></Request>`
+            };
+            const res = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(res);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                throw response.ErrorInfo.ErrorMessage;
+            }
+            else {
+                return;
+            }
         });
     }
     updateField(schemaXml, requiresUpdate, logger, args) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             if (!requiresUpdate) {
                 if (this.verbose) {
                     logger.logToStderr(`Schema of field ${args.options.id} is already up-to-date`);
                 }
-                resolve();
                 return;
             }
-            this
-                .ensureRequestDigest(args.options.webUrl, logger)
-                .then(() => {
-                if (this.verbose) {
-                    logger.logToStderr(`Updating field schema...`);
-                }
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/fields('${args.options.id}')`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata',
-                        'content-type': 'application/json;odata=nometadata',
-                        'X-HTTP-Method': 'MERGE',
-                        'x-requestdigest': this.requestDigest
-                    },
-                    data: {
-                        SchemaXml: schemaXml
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then(() => {
-                resolve();
-            }, (error) => {
-                reject(error);
-            });
+            yield this.ensureRequestDigest(args.options.webUrl, logger);
+            if (this.verbose) {
+                logger.logToStderr(`Updating field schema...`);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/fields('${args.options.id}')`,
+                headers: {
+                    accept: 'application/json;odata=nometadata',
+                    'content-type': 'application/json;odata=nometadata',
+                    'X-HTTP-Method': 'MERGE',
+                    'x-requestdigest': this.requestDigest
+                },
+                data: {
+                    SchemaXml: schemaXml
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
         });
     }
     ensureRequestDigest(siteUrl, logger) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             if (this.requestDigest) {
                 if (this.debug) {
                     logger.logToStderr('Request digest already present');
                 }
-                resolve();
                 return;
             }
             if (this.debug) {
                 logger.logToStderr('Retrieving request digest...');
             }
-            spo_1.spo
-                .getRequestDigest(siteUrl)
-                .then((res) => {
-                this.requestDigest = res.FormDigestValue;
-                resolve();
-            }, (error) => {
-                reject(error);
-            });
+            const res = yield spo_1.spo.getRequestDigest(siteUrl);
+            this.requestDigest = res.FormDigestValue;
         });
     }
 }

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

@@ -91,13 +91,12 @@ class SpoContentTypeSetCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Updating content type...`);
             }
-            const payload = this.getRequestPayload(options);
             const requestOptions = {
                 url: `${options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
                     'Content-Type': 'text/xml'
                 },
-                data: `<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>${payload}</Actions><ObjectPaths><Identity Id="9" Name="fc4179a0-e0d7-5000-c38b-bc3506fbab6f|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:contenttype:${formatting_1.formatting.escapeXml(contentTypeId)}" /></ObjectPaths></Request>`
+                data: yield this.getCsomCallXmlBody(options, siteId, webId, contentTypeId)
             };
             const res = yield request_1.default.post(requestOptions);
             const json = JSON.parse(res);
@@ -107,6 +106,13 @@ class SpoContentTypeSetCommand extends SpoCommand_1.default {
             }
         });
     }
+    getCsomCallXmlBody(options, siteId, webId, contentTypeId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const payload = this.getRequestPayload(options);
+            const list = yield this.getListId(options);
+            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>${payload}</Actions><ObjectPaths><Identity Id="9" Name="fc4179a0-e0d7-5000-c38b-bc3506fbab6f|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}${list}:contenttype:${formatting_1.formatting.escapeXml(contentTypeId)}" /></ObjectPaths></Request>`;
+        });
+    }
     getRequestPayload(options) {
         const excludeOptions = [
             'webUrl',
@@ -130,6 +136,9 @@ class SpoContentTypeSetCommand extends SpoCommand_1.default {
         if (options.updateChildren) {
             payload.push(`<Method Name="Update" Id="${i++}" ObjectPathId="9"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method>`);
         }
+        else {
+            payload.push(`<Method Name="Update" Id="${i++}" ObjectPathId="9"><Parameters><Parameter Type="Boolean">false</Parameter></Parameters></Method>`);
+        }
         return payload.join('');
     }
     getSiteId(logger, webUrl) {
@@ -164,6 +173,41 @@ class SpoContentTypeSetCommand extends SpoCommand_1.default {
             return web.Id;
         });
     }
+    getListId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!options.listId && !options.listTitle && !options.listUrl) {
+                return '';
+            }
+            let baseString = ':list:';
+            if (options.listId) {
+                return baseString += options.listId;
+            }
+            else if (options.listTitle) {
+                const requestOptions = {
+                    url: `${options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')?$select=Id`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const listResponse = yield request_1.default.get(requestOptions);
+                baseString += listResponse.Id;
+            }
+            else if (options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                const requestOptions = {
+                    url: `${options.webUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')?$select=Id`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const listResponse = yield request_1.default.get(requestOptions);
+                baseString += listResponse.Id;
+            }
+            return baseString;
+        });
+    }
 }
 _SpoContentTypeSetCommand_instances = new WeakSet(), _SpoContentTypeSetCommand_initTelemetry = function _SpoContentTypeSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -204,6 +248,9 @@ _SpoContentTypeSetCommand_instances = new WeakSet(), _SpoContentTypeSetCommand_i
         if ((args.options.listId && (args.options.listTitle || args.options.listUrl)) || (args.options.listTitle && args.options.listUrl)) {
             return `Specify either listTitle, listId or listUrl.`;
         }
+        if ((args.options.listId || args.options.listTitle || args.options.listUrl) && args.options.updateChildren) {
+            return 'It is impossible to pass updateChildren when trying to update a list content type.';
+        }
         return true;
     }));
 }, _SpoContentTypeSetCommand_initTypes = function _SpoContentTypeSetCommand_initTypes() {

package/dist/m365/spo/commands/customaction/customaction-clear.js

@@ -81,19 +81,11 @@ class SpoCustomActionClearCommand extends SpoCommand_1.default {
      * Another clear request is send with `site` scope after.
      */
     clearAllScopes(options) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             options.scope = "Web";
-            this
-                .clearScopedCustomActions(options)
-                .then(() => {
-                options.scope = "Site";
-                return this.clearScopedCustomActions(options);
-            })
-                .then(() => {
-                return resolve();
-            }, (err) => {
-                reject(err);
-            });
+            yield this.clearScopedCustomActions(options);
+            options.scope = "Site";
+            yield this.clearScopedCustomActions(options);
         });
     }
 }

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

@@ -77,7 +77,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
     getCustomActionId(options) {
         return __awaiter(this, void 0, void 0, function* () {
             if (options.id) {
-                return Promise.resolve(options.id);
+                return options.id;
             }
             const customActions = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`);
             if (customActions.length === 1) {
@@ -90,9 +90,8 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
         });
     }
     removeScopedCustomAction(options) {
-        return this
-            .getCustomActionId(options)
-            .then((customActionId) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const customActionId = yield this.getCustomActionId(options);
             const requestOptions = {
                 url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(customActionId)}')')`,
                 headers: {
@@ -101,7 +100,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return request_1.default.post(requestOptions);
+            return yield request_1.default.post(requestOptions);
         });
     }
     /**
@@ -110,25 +109,15 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
      * another get request is send with `site` scope.
      */
     searchAllScopes(options) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             options.scope = "Web";
-            this
-                .removeScopedCustomAction(options)
-                .then((webResult) => {
-                if (webResult === undefined) {
-                    return resolve(webResult);
-                }
-                options.scope = "Site";
-                this
-                    .removeScopedCustomAction(options)
-                    .then((siteResult) => {
-                    return resolve(siteResult);
-                }, (err) => {
-                    reject(err);
-                });
-            }, (err) => {
-                reject(err);
-            });
+            const webResult = yield this.removeScopedCustomAction(options);
+            if (!webResult) {
+                return webResult;
+            }
+            options.scope = "Site";
+            const siteResult = yield this.removeScopedCustomAction(options);
+            return siteResult;
         });
     }
 }

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

@@ -73,17 +73,19 @@ class SpoCustomActionSetCommand extends SpoCommand_1.default {
         });
     }
     updateCustomAction(options) {
-        const requestBody = this.mapRequestBody(options);
-        const requestOptions = {
-            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(options.id)}')`,
-            headers: {
-                accept: 'application/json;odata=nometadata',
-                'X-HTTP-Method': 'MERGE'
-            },
-            data: requestBody,
-            responseType: 'json'
-        };
-        return request_1.default.post(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestBody = this.mapRequestBody(options);
+            const requestOptions = {
+                url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(options.id)}')`,
+                headers: {
+                    accept: 'application/json;odata=nometadata',
+                    'X-HTTP-Method': 'MERGE'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            return yield request_1.default.post(requestOptions);
+        });
     }
     /**
      * Merge request with `web` scope is send first.
@@ -91,25 +93,15 @@ class SpoCustomActionSetCommand extends SpoCommand_1.default {
      * another merge request is send with `site` scope.
      */
     searchAllScopes(options) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             options.scope = "Web";
-            this
-                .updateCustomAction(options)
-                .then((webResult) => {
-                if (webResult === undefined || webResult["odata.null"] !== true) {
-                    return resolve(webResult);
-                }
-                options.scope = "Site";
-                this
-                    .updateCustomAction(options)
-                    .then((siteResult) => {
-                    return resolve(siteResult);
-                }, (err) => {
-                    reject(err);
-                });
-            }, (err) => {
-                reject(err);
-            });
+            const webResult = yield this.updateCustomAction(options);
+            if (webResult === undefined || webResult["odata.null"] !== true) {
+                return webResult;
+            }
+            options.scope = "Site";
+            const siteResult = yield this.updateCustomAction(options);
+            return siteResult;
         });
     }
     mapRequestBody(options) {