@pnp/cli-microsoft365 6.0.0-beta.8352f49 → 6.0.0-beta.845d3c1

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

@@ -1,101 +1,113 @@
 "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 _SpoGroupUserRemoveCommand_instances, _SpoGroupUserRemoveCommand_initTelemetry, _SpoGroupUserRemoveCommand_initOptions, _SpoGroupUserRemoveCommand_initValidators, _SpoGroupUserRemoveCommand_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 SpoGroupUserRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoGroupUserRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.GROUP_USER_REMOVE;
     }
     get description() {
         return 'Removes the specified user from a SharePoint group';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.groupId = (!(!args.options.groupId)).toString();
-        telemetryProps.groupName = (!(!args.options.groupName)).toString();
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        const removeUserfromSPGroup = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing User with Username ${args.options.userName} from Group: ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
-            }
-            const loginName = `i:0#.f|membership|${args.options.userName}`;
-            const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
-                ? `GetById('${encodeURIComponent(args.options.groupId)}')`
-                : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${encodeURIComponent(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) {
-            if (this.debug) {
-                logger.logToStderr('Confirmation bypassed by entering confirm option. Removing the user from SharePoint Group...');
-            }
-            removeUserfromSPGroup();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove user User ${args.options.userName} from SharePoint group?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeUserfromSPGroup = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing User with Username ${args.options.userName} from Group: ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
+                }
+                const loginName = `i:0#.f|membership|${args.options.userName}`;
+                const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
+                    ? `GetById('${encodeURIComponent(args.options.groupId)}')`
+                    : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${encodeURIComponent(loginName)}'`;
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    removeUserfromSPGroup();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '--groupId [groupId]'
-            },
-            {
-                option: '--groupName [groupName]'
-            },
-            {
-                option: '--userName <userName>'
-            },
-            {
-                option: '--confirm'
+            if (args.options.confirm) {
+                if (this.debug) {
+                    logger.logToStderr('Confirmation bypassed by entering confirm option. Removing the user from SharePoint Group...');
+                }
+                yield removeUserfromSPGroup();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove user User ${args.options.userName} from SharePoint group?`
+                });
+                if (result.continue) {
+                    yield removeUserfromSPGroup();
+                }
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        if (args.options.groupId && args.options.groupName) {
-            return 'Use either "groupName" or "groupId", but not both';
-        }
-        if (!args.options.groupId && !args.options.groupName) {
-            return 'Either "groupName" or "groupId" is required';
-        }
+}
+_SpoGroupUserRemoveCommand_instances = new WeakSet(), _SpoGroupUserRemoveCommand_initTelemetry = function _SpoGroupUserRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            groupId: (!(!args.options.groupId)).toString(),
+            groupName: (!(!args.options.groupName)).toString(),
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoGroupUserRemoveCommand_initOptions = function _SpoGroupUserRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--userName <userName>'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoGroupUserRemoveCommand_initValidators = function _SpoGroupUserRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified "groupId" ${args.options.groupId} is not valid`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
-    }
-}
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+}, _SpoGroupUserRemoveCommand_initOptionSets = function _SpoGroupUserRemoveCommand_initOptionSets() {
+    this.optionSets.push(['groupName', 'groupId']);
+};
 module.exports = new SpoGroupUserRemoveCommand();
 //# sourceMappingURL=group-user-remove.js.map

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

