@pnp/cli-microsoft365 6.0.0-beta.4e32416 → 6.0.0-beta.55cbe4a

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

package/dist/m365/spo/commands/web/web-clientsidewebpart-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoWebClientSideWebPartListCommand_instances, _SpoWebClientSideWebPartListCommand_initOptions, _SpoWebClientSideWebPartListCommand_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 SpoWebClientSideWebPartListCommand extends SpoCommand_1.default {
@@ -32,35 +32,38 @@ class SpoWebClientSideWebPartListCommand extends SpoCommand_1.default {
     get description() {
         return 'Lists available client-side web parts';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/GetClientSideWebParts`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            const clientSideWebParts = [];
-            res.value.forEach(component => {
-                if (component.ComponentType === 1) {
-                    clientSideWebParts.push({
-                        Id: component.Id.replace("{", "").replace("}", ""),
-                        Name: component.Name,
-                        Title: JSON.parse(component.Manifest).preconfiguredEntries[0].title.default
-                    });
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/GetClientSideWebParts`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                const clientSideWebParts = [];
+                res.value.forEach(component => {
+                    if (component.ComponentType === 1) {
+                        clientSideWebParts.push({
+                            Id: component.Id.replace("{", "").replace("}", ""),
+                            Name: component.Name,
+                            Title: JSON.parse(component.Manifest).preconfiguredEntries[0].title.default
+                        });
+                    }
+                });
+                if (clientSideWebParts.length === 0 && this.verbose) {
+                    logger.logToStderr("No client-side web parts available for this site");
+                }
+                if (clientSideWebParts.length > 0) {
+                    logger.log(clientSideWebParts);
                 }
-            });
-            if (clientSideWebParts.length === 0 && this.verbose) {
-                logger.logToStderr("No client-side web parts available for this site");
             }
-            if (clientSideWebParts.length > 0) {
-                logger.log(clientSideWebParts);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoWebClientSideWebPartListCommand_instances = new WeakSet(), _SpoWebClientSideWebPartListCommand_initOptions = function _SpoWebClientSideWebPartListCommand_initOptions() {
@@ -68,7 +71,7 @@ _SpoWebClientSideWebPartListCommand_instances = new WeakSet(), _SpoWebClientSide
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoWebClientSideWebPartListCommand_initValidators = function _SpoWebClientSideWebPartListCommand_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 SpoWebClientSideWebPartListCommand();
 //# sourceMappingURL=web-clientsidewebpart-list.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoWebGetCommand_instances, _SpoWebGetCommand_initTelemetry, _SpoWebGetCommand_initOptions, _SpoWebGetCommand_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 SpoWebGetCommand extends SpoCommand_1.default {
@@ -33,24 +33,27 @@ class SpoWebGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Retrieve information about the specified site';
     }
-    commandAction(logger, args, cb) {
-        let url = `${args.options.url}/_api/web`;
-        if (args.options.withGroups) {
-            url += '?$expand=AssociatedMemberGroup,AssociatedOwnerGroup,AssociatedVisitorGroup';
-        }
-        const requestOptions = {
-            url,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((webProperties) => {
-            logger.log(webProperties);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let url = `${args.options.url}/_api/web`;
+            if (args.options.withGroups) {
+                url += '?$expand=AssociatedMemberGroup,AssociatedOwnerGroup,AssociatedVisitorGroup';
+            }
+            const requestOptions = {
+                url,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const webProperties = yield request_1.default.get(requestOptions);
+                logger.log(webProperties);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoWebGetCommand_instances = new WeakSet(), _SpoWebGetCommand_initTelemetry = function _SpoWebGetCommand_initTelemetry() {
@@ -66,7 +69,7 @@ _SpoWebGetCommand_instances = new WeakSet(), _SpoWebGetCommand_initTelemetry = f
         option: '--withGroups'
     });
 }, _SpoWebGetCommand_initValidators = function _SpoWebGetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebGetCommand();
 //# sourceMappingURL=web-get.js.map

package/dist/m365/spo/commands/web/web-installedlanguage-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoWebInstalledLanguageListCommand_instances, _SpoWebInstalledLanguageListCommand_initOptions, _SpoWebInstalledLanguageListCommand_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 SpoWebInstalledLanguageListCommand extends SpoCommand_1.default {
@@ -35,23 +35,26 @@ class SpoWebInstalledLanguageListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['DisplayName', 'LanguageTag', 'Lcid'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving all installed languages on site ${args.options.webUrl}...`);
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/RegionalSettings/InstalledLanguages`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((webInstalledLanguageProperties) => {
-            logger.log(webInstalledLanguageProperties.Items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving all installed languages on site ${args.options.webUrl}...`);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/RegionalSettings/InstalledLanguages`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const webInstalledLanguageProperties = yield request_1.default.get(requestOptions);
+                logger.log(webInstalledLanguageProperties.Items);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoWebInstalledLanguageListCommand_instances = new WeakSet(), _SpoWebInstalledLanguageListCommand_initOptions = function _SpoWebInstalledLanguageListCommand_initOptions() {
@@ -59,7 +62,7 @@ _SpoWebInstalledLanguageListCommand_instances = new WeakSet(), _SpoWebInstalledL
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoWebInstalledLanguageListCommand_initValidators = function _SpoWebInstalledLanguageListCommand_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 SpoWebInstalledLanguageListCommand();
 //# sourceMappingURL=web-installedlanguage-list.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoWebListCommand_instances, _SpoWebListCommand_initOptions, _SpoWebListCommand_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 SpoWebListCommand extends SpoCommand_1.default {
@@ -35,27 +35,30 @@ class SpoWebListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Title', 'Url', 'Id'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving all webs in site at ${args.options.url}...`);
-        }
-        let requestUrl = `${args.options.url}/_api/web/webs`;
-        if (args.options.output !== 'json') {
-            requestUrl += '?$select=Title,Id,URL';
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((webProperties) => {
-            logger.log(webProperties.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 all webs in site at ${args.options.url}...`);
+            }
+            let requestUrl = `${args.options.url}/_api/web/webs`;
+            if (args.options.output !== 'json') {
+                requestUrl += '?$select=Title,Id,URL';
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const webProperties = yield request_1.default.get(requestOptions);
+                logger.log(webProperties.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoWebListCommand_instances = new WeakSet(), _SpoWebListCommand_initOptions = function _SpoWebListCommand_initOptions() {
@@ -63,7 +66,7 @@ _SpoWebListCommand_instances = new WeakSet(), _SpoWebListCommand_initOptions = f
         option: '-u, --url <url>'
     });
 }, _SpoWebListCommand_initValidators = function _SpoWebListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebListCommand();
 //# sourceMappingURL=web-list.js.map

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoWebReindexCommand_instances, _SpoWebReindexCommand_initOptions, _SpoWebReindexCommand_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");
 const propertybag_base_1 = require("../propertybag/propertybag-base");
@@ -24,7 +25,6 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoWebReindexCommand_instances.add(this);
-        this.reindexedLists = false;
         __classPrivateFieldGet(this, _SpoWebReindexCommand_instances, "m", _SpoWebReindexCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoWebReindexCommand_instances, "m", _SpoWebReindexCommand_initValidators).call(this);
     }
@@ -34,58 +34,48 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
     get description() {
         return 'Requests reindexing the specified subsite';
     }
-    commandAction(logger, args, cb) {
-        let requestDigest = '';
-        let webIdentityResp;
-        utils_1.spo
-            .getRequestDigest(args.options.url)
-            .then((res) => {
-            requestDigest = res.FormDigestValue;
-            if (this.debug) {
-                logger.logToStderr(`Retrieved request digest. Retrieving web identity...`);
-            }
-            return utils_1.spo.getCurrentWebIdentity(args.options.url, requestDigest);
-        })
-            .then((identityResp) => {
-            webIdentityResp = identityResp;
-            if (this.debug) {
-                logger.logToStderr(`Retrieved web identity.`);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Checking if the site is a no-script site...`);
-            }
-            return propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(args.options.url, requestDigest, webIdentityResp, logger, this.debug);
-        })
-            .then((isNoScriptSite) => {
-            if (isNoScriptSite) {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestDigest = '';
+            let webIdentityResp;
+            try {
+                const res = yield spo_1.spo.getRequestDigest(args.options.url);
+                requestDigest = res.FormDigestValue;
+                if (this.debug) {
+                    logger.logToStderr(`Retrieved request digest. Retrieving web identity...`);
+                }
+                const identityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.url, requestDigest);
+                webIdentityResp = identityResp;
+                if (this.debug) {
+                    logger.logToStderr(`Retrieved web identity.`);
+                }
                 if (this.verbose) {
-                    logger.logToStderr(`Site is a no-script site. Reindexing lists instead...`);
+                    logger.logToStderr(`Checking if the site is a no-script site...`);
                 }
-                return this.reindexLists(args.options.url, requestDigest, logger, webIdentityResp);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Site is not a no-script site. Reindexing site...`);
-            }
-            const requestOptions = {
-                url: `${args.options.url}/_api/web/allproperties`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((webProperties) => {
-            let searchVersion = webProperties.vti_x005f_searchversion || 0;
-            searchVersion++;
-            return propertybag_base_1.SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchVersion.toString(), args.options.url, requestDigest, webIdentityResp, logger, this.debug);
-        })
-            .then(_ => cb(), (err) => {
-            if (this.reindexedLists) {
-                cb();
+                const isNoScriptSite = yield propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(args.options.url, requestDigest, webIdentityResp, logger, this.debug);
+                if (isNoScriptSite) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Site is a no-script site. Reindexing lists instead...`);
+                    }
+                    yield this.reindexLists(args.options.url, requestDigest, logger, webIdentityResp);
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Site is not a no-script site. Reindexing site...`);
+                }
+                const requestOptions = {
+                    url: `${args.options.url}/_api/web/allproperties`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const webProperties = yield request_1.default.get(requestOptions);
+                let searchVersion = webProperties.vti_x005f_searchversion || 0;
+                searchVersion++;
+                yield propertybag_base_1.SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchVersion.toString(), args.options.url, requestDigest, webIdentityResp, logger, this.debug);
             }
-            else {
-                this.handleRejectedPromise(err, logger, cb);
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
         });
     }
@@ -109,8 +99,7 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
                 return Promise.all(promises);
             })
                 .then(() => {
-                this.reindexedLists = true;
-                reject(undefined);
+                resolve();
             }, (err) => reject(err));
         });
     }
@@ -123,7 +112,7 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
                 resolve();
                 return;
             }
-            utils_1.spo
+            spo_1.spo
                 .getFolderIdentity(webIdentityResp.objectIdentity, webUrl, list.RootFolder.ServerRelativeUrl, requestDigest)
                 .then((folderIdentityResp) => {
                 let searchversion = list.RootFolder.Properties.vti_x005f_searchversion || 0;
@@ -141,7 +130,7 @@ _SpoWebReindexCommand_instances = new WeakSet(), _SpoWebReindexCommand_initOptio
         option: '-u, --url <url>'
     });
 }, _SpoWebReindexCommand_initValidators = function _SpoWebReindexCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebReindexCommand();
 //# sourceMappingURL=web-reindex.js.map