@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7920dfd

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoStorageEntityListCommand_instances, _SpoStorageEntityListCommand_initOptions, _SpoStorageEntityListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoStorageEntityListCommand extends SpoCommand_1.default {
@@ -32,53 +32,51 @@ class SpoStorageEntityListCommand extends SpoCommand_1.default {
     get description() {
         return 'Lists tenant properties stored on the specified SharePoint Online app catalog';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving details for all tenant properties in ${args.options.appCatalogUrl}...`);
-        }
-        const requestOptions = {
-            url: `${args.options.appCatalogUrl}/_api/web/AllProperties?$select=storageentitiesindex`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((web) => {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving details for all tenant properties in ${args.options.appCatalogUrl}...`);
+            }
+            const requestOptions = {
+                url: `${args.options.appCatalogUrl}/_api/web/AllProperties?$select=storageentitiesindex`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
             try {
+                const web = yield request_1.default.get(requestOptions);
                 if (!web.storageentitiesindex ||
                     web.storageentitiesindex.trim().length === 0) {
                     if (this.verbose) {
                         logger.logToStderr('No tenant properties found');
                     }
-                    cb();
-                    return;
-                }
-                const properties = JSON.parse(web.storageentitiesindex);
-                const keys = Object.keys(properties);
-                if (keys.length === 0) {
-                    if (this.verbose) {
-                        logger.logToStderr('No tenant properties found');
-                    }
                 }
                 else {
-                    logger.log(keys.map((key) => {
-                        const property = properties[key];
-                        return {
-                            Key: key,
-                            Value: property.Value,
-                            Description: property.Description,
-                            Comment: property.Comment
-                        };
-                    }));
+                    const properties = JSON.parse(web.storageentitiesindex);
+                    const keys = Object.keys(properties);
+                    if (keys.length === 0) {
+                        if (this.verbose) {
+                            logger.logToStderr('No tenant properties found');
+                        }
+                    }
+                    else {
+                        logger.log(keys.map((key) => {
+                            const property = properties[key];
+                            return {
+                                Key: key,
+                                Value: property.Value,
+                                Description: property.Description,
+                                Comment: property.Comment
+                            };
+                        }));
+                    }
                 }
-                cb();
             }
-            catch (e) {
-                this.handleError(e, logger, cb);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
 }
 _SpoStorageEntityListCommand_instances = new WeakSet(), _SpoStorageEntityListCommand_initOptions = function _SpoStorageEntityListCommand_initOptions() {
@@ -86,7 +84,7 @@ _SpoStorageEntityListCommand_instances = new WeakSet(), _SpoStorageEntityListCom
         option: '-u, --appCatalogUrl <appCatalogUrl>'
     });
 }, _SpoStorageEntityListCommand_initValidators = function _SpoStorageEntityListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));
 };
 module.exports = new SpoStorageEntityListCommand();
 //# sourceMappingURL=storageentity-list.js.map

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

@@ -15,11 +15,12 @@ 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 Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoStorageEntityRemoveCommand extends SpoCommand_1.default {
@@ -36,57 +37,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 spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const res = yield spo_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">${formatting_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">${formatting_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() {
@@ -104,7 +96,7 @@ _SpoStorageEntityRemoveCommand_instances = new WeakSet(), _SpoStorageEntityRemov
         option: '--confirm'
     });
 }, _SpoStorageEntityRemoveCommand_initValidators = function _SpoStorageEntityRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));
 };
 module.exports = new SpoStorageEntityRemoveCommand();
 //# sourceMappingURL=storageentity-remove.js.map

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

@@ -15,10 +15,11 @@ 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");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoStorageEntitySetCommand extends SpoCommand_1.default {
@@ -35,41 +36,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 spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_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">${formatting_1.formatting.escapeXml(args.options.key)}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.value)}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.description || '')}</Parameter><Parameter Type="String">${formatting_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">${formatting_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() {
@@ -92,7 +89,7 @@ _SpoStorageEntitySetCommand_instances = new WeakSet(), _SpoStorageEntitySetComma
         option: '-c, --comment [comment]'
     });
 }, _SpoStorageEntitySetCommand_initValidators = function _SpoStorageEntitySetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));
 };
 module.exports = new SpoStorageEntitySetCommand();
 //# sourceMappingURL=storageentity-set.js.map

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoTenantAppCatalogAddCommand_instances, _SpoTenantAppCatalogAddCommand_initTelemetry, _SpoTenantAppCatalogAddCommand_initOptions, _SpoTenantAppCatalogAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const Command_1 = require("../../../../Command");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const spoSiteAddCommand = require("../site/site-add");
@@ -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) => {
@@ -75,7 +74,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
                     _: []
                 }
             };
-            cli_1.Cli
+            Cli_1.Cli
                 .executeCommandWithOutput(spoSiteGetCommand, siteGetOptions)
                 .then(() => {
                 if (this.verbose) {
@@ -95,7 +94,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
                     verbose: this.verbose,
                     debug: this.debug
                 };
-                cli_1.Cli
+                Cli_1.Cli
                     .executeCommand(spoSiteRemoveCommand, { options: Object.assign(Object.assign({}, siteRemoveOptions), { _: [] }) })
                     .then(() => resolve(), (err) => reject(err));
             }, (err) => {
@@ -127,7 +126,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
             debug: this.debug,
             removeDeletedSite: false
         };
-        return cli_1.Cli.executeCommand(spoSiteAddCommand, { options: Object.assign(Object.assign({}, siteAddOptions), { _: [] }) });
+        return Cli_1.Cli.executeCommand(spoSiteAddCommand, { options: Object.assign(Object.assign({}, siteAddOptions), { _: [] }) });
     }
 }
 _SpoTenantAppCatalogAddCommand_instances = new WeakSet(), _SpoTenantAppCatalogAddCommand_initTelemetry = function _SpoTenantAppCatalogAddCommand_initTelemetry() {
@@ -151,7 +150,7 @@ _SpoTenantAppCatalogAddCommand_instances = new WeakSet(), _SpoTenantAppCatalogAd
     });
 }, _SpoTenantAppCatalogAddCommand_initValidators = function _SpoTenantAppCatalogAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/tenant/tenant-appcatalogurl-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 SpoTenantAppCatalogUrlGetCommand extends SpoCommand_1.default {
@@ -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 spo_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,9 +1,17 @@
 "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");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoTenantRecycleBinItemListCommand extends SpoCommand_1.default {
@@ -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 spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_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);