@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

package/dist/m365/spo/commands/page/page-header-set.js

@@ -36,254 +36,250 @@ class SpoPageHeaderSetCommand extends SpoCommand_1.default {
     getExcludedOptionsWithUrls() {
         return ['imageUrl'];
     }
-    commandAction(logger, args, cb) {
-        const noPageHeader = {
-            "id": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
-            "instanceId": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
-            "title": "Title Region",
-            "description": "Title Region Description",
-            "serverProcessedContent": {
-                "htmlStrings": {},
-                "searchablePlainTexts": {},
-                "imageSources": {},
-                "links": {}
-            },
-            "dataVersion": "1.4",
-            "properties": {
-                "title": "",
-                "imageSourceType": 4,
-                "layoutType": "NoImage",
-                "textAlignment": "Left",
-                "showTopicHeader": false,
-                "showPublishDate": false,
-                "topicHeader": ""
-            }
-        };
-        const defaultPageHeader = {
-            "id": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
-            "instanceId": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
-            "title": "Title Region",
-            "description": "Title Region Description",
-            "serverProcessedContent": {
-                "htmlStrings": {},
-                "searchablePlainTexts": {},
-                "imageSources": {},
-                "links": {}
-            },
-            "dataVersion": "1.4",
-            "properties": {
-                "title": "",
-                "imageSourceType": 4,
-                "layoutType": "FullWidthImage",
-                "textAlignment": "Left",
-                "showTopicHeader": false,
-                "showPublishDate": false,
-                "topicHeader": ""
-            }
-        };
-        const customPageHeader = {
-            "id": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
-            "instanceId": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
-            "title": "Title Region",
-            "description": "Title Region Description",
-            "serverProcessedContent": {
-                "htmlStrings": {},
-                "searchablePlainTexts": {},
-                "imageSources": {
-                    "imageSource": ""
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const noPageHeader = {
+                "id": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
+                "instanceId": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
+                "title": "Title Region",
+                "description": "Title Region Description",
+                "serverProcessedContent": {
+                    "htmlStrings": {},
+                    "searchablePlainTexts": {},
+                    "imageSources": {},
+                    "links": {}
+                },
+                "dataVersion": "1.4",
+                "properties": {
+                    "title": "",
+                    "imageSourceType": 4,
+                    "layoutType": "NoImage",
+                    "textAlignment": "Left",
+                    "showTopicHeader": false,
+                    "showPublishDate": false,
+                    "topicHeader": ""
+                }
+            };
+            const defaultPageHeader = {
+                "id": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
+                "instanceId": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
+                "title": "Title Region",
+                "description": "Title Region Description",
+                "serverProcessedContent": {
+                    "htmlStrings": {},
+                    "searchablePlainTexts": {},
+                    "imageSources": {},
+                    "links": {}
                 },
-                "links": {},
-                "customMetadata": {
-                    "imageSource": {
-                        "siteId": "",
-                        "webId": "",
-                        "listId": "",
-                        "uniqueId": ""
+                "dataVersion": "1.4",
+                "properties": {
+                    "title": "",
+                    "imageSourceType": 4,
+                    "layoutType": "FullWidthImage",
+                    "textAlignment": "Left",
+                    "showTopicHeader": false,
+                    "showPublishDate": false,
+                    "topicHeader": ""
+                }
+            };
+            const customPageHeader = {
+                "id": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
+                "instanceId": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
+                "title": "Title Region",
+                "description": "Title Region Description",
+                "serverProcessedContent": {
+                    "htmlStrings": {},
+                    "searchablePlainTexts": {},
+                    "imageSources": {
+                        "imageSource": ""
+                    },
+                    "links": {},
+                    "customMetadata": {
+                        "imageSource": {
+                            "siteId": "",
+                            "webId": "",
+                            "listId": "",
+                            "uniqueId": ""
+                        }
                     }
+                },
+                "dataVersion": "1.4",
+                "properties": {
+                    "title": "",
+                    "imageSourceType": 2,
+                    "layoutType": "FullWidthImage",
+                    "textAlignment": "Left",
+                    "showTopicHeader": false,
+                    "showPublishDate": false,
+                    "topicHeader": "",
+                    "authors": [],
+                    "altText": "",
+                    "webId": "",
+                    "siteId": "",
+                    "listId": "",
+                    "uniqueId": "",
+                    "translateX": 0,
+                    "translateY": 0
                 }
-            },
-            "dataVersion": "1.4",
-            "properties": {
-                "title": "",
-                "imageSourceType": 2,
-                "layoutType": "FullWidthImage",
-                "textAlignment": "Left",
-                "showTopicHeader": false,
-                "showPublishDate": false,
-                "topicHeader": "",
-                "authors": [],
-                "altText": "",
-                "webId": "",
-                "siteId": "",
-                "listId": "",
-                "uniqueId": "",
-                "translateX": 0,
-                "translateY": 0
+            };
+            let header = defaultPageHeader;
+            let pageFullName = args.options.pageName.toLowerCase();
+            if (pageFullName.indexOf('.aspx') < 0) {
+                pageFullName += '.aspx';
             }
-        };
-        let header = defaultPageHeader;
-        let pageFullName = args.options.pageName.toLowerCase();
-        if (pageFullName.indexOf('.aspx') < 0) {
-            pageFullName += '.aspx';
-        }
-        let canvasContent = "";
-        let bannerImageUrl = "";
-        let description = "";
-        let title = "";
-        let authorByline = args.options.authors ? args.options.authors.split(',').map(a => a.trim()) : [];
-        let topicHeader = args.options.topicHeader || "";
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information about the page...`);
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')?$select=IsPageCheckedOutToCurrentUser,Title`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            title = res.Title;
-            if (res.IsPageCheckedOutToCurrentUser) {
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')?$expand=ListItemAllFields`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.get(requestOptions);
+            let canvasContent = "";
+            let bannerImageUrl = "";
+            let description = "";
+            let title = "";
+            let authorByline = args.options.authors ? args.options.authors.split(',').map(a => a.trim()) : [];
+            let topicHeader = args.options.topicHeader || "";
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about the page...`);
             }
-            else {
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/checkoutpage`,
+            try {
+                let requestOptions = {
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')?$select=IsPageCheckedOutToCurrentUser,Title`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
                     responseType: 'json'
                 };
-                return request_1.default.post(requestOptions);
-            }
-        })
-            .then((pageData) => {
-            switch (args.options.type) {
-                case 'None':
-                    header = noPageHeader;
-                    break;
-                case 'Default':
-                    header = defaultPageHeader;
-                    break;
-                case 'Custom':
-                    header = customPageHeader;
-                    break;
-                default:
-                    header = defaultPageHeader;
-            }
-            if (pageData) {
-                canvasContent = pageData.CanvasContent1;
-                authorByline = authorByline.length > 0 ? authorByline : pageData.AuthorByline;
-                bannerImageUrl = pageData.BannerImageUrl;
-                description = pageData.Description;
-                title = pageData.Title;
-                topicHeader = topicHeader || pageData.TopicHeader || "";
-            }
-            header.properties.title = title;
-            header.properties.textAlignment = args.options.textAlignment || 'Left';
-            header.properties.showTopicHeader = args.options.showTopicHeader || false;
-            header.properties.topicHeader = args.options.topicHeader || '';
-            header.properties.showPublishDate = args.options.showPublishDate || false;
-            if (args.options.type !== 'None') {
-                header.properties.layoutType = args.options.layout || 'FullWidthImage';
-            }
-            if (args.options.type === 'Custom') {
-                header.serverProcessedContent.imageSources = {
-                    imageSource: args.options.imageUrl || ''
-                };
-                const properties = header.properties;
-                properties.altText = args.options.altText || '';
-                properties.translateX = args.options.translateX || 0;
-                properties.translateY = args.options.translateY || 0;
-                header.properties = properties;
-                if (!args.options.imageUrl) {
-                    header.serverProcessedContent.customMetadata = {
-                        imageSource: {
-                            siteId: '',
-                            webId: '',
-                            listId: '',
-                            uniqueId: ''
-                        }
+                const page = yield request_1.default.get(requestOptions);
+                title = page.Title;
+                let pageData;
+                if (page.IsPageCheckedOutToCurrentUser) {
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')?$expand=ListItemAllFields`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
                     };
-                    properties.listId = '';
-                    properties.siteId = '';
-                    properties.uniqueId = '';
-                    properties.webId = '';
-                    header.properties = properties;
-                    return Promise.resolve();
+                    pageData = yield request_1.default.get(requestOptions);
                 }
-                return Promise.all([
-                    this.getSiteId(args.options.webUrl, this.verbose, logger),
-                    this.getWebId(args.options.webUrl, this.verbose, logger),
-                    this.getImageInfo(args.options.webUrl, args.options.imageUrl, this.verbose, logger)
-                ]);
-            }
-            else {
-                return Promise.resolve();
-            }
-        })
-            .then((res) => {
-            if (res) {
-                header.serverProcessedContent.customMetadata = {
-                    imageSource: {
-                        siteId: res[0].Id,
-                        webId: res[1].Id,
-                        listId: res[2].ListId,
-                        uniqueId: res[2].UniqueId
+                else {
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/checkoutpage`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    pageData = yield request_1.default.post(requestOptions);
+                }
+                switch (args.options.type) {
+                    case 'None':
+                        header = noPageHeader;
+                        break;
+                    case 'Default':
+                        header = defaultPageHeader;
+                        break;
+                    case 'Custom':
+                        header = customPageHeader;
+                        break;
+                    default:
+                        header = defaultPageHeader;
+                }
+                if (pageData) {
+                    canvasContent = pageData.CanvasContent1;
+                    authorByline = authorByline.length > 0 ? authorByline : pageData.AuthorByline;
+                    bannerImageUrl = pageData.BannerImageUrl;
+                    description = pageData.Description;
+                    title = pageData.Title;
+                    topicHeader = topicHeader || pageData.TopicHeader || "";
+                }
+                header.properties.title = title;
+                header.properties.textAlignment = args.options.textAlignment || 'Left';
+                header.properties.showTopicHeader = args.options.showTopicHeader || false;
+                header.properties.topicHeader = args.options.topicHeader || '';
+                header.properties.showPublishDate = args.options.showPublishDate || false;
+                if (args.options.type !== 'None') {
+                    header.properties.layoutType = args.options.layout || 'FullWidthImage';
+                }
+                if (args.options.type === 'Custom') {
+                    header.serverProcessedContent.imageSources = {
+                        imageSource: args.options.imageUrl || ''
+                    };
+                    const properties = header.properties;
+                    properties.altText = args.options.altText || '';
+                    properties.translateX = args.options.translateX || 0;
+                    properties.translateY = args.options.translateY || 0;
+                    header.properties = properties;
+                    if (!args.options.imageUrl) {
+                        header.serverProcessedContent.customMetadata = {
+                            imageSource: {
+                                siteId: '',
+                                webId: '',
+                                listId: '',
+                                uniqueId: ''
+                            }
+                        };
+                        properties.listId = '';
+                        properties.siteId = '';
+                        properties.uniqueId = '';
+                        properties.webId = '';
+                        header.properties = properties;
+                    }
+                    else {
+                        const res = yield Promise.all([
+                            this.getSiteId(args.options.webUrl, this.verbose, logger),
+                            this.getWebId(args.options.webUrl, this.verbose, logger),
+                            this.getImageInfo(args.options.webUrl, args.options.imageUrl, this.verbose, logger)
+                        ]);
+                        header.serverProcessedContent.customMetadata = {
+                            imageSource: {
+                                siteId: res[0].Id,
+                                webId: res[1].Id,
+                                listId: res[2].ListId,
+                                uniqueId: res[2].UniqueId
+                            }
+                        };
+                        const properties = header.properties;
+                        properties.listId = res[2].ListId;
+                        properties.siteId = res[0].Id;
+                        properties.uniqueId = res[2].UniqueId;
+                        properties.webId = res[1].Id;
+                        header.properties = properties;
                     }
+                }
+                const requestBody = {
+                    LayoutWebpartsContent: JSON.stringify([header])
                 };
-                const properties = header.properties;
-                properties.listId = res[2].ListId;
-                properties.siteId = res[0].Id;
-                properties.uniqueId = res[2].UniqueId;
-                properties.webId = res[1].Id;
-                header.properties = properties;
-            }
-            const pageData = {
-                LayoutWebpartsContent: JSON.stringify([header])
-            };
-            if (title) {
-                pageData.Title = title;
-            }
-            if (topicHeader) {
-                pageData.TopicHeader = topicHeader;
-            }
-            if (description) {
-                pageData.Description = description;
-            }
-            if (authorByline) {
-                pageData.AuthorByline = authorByline;
-            }
-            if (bannerImageUrl) {
-                pageData.BannerImageUrl = bannerImageUrl;
+                if (title) {
+                    requestBody.Title = title;
+                }
+                if (topicHeader) {
+                    requestBody.TopicHeader = topicHeader;
+                }
+                if (description) {
+                    requestBody.Description = description;
+                }
+                if (authorByline) {
+                    requestBody.AuthorByline = authorByline;
+                }
+                if (bannerImageUrl) {
+                    requestBody.BannerImageUrl = bannerImageUrl;
+                }
+                if (canvasContent) {
+                    requestBody.CanvasContent1 = canvasContent;
+                }
+                requestOptions = {
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/SavePageAsDraft`,
+                    headers: {
+                        'X-HTTP-Method': 'MERGE',
+                        'IF-MATCH': '*',
+                        'content-type': 'application/json;odata=nometadata',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    data: requestBody,
+                    responseType: 'json'
+                };
+                return request_1.default.post(requestOptions);
             }
-            if (canvasContent) {
-                pageData.CanvasContent1 = canvasContent;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/SavePageAsDraft`,
-                headers: {
-                    'X-HTTP-Method': 'MERGE',
-                    'IF-MATCH': '*',
-                    'content-type': 'application/json;odata=nometadata',
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: pageData,
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getSiteId(siteUrl, verbose, logger) {
         if (verbose) {

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

@@ -35,47 +35,48 @@ class SpoPageListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Name', 'Title'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving client-side pages...`);
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/sitepages/pages?$orderby=Title`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        let pages = [];
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/lists/SitePages/rootfolder/files?$expand=ListItemAllFields/ClientSideApplicationId&$orderby=Name`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            if (res.value && res.value.length > 0) {
-                pages = res.value;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving client-side pages...`);
+                }
+                let requestOptions = {
+                    url: `${args.options.webUrl}/_api/sitepages/pages?$orderby=Title`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                let pages = [];
+                const pagesList = yield request_1.default.get(requestOptions);
+                requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/lists/SitePages/rootfolder/files?$expand=ListItemAllFields/ClientSideApplicationId&$orderby=Name`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                if (pagesList.value && pagesList.value.length > 0) {
+                    pages = pagesList.value;
+                }
+                const res = yield request_1.default.get(requestOptions);
+                if (res.value && res.value.length > 0) {
+                    const clientSidePages = res.value.filter(p => p.ListItemAllFields.ClientSideApplicationId === 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec');
+                    pages = pages.map(p => {
+                        const clientSidePage = clientSidePages.find(cp => cp && cp.ListItemAllFields && cp.ListItemAllFields.Id === p.Id);
+                        if (clientSidePage) {
+                            return Object.assign(Object.assign({}, clientSidePage), p);
+                        }
+                        return p;
+                    });
+                    logger.log(pages);
+                }
             }
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (res.value && res.value.length > 0) {
-                const clientSidePages = res.value.filter(p => p.ListItemAllFields.ClientSideApplicationId === 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec');
-                pages = pages.map(p => {
-                    const clientSidePage = clientSidePages.find(cp => cp && cp.ListItemAllFields && cp.ListItemAllFields.Id === p.Id);
-                    if (clientSidePage) {
-                        return Object.assign(Object.assign({}, clientSidePage), p);
-                    }
-                    return p;
-                });
-                logger.log(pages);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoPageListCommand_instances = new WeakSet(), _SpoPageListCommand_initOptions = function _SpoPageListCommand_initOptions() {