@pnp/cli-microsoft365 6.1.0-beta.3e0114a → 6.1.0-beta.539ef23

package/dist/m365/spo/commands/list/{list-label-get.js → list-retentionlabel-get.js}

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoListLabelGetCommand_instances, _SpoListLabelGetCommand_initTelemetry, _SpoListLabelGetCommand_initOptions, _SpoListLabelGetCommand_initValidators, _SpoListLabelGetCommand_initOptionSets;
+var _SpoListRetentionLabelGetCommand_instances, _SpoListRetentionLabelGetCommand_initTelemetry, _SpoListRetentionLabelGetCommand_initOptions, _SpoListRetentionLabelGetCommand_initValidators, _SpoListRetentionLabelGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -21,23 +21,27 @@ const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoListLabelGetCommand extends SpoCommand_1.default {
+class SpoListRetentionLabelGetCommand extends SpoCommand_1.default {
     get name() {
-        return commands_1.default.LIST_LABEL_GET;
+        return commands_1.default.LIST_RETENTIONLABEL_GET;
+    }
+    alias() {
+        return [commands_1.default.LIST_LABEL_GET];
     }
     get description() {
-        return 'Gets label set on the specified list';
+        return 'Gets the default retention label set on the specified list or library.';
     }
     constructor() {
         super();
-        _SpoListLabelGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoListLabelGetCommand_instances, "m", _SpoListLabelGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoListLabelGetCommand_instances, "m", _SpoListLabelGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoListLabelGetCommand_instances, "m", _SpoListLabelGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoListLabelGetCommand_instances, "m", _SpoListLabelGetCommand_initOptionSets).call(this);
+        _SpoListRetentionLabelGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelGetCommand_instances, "m", _SpoListRetentionLabelGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelGetCommand_instances, "m", _SpoListRetentionLabelGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelGetCommand_instances, "m", _SpoListRetentionLabelGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelGetCommand_instances, "m", _SpoListRetentionLabelGetCommand_initOptionSets).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.showDeprecationWarning(logger, commands_1.default.LIST_LABEL_GET, commands_1.default.LIST_RETENTIONLABEL_GET);
             try {
                 if (this.verbose) {
                     logger.logToStderr(`Getting label set on the list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site at ${args.options.webUrl}...`);
@@ -96,7 +100,7 @@ class SpoListLabelGetCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoListLabelGetCommand_instances = new WeakSet(), _SpoListLabelGetCommand_initTelemetry = function _SpoListLabelGetCommand_initTelemetry() {
+_SpoListRetentionLabelGetCommand_instances = new WeakSet(), _SpoListRetentionLabelGetCommand_initTelemetry = function _SpoListRetentionLabelGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: (!(!args.options.listId)).toString(),
@@ -104,7 +108,7 @@ _SpoListLabelGetCommand_instances = new WeakSet(), _SpoListLabelGetCommand_initT
             listUrl: (!(!args.options.listUrl)).toString()
         });
     });
-}, _SpoListLabelGetCommand_initOptions = function _SpoListLabelGetCommand_initOptions() {
+}, _SpoListRetentionLabelGetCommand_initOptions = function _SpoListRetentionLabelGetCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
@@ -114,7 +118,7 @@ _SpoListLabelGetCommand_instances = new WeakSet(), _SpoListLabelGetCommand_initT
     }, {
         option: '--listUrl [listUrl]'
     });
-}, _SpoListLabelGetCommand_initValidators = function _SpoListLabelGetCommand_initValidators() {
+}, _SpoListRetentionLabelGetCommand_initValidators = function _SpoListRetentionLabelGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
@@ -127,8 +131,8 @@ _SpoListLabelGetCommand_instances = new WeakSet(), _SpoListLabelGetCommand_initT
         }
         return true;
     }));
-}, _SpoListLabelGetCommand_initOptionSets = function _SpoListLabelGetCommand_initOptionSets() {
+}, _SpoListRetentionLabelGetCommand_initOptionSets = function _SpoListRetentionLabelGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
-module.exports = new SpoListLabelGetCommand();
-//# sourceMappingURL=list-label-get.js.map
+module.exports = new SpoListRetentionLabelGetCommand();
+//# sourceMappingURL=list-retentionlabel-get.js.map

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

