@pnp/cli-microsoft365 6.0.0-beta.27e1012 → 6.0.0-beta.3261c97

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

@@ -1,4 +1,19 @@
 "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 _SpoHubSiteListCommand_instances, _SpoHubSiteListCommand_initTelemetry, _SpoHubSiteListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -7,8 +22,11 @@ const commands_1 = require("../../commands");
 class SpoHubSiteListCommand extends SpoCommand_1.default {
     constructor() {
         super();
+        _SpoHubSiteListCommand_instances.add(this);
         this.batchSize = 30;
         this.batchSize = 30;
+        __classPrivateFieldGet(this, _SpoHubSiteListCommand_instances, "m", _SpoHubSiteListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteListCommand_instances, "m", _SpoHubSiteListCommand_initOptions).call(this);
     }
     get name() {
         return commands_1.default.HUBSITE_LIST;
@@ -16,80 +34,68 @@ class SpoHubSiteListCommand extends SpoCommand_1.default {
     get description() {
         return 'Lists hub sites in the current tenant';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.includeAssociatedSites = args.options.includeAssociatedSites === true;
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['ID', 'SiteUrl', 'Title'];
     }
-    commandAction(logger, args, cb) {
-        let hubSites;
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            const requestOptions = {
-                url: `${spoAdminUrl}/_api/hubsites`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            hubSites = res.value;
-            if (args.options.includeAssociatedSites !== true || args.options.output && args.options.output !== 'json') {
-                return Promise.resolve();
-            }
-            else {
-                if (this.debug) {
-                    logger.logToStderr('Retrieving associated sites...');
-                    logger.logToStderr('');
-                }
-            }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_api/web/lists/GetByTitle('DO_NOT_DELETE_SPLIST_TENANTADMIN_AGGREGATED_SITECOLLECTIONS')/RenderListDataAsStream`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: {
-                    parameters: {
-                        ViewXml: "<View><Query><Where><And><And><IsNull><FieldRef Name=\"TimeDeleted\"/></IsNull><Neq><FieldRef Name=\"State\"/><Value Type='Integer'>0</Value></Neq></And><Neq><FieldRef Name=\"HubSiteId\"/><Value Type='Text'>{00000000-0000-0000-0000-000000000000}</Value></Neq></And></Where><OrderBy><FieldRef Name='Title' Ascending='true' /></OrderBy></Query><ViewFields><FieldRef Name=\"Title\"/><FieldRef Name=\"SiteUrl\"/><FieldRef Name=\"SiteId\"/><FieldRef Name=\"HubSiteId\"/></ViewFields><RowLimit Paged=\"TRUE\">" + this.batchSize + "</RowLimit></View>",
-                        DatesInUtc: true
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                let requestOptions = {
+                    url: `${spoAdminUrl}/_api/hubsites`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const hubSitesResult = yield request_1.default.get(requestOptions);
+                const hubSites = hubSitesResult.value;
+                if (!(args.options.includeAssociatedSites !== true || args.options.output && args.options.output !== 'json')) {
+                    if (this.debug) {
+                        logger.logToStderr('Retrieving associated sites...');
+                        logger.logToStderr('');
+                    }
+                    requestOptions = {
+                        url: `${spoAdminUrl}/_api/web/lists/GetByTitle('DO_NOT_DELETE_SPLIST_TENANTADMIN_AGGREGATED_SITECOLLECTIONS')/RenderListDataAsStream`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json',
+                        data: {
+                            parameters: {
+                                ViewXml: "<View><Query><Where><And><And><IsNull><FieldRef Name=\"TimeDeleted\"/></IsNull><Neq><FieldRef Name=\"State\"/><Value Type='Integer'>0</Value></Neq></And><Neq><FieldRef Name=\"HubSiteId\"/><Value Type='Text'>{00000000-0000-0000-0000-000000000000}</Value></Neq></And></Where><OrderBy><FieldRef Name='Title' Ascending='true' /></OrderBy></Query><ViewFields><FieldRef Name=\"Title\"/><FieldRef Name=\"SiteUrl\"/><FieldRef Name=\"SiteId\"/><FieldRef Name=\"HubSiteId\"/></ViewFields><RowLimit Paged=\"TRUE\">" + this.batchSize + "</RowLimit></View>",
+                                DatesInUtc: true
+                            }
+                        }
+                    };
+                    if (this.debug) {
+                        logger.logToStderr(`Will retrieve associated sites (including the hub sites) in batches of ${this.batchSize}`);
+                    }
+                    const res = yield this.getSites(requestOptions, requestOptions.url, logger);
+                    if (res) {
+                        hubSites.forEach(h => {
+                            const filteredSites = res.filter(f => {
+                                // Only include sites of which the Site Id is not the same as the
+                                // Hub Site ID (as this site is the actual hub site) and of which the
+                                // Hub Site ID matches the ID of the Hub
+                                return f.SiteId !== f.HubSiteId
+                                    && f.HubSiteId.toUpperCase() === `{${h.ID.toUpperCase()}}`;
+                            });
+                            h.AssociatedSites = filteredSites.map(a => {
+                                return {
+                                    Title: a.Title,
+                                    SiteUrl: a.SiteUrl
+                                };
+                            });
+                        });
                     }
                 }
-            };
-            if (this.debug) {
-                logger.logToStderr(`Will retrieve associated sites (including the hub sites) in batches of ${this.batchSize}`);
+                logger.log(hubSites);
             }
-            return this.getSites(requestOptions, requestOptions.url, logger);
-        })
-            .then((res) => {
-            if (res) {
-                hubSites.forEach(h => {
-                    const filteredSites = res.filter(f => {
-                        // Only include sites of which the Site Id is not the same as the
-                        // Hub Site ID (as this site is the actual hub site) and of which the
-                        // Hub Site ID matches the ID of the Hub
-                        return f.SiteId !== f.HubSiteId
-                            && f.HubSiteId.toUpperCase() === `{${h.ID.toUpperCase()}}`;
-                    });
-                    h.AssociatedSites = filteredSites.map(a => {
-                        return {
-                            Title: a.Title,
-                            SiteUrl: a.SiteUrl
-                        };
-                    });
-                });
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(hubSites);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getSites(reqOptions, nonPagedUrl, logger, sites = [], batchNumber = 0) {
         return new Promise((resolve, reject) => {
@@ -126,15 +132,17 @@ class SpoHubSiteListCommand extends SpoCommand_1.default {
             });
         });
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --includeAssociatedSites'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
 }
+_SpoHubSiteListCommand_instances = new WeakSet(), _SpoHubSiteListCommand_initTelemetry = function _SpoHubSiteListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            includeAssociatedSites: args.options.includeAssociatedSites === true
+        });
+    });
+}, _SpoHubSiteListCommand_initOptions = function _SpoHubSiteListCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --includeAssociatedSites'
+    });
+};
 module.exports = new SpoHubSiteListCommand();
 //# sourceMappingURL=hubsite-list.js.map

package/dist/m365/spo/commands/hubsite/hubsite-register.js

@@ -1,47 +1,64 @@
 "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 _SpoHubSiteRegisterCommand_instances, _SpoHubSiteRegisterCommand_initOptions, _SpoHubSiteRegisterCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteRegisterCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHubSiteRegisterCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteRegisterCommand_instances, "m", _SpoHubSiteRegisterCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteRegisterCommand_instances, "m", _SpoHubSiteRegisterCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.HUBSITE_REGISTER;
     }
     get description() {
         return 'Registers the specified site collection as a hub site';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getRequestDigest(args.options.url)
-            .then((res) => {
-            const requestOptions = {
-                url: `${args.options.url}/_api/site/RegisterHubSite`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue,
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const reqDigest = yield utils_1.spo.getRequestDigest(args.options.siteUrl);
+                const requestOptions = {
+                    url: `${args.options.siteUrl}/_api/site/RegisterHubSite`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.FormDigestValue,
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
+_SpoHubSiteRegisterCommand_instances = new WeakSet(), _SpoHubSiteRegisterCommand_initOptions = function _SpoHubSiteRegisterCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    });
+}, _SpoHubSiteRegisterCommand_initValidators = function _SpoHubSiteRegisterCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+};
 module.exports = new SpoHubSiteRegisterCommand();
 //# sourceMappingURL=hubsite-register.js.map

package/dist/m365/spo/commands/hubsite/hubsite-rights-grant.js

@@ -1,72 +1,83 @@
 "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 _SpoHubSiteRightsGrantCommand_instances, _SpoHubSiteRightsGrantCommand_initOptions, _SpoHubSiteRightsGrantCommand_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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHubSiteRightsGrantCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteRightsGrantCommand_instances, "m", _SpoHubSiteRightsGrantCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteRightsGrantCommand_instances, "m", _SpoHubSiteRightsGrantCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.HUBSITE_RIGHTS_GRANT;
     }
     get description() {
         return 'Grants permissions to join the hub site for one or more principals';
     }
-    commandAction(logger, args, cb) {
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(`Granting permissions to join the hub site ${args.options.url} to principals ${args.options.principals}...`);
-            }
-            const principals = args.options.principals
-                .split(',')
-                .map(p => `<Object Type="String">${utils_1.formatting.escapeXml(p.trim())}</Object>`)
-                .join('');
-            const grantedRights = '1';
-            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="37" ObjectPathId="36" /><Method Name="GrantHubSiteRights" Id="38" ObjectPathId="36"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Array">${principals}</Parameter><Parameter Type="Enum">${grantedRights}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="36" 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;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                if (this.verbose) {
+                    logger.logToStderr(`Granting permissions to join the hub site ${args.options.hubSiteUrl} to principals ${args.options.principals}...`);
+                }
+                const principals = args.options.principals
+                    .split(',')
+                    .map(p => `<Object Type="String">${utils_1.formatting.escapeXml(p.trim())}</Object>`)
+                    .join('');
+                const grantedRights = '1';
+                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="37" ObjectPathId="36" /><Method Name="GrantHubSiteRights" Id="38" ObjectPathId="36"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.hubSiteUrl)}</Parameter><Parameter Type="Array">${principals}</Parameter><Parameter Type="Enum">${grantedRights}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="36" 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;
+                }
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-p, --principals <principals>'
-            },
-            {
-                option: '-r, --rights <rights>',
-                autocomplete: ['Join']
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+}
+_SpoHubSiteRightsGrantCommand_instances = new WeakSet(), _SpoHubSiteRightsGrantCommand_initOptions = function _SpoHubSiteRightsGrantCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --hubSiteUrl <hubSiteUrl>'
+    }, {
+        option: '-p, --principals <principals>'
+    }, {
+        option: '-r, --rights <rights>',
+        autocomplete: ['Join']
+    });
+}, _SpoHubSiteRightsGrantCommand_initValidators = function _SpoHubSiteRightsGrantCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.hubSiteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -74,7 +85,7 @@ class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
             return `${args.options.rights} is not a valid rights value. Allowed values Join`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoHubSiteRightsGrantCommand();
 //# sourceMappingURL=hubsite-rights-grant.js.map

package/dist/m365/spo/commands/hubsite/hubsite-rights-revoke.js

@@ -1,97 +1,104 @@
 "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 _SpoHubSiteRightsRevokeCommand_instances, _SpoHubSiteRightsRevokeCommand_initTelemetry, _SpoHubSiteRightsRevokeCommand_initOptions, _SpoHubSiteRightsRevokeCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHubSiteRightsRevokeCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteRightsRevokeCommand_instances, "m", _SpoHubSiteRightsRevokeCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteRightsRevokeCommand_instances, "m", _SpoHubSiteRightsRevokeCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteRightsRevokeCommand_instances, "m", _SpoHubSiteRightsRevokeCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.HUBSITE_RIGHTS_REVOKE;
     }
     get description() {
         return 'Revokes rights to join sites to the specified hub site for one or more principals';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        const revokeRights = () => {
-            let spoAdminUrl = '';
-            if (this.verbose) {
-                logger.logToStderr(`Revoking rights for ${args.options.principals} from ${args.options.url}...`);
-            }
-            utils_1.spo
-                .getSpoAdminUrl(logger, this.debug)
-                .then((_spoAdminUrl) => {
-                spoAdminUrl = _spoAdminUrl;
-                return utils_1.spo.getRequestDigest(spoAdminUrl);
-            })
-                .then((res) => {
-                const principals = args.options.principals
-                    .split(',')
-                    .map(p => `<Object Type="String">${utils_1.formatting.escapeXml(p.trim())}</Object>`)
-                    .join('');
-                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="10" ObjectPathId="9" /><Method Name="RevokeHubSiteRights" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Array">${principals}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" 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;
-                }
-                cb();
-            }, (err) => this.handleRejectedPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            revokeRights();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to revoke rights to join sites to the hub site ${args.options.url} from the specified users?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const revokeRights = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (this.verbose) {
+                        logger.logToStderr(`Revoking rights for ${args.options.principals} from ${args.options.hubSiteUrl}...`);
+                    }
+                    const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                    const principals = args.options.principals
+                        .split(',')
+                        .map(p => `<Object Type="String">${utils_1.formatting.escapeXml(p.trim())}</Object>`)
+                        .join('');
+                    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="10" ObjectPathId="9" /><Method Name="RevokeHubSiteRights" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.hubSiteUrl)}</Parameter><Parameter Type="Array">${principals}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" 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 {
-                    revokeRights();
+                catch (err) {
+                    this.handleRejectedPromise(err);
                 }
             });
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-p, --principals <principals>'
-            },
-            {
-                option: '--confirm'
+            if (args.options.confirm) {
+                yield revokeRights();
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to revoke rights to join sites to the hub site ${args.options.hubSiteUrl} from the specified users?`
+                });
+                if (result.continue) {
+                    yield revokeRights();
+                }
+            }
+        });
     }
 }
+_SpoHubSiteRightsRevokeCommand_instances = new WeakSet(), _SpoHubSiteRightsRevokeCommand_initTelemetry = function _SpoHubSiteRightsRevokeCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoHubSiteRightsRevokeCommand_initOptions = function _SpoHubSiteRightsRevokeCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --hubSiteUrl <hubSiteUrl>'
+    }, {
+        option: '-p, --principals <principals>'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoHubSiteRightsRevokeCommand_initValidators = function _SpoHubSiteRightsRevokeCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.hubSiteUrl); }));
+};
 module.exports = new SpoHubSiteRightsRevokeCommand();
 //# sourceMappingURL=hubsite-rights-revoke.js.map