@pnp/cli-microsoft365 6.0.0-beta.37b9374 → 6.0.0-beta.3da776c

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserListCommand_instances, _SpoUserListCommand_initOptions, _SpoUserListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserListCommand extends SpoCommand_1.default {
@@ -35,26 +35,29 @@ class SpoUserListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Id', 'Title', 'LoginName'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving users from web ${args.options.webUrl}...`);
-        }
-        let requestUrl = '';
-        requestUrl = `${args.options.webUrl}/_api/web/siteusers`;
-        const requestOptions = {
-            url: requestUrl,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((users) => {
-            logger.log(users.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving users from web ${args.options.webUrl}...`);
+            }
+            let requestUrl = '';
+            requestUrl = `${args.options.webUrl}/_api/web/siteusers`;
+            const requestOptions = {
+                url: requestUrl,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const users = yield request_1.default.get(requestOptions);
+                logger.log(users.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoUserListCommand_instances = new WeakSet(), _SpoUserListCommand_initOptions = function _SpoUserListCommand_initOptions() {
@@ -62,7 +65,7 @@ _SpoUserListCommand_instances = new WeakSet(), _SpoUserListCommand_initOptions =
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoUserListCommand_initValidators = function _SpoUserListCommand_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 SpoUserListCommand();
 //# sourceMappingURL=user-list.js.map

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

@@ -13,11 +13,11 @@ 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 _SpoUserRemoveCommand_instances, _SpoUserRemoveCommand_initTelemetry, _SpoUserRemoveCommand_initOptions, _SpoUserRemoveCommand_initValidators;
+var _SpoUserRemoveCommand_instances, _SpoUserRemoveCommand_initTelemetry, _SpoUserRemoveCommand_initOptions, _SpoUserRemoveCommand_initValidators, _SpoUserRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserRemoveCommand extends SpoCommand_1.default {
@@ -27,6 +27,7 @@ class SpoUserRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.USER_REMOVE;
@@ -34,47 +35,48 @@ class SpoUserRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes user from specific web';
     }
-    commandAction(logger, args, cb) {
-        const removeUser = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing user from  subsite ${args.options.webUrl} ...`);
-            }
-            let requestUrl = '';
-            if (args.options.id) {
-                requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removebyid(${args.options.id})`;
-            }
-            if (args.options.loginName) {
-                requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removeByLoginName('${encodeURIComponent(args.options.loginName)}')`;
-            }
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .post(requestOptions)
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeUser();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove specified user from the site ${args.options.webUrl}`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeUser = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing user from  subsite ${args.options.webUrl} ...`);
+                }
+                let requestUrl = '';
+                if (args.options.id) {
+                    requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removebyid(${args.options.id})`;
+                }
+                if (args.options.loginName) {
+                    requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removeByLoginName('${encodeURIComponent(args.options.loginName)}')`;
                 }