@@ -41,7 +41,7 @@ class SpoListItemRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeListItem = () => __awaiter(this, void 0, void 0, function* () {
                 if (this.verbose) {
-                    logger.logToStderr(`Removing list from list ${args.options.listId || args.options.listTitle || args.options.listUrl} item in site at ${args.options.webUrl}...`);
+                    logger.logToStderr(`Removing list item ${args.options.id} from list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site at ${args.options.webUrl}...`);
                 }
                 let requestUrl = `${args.options.webUrl}/_api/web`;
                 if (args.options.listId) {

package/dist/m365/spo/commands/listitem/listitem-retentionlabel-remove.js

@@ -0,0 +1,143 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoListItemRetentionLabelRemoveCommand_instances, _SpoListItemRetentionLabelRemoveCommand_initTelemetry, _SpoListItemRetentionLabelRemoveCommand_initOptions, _SpoListItemRetentionLabelRemoveCommand_initValidators, _SpoListItemRetentionLabelRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoListItemRetentionLabelRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.LISTITEM_RETENTIONLABEL_REMOVE;
+    }
+    get description() {
+        return 'Clear the retention label from a list item';
+    }
+    constructor() {
+        super();
+        _SpoListItemRetentionLabelRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListItemRetentionLabelRemoveCommand_instances, "m", _SpoListItemRetentionLabelRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRetentionLabelRemoveCommand_instances, "m", _SpoListItemRetentionLabelRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRetentionLabelRemoveCommand_instances, "m", _SpoListItemRetentionLabelRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRetentionLabelRemoveCommand_instances, "m", _SpoListItemRetentionLabelRemoveCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.confirm) {
+                yield this.removeListItemRetentionLabel(logger, args);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the retentionlabel from list item ${args.options.listItemId} from list ${args.options.listId || args.options.listTitle || args.options.listUrl} located in site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield this.removeListItemRetentionLabel(logger, args);
+                }
+            }
+        });
+    }
+    removeListItemRetentionLabel(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing retention label from list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site at ${args.options.webUrl}...`);
+            }
+            try {
+                let url = `${args.options.webUrl}/_api/web`;
+                if (args.options.listId) {
+                    url += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/items(${args.options.listItemId})/SetComplianceTag()`;
+                }
+                else if (args.options.listTitle) {
+                    url += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/items(${args.options.listItemId})/SetComplianceTag()`;
+                }
+                else {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    url += `/GetList(@a1)/items(@a2)/SetComplianceTag()?@a1='${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}'&@a2='${args.options.listItemId}'`;
+                }
+                const requestBody = {
+                    "complianceTag": "",
+                    "isTagPolicyHold": false,
+                    "isTagPolicyRecord": false,
+                    "isEventBasedTag": false,
+                    "isTagSuperLock": false,
+                    "isUnlockedAsDefault": false
+                };
+                const requestOptions = {
+                    url: url,
+                    method: 'POST',
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    data: requestBody,
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoListItemRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoListItemRetentionLabelRemoveCommand_initTelemetry = function _SpoListItemRetentionLabelRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoListItemRetentionLabelRemoveCommand_initOptions = function _SpoListItemRetentionLabelRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-i, --listItemId <listItemId>'
+    }, {
+        option: '-l, --listId [listId]'
+    }, {
+        option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoListItemRetentionLabelRemoveCommand_initValidators = function _SpoListItemRetentionLabelRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const id = parseInt(args.options.listItemId);
+        if (isNaN(id)) {
+            return `${args.options.listItemId} is not a valid list item ID`;
+        }
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.listId &&
+            !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoListItemRetentionLabelRemoveCommand_initOptionSets = function _SpoListItemRetentionLabelRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+};
+module.exports = new SpoListItemRetentionLabelRemoveCommand();
+//# sourceMappingURL=listitem-retentionlabel-remove.js.map

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

@@ -24,6 +24,9 @@ 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 SpoPageAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.PAGE_ADD;
@@ -52,12 +55,14 @@ class SpoPageAddCommand extends SpoCommand_1.default {
             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 || "";
+            if (!pageName.endsWith('.aspx')) {
+                pageName += '.aspx';
+            }
+            const listServerRelativeUrl = `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages`;
+            const serverRelativeFileUrl = `${listServerRelativeUrl}/${pageName}`;
             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: {
@@ -73,32 +78,25 @@ class SpoPageAddCommand extends SpoCommand_1.default {
                 };
                 const template = yield request_1.default.post(requestOptions);
                 itemId = template.UniqueId;
+                const listItemId = yield this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
                 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'
+                const listItemSetOptions = {
+                    webUrl: args.options.webUrl,
+                    listUrl: listServerRelativeUrl,
+                    id: listItemId,
+                    systemUpdate: true,
+                    ContentTypeId: '0x0101009D1CB255DA76424F860D91F20E6C4118',
+                    Title: pageTitle,
+                    ClientSideApplicationId: 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec',
+                    PageLayoutType: layoutType,
+                    verbose: this.verbose,
+                    debug: this.debug
                 };
-                if (layoutType === 'Article') {
-                    requestOptions.data.PromotedState = 0;
-                    requestOptions.data.BannerImageUrl = {
-                        Description: '/_layouts/15/images/sitepagethumbnail.png',
-                        Url: `${resource}/_layouts/15/images/sitepagethumbnail.png`
-                    };
+                if (args.options.layoutType === 'Article') {
+                    listItemSetOptions.PromotedState = 0;
+                    listItemSetOptions.BannerImageUrl = `${resource}/_layouts/15/images/sitepagethumbnail.png, /_layouts/15/images/sitepagethumbnail.png`;
                 }
-                yield request_1.default.post(requestOptions);
+                yield Cli_1.Cli.executeCommand(spoListItemSetCommand, { options: Object.assign(Object.assign({}, listItemSetOptions), { _: [] }) });
                 const pageProps = yield Page_1.Page.checkout(pageName, args.options.webUrl, logger, this.debug, this.verbose);
                 if (pageProps) {
                     pageId = pageProps.Id;
@@ -123,58 +121,43 @@ class SpoPageAddCommand extends SpoCommand_1.default {
                             requestOptions.data = {
                                 WelcomePage: `SitePages/${pageName}`
                             };
+                            yield request_1.default.post(requestOptions);
                             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 = {
+                            const listItemSetOptions = {
+                                webUrl: args.options.webUrl,
+                                listUrl: listServerRelativeUrl,
+                                id: listItemId,
+                                systemUpdate: true,
                                 PromotedState: 2,
-                                FirstPublishedDate: new Date().toISOString().replace('Z', '')
+                                FirstPublishedDate: new Date().toISOString(),
+                                verbose: this.verbose,
+                                debug: this.debug
                             };
+                            yield Cli_1.Cli.executeCommand(spoListItemSetCommand, { options: Object.assign(Object.assign({}, listItemSetOptions), { _: [] }) });
                             break;
                         case 'Template':
-                            requestOptions.url = `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/ListItemAllFields`;
+                            requestOptions.url = `${args.options.webUrl}/_api/SitePages/Pages(${listItemId})/SavePageAsTemplate`;
                             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: {
+                            };
+                            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})`;
+                            requestOptions.headers = {
                                 'X-RequestDigest': requestDigest,
                                 'content-type': 'application/json;odata=nometadata',
                                 accept: 'application/json;odata=nometadata'
-                            },
-                            responseType: 'json'
-                        };
-                        yield request_1.default.post(requestOptions);
+                            };
+                            yield request_1.default.post(requestOptions);
+                            break;
                     }
                 }
                 requestOptions = {
@@ -263,6 +246,20 @@ class SpoPageAddCommand extends SpoCommand_1.default {
             }
         });
     }