@@ -1,7 +1,16 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const 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 SpoHideDefaultThemesGetCommand extends SpoCommand_1.default {
@@ -11,26 +20,27 @@ class SpoHideDefaultThemesGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets the current value of the HideDefaultThemes setting';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((spoAdminUrl) => {
-            if (this.verbose) {
-                logger.logToStderr(`Getting the current value of the HideDefaultThemes setting...`);
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                if (this.verbose) {
+                    logger.logToStderr(`Getting the current value of the HideDefaultThemes setting...`);
+                }
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_api/thememanager/GetHideDefaultThemes`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res.value);
             }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_api/thememanager/GetHideDefaultThemes`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((rawRes) => {
-            logger.log(rawRes.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new SpoHideDefaultThemesGetCommand();

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

@@ -1,58 +1,81 @@
 "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 _SpoHideDefaultThemesSetCommand_instances, _SpoHideDefaultThemesSetCommand_initTelemetry, _SpoHideDefaultThemesSetCommand_initOptions, _SpoHideDefaultThemesSetCommand_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 SpoHideDefaultThemesSetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHideDefaultThemesSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHideDefaultThemesSetCommand_instances, "m", _SpoHideDefaultThemesSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoHideDefaultThemesSetCommand_instances, "m", _SpoHideDefaultThemesSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHideDefaultThemesSetCommand_instances, "m", _SpoHideDefaultThemesSetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.HIDEDEFAULTTHEMES_SET;
     }
     get description() {
         return 'Sets the value of the HideDefaultThemes setting';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.hideDefaultThemes = args.options.hideDefaultThemes;
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((spoAdminUrl) => {
-            if (this.verbose) {
-                logger.logToStderr(`Setting the value of the HideDefaultThemes setting to ${args.options.hideDefaultThemes}...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                if (this.verbose) {
+                    logger.logToStderr(`Setting the value of the HideDefaultThemes setting to ${args.options.hideDefaultThemes}...`);
+                }
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_api/thememanager/SetHideDefaultThemes`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    data: {
+                        hideDefaultThemes: args.options.hideDefaultThemes
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
             }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_api/thememanager/SetHideDefaultThemes`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                data: {
-                    hideDefaultThemes: args.options.hideDefaultThemes
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '--hideDefaultThemes <hideDefaultThemes>'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
+}
+_SpoHideDefaultThemesSetCommand_instances = new WeakSet(), _SpoHideDefaultThemesSetCommand_initTelemetry = function _SpoHideDefaultThemesSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            hideDefaultThemes: args.options.hideDefaultThemes
+        });
+    });
+}, _SpoHideDefaultThemesSetCommand_initOptions = function _SpoHideDefaultThemesSetCommand_initOptions() {
+    this.options.unshift({
+        option: '--hideDefaultThemes <hideDefaultThemes>'
+    });
+}, _SpoHideDefaultThemesSetCommand_initValidators = function _SpoHideDefaultThemesSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.hideDefaultThemes !== 'false' &&
             args.options.hideDefaultThemes !== 'true') {
             return `${args.options.hideDefaultThemes} is not a valid boolean`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoHideDefaultThemesSetCommand();
 //# sourceMappingURL=hidedefaultthemes-set.js.map

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

@@ -1,7 +1,16 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const 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 SpoHomeSiteGetCommand extends SpoCommand_1.default {
@@ -11,25 +20,26 @@ class SpoHomeSiteGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets information about the Home Site';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            const requestOptions = {
-                url: `${spoUrl}/_api/SP.SPHSite/Details`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (!res["odata.null"]) {
-                logger.log(res);
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const requestOptions = {
+                    url: `${spoUrl}/_api/SP.SPHSite/Details`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                if (!res["odata.null"]) {
+                    logger.log(res);
+                }
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new SpoHomeSiteGetCommand();

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

@@ -1,83 +1,93 @@
 "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 _SpoHomeSiteRemoveCommand_instances, _SpoHomeSiteRemoveCommand_initTelemetry, _SpoHomeSiteRemoveCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
-const Command_1 = require("../../../../Command");
+const Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
 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 SpoHomeSiteRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHomeSiteRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHomeSiteRemoveCommand_instances, "m", _SpoHomeSiteRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoHomeSiteRemoveCommand_instances, "m", _SpoHomeSiteRemoveCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.HOMESITE_REMOVE;
     }
     get description() {
         return 'Removes the current Home Site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = args.options.confirm || false;
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        const removeHomeSite = () => {
-            let spoAdminUrl = '';
-            utils_1.spo.getSpoAdminUrl(logger, this.debug)
-                .then((_spoAdminUrl) => {
-                spoAdminUrl = _spoAdminUrl;
-                return utils_1.spo.getRequestDigest(spoAdminUrl);
-            })
-                .then((res) => {
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': res.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="28" ObjectPathId="27" /><Method Name="RemoveSPHSite" Id="29" ObjectPathId="27" /></Actions><ObjectPaths><Constructor Id="27" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></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(json[json.length - 1]);
-                }
-                cb();
-            }, (err) => this.handleRejectedPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeHomeSite();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the Home Site?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeHomeSite = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                    const requestOptions = {
+                        url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                        headers: {
+                            'X-RequestDigest': reqDigest.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="28" ObjectPathId="27" /><Method Name="RemoveSPHSite" Id="29" ObjectPathId="27" /></Actions><ObjectPaths><Constructor Id="27" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    };
+                    const res = yield request_1.default.post(requestOptions);
+                    const json = JSON.parse(res);
+                    const response = json[0];
+                    if (response.ErrorInfo) {
+                        throw response.ErrorInfo.ErrorMessage;
+                    }
+                    else {
+                        logger.log(json[json.length - 1]);
+                    }
                 }
-                else {
-                    removeHomeSite();
+                catch (err) {
+                    this.handleRejectedPromise(err);
                 }
             });
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '--confirm'
+            if (args.options.confirm) {
+                yield removeHomeSite();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the Home Site?`
+                });
+                if (result.continue) {
+                    yield removeHomeSite();
+                }
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
 }
+_SpoHomeSiteRemoveCommand_instances = new WeakSet(), _SpoHomeSiteRemoveCommand_initTelemetry = function _SpoHomeSiteRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: args.options.confirm || false
+        });
+    });
+}, _SpoHomeSiteRemoveCommand_initOptions = function _SpoHomeSiteRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--confirm'
+    });
+};
 module.exports = new SpoHomeSiteRemoveCommand();
 //# sourceMappingURL=homesite-remove.js.map