-                else {
-                    removeUser();
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeUser();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove specified user from the site ${args.options.webUrl}`
+                });
+                if (result.continue) {
+                    yield removeUser();
+                }
+            }
+        });
     }
 }
 _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelemetry = function _SpoUserRemoveCommand_initTelemetry() {
@@ -97,14 +99,10 @@ _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelem
     });
 }, _SpoUserRemoveCommand_initValidators = function _SpoUserRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.loginName) {
-            return 'Required option id or loginName missing, one is required';
-        }
-        if (args.options.id && args.options.loginName) {
-            return 'Use either id or loginName, but not both';
-        }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
+}, _SpoUserRemoveCommand_initOptionSets = function _SpoUserRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'loginName']);
 };
 module.exports = new SpoUserRemoveCommand();
 //# sourceMappingURL=user-remove.js.map

package/dist/m365/spo/commands/userprofile/userprofile-get.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserProfileGetCommand_instances, _SpoUserProfileGetCommand_initOptions, _SpoUserProfileGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserProfileGetCommand extends SpoCommand_1.default {
@@ -32,29 +33,29 @@ class SpoUserProfileGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Sets user profile property for a SharePoint user';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            const userName = `i:0#.f|membership|${args.options.userName}`;
-            const requestOptions = {
-                url: `${spoUrl}/_api/SP.UserProfiles.PeopleManager/GetPropertiesFor(accountName=@v)?@v='${encodeURIComponent(`${userName}`)}'`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            // in text mode, reformat properties for readability
-            if (!args.options.output ||
-                args.options.output === 'text') {
-                res.UserProfileProperties = JSON.stringify(res.UserProfileProperties);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const userName = `i:0#.f|membership|${args.options.userName}`;
+                const requestOptions = {
+                    url: `${spoUrl}/_api/SP.UserProfiles.PeopleManager/GetPropertiesFor(accountName=@v)?@v='${encodeURIComponent(`${userName}`)}'`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                if (!args.options.output ||
+                    args.options.output === 'text') {
+                    res.UserProfileProperties = JSON.stringify(res.UserProfileProperties);
+                }
+                logger.log(res);
             }
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoUserProfileGetCommand_instances = new WeakSet(), _SpoUserProfileGetCommand_initOptions = function _SpoUserProfileGetCommand_initOptions() {
@@ -63,7 +64,7 @@ _SpoUserProfileGetCommand_instances = new WeakSet(), _SpoUserProfileGetCommand_i
     });
 }, _SpoUserProfileGetCommand_initValidators = function _SpoUserProfileGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidUserPrincipalName(args.options.userName)) {
+        if (!validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
             return `${args.options.userName} is not a valid user principal name`;
         }
         return true;

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

@@ -1,4 +1,13 @@
 "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");
@@ -7,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserProfileSetCommand_instances, _SpoUserProfileSetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserProfileSetCommand extends SpoCommand_1.default {
@@ -22,41 +31,40 @@ class SpoUserProfileSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Sets user profile property for a SharePoint user';
     }
