@pnp/cli-microsoft365 6.1.0-beta.c68d208 → 6.1.0-beta.d3a109a

package/dist/m365/spo/commands/group/group-member-remove.js

@@ -19,6 +19,7 @@ const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
+const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupMemberRemoveCommand extends SpoCommand_1.default {
@@ -36,16 +37,42 @@ class SpoGroupMemberRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initOptionSets).call(this);
     }
+    getUserName(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.userName) {
+                return args.options.userName;
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about the user ${args.options.email}`);
+            }
+            const options = {
+                email: args.options.email,
+                output: 'json',
+                debug: args.options.debug,
+                verbose: args.options.verbose
+            };
+            const userGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            const userOutput = JSON.parse(userGetOutput.stdout);
+            return userOutput.userPrincipalName;
+        });
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const removeUserfromSPGroup = () => __awaiter(this, void 0, void 0, function* () {
                 if (this.verbose) {
-                    logger.logToStderr(`Removing User with Username ${args.options.userName} from Group: ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
+                    logger.logToStderr(`Removing User ${args.options.userName || args.options.email || args.options.userId} from Group: ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
                 }
-                const loginName = `i:0#.f|membership|${args.options.userName}`;
-                const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
+                let requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
                     ? `GetById('${args.options.groupId}')`
-                    : `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${formatting_1.formatting.encodeQueryParameter(loginName)}'`;
+                    : `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')`}`;
+                if (args.options.userId) {
+                    requestUrl += `/users/removeById(${args.options.userId})`;
+                }
+                else {
+                    const userName = yield this.getUserName(logger, args);
+                    const loginName = `i:0#.f|membership|${userName}`;
+                    requestUrl += `/users/removeByLoginName(@LoginName)?@LoginName='${formatting_1.formatting.encodeQueryParameter(loginName)}'`;
+                }
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -71,7 +98,7 @@ class SpoGroupMemberRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to remove user User ${args.options.userName} from SharePoint group?`
+                    message: `Are you sure you want to remove user ${args.options.userName || args.options.userId || args.options.email} from the SharePoint group?`
                 });
                 if (result.continue) {
                     yield removeUserfromSPGroup();
@@ -85,6 +112,9 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         Object.assign(this.telemetryProperties, {
             groupId: (!(!args.options.groupId)).toString(),
             groupName: (!(!args.options.groupName)).toString(),
+            userName: (!(!args.options.userName)).toString(),
+            email: (!(!args.options.email)).toString(),
+            userId: (!(!args.options.userId)).toString(),
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -96,7 +126,11 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
     }, {
         option: '--groupName [groupName]'
     }, {
-        option: '--userName <userName>'
+        option: '--userName [userName]'
+    }, {
+        option: '--email [email]'
+    }, {
+        option: '--userId [userId]'
     }, {
         option: '--confirm'
     });
@@ -105,10 +139,19 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified "groupId" ${args.options.groupId} is not valid`;
         }
+        if (args.options.userId && isNaN(args.options.userId)) {
+            return `Specified "userId" ${args.options.userId} is not valid`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
+        if (args.options.email && !validation_1.validation.isValidUserPrincipalName(args.options.email)) {
+            return `${args.options.email} is not a valid email`;
+        }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoGroupMemberRemoveCommand_initOptionSets = function _SpoGroupMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupName', 'groupId'] });
+    this.optionSets.push({ options: ['groupName', 'groupId'] }, { options: ['userName', 'email', 'userId'] });
 };
 module.exports = new SpoGroupMemberRemoveCommand();
 //# sourceMappingURL=group-member-remove.js.map

