@pnp/cli-microsoft365 6.0.0-beta.550f33a → 6.0.0-beta.55cbe4a

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

@@ -17,7 +17,9 @@ var _SpoPageAddCommand_instances, _SpoPageAddCommand_initTelemetry, _SpoPageAddC
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+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");
 const Page_1 = require("./Page");
@@ -35,242 +37,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 = urlUtil_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 spo_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 +224,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() {
@@ -319,7 +298,7 @@ _SpoPageAddCommand_instances = new WeakSet(), _SpoPageAddCommand_initTelemetry =
     });
 }, _SpoPageAddCommand_initValidators = function _SpoPageAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }