@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

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

@@ -16,7 +16,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoStorageEntityRemoveCommand_instances, _SpoStorageEntityRemoveCommand_initTelemetry, _SpoStorageEntityRemoveCommand_initOptions, _SpoStorageEntityRemoveCommand_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");
@@ -36,57 +35,48 @@ class SpoStorageEntityRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes tenant property stored on the specified SharePoint Online app catalog';
     }
-    commandAction(logger, args, cb) {
-        const removeTenantProperty = () => {
-            let spoAdminUrl = '';
-            if (this.verbose) {
-                logger.logToStderr(`Removing tenant property ${args.options.key} from ${args.options.appCatalogUrl}...`);
-            }
-            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="31" ObjectPathId="30" /><ObjectPath Id="33" ObjectPathId="32" /><ObjectPath Id="35" ObjectPathId="34" /><Method Name="RemoveStorageEntity" Id="36" ObjectPathId="34"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.key)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="30" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="32" ParentId="30" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="34" ParentId="32" Name="RootWeb" /></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));
-                }
-                else {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeTenantProperty = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing tenant property ${args.options.key} from ${args.options.appCatalogUrl}...`);
                 }
-            }, (err) => this.handleRejectedPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeTenantProperty();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to delete the ${args.options.key} tenant property?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+                try {
+                    const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const res = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                    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="31" ObjectPathId="30" /><ObjectPath Id="33" ObjectPathId="32" /><ObjectPath Id="35" ObjectPathId="34" /><Method Name="RemoveStorageEntity" Id="36" ObjectPathId="34"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.key)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="30" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="32" ParentId="30" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="34" ParentId="32" Name="RootWeb" /></ObjectPaths></Request>`
+                    };
+                    const processQuery = yield request_1.default.post(requestOptions);
+                    const json = JSON.parse(processQuery);
+                    const response = json[0];
+                    if (response.ErrorInfo) {
+                        throw response.ErrorInfo.ErrorMessage;
+                    }
                 }
-                else {
-                    removeTenantProperty();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeTenantProperty();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to delete the ${args.options.key} tenant property?`
+                });
+                if (result.continue) {
+                    yield removeTenantProperty();
+                }
+            }
+        });
     }
 }
 _SpoStorageEntityRemoveCommand_instances = new WeakSet(), _SpoStorageEntityRemoveCommand_initTelemetry = function _SpoStorageEntityRemoveCommand_initTelemetry() {

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

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoStorageEntitySetCommand_instances, _SpoStorageEntitySetCommand_initTelemetry, _SpoStorageEntitySetCommand_initOptions, _SpoStorageEntitySetCommand_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");
@@ -35,41 +34,37 @@ class SpoStorageEntitySetCommand extends SpoCommand_1.default {
     get description() {
         return 'Sets tenant property on the specified SharePoint Online app catalog';
     }
-    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(`Setting tenant property ${args.options.key} in ${args.options.appCatalogUrl}...`);
-            }
-            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="24" ObjectPathId="23" /><ObjectPath Id="26" ObjectPathId="25" /><ObjectPath Id="28" ObjectPathId="27" /><Method Name="SetStorageEntity" Id="29" ObjectPathId="27"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.key)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.value)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.description || '')}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.comment || '')}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="23" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="25" ParentId="23" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="27" ParentId="25" Name="RootWeb" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                if (this.verbose && response.ErrorInfo.ErrorMessage.indexOf('Access denied.') > -1) {
-                    logger.logToStderr('');
-                    logger.logToStderr(`This error is often caused by invalid URL of the app catalog site. Verify, that the URL you specified as an argument of the ${commands_1.default.STORAGEENTITY_SET} command is a valid app catalog URL and try again.`);
-                    logger.logToStderr('');
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                if (this.verbose) {
+                    logger.logToStderr(`Setting tenant property ${args.options.key} in ${args.options.appCatalogUrl}...`);
+                }
+                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="24" ObjectPathId="23" /><ObjectPath Id="26" ObjectPathId="25" /><ObjectPath Id="28" ObjectPathId="27" /><Method Name="SetStorageEntity" Id="29" ObjectPathId="27"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.key)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.value)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.description || '')}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.comment || '')}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="23" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="25" ParentId="23" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="27" ParentId="25" Name="RootWeb" /></ObjectPaths></Request>`
+                };
+                const processQuery = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(processQuery);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    if (this.verbose && response.ErrorInfo.ErrorMessage.indexOf('Access denied.') > -1) {
+                        logger.logToStderr('');
+                        logger.logToStderr(`This error is often caused by invalid URL of the app catalog site. Verify, that the URL you specified as an argument of the ${commands_1.default.STORAGEENTITY_SET} command is a valid app catalog URL and try again.`);
+                        logger.logToStderr('');
+                    }
+                    throw response.ErrorInfo.ErrorMessage;
                 }
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                return;
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoStorageEntitySetCommand_instances = new WeakSet(), _SpoStorageEntitySetCommand_initTelemetry = function _SpoStorageEntitySetCommand_initTelemetry() {

package/dist/m365/spo/commands/tenant/tenant-appcatalog-add.js

@@ -38,29 +38,28 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Creates new tenant app catalog site';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr('Checking for existing app catalog URL...');
-        }
-        cli_1.Cli
-            .executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { output: 'text', _: [] } })
-            .then((spoTenantAppCatalogUrlGetCommandOutput) => {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Checking for existing app catalog URL...');
+            }
+            const spoTenantAppCatalogUrlGetCommandOutput = yield cli_1.Cli.executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { output: 'text', _: [] } });
             const appCatalogUrl = spoTenantAppCatalogUrlGetCommandOutput.stdout;
             if (!appCatalogUrl) {
                 if (this.verbose) {
                     logger.logToStderr('No app catalog URL found');
                 }
-                return Promise.resolve();
             }