package/dist/m365/spo/commands/list/{list-retentionlabel-set.js → list-retentionlabel-ensure.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 _SpoListRetentionLabelSetCommand_instances, _SpoListRetentionLabelSetCommand_initTelemetry, _SpoListRetentionLabelSetCommand_initOptions, _SpoListRetentionLabelSetCommand_initValidators, _SpoListRetentionLabelSetCommand_initOptionSets;
+var _SpoListRetentionLabelEnsureCommand_instances, _SpoListRetentionLabelEnsureCommand_initTelemetry, _SpoListRetentionLabelEnsureCommand_initOptions, _SpoListRetentionLabelEnsureCommand_initValidators, _SpoListRetentionLabelEnsureCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -21,9 +21,9 @@ const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoListRetentionLabelSetCommand extends SpoCommand_1.default {
+class SpoListRetentionLabelEnsureCommand extends SpoCommand_1.default {
     get name() {
-        return commands_1.default.LIST_RETENTIONLABEL_SET;
+        return commands_1.default.LIST_RETENTIONLABEL_ENSURE;
     }
     alias() {
         return [commands_1.default.LIST_LABEL_SET];
@@ -33,15 +33,21 @@ class SpoListRetentionLabelSetCommand extends SpoCommand_1.default {
     }
     constructor() {
         super();
-        _SpoListRetentionLabelSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoListRetentionLabelSetCommand_instances, "m", _SpoListRetentionLabelSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoListRetentionLabelSetCommand_instances, "m", _SpoListRetentionLabelSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoListRetentionLabelSetCommand_instances, "m", _SpoListRetentionLabelSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoListRetentionLabelSetCommand_instances, "m", _SpoListRetentionLabelSetCommand_initOptionSets).call(this);
+        _SpoListRetentionLabelEnsureCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelEnsureCommand_instances, "m", _SpoListRetentionLabelEnsureCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelEnsureCommand_instances, "m", _SpoListRetentionLabelEnsureCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelEnsureCommand_instances, "m", _SpoListRetentionLabelEnsureCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelEnsureCommand_instances, "m", _SpoListRetentionLabelEnsureCommand_initOptionSets).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.showDeprecationWarning(logger, commands_1.default.LIST_LABEL_SET, commands_1.default.LIST_RETENTIONLABEL_SET);
+            this.showDeprecationWarning(logger, commands_1.default.LIST_LABEL_SET, commands_1.default.LIST_RETENTIONLABEL_ENSURE);
+            if (args.options.blockDelete) {
+                this.warn(logger, `Option 'blockDelete' is deprecated.`);
+            }
+            if (args.options.blockEdit) {
+                this.warn(logger, `Option 'blockEdit' is deprecated.`);
+            }
             try {
                 let listRestUrl = '';
                 let listServerRelativeUrl = '';
@@ -90,7 +96,7 @@ class SpoListRetentionLabelSetCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoListRetentionLabelSetCommand_instances = new WeakSet(), _SpoListRetentionLabelSetCommand_initTelemetry = function _SpoListRetentionLabelSetCommand_initTelemetry() {
+_SpoListRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListRetentionLabelEnsureCommand_initTelemetry = function _SpoListRetentionLabelEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: (!(!args.options.listId)).toString(),
@@ -101,7 +107,7 @@ _SpoListRetentionLabelSetCommand_instances = new WeakSet(), _SpoListRetentionLab
             blockEdit: args.options.blockEdit || false
         });
     });
-}, _SpoListRetentionLabelSetCommand_initOptions = function _SpoListRetentionLabelSetCommand_initOptions() {
+}, _SpoListRetentionLabelEnsureCommand_initOptions = function _SpoListRetentionLabelEnsureCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
@@ -119,15 +125,15 @@ _SpoListRetentionLabelSetCommand_instances = new WeakSet(), _SpoListRetentionLab
     }, {
         option: '--blockEdit'
     });
-}, _SpoListRetentionLabelSetCommand_initValidators = function _SpoListRetentionLabelSetCommand_initValidators() {
+}, _SpoListRetentionLabelEnsureCommand_initValidators = function _SpoListRetentionLabelEnsureCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
-}, _SpoListRetentionLabelSetCommand_initOptionSets = function _SpoListRetentionLabelSetCommand_initOptionSets() {
+}, _SpoListRetentionLabelEnsureCommand_initOptionSets = function _SpoListRetentionLabelEnsureCommand_initOptionSets() {
     this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
-module.exports = new SpoListRetentionLabelSetCommand();
-//# sourceMappingURL=list-retentionlabel-set.js.map
+module.exports = new SpoListRetentionLabelEnsureCommand();
+//# sourceMappingURL=list-retentionlabel-ensure.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) => {