@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.119711d

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

@@ -16,7 +16,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoOrgNewsSiteRemoveCommand_instances, _SpoOrgNewsSiteRemoveCommand_initTelemetry, _SpoOrgNewsSiteRemoveCommand_initOptions, _SpoOrgNewsSiteRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -36,55 +35,45 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes a site from the list of organizational news sites';
     }
-    commandAction(logger, args, cb) {
-        const removeOrgNewsSite = () => {
-            let spoAdminUrl = '';
-            utils_1.spo
-                .getSpoAdminUrl(logger, this.debug)
-                .then((_spoAdminUrl) => {
-                spoAdminUrl = _spoAdminUrl;
-                return utils_1.spo.getRequestDigest(spoAdminUrl);
-            })
-                .then((res) => {
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': res.FormDigestValue
-                    },
-                    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="64" ObjectPathId="63" /><Method Name="RemoveOrgNewsSite" Id="65" ObjectPathId="63"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="63" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                    return;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeOrgNewsSite = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                    const requestOptions = {
+                        url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                        headers: {
+                            'X-RequestDigest': reqDigest.FormDigestValue
+                        },
+                        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="64" ObjectPathId="63" /><Method Name="RemoveOrgNewsSite" Id="65" ObjectPathId="63"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="63" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></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 {
-                    cb();
-                }
-            }, (err) => this.handleRejectedPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeOrgNewsSite();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove ${args.options.url} from the list of organizational news sites?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    removeOrgNewsSite();
+                catch (err) {
+                    this.handleRejectedPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeOrgNewsSite();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove ${args.options.url} from the list of organizational news sites?`
+                });
+                if (result.continue) {
+                    yield removeOrgNewsSite();
+                }
+            }
+        });
     }
 }
 _SpoOrgNewsSiteRemoveCommand_instances = new WeakSet(), _SpoOrgNewsSiteRemoveCommand_initTelemetry = function _SpoOrgNewsSiteRemoveCommand_initTelemetry() {

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

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoOrgNewsSiteSetCommand_instances, _SpoOrgNewsSiteSetCommand_initOptions, _SpoOrgNewsSiteSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -34,33 +33,29 @@ class SpoOrgNewsSiteSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Marks site as an organizational news site';
     }
-    commandAction(logger, args, cb) {
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue
-                },
-                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="61" ObjectPathId="60" /><Method Name="SetOrgNewsSite" Id="62" ObjectPathId="60"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="60" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                return;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.FormDigestValue
+                    },
+                    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="61" ObjectPathId="60" /><Method Name="SetOrgNewsSite" Id="62" ObjectPathId="60"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="60" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></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;
+                }
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
 }
 _SpoOrgNewsSiteSetCommand_instances = new WeakSet(), _SpoOrgNewsSiteSetCommand_initOptions = function _SpoOrgNewsSiteSetCommand_initOptions() {

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

@@ -35,242 +35,186 @@ class SpoPageAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Creates modern page';
     }
-    commandAction(logger, args, cb) {
-        const resource = Auth_1.Auth.getResourceFromUrl(args.options.webUrl);
-        let requestDigest = '';
-        let itemId = '';
-        let pageName = args.options.name;
-        const serverRelativeSiteUrl = utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl);
-        const fileNameWithoutExtension = pageName.replace('.aspx', '');
-        let bannerImageUrl = '';
-        let canvasContent1 = '';
-        let layoutWebpartsContent = '';
-        const pageTitle = args.options.title ? args.options.title : (args.options.name.indexOf('.aspx') > -1 ? args.options.name.substr(0, args.options.name.indexOf('.aspx')) : args.options.name);
-        let pageId = null;
-        const pageDescription = args.options.description || "";
-        utils_1.spo
-            .getRequestDigest(args.options.webUrl)
-            .then((res) => {
-            requestDigest = res.FormDigestValue;
-            if (!pageName.endsWith('.aspx')) {
-                pageName += '.aspx';
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/getfolderbyserverrelativeurl('${serverRelativeSiteUrl}/sitepages')/files/AddTemplateFile`,
-                headers: {
-                    'X-RequestDigest': requestDigest,
-                    'content-type': 'application/json;odata=nometadata',
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: {
-                    urlOfFile: `${serverRelativeSiteUrl}/sitepages/${pageName}`,
-                    templateFileType: 3
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            itemId = res.UniqueId;
-            const layoutType = args.options.layoutType || 'Article';
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/ListItemAllFields`,
-                headers: {
-                    'X-RequestDigest': requestDigest,
-                    'X-HTTP-Method': 'MERGE',
-                    'IF-MATCH': '*',
-                    'content-type': 'application/json;odata=nometadata',
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: {
-                    ContentTypeId: '0x0101009D1CB255DA76424F860D91F20E6C4118',
-                    Title: pageTitle,
-                    ClientSideApplicationId: 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec',
-                    PageLayoutType: layoutType
-                },
-                responseType: 'json'
-            };
-            if (layoutType === 'Article') {
-                requestOptions.data.PromotedState = 0;
-                requestOptions.data.BannerImageUrl = {
-                    Description: '/_layouts/15/images/sitepagethumbnail.png',
-                    Url: `${resource}/_layouts/15/images/sitepagethumbnail.png`
-                };
-            }
-            return request_1.default.post(requestOptions);
-        })
-            .then(() => {
-            return Page_1.Page.checkout(pageName, args.options.webUrl, logger, this.debug, this.verbose);
-        })
-            .then((res) => {
-            if (res) {
-                pageId = res.Id;
-                bannerImageUrl = res.BannerImageUrl;
-                canvasContent1 = res.CanvasContent1;
-                layoutWebpartsContent = res.LayoutWebpartsContent;
-            }
-            if (!args.options.promoteAs) {
-                return Promise.resolve({ Id: '' });
-            }
-            const requestOptions = {
-                responseType: 'json'
-            };
-            switch (args.options.promoteAs) {
-                case 'HomePage':
-                    requestOptions.url = `${args.options.webUrl}/_api/web/rootfolder`;
-                    requestOptions.headers = {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const resource = Auth_1.Auth.getResourceFromUrl(args.options.webUrl);
+            let requestDigest = '';
+            let itemId = '';
+            let pageName = args.options.name;
+            const serverRelativeSiteUrl = utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl);
+            const fileNameWithoutExtension = pageName.replace('.aspx', '');
+            let bannerImageUrl = '';
+            let canvasContent1 = '';
+            let layoutWebpartsContent = '';
+            const pageTitle = args.options.title ? args.options.title : (args.options.name.indexOf('.aspx') > -1 ? args.options.name.substr(0, args.options.name.indexOf('.aspx')) : args.options.name);
+            let pageId = null;
+            const pageDescription = args.options.description || "";
+            try {
+                const reqDigest = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                requestDigest = reqDigest.FormDigestValue;
+                if (!pageName.endsWith('.aspx')) {
+                    pageName += '.aspx';
+                }
+                let requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/getfolderbyserverrelativeurl('${serverRelativeSiteUrl}/sitepages')/files/AddTemplateFile`,
+                    headers: {
                         'X-RequestDigest': requestDigest,
-                        'X-HTTP-Method': 'MERGE',
-                        'IF-MATCH': '*',
                         'content-type': 'application/json;odata=nometadata',
                         accept: 'application/json;odata=nometadata'
-                    };
-                    requestOptions.data = {
-                        WelcomePage: `SitePages/${pageName}`
-                    };
-                    break;
-                case 'NewsPage':
-                    requestOptions.url = `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/ListItemAllFields`;
-                    requestOptions.headers = {
+                    },
+                    data: {
+                        urlOfFile: `${serverRelativeSiteUrl}/sitepages/${pageName}`,
+                        templateFileType: 3
+                    },
+                    responseType: 'json'
+                };
+                const template = yield request_1.default.post(requestOptions);
+                itemId = template.UniqueId;
+                const layoutType = args.options.layoutType || 'Article';
+                requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/ListItemAllFields`,
+                    headers: {
                         'X-RequestDigest': requestDigest,
                         'X-HTTP-Method': 'MERGE',
                         'IF-MATCH': '*',
                         'content-type': 'application/json;odata=nometadata',
                         accept: 'application/json;odata=nometadata'
+                    },
+                    data: {
+                        ContentTypeId: '0x0101009D1CB255DA76424F860D91F20E6C4118',
+                        Title: pageTitle,
+                        ClientSideApplicationId: 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec',
+                        PageLayoutType: layoutType
+                    },
+                    responseType: 'json'
+                };
+                if (layoutType === 'Article') {
+                    requestOptions.data.PromotedState = 0;
+                    requestOptions.data.BannerImageUrl = {
+                        Description: '/_layouts/15/images/sitepagethumbnail.png',
+                        Url: `${resource}/_layouts/15/images/sitepagethumbnail.png`
                     };
-                    requestOptions.data = {
-                        PromotedState: 2,
-                        FirstPublishedDate: new Date().toISOString().replace('Z', '')
-                    };
-                    break;
-                case 'Template':
-                    requestOptions.url = `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/ListItemAllFields`;
-                    requestOptions.headers = {
-                        'X-RequestDigest': requestDigest,
-                        'content-type': 'application/json;odata=nometadata',
-                        accept: 'application/json;odata=nometadata'
-                    };
-                    break;
-            }
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            if (args.options.promoteAs !== 'Template') {
-                return Promise.resolve({ Id: null, BannerImageUrl: '', CanvasContent1: '', LayoutWebpartsContent: '', UniqueId: '' });
-            }
-            const requestOptions = {
-                responseType: 'json',
-                url: `${args.options.webUrl}/_api/SitePages/Pages(${res.Id})/SavePageAsTemplate`,
-                headers: {
-                    'X-RequestDigest': requestDigest,
-                    'content-type': 'application/json;odata=nometadata',
-                    'X-HTTP-Method': 'POST',
-                    'IF-MATCH': '*',
-                    accept: 'application/json;odata=nometadata'
                 }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            if (args.options.promoteAs !== 'Template') {
-                return Promise.resolve();
-            }
-            bannerImageUrl = res.BannerImageUrl;
-            canvasContent1 = res.CanvasContent1;
-            layoutWebpartsContent = res.LayoutWebpartsContent;
-            pageId = res.Id;
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/getfilebyid('${res.UniqueId}')/ListItemAllFields/SetCommentsDisabled(${!args.options.commentsEnabled})`,
-                headers: {
-                    'X-RequestDigest': requestDigest,
-                    'content-type': 'application/json;odata=nometadata',
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(() => {
-            const requestOptions = {
-                responseType: 'json',
-                url: `${args.options.webUrl}/_api/SitePages/Pages(${pageId})/SavePage`,
-                headers: {
-                    'X-RequestDigest': requestDigest,
-                    'X-HTTP-Method': 'MERGE',
-                    'IF-MATCH': '*',
-                    'content-type': 'application/json;odata=nometadata',
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: {
-                    BannerImageUrl: bannerImageUrl,
-                    CanvasContent1: canvasContent1,
-                    LayoutWebpartsContent: layoutWebpartsContent,
-                    Description: pageDescription
+                yield request_1.default.post(requestOptions);
+                const pageProps = yield Page_1.Page.checkout(pageName, args.options.webUrl, logger, this.debug, this.verbose);
+                if (pageProps) {
+                    pageId = pageProps.Id;
+                    bannerImageUrl = pageProps.BannerImageUrl;
+                    canvasContent1 = pageProps.CanvasContent1;
+                    layoutWebpartsContent = pageProps.LayoutWebpartsContent;
                 }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(() => {
-            if (args.options.promoteAs !== 'Template') {
-                return Promise.resolve();
-            }
-            const requestOptions = {
-                responseType: 'json',
-                url: `${args.options.webUrl}/_api/SitePages/Pages(${pageId})/SavePageAsDraft`,
-                headers: {
-                    'X-RequestDigest': requestDigest,
-                    'X-HTTP-Method': 'MERGE',
-                    'IF-MATCH': '*',
-                    'content-type': 'application/json;odata=nometadata',
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: {
-                    Title: fileNameWithoutExtension,
-                    BannerImageUrl: bannerImageUrl,
-                    CanvasContent1: canvasContent1,
-                    LayoutWebpartsContent: layoutWebpartsContent,
-                    Description: pageDescription
-                }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(() => {
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/ListItemAllFields/SetCommentsDisabled(${!args.options.commentsEnabled})`,
-                headers: {
-                    'X-RequestDigest': requestDigest,
-                    'content-type': 'application/json;odata=nometadata',
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(() => {
-            let requestOptions = {};
-            if (!args.options.publish) {
-                if (args.options.promoteAs === 'Template' || !pageId) {
-                    return Promise.resolve();
+                if (args.options.promoteAs) {
+                    const requestOptions = {
+                        responseType: 'json'
+                    };
+                    switch (args.options.promoteAs) {
+                        case 'HomePage':
+                            requestOptions.url = `${args.options.webUrl}/_api/web/rootfolder`;
+                            requestOptions.headers = {
+                                'X-RequestDigest': requestDigest,
+                                'X-HTTP-Method': 'MERGE',
+                                'IF-MATCH': '*',
+                                'content-type': 'application/json;odata=nometadata',
+                                accept: 'application/json;odata=nometadata'
+                            };
+                            requestOptions.data = {
+                                WelcomePage: `SitePages/${pageName}`
+                            };
+                            break;
+                        case 'NewsPage':
+                            requestOptions.url = `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/ListItemAllFields`;
+                            requestOptions.headers = {
+                                'X-RequestDigest': requestDigest,
+                                'X-HTTP-Method': 'MERGE',
+                                'IF-MATCH': '*',
+                                'content-type': 'application/json;odata=nometadata',
+                                accept: 'application/json;odata=nometadata'
+                            };
+                            requestOptions.data = {
+                                PromotedState: 2,
+                                FirstPublishedDate: new Date().toISOString().replace('Z', '')
+                            };
+                            break;
+                        case 'Template':
+                            requestOptions.url = `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/ListItemAllFields`;
+                            requestOptions.headers = {
+                                'X-RequestDigest': requestDigest,
+                                'content-type': 'application/json;odata=nometadata',
+                                accept: 'application/json;odata=nometadata'
+                            };
+                            break;
+                    }
+                    const res = yield request_1.default.post(requestOptions);
+                    if (args.options.promoteAs === 'Template') {
+                        let requestOptions = {
+                            responseType: 'json',
+                            url: `${args.options.webUrl}/_api/SitePages/Pages(${res.Id})/SavePageAsTemplate`,
+                            headers: {
+                                'X-RequestDigest': requestDigest,
+                                'content-type': 'application/json;odata=nometadata',
+                                'X-HTTP-Method': 'POST',
+                                'IF-MATCH': '*',
+                                accept: 'application/json;odata=nometadata'
+                            }
+                        };
+                        const tmpl = yield request_1.default.post(requestOptions);
+                        bannerImageUrl = tmpl.BannerImageUrl;
+                        canvasContent1 = tmpl.CanvasContent1;
+                        layoutWebpartsContent = tmpl.LayoutWebpartsContent;
+                        pageId = tmpl.Id;
+                        requestOptions = {
+                            url: `${args.options.webUrl}/_api/web/getfilebyid('${tmpl.UniqueId}')/ListItemAllFields/SetCommentsDisabled(${!args.options.commentsEnabled})`,
+                            headers: {
+                                'X-RequestDigest': requestDigest,
+                                'content-type': 'application/json;odata=nometadata',
+                                accept: 'application/json;odata=nometadata'
+                            },
+                            responseType: 'json'
+                        };
+                        yield request_1.default.post(requestOptions);
+                    }
                 }
                 requestOptions = {
                     responseType: 'json',
-                    url: `${args.options.webUrl}/_api/SitePages/Pages(${pageId})/SavePageAsDraft`,
+                    url: `${args.options.webUrl}/_api/SitePages/Pages(${pageId})/SavePage`,
                     headers: {
+                        'X-RequestDigest': requestDigest,
+                        'X-HTTP-Method': 'MERGE',
+                        'IF-MATCH': '*',
                         'content-type': 'application/json;odata=nometadata',
-                        'accept': 'application/json;odata=nometadata'
+                        accept: 'application/json;odata=nometadata'
                     },
                     data: {
-                        Title: pageTitle,
-                        Description: pageDescription,
                         BannerImageUrl: bannerImageUrl,
                         CanvasContent1: canvasContent1,
-                        LayoutWebpartsContent: layoutWebpartsContent
+                        LayoutWebpartsContent: layoutWebpartsContent,
+                        Description: pageDescription
                     }
                 };
-            }
-            else {
+                yield request_1.default.post(requestOptions);
+                if (args.options.promoteAs === 'Template') {
+                    const requestOptions = {
+                        responseType: 'json',
+                        url: `${args.options.webUrl}/_api/SitePages/Pages(${pageId})/SavePageAsDraft`,
+                        headers: {
+                            'X-RequestDigest': requestDigest,
+                            'X-HTTP-Method': 'MERGE',
+                            'IF-MATCH': '*',
+                            'content-type': 'application/json;odata=nometadata',
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        data: {
+                            Title: fileNameWithoutExtension,
+                            BannerImageUrl: bannerImageUrl,
+                            CanvasContent1: canvasContent1,
+                            LayoutWebpartsContent: layoutWebpartsContent,
+                            Description: pageDescription
+                        }
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
                 requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${encodeURIComponent(args.options.publishMessage || '').replace(/'/g, '%39')}'&@a2=1`,
+                    url: `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/ListItemAllFields/SetCommentsDisabled(${!args.options.commentsEnabled})`,
                     headers: {
                         'X-RequestDigest': requestDigest,
                         'content-type': 'application/json;odata=nometadata',
@@ -278,10 +222,43 @@ class SpoPageAddCommand extends SpoCommand_1.default {
                     },
                     responseType: 'json'
                 };
+                yield request_1.default.post(requestOptions);
+                if (!args.options.publish) {
+                    if (args.options.promoteAs !== 'Template' && pageId) {
+                        requestOptions = {
+                            responseType: 'json',
+                            url: `${args.options.webUrl}/_api/SitePages/Pages(${pageId})/SavePageAsDraft`,
+                            headers: {
+                                'content-type': 'application/json;odata=nometadata',
+                                'accept': 'application/json;odata=nometadata'
+                            },
+                            data: {
+                                Title: pageTitle,
+                                Description: pageDescription,
+                                BannerImageUrl: bannerImageUrl,
+                                CanvasContent1: canvasContent1,
+                                LayoutWebpartsContent: layoutWebpartsContent
+                            }
+                        };
+                    }
+                }
+                else {
+                    requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${encodeURIComponent(args.options.publishMessage || '').replace(/'/g, '%39')}'&@a2=1`,
+                        headers: {
+                            'X-RequestDigest': requestDigest,
+                            'content-type': 'application/json;odata=nometadata',
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                }
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoPageAddCommand_instances = new WeakSet(), _SpoPageAddCommand_initTelemetry = function _SpoPageAddCommand_initTelemetry() {