-            if (this.verbose) {
-                logger.logToStderr(`Found app catalog URL ${appCatalogUrl}`);
+            else {
+                if (this.verbose) {
+                    logger.logToStderr(`Found app catalog URL ${appCatalogUrl}`);
+                }
+                //Using JSON.parse
+                yield this.ensureNoExistingSite(appCatalogUrl, args.options.force, logger);
             }
-            //Using JSON.parse
-            return this.ensureNoExistingSite(appCatalogUrl, args.options.force, logger);
-        })
-            .then(() => this.ensureNoExistingSite(args.options.url, args.options.force, logger))
-            .then(() => this.createAppCatalog(args.options, logger))
-            .then(_ => cb(), (err) => cb(err));
+            yield this.ensureNoExistingSite(args.options.url, args.options.force, logger);
+            yield this.createAppCatalog(args.options, logger);
+        });
     }
     ensureNoExistingSite(url, force, logger) {
         return new Promise((resolve, reject) => {

package/dist/m365/spo/commands/tenant/tenant-appcatalogurl-get.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -11,30 +20,31 @@ class SpoTenantAppCatalogUrlGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets the URL of the tenant app catalog';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            const requestOptions = {
-                url: `${spoUrl}/_api/SP_TenantSettings_Current`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const requestOptions = {
+                    url: `${spoUrl}/_api/SP_TenantSettings_Current`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    }
+                };
+                const res = yield request_1.default.get(requestOptions);
+                const json = JSON.parse(res);
+                if (json.CorporateCatalogUrl) {
+                    logger.log(json.CorporateCatalogUrl);
                 }
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            if (json.CorporateCatalogUrl) {
-                logger.log(json.CorporateCatalogUrl);
-            }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr("Tenant app catalog is not configured.");
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr("Tenant app catalog is not configured.");
+                    }
                 }
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new SpoTenantAppCatalogUrlGetCommand();

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-list.js

@@ -1,6 +1,14 @@
 "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 Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -16,41 +24,37 @@ class SpoTenantRecycleBinItemListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['DaysRemaining', 'DeletionTime', 'Url'];
     }