-    commandAction(logger, args, cb) {
-        let spoUrl = '';
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((_spoUrl) => {
-            spoUrl = _spoUrl;
-            return utils_1.spo.getRequestDigest(spoUrl);
-        })
-            .then((res) => {
-            const propertyValue = args.options.propertyValue.split(',').map(o => o.trim());
-            let propertyType = 'SetSingleValueProfileProperty';
-            const data = {
-                accountName: `i:0#.f|membership|${args.options.userName}`,
-                propertyName: args.options.propertyName
-            };
-            if (propertyValue.length > 1) {
-                propertyType = 'SetMultiValuedProfileProperty';
-                data.propertyValues = [...propertyValue];
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoUrl);
+                const propertyValue = args.options.propertyValue.split(',').map(o => o.trim());
+                let propertyType = 'SetSingleValueProfileProperty';
+                const data = {
+                    accountName: `i:0#.f|membership|${args.options.userName}`,
+                    propertyName: args.options.propertyName
+                };
+                if (propertyValue.length > 1) {
+                    propertyType = 'SetMultiValuedProfileProperty';
+                    data.propertyValues = [...propertyValue];
+                }
+                else {
+                    data.propertyValue = propertyValue[0];
+                }
+                const requestOptions = {
+                    url: `${spoUrl}/_api/SP.UserProfiles.PeopleManager/${propertyType}`,
+                    headers: {
+                        'Accept': 'application/json;odata=nometadata',
+                        'Content-type': 'application/json;odata=verbose',
+                        'X-RequestDigest': res.FormDigestValue
+                    },
+                    data: data,
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
             }
-            else {
-                data.propertyValue = propertyValue[0];
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: `${spoUrl}/_api/SP.UserProfiles.PeopleManager/${propertyType}`,
-                headers: {
-                    'Accept': 'application/json;odata=nometadata',
-                    'Content-type': 'application/json;odata=verbose',
-                    'X-RequestDigest': res.FormDigestValue
-                },
-                data: data,
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoUserProfileSetCommand_instances = new WeakSet(), _SpoUserProfileSetCommand_initOptions = function _SpoUserProfileSetCommand_initOptions() {

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

@@ -15,10 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoWebAddCommand_instances, _SpoWebAddCommand_initTelemetry, _SpoWebAddCommand_initOptions, _SpoWebAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
@@ -39,105 +39,82 @@ class SpoWebAddCommand extends SpoCommand_1.default {
     getExcludedOptionsWithUrls() {
         return ['url'];
     }
-    commandAction(logger, args, cb) {
-        let siteInfo = null;
-        let subsiteFullUrl = '';
-        utils_1.spo
-            .getRequestDigest(args.options.parentWebUrl)
-            .then((res) => {
-            const requestOptions = {
-                url: `${args.options.parentWebUrl}/_api/web/webinfos/add`,
-                headers: {
-                    'content-type': 'application/json;odata=nometadata',
-                    accept: 'application/json;odata=nometadata',
-                    'X-RequestDigest': res.FormDigestValue
-                },
-                responseType: 'json',
-                data: {
-                    parameters: {
-                        Url: args.options.url,
-                        Title: args.options.title,
-                        Description: args.options.description,
-                        Language: args.options.locale,
-                        WebTemplate: args.options.webTemplate,
-                        UseUniquePermissions: args.options.breakInheritance
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let siteInfo = null;
+            let subsiteFullUrl = '';
+            try {
+                const res = yield spo_1.spo.getRequestDigest(args.options.parentWebUrl);
+                const requestOptionsPost = {
+                    url: `${args.options.parentWebUrl}/_api/web/webinfos/add`,
+                    headers: {
+                        'content-type': 'application/json;odata=nometadata',
+                        accept: 'application/json;odata=nometadata',
+                        'X-RequestDigest': res.FormDigestValue
+                    },
+                    responseType: 'json',
+                    data: {
+                        parameters: {
+                            Url: args.options.url,
+                            Title: args.options.title,
+                            Description: args.options.description,
+                            Language: args.options.locale,
+                            WebTemplate: args.options.webTemplate,
+                            UseUniquePermissions: args.options.breakInheritance
+                        }
                     }
-                }
-            };
-            if (this.verbose) {
-                logger.logToStderr(`Creating subsite ${args.options.parentWebUrl}/${args.options.url}...`);
-            }
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            siteInfo = res;
-            if (!args.options.inheritNavigation) {
-                return Promise.reject(SpoWebAddCommand.DONE);
-            }
-            if (this.verbose) {
-                logger.logToStderr("Setting inheriting navigation from the parent site...");
-            }
-            subsiteFullUrl = `${args.options.parentWebUrl}/${encodeURIComponent(args.options.url)}`;
-            const requestOptions = {
-                url: `${subsiteFullUrl}/_api/web/effectivebasepermissions`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            const permissions = new base_permissions_1.BasePermissions();
-            permissions.high = res.High;
-            permissions.low = res.Low;
-            /// Detects if the site in question has no script enabled or not. 
-            /// Detection is done by verifying if the AddAndCustomizePages permission is missing.
-            /// 
-            /// See https://support.office.com/en-us/article/Turn-scripting-capabilities-on-or-off-1f2c515f-5d7e-448a-9fd7-835da935584f
-            /// for the effects of NoScript
-            if (!permissions.has(base_permissions_1.PermissionKind.AddAndCustomizePages)) {
+                };
                 if (this.verbose) {
-                    logger.logToStderr("No script is enabled. Skipping the InheritParentNavigation settings.");
+                    logger.logToStderr(`Creating subsite ${args.options.parentWebUrl}/${args.options.webUrl}...`);
+                }
+                siteInfo = yield request_1.default.post(requestOptionsPost);
+                if (args.options.inheritNavigation) {
+                    if (this.verbose) {
+                        logger.logToStderr("Setting inheriting navigation from the parent site...");
+                    }
+                    subsiteFullUrl = `${args.options.parentWebUrl}/${encodeURIComponent(args.options.url)}`;
+                    const requestOptionsPer = {
+                        url: `${subsiteFullUrl}/_api/web/effectivebasepermissions`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const effectivebasepermissions = yield request_1.default.get(requestOptionsPer);
+                    const permissions = new base_permissions_1.BasePermissions();
+                    permissions.high = effectivebasepermissions.High;
+                    permissions.low = effectivebasepermissions.Low;
+                    /// Detects if the site in question has no script enabled or not. 
+                    /// Detection is done by verifying if the AddAndCustomizePages permission is missing.
+                    /// 
+                    /// See https://support.office.com/en-us/article/Turn-scripting-capabilities-on-or-off-1f2c515f-5d7e-448a-9fd7-835da935584f
+                    /// for the effects of NoScript
+                    if (permissions.has(base_permissions_1.PermissionKind.AddAndCustomizePages)) {
+                        const digest = yield spo_1.spo.getRequestDigest(subsiteFullUrl);
+                        const requestOptionsQuery = {
+                            url: `${subsiteFullUrl}/_vti_bin/client.svc/ProcessQuery`,
+                            headers: {
+                                'X-RequestDigest': digest.FormDigestValue
+                            },
+                            data: `<Request xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}"><Actions><ObjectPath Id="1" ObjectPathId="0" /><ObjectPath Id="3" ObjectPathId="2" /><ObjectPath Id="5" ObjectPathId="4" /><SetProperty Id="6" ObjectPathId="4" Name="UseShared"><Parameter Type="Boolean">true</Parameter></SetProperty></Actions><ObjectPaths><StaticProperty Id="0" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /><Property Id="2" ParentId="0" Name="Web" /><Property Id="4" ParentId="2" Name="Navigation" /></ObjectPaths></Request>`
+                        };
+                        const query = yield request_1.default.post(requestOptionsQuery);
+                        const json = JSON.parse(query);
+                        const response = json[0];
+                        if (response.ErrorInfo) {
+                            throw response.ErrorInfo.ErrorMessage;
+                        }
+                    }
+                    else {
+                        if (this.verbose) {
+                            logger.logToStderr("No script is enabled. Skipping the InheritParentNavigation settings.");
+                        }
+                    }
                 }
-                return Promise.reject(SpoWebAddCommand.DONE);
-            }
-            return utils_1.spo.getRequestDigest(subsiteFullUrl);
-        })
-            .then((res) => {
-            const requestOptions = {
-                url: `${subsiteFullUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue
-                },
-                data: `<Request xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}"><Actions><ObjectPath Id="1" ObjectPathId="0" /><ObjectPath Id="3" ObjectPathId="2" /><ObjectPath Id="5" ObjectPathId="4" /><SetProperty Id="6" ObjectPathId="4" Name="UseShared"><Parameter Type="Boolean">true</Parameter></SetProperty></Actions><ObjectPaths><StaticProperty Id="0" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /><Property Id="2" ParentId="0" Name="Web" /><Property Id="4" ParentId="2" Name="Navigation" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                return;
-            }
-            else {
-                logger.log(siteInfo);
-            }
-            cb();
-        }, (err) => {
-            if (err === SpoWebAddCommand.DONE) {
                 logger.log(siteInfo);
-                cb();
-                return;
-            }
-            if (err.error &&
-                err.error['odata.error'] &&
-                err.error['odata.error'].message) {
-                cb(new Command_1.CommandError(err.error['odata.error'].message.value));
             }
-            else {
-                this.handleRejectedPromise(err, logger, cb);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
         });
     }
@@ -171,7 +148,7 @@ _SpoWebAddCommand_instances = new WeakSet(), _SpoWebAddCommand_initTelemetry = f
     });
 }, _SpoWebAddCommand_initValidators = function _SpoWebAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.parentWebUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.parentWebUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -184,7 +161,5 @@ _SpoWebAddCommand_instances = new WeakSet(), _SpoWebAddCommand_initTelemetry = f
         return true;
     }));
 };
-// used to early break promises chain
-SpoWebAddCommand.DONE = 'DONE';
 module.exports = new SpoWebAddCommand();
 //# sourceMappingURL=web-add.js.map