+    getFileListItemId(webUrl, serverRelativeFileUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const fileGetOptions = {
+                webUrl: 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);
+            return fileGetOutputJson.Id;
+        });
+    }
 }
 _SpoPageAddCommand_instances = new WeakSet(), _SpoPageAddCommand_initTelemetry = function _SpoPageAddCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -77,28 +77,21 @@ class SpoPageSetCommand extends SpoCommand_1.default {
                     authorByline = page.AuthorByline;
                 }
                 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'
+                    const itemId = yield this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+                    const listItemSetOptions = {
+                        webUrl: args.options.webUrl,
+                        listUrl: listServerRelativeUrl,
+                        id: itemId,
+                        systemUpdate: true,
+                        PageLayoutType: args.options.layoutType,
+                        verbose: this.verbose,
+                        debug: this.debug
                     };
                     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`
-                        };
+                        listItemSetOptions.PromotedState = 0;
+                        listItemSetOptions.BannerImageUrl = `${resource}/_layouts/15/images/sitepagethumbnail.png, /_layouts/15/images/sitepagethumbnail.png`;
                     }
-                    yield request_1.default.post(requestOptions);
+                    yield Cli_1.Cli.executeCommand(spoListItemSetCommand, { options: Object.assign(Object.assign({}, listItemSetOptions), { _: [] }) });
                 }
                 if (args.options.promoteAs) {
                     const requestOptions = {
@@ -117,60 +110,50 @@ class SpoPageSetCommand extends SpoCommand_1.default {
                             requestOptions.data = {
                                 WelcomePage: `SitePages/${pageName}`
                             };
+                            yield request_1.default.post(requestOptions);
                             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 = {
+                            const newsPageItemId = yield this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+                            const listItemSetOptions = {
+                                webUrl: args.options.webUrl,
+                                listUrl: listServerRelativeUrl,
+                                id: newsPageItemId,
+                                systemUpdate: true,
                                 PromotedState: 2,
-                                FirstPublishedDate: new Date().toISOString().replace('Z', '')
+                                FirstPublishedDate: new Date().toISOString(),
+                                verbose: this.verbose,
+                                debug: this.debug
                             };
+                            yield Cli_1.Cli.executeCommand(spoListItemSetCommand, { options: Object.assign(Object.assign({}, listItemSetOptions), { _: [] }) });
                             break;
                         case 'Template':
-                            requestOptions.url = `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/ListItemAllFields`;
+                            const templateItemId = yield this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
                             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'
+                            };
+                            requestOptions.url = `${args.options.webUrl}/_api/SitePages/Pages(${templateItemId})/SavePageAsTemplate`;
+                            const res = yield request_1.default.post(requestOptions);
+                            if (fileNameWithoutExtension) {
+                                pageData.Title = fileNameWithoutExtension;
+                            }
+                            if (pageDescription) {
+                                pageData.Description = pageDescription;
                             }
-                        };
-                        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;
+                            if (res.BannerImageUrl) {
+                                pageData.BannerImageUrl = res.BannerImageUrl;
+                            }
+                            if (res.LayoutWebpartsContent) {
+                                pageData.LayoutWebpartsContent = res.LayoutWebpartsContent;
+                            }
+                            if (res.CanvasContent1) {
+                                pageData.CanvasContent1 = res.CanvasContent1;
+                            }
+                            pageId = res.Id;
+                            break;
                     }
                 }
                 if (args.options.promoteAs !== 'Template') {
@@ -239,19 +222,11 @@ class SpoPageSetCommand extends SpoCommand_1.default {
                     yield request_1.default.post(requestOptions);
                 }
                 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 fileId = yield this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
                     const listItemSetOptions = {
                         webUrl: args.options.webUrl,
                         listUrl: listServerRelativeUrl,
-                        id: fileGetOutputJson.Id,
+                        id: fileId,
                         systemUpdate: true,
                         PromotedState: 0,
                         verbose: this.verbose,
@@ -292,6 +267,20 @@ class SpoPageSetCommand extends SpoCommand_1.default {
             }
         });
     }
+    getFileListItemId(webUrl, serverRelativeFileUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const fileGetOptions = {
+                webUrl: 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);
+            return fileGetOutputJson.Id;
+        });
+    }
 }
 _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry = function _SpoPageSetCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/site/site-appcatalog-list.js

@@ -0,0 +1,43 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const odata_1 = require("../../../../utils/odata");
+const spo_1 = require("../../../../utils/spo");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoSiteAppCatalogListCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.SITE_APPCATALOG_LIST;
+    }
+    get description() {
+        return 'List all site collection app catalogs within the tenant';
+    }
+    defaultProperties() {
+        return ['AbsoluteUrl', 'SiteID'];
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr('Retrieving site collection app catalogs...');
+                }
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const appCatalogs = yield odata_1.odata.getAllItems(`${spoUrl}/_api/Web/TenantAppCatalog/SiteCollectionAppCatalogsSites`);
+                logger.log(appCatalogs);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+module.exports = new SpoSiteAppCatalogListCommand();
+//# sourceMappingURL=site-appcatalog-list.js.map