-    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) => {
-            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="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties><Property Name="Url" ScalarProperty="true" /><Property Name="SiteId" ScalarProperty="true" /><Property Name="DaysRemaining" ScalarProperty="true" /><Property Name="Status" ScalarProperty="true" /></Properties></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetDeletedSitePropertiesFromSharePoint"><Parameters><Parameter Type="String">0</Parameter></Parameters></Method></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 res = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                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="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties><Property Name="Url" ScalarProperty="true" /><Property Name="SiteId" ScalarProperty="true" /><Property Name="DaysRemaining" ScalarProperty="true" /><Property Name="Status" ScalarProperty="true" /></Properties></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetDeletedSitePropertiesFromSharePoint"><Parameters><Parameter Type="String">0</Parameter></Parameters></Method></ObjectPaths></Request>`
+                };
+                const processQuery = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(processQuery);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                const results = json[json.length - 1];
+                if (args.options.output !== 'json') {
+                    results._Child_Items_.forEach(s => {
+                        s.DaysRemaining = Number(s.DaysRemaining);
+                        s.DeletionTime = this.dateParser(s.DeletionTime);
+                    });
+                }
+                logger.log(results._Child_Items_);
             }
-            const results = json[json.length - 1];
-            if (args.options.output !== 'json') {
-                results._Child_Items_.forEach(s => {
-                    s.DaysRemaining = Number(s.DaysRemaining);
-                    s.DeletionTime = this.dateParser(s.DeletionTime);
-                });
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(results._Child_Items_);
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     dateParser(dateString) {
         const d = dateString.replace('/Date(', '').replace(')/', '').split(',').map(Number);

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-remove.js

@@ -35,78 +35,70 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the specified deleted site collection from tenant recycle bin';
     }
-    commandAction(logger, args, cb) {
-        const removeDeletedSite = () => {
-            utils_1.spo
-                .getSpoAdminUrl(logger, this.debug)
-                .then((adminUrl) => {
-                this.spoAdminUrl = adminUrl;
-                return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-            })
-                .then((res) => {
-                this.context = res;
-                if (this.verbose) {
-                    logger.logToStderr(`Removing deleted site collection ${args.options.url}...`);
-                }
-                const requestOptions = {
-                    url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    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="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                return new Promise((resolve, reject) => {
-                    const json = JSON.parse(res);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeDeletedSite = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const adminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const res = yield utils_1.spo.ensureFormDigest(adminUrl, logger, this.context, this.debug);
+                    if (this.verbose) {
+                        logger.logToStderr(`Removing deleted site collection ${args.options.url}...`);
+                    }
+                    const requestOptions = {
+                        url: `${this.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="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    };
+                    const processQuery = yield request_1.default.post(requestOptions);
+                    const json = JSON.parse(processQuery);
                     const response = json[0];
                     if (response.ErrorInfo) {
-                        reject(response.ErrorInfo.ErrorMessage);
+                        throw response.ErrorInfo.ErrorMessage;
                     }
                     else {
                         const operation = json[json.length - 1];
                         const isComplete = operation.IsComplete;
                         if (!args.options.wait || isComplete) {
-                            resolve();
                             return;
                         }
-                        setTimeout(() => {
-                            utils_1.spo.waitUntilFinished({
-                                operationId: JSON.stringify(operation._ObjectIdentity_),
-                                siteUrl: this.spoAdminUrl,
-                                resolve,
-                                reject,
-                                logger,
-                                currentContext: this.context,
-                                dots: this.dots,
-                                debug: this.debug,
-                                verbose: this.verbose
-                            });
-                        }, operation.PollingInterval);
+                        yield new Promise((resolve, reject) => {
+                            setTimeout(() => {
+                                utils_1.spo.waitUntilFinished({
+                                    operationId: JSON.stringify(operation._ObjectIdentity_),
+                                    siteUrl: this.spoAdminUrl,
+                                    resolve,
+                                    reject,
+                                    logger,
+                                    currentContext: this.context,
+                                    dots: this.dots,
+                                    debug: this.debug,
+                                    verbose: this.verbose
+                                });
+                            }, operation.PollingInterval);
+                        });
                     }
-                });
-            })
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeDeletedSite();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the deleted site collection ${args.options.url} from tenant recycle bin?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
                 }
-                else {
-                    removeDeletedSite();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeDeletedSite();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the deleted site collection ${args.options.url} from tenant recycle bin?`
+                });
+                if (result.continue) {
+                    yield removeDeletedSite();
+                }
+            }
+        });
     }
 }
 _SpoTenantRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRemoveCommand_initTelemetry = function _SpoTenantRecycleBinItemRemoveCommand_initTelemetry() {

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-restore.js

@@ -33,26 +33,27 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand_1.default {
     get description() {
         return 'Restores the specified deleted site collection from tenant recycle bin';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((adminUrl) => {
-            const requestOptions = {
-                url: `${adminUrl}/_api/SPOInternalUseOnly.Tenant/RestoreDeletedSite`,
-                headers: {
-                    accept: 'application/json;odata=nometadata',
-                    'content-type': 'application/json;charset=utf-8'
-                },
-                data: {
-                    siteUrl: args.options.url
-                }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(res => {
-            logger.log(JSON.parse(res));
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const adminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const requestOptions = {
+                    url: `${adminUrl}/_api/SPOInternalUseOnly.Tenant/RestoreDeletedSite`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata',
+                        'content-type': 'application/json;charset=utf-8'
+                    },
+                    data: {
+                        siteUrl: args.options.url
+                    }
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(JSON.parse(res));
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRestoreCommand_initTelemetry = function _SpoTenantRecycleBinItemRestoreCommand_initTelemetry() {