@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7920dfd

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

@@ -17,10 +17,16 @@ var _SpoPageSetCommand_instances, _SpoPageSetCommand_initTelemetry, _SpoPageSetC
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+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");
+const spoFileGetCommand = require("../file/file-get");
+const spoListItemSetCommand = require("../listitem/listitem-set");
+const Cli_1 = require("../../../../cli/Cli");
 class SpoPageSetCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -35,261 +41,263 @@ class SpoPageSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Updates modern page properties';
     }
-    commandAction(logger, args, cb) {
-        const resource = Auth_1.Auth.getResourceFromUrl(args.options.webUrl);
-        let requestDigest = '';
-        let pageName = args.options.name;
-        const fileNameWithoutExtension = pageName.replace('.aspx', '');
-        let bannerImageUrl = '';
-        let canvasContent1 = '';
-        let layoutWebpartsContent = '';
-        let pageTitle = args.options.title || "";
-        let pageId = null;
-        let pageDescription = args.options.description || "";
-        let topicHeader = "";
-        let authorByline = [];
-        const pageData = {};
-        if (!pageName.endsWith('.aspx')) {
-            pageName += '.aspx';
-        }
-        const serverRelativeFileUrl = `${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}`;
-        const needsToSavePage = !!args.options.title || !!args.options.description;
-        utils_1.spo
-            .getRequestDigest(args.options.webUrl)
-            .then((res) => {
-            requestDigest = res.FormDigestValue;
-            return Page_1.Page.checkout(args.options.name, args.options.webUrl, logger, this.debug, this.verbose);
-        })
-            .then((res) => {
-            if (res) {
-                pageTitle = pageTitle || res.Title;
-                pageId = res.Id;
-                bannerImageUrl = res.BannerImageUrl;
-                canvasContent1 = res.CanvasContent1;
-                layoutWebpartsContent = res.LayoutWebpartsContent;
-                pageDescription = pageDescription || res.Description;
-                topicHeader = res.TopicHeader;
-                authorByline = res.AuthorByline;
-            }
-            if (!args.options.layoutType) {
-                return Promise.resolve();
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/ListItemAllFields`,
-                headers: {
-                    'X-RequestDigest': requestDigest,
-                    'content-type': 'application/json;odata=nometadata',
-                    'X-HTTP-Method': 'MERGE',
-                    'IF-MATCH': '*',
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: {
-                    PageLayoutType: args.options.layoutType
-                },
-                responseType: 'json'
-            };
-            if (args.options.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(() => {
-            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 = {
-                        '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/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/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/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/ListItemAllFields`;
-                    requestOptions.headers = {
-                        'X-RequestDigest': requestDigest,
-                        'content-type': 'application/json;odata=nometadata',
-                        accept: 'application/json;odata=nometadata'
-                    };
-                    break;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const resource = Auth_1.Auth.getResourceFromUrl(args.options.webUrl);
+            let pageName = args.options.name;
+            const fileNameWithoutExtension = pageName.replace('.aspx', '');
+            let bannerImageUrl = '';
+            let canvasContent1 = '';
+            let layoutWebpartsContent = '';
+            let pageTitle = args.options.title || "";
+            let pageId = null;
+            let pageDescription = args.options.description || "";
+            let topicHeader = "";
+            let authorByline = [];
+            const pageData = {};
+            if (!pageName.endsWith('.aspx')) {
+                pageName += '.aspx';
             }
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            if (args.options.promoteAs !== 'Template') {
-                return Promise.resolve({ Id: null, BannerImageUrl: '', CanvasContent1: '', LayoutWebpartsContent: '' });
-            }
-            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') {
-                if (pageTitle) {
-                    pageData.Title = pageTitle;
-                }
-                if (pageDescription) {
-                    pageData.Description = pageDescription;
-                }
-                if (bannerImageUrl) {
-                    pageData.BannerImageUrl = bannerImageUrl;
-                }
-                if (canvasContent1) {
-                    pageData.CanvasContent1 = canvasContent1;
-                }
-                if (layoutWebpartsContent) {
-                    pageData.LayoutWebpartsContent = layoutWebpartsContent;
+            const listServerRelativeUrl = `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages`;
+            const serverRelativeFileUrl = `${listServerRelativeUrl}/${pageName}`;
+            const needsToSavePage = !!args.options.title || !!args.options.description;
+            try {
+                const requestDigestResult = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                const requestDigest = requestDigestResult.FormDigestValue;
+                const page = yield Page_1.Page.checkout(args.options.name, args.options.webUrl, logger, this.debug, this.verbose);
+                if (page) {
+                    pageTitle = pageTitle || page.Title;
+                    pageId = page.Id;
+                    bannerImageUrl = page.BannerImageUrl;
+                    canvasContent1 = page.CanvasContent1;
+                    layoutWebpartsContent = page.LayoutWebpartsContent;
+                    pageDescription = pageDescription || page.Description;
+                    topicHeader = page.TopicHeader;
+                    authorByline = page.AuthorByline;
                 }
-                if (topicHeader) {
-                    pageData.TopicHeader = topicHeader;
+                if (args.options.layoutType) {
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/ListItemAllFields`,
+                        headers: {
+                            'X-RequestDigest': requestDigest,
+                            'content-type': 'application/json;odata=nometadata',
+                            'X-HTTP-Method': 'MERGE',
+                            'IF-MATCH': '*',
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        data: {
+                            PageLayoutType: args.options.layoutType
+                        },
+                        responseType: 'json'
+                    };
+                    if (args.options.layoutType === 'Article') {
+                        requestOptions.data.PromotedState = 0;
+                        requestOptions.data.BannerImageUrl = {
+                            Description: '/_layouts/15/images/sitepagethumbnail.png',
+                            Url: `${resource}/_layouts/15/images/sitepagethumbnail.png`
+                        };
+                    }
+                    yield request_1.default.post(requestOptions);
                 }
-                if (authorByline) {
-                    pageData.AuthorByline = authorByline;
+                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/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/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/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/ListItemAllFields`;
+                            requestOptions.headers = {
+                                'X-RequestDigest': requestDigest,
+                                'content-type': 'application/json;odata=nometadata',
+                                accept: 'application/json;odata=nometadata'
+                            };
+                            break;
+                    }
+                    const pageRes = yield request_1.default.post(requestOptions);
+                    if (args.options.promoteAs === 'Template') {
+                        const requestOptions = {
+                            responseType: 'json',
+                            url: `${args.options.webUrl}/_api/SitePages/Pages(${pageRes.Id})/SavePageAsTemplate`,
+                            headers: {
+                                'X-RequestDigest': requestDigest,
+                                'content-type': 'application/json;odata=nometadata',
+                                'X-HTTP-Method': 'POST',
+                                'IF-MATCH': '*',
+                                accept: 'application/json;odata=nometadata'
+                            }
+                        };
+                        const res = yield request_1.default.post(requestOptions);
+                        if (fileNameWithoutExtension) {
+                            pageData.Title = fileNameWithoutExtension;
+                        }
+                        if (pageDescription) {
+                            pageData.Description = pageDescription;
+                        }
+                        if (res.BannerImageUrl) {
+                            pageData.BannerImageUrl = res.BannerImageUrl;
+                        }
+                        if (res.LayoutWebpartsContent) {
+                            pageData.LayoutWebpartsContent = res.LayoutWebpartsContent;
+                        }
+                        if (res.CanvasContent1) {
+                            pageData.CanvasContent1 = res.CanvasContent1;
+                        }
+                        pageId = res.Id;
+                    }
                 }
-                // Needs to be at the end, as the data is still needed in the last step
-                if (!needsToSavePage) {
-                    return Promise.resolve();
+                if (args.options.promoteAs !== 'Template') {
+                    if (pageTitle) {
+                        pageData.Title = pageTitle;
+                    }
+                    if (pageDescription) {
+                        pageData.Description = pageDescription;
+                    }
+                    if (bannerImageUrl) {
+                        pageData.BannerImageUrl = bannerImageUrl;
+                    }
+                    if (canvasContent1) {
+                        pageData.CanvasContent1 = canvasContent1;
+                    }
+                    if (layoutWebpartsContent) {
+                        pageData.LayoutWebpartsContent = layoutWebpartsContent;
+                    }
+                    if (topicHeader) {
+                        pageData.TopicHeader = topicHeader;
+                    }
+                    if (authorByline) {
+                        pageData.AuthorByline = authorByline;
+                    }
                 }
-            }
-            else {
-                if (fileNameWithoutExtension) {
-                    pageData.Title = fileNameWithoutExtension;
+                if (needsToSavePage) {
+                    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: pageData
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                if (pageDescription) {
-                    pageData.Description = pageDescription;
+                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: pageData
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                if (res.BannerImageUrl) {
-                    pageData.BannerImageUrl = res.BannerImageUrl;
+                if (typeof args.options.commentsEnabled !== 'undefined') {
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/ListItemAllFields/SetCommentsDisabled(${args.options.commentsEnabled === 'false'})`,
+                        headers: {
+                            'X-RequestDigest': requestDigest,
+                            'content-type': 'application/json;odata=nometadata',
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                if (res.LayoutWebpartsContent) {
-                    pageData.LayoutWebpartsContent = res.LayoutWebpartsContent;
+                if (args.options.demoteFrom === 'NewsPage') {
+                    const fileGetOptions = {
+                        webUrl: args.options.webUrl,
+                        url: serverRelativeFileUrl,
+                        asListItem: true,
+                        verbose: this.verbose,
+                        debug: this.debug
+                    };
+                    const fileGetOutput = yield Cli_1.Cli.executeCommandWithOutput(spoFileGetCommand, { options: Object.assign(Object.assign({}, fileGetOptions), { _: [] }) });
+                    const fileGetOutputJson = JSON.parse(fileGetOutput.stdout);
+                    const listItemSetOptions = {
+                        webUrl: args.options.webUrl,
+                        listUrl: listServerRelativeUrl,
+                        id: fileGetOutputJson.Id,
+                        systemUpdate: true,
+                        PromotedState: 0,
+                        verbose: this.verbose,
+                        debug: this.debug
+                    };
+                    yield Cli_1.Cli.executeCommandWithOutput(spoListItemSetCommand, { options: Object.assign(Object.assign({}, listItemSetOptions), { _: [] }) });
                 }
-                if (res.CanvasContent1) {
-                    pageData.CanvasContent1 = res.CanvasContent1;
+                let requestOptions;
+                if (!args.options.publish) {
+                    if (args.options.promoteAs === 'Template' || !pageId) {
+                        return;
+                    }
+                    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: pageData
+                    };
                 }
-                pageId = res.Id;
-            }
-            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: pageData
-            };
-            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: pageData
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(() => {
-            if (typeof args.options.commentsEnabled === 'undefined') {
-                return Promise.resolve();
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/ListItemAllFields/SetCommentsDisabled(${args.options.commentsEnabled === 'false'})`,
-                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();
+                else {
+                    requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${formatting_1.formatting.encodeQueryParameter(args.options.publishMessage || '')}'&@a2=1`,
+                        headers: {
+                            'X-RequestDigest': requestDigest,
+                            'content-type': 'application/json;odata=nometadata',
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
                 }
-                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: pageData
-                };
+                yield request_1.default.post(requestOptions);
             }
-            else {
-                requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/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'
-                };
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry = function _SpoPageSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            layoutType: args.options.layoutType,
-            promoteAs: args.options.promoteAs,
+            layoutType: args.options.layoutType || false,
+            promoteAs: args.options.promoteAs || false,
+            demotefrom: args.options.demoteFrom || false,
             commentsEnabled: args.options.commentsEnabled || false,
             publish: args.options.publish || false,
             publishMessage: typeof args.options.publishMessage !== 'undefined',
@@ -308,6 +316,9 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
     }, {
         option: '-p, --promoteAs [promoteAs]',
         autocomplete: Page_1.supportedPromoteAs
+    }, {
+        option: '--demoteFrom [demoteFrom]',
+        autocomplete: ['NewsPage']
     }, {
         option: '--commentsEnabled [commentsEnabled]',
         autocomplete: ['true', 'false']
@@ -322,7 +333,7 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
     });
 }, _SpoPageSetCommand_initValidators = function _SpoPageSetCommand_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;
         }
@@ -334,6 +345,10 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
             Page_1.supportedPromoteAs.indexOf(args.options.promoteAs) < 0) {
             return `${args.options.promoteAs} is not a valid option for promoteAs. Allowed values ${Page_1.supportedPromoteAs.join(', ')}`;
         }
+        if (args.options.demoteFrom &&
+            args.options.demoteFrom !== 'NewsPage') {
+            return `${args.options.demoteFrom} is not a valid option for demoteFrom. The only allowed value is 'NewsPage'`;
+        }
         if (args.options.promoteAs === 'HomePage' && args.options.layoutType !== 'Home') {
             return 'You can only promote home pages as site home page';
         }

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

@@ -15,8 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageTemplateListCommand_instances, _SpoPageTemplateListCommand_initOptions, _SpoPageTemplateListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoPageTemplateListCommand extends SpoCommand_1.default {
@@ -35,33 +35,25 @@ class SpoPageTemplateListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Title', 'FileName', 'Id', 'PageLayoutType', 'Url'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving templates...`);
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/sitepages/pages/templates`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res.value && res.value.length > 0) {
-                logger.log(res.value);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving templates...`);
             }
-            cb();
-        })
-            .catch((err) => {
-            // The API returns a 404 when no templates are created on the site collection
-            if (err && err.response && err.response.status && err.response.status === 404) {
-                logger.log([]);
-                cb();
-                return;
+            try {
+                const res = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/sitepages/pages/templates`);
+                if (res && res.length > 0) {
+                    logger.log(res);
+                }
+            }
+            catch (err) {
+                // The API returns a 404 when no templates are created on the site collection
+                if (err && err.response && err.response.status && err.response.status === 404) {
+                    logger.log([]);
+                    return;
+                }
+                return this.handleRejectedODataJsonPromise(err);
             }
-            return this.handleRejectedODataJsonPromise(err, logger, cb);
         });
     }
 }
@@ -70,7 +62,7 @@ _SpoPageTemplateListCommand_instances = new WeakSet(), _SpoPageTemplateListComma
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoPageTemplateListCommand_initValidators = function _SpoPageTemplateListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoPageTemplateListCommand();
 //# sourceMappingURL=page-template-list.js.map