@pnp/cli-microsoft365 6.0.0-beta.3f3b164 → 6.0.0-beta.42305df

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

@@ -1,65 +1,77 @@
 "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 _SpoSiteRemoveCommand_instances, _SpoSiteRemoveCommand_initTelemetry, _SpoSiteRemoveCommand_initOptions, _SpoSiteRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoSiteRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteRemoveCommand_instances, "m", _SpoSiteRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRemoveCommand_instances, "m", _SpoSiteRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRemoveCommand_instances, "m", _SpoSiteRemoveCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SITE_REMOVE;
     }
     get description() {
         return 'Removes the specified site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.skipRecycleBin = (!(!args.options.skipRecycleBin)).toString();
-        telemetryProps.fromRecycleBin = (!(!args.options.fromRecycleBin)).toString();
-        telemetryProps.wait = args.options.wait;
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        const removeSite = () => {
-            this.dots = '';
-            if (args.options.fromRecycleBin) {
-                this
-                    .deleteSiteWithoutGroup(logger, args)
-                    .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
-            }
-            else {
-                this
-                    .getSiteGroupId(args.options.url, logger)
-                    .then((groupId) => {
-                    if (groupId === '00000000-0000-0000-0000-000000000000') {
-                        if (this.debug) {
-                            logger.logToStderr('Site is not groupified. Going ahead with the conventional site deletion options');
-                        }
-                        return this.deleteSiteWithoutGroup(logger, args);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeSite = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    this.dots = '';
+                    if (args.options.fromRecycleBin) {
+                        yield this.deleteSiteWithoutGroup(logger, args);
                     }
                     else {
-                        if (this.debug) {
-                            logger.logToStderr(`Site attached to group ${groupId}. Initiating group delete operation via Graph API`);
+                        const groupId = yield this.getSiteGroupId(args.options.url, logger);
+                        if (groupId === '00000000-0000-0000-0000-000000000000') {
+                            if (this.debug) {
+                                logger.logToStderr('Site is not groupified. Going ahead with the conventional site deletion options');
+                            }
+                            yield this.deleteSiteWithoutGroup(logger, args);
                         }
-                        return aadGroup_1.aadGroup
-                            .getGroupById(groupId)
-                            .then((group) => {
-                            if (args.options.skipRecycleBin || args.options.wait) {
-                                logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameters 'skipRecycleBin' and 'wait' will not be applicable.`));
+                        else {
+                            if (this.debug) {
+                                logger.logToStderr(`Site attached to group ${groupId}. Initiating group delete operation via Graph API`);
                             }
-                            return this.deleteGroup(group.id, logger);
-                        })
-                            .catch(() => {
-                            if (this.verbose) {
-                                logger.logToStderr(`Site group doesn't exist. Searching in the Microsoft 365 deleted groups.`);
+                            try {
+                                const group = yield aadGroup_1.aadGroup.getGroupById(groupId);
+                                if (args.options.skipRecycleBin || args.options.wait) {
+                                    logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameters 'skipRecycleBin' and 'wait' will not be applicable.`));
+                                }
+                                yield this.deleteGroup(group.id, logger);
+                                yield this.deleteSite(args.options.url, args.options.wait, logger);
                             }
-                            return this
-                                .isSiteGroupDeleted(groupId)
-                                .then((deletedGroups) => {
+                            catch (err) {
+                                if (this.verbose) {
+                                    logger.logToStderr(`Site group doesn't exist. Searching in the Microsoft 365 deleted groups.`);
+                                }
+                                const deletedGroups = yield this.isSiteGroupDeleted(groupId);
                                 if (deletedGroups.value.length === 0) {
                                     if (this.verbose) {
                                         logger.logToStderr("Site group doesn't exist anymore. Deleting the site.");
@@ -67,39 +79,34 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                                     if (args.options.wait) {
                                         logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameter 'wait' will not be applicable.`));
                                     }
-                                    return Promise.resolve();
+                                    yield this.deleteOrphanedSite(logger, args.options.url);
                                 }
                                 else {
-                                    return Promise.reject(`Site group still exists in the deleted groups. The site won't be removed.`);
+                                    throw `Site group still exists in the deleted groups. The site won't be removed.`;
                                 }
-                            })
-                                .then(_ => this.deleteOrphanedSite(logger, args.options.url))
-                                .catch((err) => Promise.reject(err));
-                        })
-                            .then(_ => this.deleteSite(args.options.url, args.options.wait, logger));
+                            }
+                        }
                     }
-                })
-                    .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
-            }
-        };
-        if (args.options.confirm) {
-            removeSite();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the site ${args.options.url}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
                 }
-                else {
-                    removeSite();
+                catch (err) {
+                    this.handleRejectedPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeSite();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the site ${args.options.url}?`
+                });
+                if (result.continue) {
+                    yield removeSite();
+                }
+            }
+        });
     }
     isSiteGroupDeleted(groupId) {
         const requestOptions = {
@@ -112,7 +119,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
         return request_1.default.get(requestOptions);
     }
     deleteOrphanedSite(logger, url) {
-        return utils_1.spo
+        return spo_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((spoAdminUrl) => {
             const requestOptions = {
@@ -127,11 +134,11 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
         });
     }
     deleteSiteWithoutGroup(logger, args) {
-        return utils_1.spo
+        return spo_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((spoAdminUrl) => {
             this.spoAdminUrl = spoAdminUrl;
-            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            return spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
         })
             .then((res) => {
             this.context = res;
@@ -159,7 +166,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
     }
     deleteSite(url, wait, logger) {
         return new Promise((resolve, reject) => {
-            utils_1.spo
+            spo_1.spo
                 .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
                 .then((res) => {
                 this.context = res;
@@ -171,7 +178,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': this.context.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="55" ObjectPathId="54"/><ObjectPath Id="57" ObjectPathId="56"/><Query Id="58" ObjectPathId="54"><Query SelectAllProperties="true"><Properties/></Query></Query><Query Id="59" ObjectPathId="56"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true"/><Property Name="PollingInterval" ScalarProperty="true"/></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="54" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/><Method Id="56" ParentId="54" Name="RemoveSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="55" ObjectPathId="54"/><ObjectPath Id="57" ObjectPathId="56"/><Query Id="58" ObjectPathId="54"><Query SelectAllProperties="true"><Properties/></Query></Query><Query Id="59" ObjectPathId="56"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true"/><Property Name="PollingInterval" ScalarProperty="true"/></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="54" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/><Method Id="56" ParentId="54" Name="RemoveSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -189,7 +196,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                         return;
                     }
                     setTimeout(() => {
-                        utils_1.spo.waitUntilFinished({
+                        spo_1.spo.waitUntilFinished({
                             operationId: JSON.stringify(operation._ObjectIdentity_),
                             siteUrl: this.spoAdminUrl,
                             resolve,
@@ -207,7 +214,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
     }
     deleteSiteFromTheRecycleBin(url, wait, logger) {
         return new Promise((resolve, reject) => {
-            utils_1.spo
+            spo_1.spo
                 .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
                 .then((res) => {
                 this.context = res;
@@ -216,7 +223,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': this.context.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="185" ObjectPathId="184" /><Query Id="186" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="184" ParentId="175" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="185" ObjectPathId="184" /><Query Id="186" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="184" ParentId="175" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -234,7 +241,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                         return;
                     }
                     setTimeout(() => {
-                        utils_1.spo.waitUntilFinished({
+                        spo_1.spo.waitUntilFinished({
                             operationId: JSON.stringify(operation._ObjectIdentity_),
                             siteUrl: this.spoAdminUrl,
                             resolve,
@@ -251,11 +258,11 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
         });
     }
     getSiteGroupId(url, logger) {
-        return utils_1.spo
+        return spo_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             this.spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            return spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
         })
             .then((res) => {
             this.context = res;
@@ -267,7 +274,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': this.context.FormDigestValue
                 },
-                data: `<Request xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009" AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}"><Actions><ObjectPath Id="4" ObjectPathId="3"/><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="false"><Properties><Property Name="GroupId" ScalarProperty="true"/></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/><Method Id="3" ParentId="1" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                data: `<Request xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009" AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}"><Actions><ObjectPath Id="4" ObjectPathId="3"/><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="false"><Properties><Property Name="GroupId" ScalarProperty="true"/></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/><Method Id="3" ParentId="1" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -295,30 +302,30 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
         };
         return request_1.default.delete(requestOptions);
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '--skipRecycleBin'
-            },
-            {
-                option: '--fromRecycleBin'
-            },
-            {
-                option: '--wait'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
-    }
 }
+_SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelemetry = function _SpoSiteRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            skipRecycleBin: (!(!args.options.skipRecycleBin)).toString(),
+            fromRecycleBin: (!(!args.options.fromRecycleBin)).toString(),
+            wait: args.options.wait,
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoSiteRemoveCommand_initOptions = function _SpoSiteRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --url <url>'
+    }, {
+        option: '--skipRecycleBin'
+    }, {
+        option: '--fromRecycleBin'
+    }, {
+        option: '--wait'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoSiteRemoveCommand_initValidators = function _SpoSiteRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
+};
 module.exports = new SpoSiteRemoveCommand();
 //# sourceMappingURL=site-remove.js.map

package/dist/m365/spo/commands/site/site-rename.js

@@ -1,148 +1,149 @@
 "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 _SpoSiteRenameCommand_instances, _SpoSiteRenameCommand_initTelemetry, _SpoSiteRenameCommand_initOptions, _SpoSiteRenameCommand_initValidators;
 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 SpoSiteRenameCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoSiteRenameCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteRenameCommand_instances, "m", _SpoSiteRenameCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRenameCommand_instances, "m", _SpoSiteRenameCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRenameCommand_instances, "m", _SpoSiteRenameCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SITE_RENAME;
     }
     get description() {
         return 'Renames the URL and title of a site collection';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.newSiteTitle = args.options.newSiteTitle ? true : false;
-        telemetryProps.suppressMarketplaceAppCheck = args.options.suppressMarketplaceAppCheck;
-        telemetryProps.suppressWorkflow2013Check = args.options.suppressWorkflow2013Check;
-        telemetryProps.wait = args.options.wait;
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        let spoAdminUrl = "";
-        const options = args.options;
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            this.context = res;
-            if (this.verbose) {
-                logger.logToStderr(`Scheduling rename job...`);
-            }
-            let optionsBitmask = 0;
-            if (options.suppressMarketplaceAppCheck) {
-                optionsBitmask = optionsBitmask | 8;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const options = args.options;
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                this.context = reqDigest;
+                if (this.verbose) {
+                    logger.logToStderr(`Scheduling rename job...`);
+                }
+                let optionsBitmask = 0;
+                if (options.suppressMarketplaceAppCheck) {
+                    optionsBitmask = optionsBitmask | 8;
+                }
+                if (options.suppressWorkflow2013Check) {
+                    optionsBitmask = optionsBitmask | 16;
+                }
+                const requestOptions = {
+                    "SourceSiteUrl": options.url,
+                    "TargetSiteUrl": options.newUrl,
+                    "TargetSiteTitle": options.newTitle || null,
+                    "Option": optionsBitmask,
+                    "Reserve": null,
+                    "SkipGestures": null,
+                    "OperationId": "00000000-0000-0000-0000-000000000000"
+                };
+                const postData = {
+                    url: `${spoAdminUrl}/_api/SiteRenameJobs?api-version=1.4.7`,
+                    headers: {
+                        'X-RequestDigest': this.context.FormDigestValue,
+                        'Content-Type': 'application/json'
+                    },
+                    responseType: 'json',
+                    data: requestOptions
+                };
+                const res = yield request_1.default.post(postData);
+                if (options.verbose) {
+                    logger.logToStderr(res);
+                }
+                this.operationData = res;
+                if (this.operationData.JobState && this.operationData.JobState === "Error") {
+                    throw this.operationData.ErrorDescription;
+                }
+                const isComplete = this.operationData.JobState === "Success";
+                if (options.wait && !isComplete) {
+                    yield this.waitForRenameCompletion(this, true, spoAdminUrl, options.url, 0);
+                }
+                logger.log(this.operationData);
             }
-            if (options.suppressWorkflow2013Check) {
-                optionsBitmask = optionsBitmask | 16;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
+        });
+    }
+    waitForRenameCompletion(command, isVerbose, spoAdminUrl, siteUrl, iteration) {
+        return __awaiter(this, void 0, void 0, function* () {
+            iteration++;
             const requestOptions = {
-                "SourceSiteUrl": options.siteUrl,
-                "TargetSiteUrl": options.newSiteUrl,
-                "TargetSiteTitle": options.newSiteTitle || null,
-                "Option": optionsBitmask,
-                "Reserve": null,
-                "SkipGestures": null,
-                "OperationId": "00000000-0000-0000-0000-000000000000"
-            };
-            const postData = {
-                url: `${spoAdminUrl}/_api/SiteRenameJobs?api-version=1.4.7`,
+                url: `${spoAdminUrl}/_api/SiteRenameJobs/GetJobsBySiteUrl(url='${encodeURIComponent(siteUrl)}')?api-version=1.4.7`,
                 headers: {
-                    'X-RequestDigest': this.context.FormDigestValue,
-                    'Content-Type': 'application/json'
+                    'X-AttemptNumber': iteration.toString()
                 },
-                responseType: 'json',
-                data: requestOptions
+                responseType: 'json'
             };
-            return request_1.default.post(postData);
-        })
-            .then((res) => {
-            if (options.verbose) {
-                logger.logToStderr(res);
-            }
-            this.operationData = res;
-            if (this.operationData.JobState && this.operationData.JobState === "Error") {
-                return Promise.reject(this.operationData.ErrorDescription);
-            }
-            const isComplete = this.operationData.JobState === "Success";
-            if (!options.wait || isComplete) {
-                return Promise.resolve();
-            }
-            return new Promise((resolve, reject) => {
-                this.waitForRenameCompletion(this, true, spoAdminUrl, options.siteUrl, resolve, reject, 0);
-            });
-        }).then(() => {
-            logger.log(this.operationData);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    waitForRenameCompletion(command, isVerbose, spoAdminUrl, siteUrl, resolve, reject, iteration) {
-        iteration++;
-        const requestOptions = {
-            url: `${spoAdminUrl}/_api/SiteRenameJobs/GetJobsBySiteUrl(url='${encodeURIComponent(siteUrl)}')?api-version=1.4.7`,
-            headers: {
-                'X-AttemptNumber': iteration.toString()
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
+            const res = yield request_1.default.get(requestOptions);
             this.operationData = res.value[0];
             if (this.operationData.ErrorDescription) {
-                reject(this.operationData.ErrorDescription);
-                return;
+                throw this.operationData.ErrorDescription;
             }
             if (this.operationData.JobState === "Success") {
-                resolve();
                 return;
             }
-            setTimeout(() => {
-                command.waitForRenameCompletion(command, isVerbose, spoAdminUrl, siteUrl, resolve, reject, iteration);
-            }, SpoSiteRenameCommand.checkIntervalInMs);
-        })
-            .catch((ex) => {
-            reject(ex);
+            yield this.sleep(SpoSiteRenameCommand.checkIntervalInMs);
+            yield command.waitForRenameCompletion(command, isVerbose, spoAdminUrl, siteUrl, iteration);
         });
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --siteUrl <siteUrl>'
-            },
-            {
-                option: '--newSiteUrl <newSiteUrl>'
-            },
-            {
-                option: '--newSiteTitle [newSiteTitle]'
-            },
-            {
-                option: '--suppressMarketplaceAppCheck'
-            },
-            {
-                option: '--suppressWorkflow2013Check'
-            },
-            {
-                option: '--wait'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+    sleep(ms) {
+        return new Promise(resolve => setTimeout(resolve, ms));
     }
-    validate(args) {
-        if (!args.options.newSiteUrl) {
-            return 'A new url must be provided.';
-        }
-        if (args.options.siteUrl.toLowerCase() === args.options.newSiteUrl.toLowerCase()) {
+}
+_SpoSiteRenameCommand_instances = new WeakSet(), _SpoSiteRenameCommand_initTelemetry = function _SpoSiteRenameCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            newTitle: args.options.newTitle ? true : false,
+            suppressMarketplaceAppCheck: args.options.suppressMarketplaceAppCheck,
+            suppressWorkflow2013Check: args.options.suppressWorkflow2013Check,
+            wait: args.options.wait
+        });
+    });
+}, _SpoSiteRenameCommand_initOptions = function _SpoSiteRenameCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --url <url>'
+    }, {
+        option: '--newUrl <newUrl>'
+    }, {
+        option: '--newTitle [newTitle]'
+    }, {
+        option: '--suppressMarketplaceAppCheck'
+    }, {
+        option: '--suppressWorkflow2013Check'
+    }, {
+        option: '--wait'
+    });
+}, _SpoSiteRenameCommand_initValidators = function _SpoSiteRenameCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.url.toLowerCase() === args.options.newUrl.toLowerCase()) {
             return 'The new URL cannot be the same as the target URL.';
         }
         return true;
-    }
-}
+    }));
+};
 SpoSiteRenameCommand.checkIntervalInMs = 5000;
 module.exports = new SpoSiteRenameCommand();
 //# sourceMappingURL=site-rename.js.map