@pnp/cli-microsoft365 6.0.0-beta.5637b93 → 6.0.0-beta.62647c9

package/dist/m365/spo/commands/app/app-retract.js

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoAppRetractCommand_instances, _SpoAppRetractCommand_initTelemetry, _SpoAppRetractCommand_initOptions, _SpoAppRetractCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -34,46 +35,43 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     get description() {
         return 'Retracts the specified app from the specified app catalog';
     }
-    commandAction(logger, args, cb) {
-        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-        const retractApp = () => {
-            utils_1.spo
-                .getSpoUrl(logger, this.debug)
-                .then((spoUrl) => {
-                return this.getAppCatalogSiteUrl(logger, spoUrl, args);
-            })
-                .then((appCatalogSiteUrl) => {
-                if (this.verbose) {
-                    logger.logToStderr(`Retracting app...`);
-                }
-                const requestOptions = {
-                    url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/retract`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
+            const retractApp = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                    const appCatalogSiteUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
+                    if (this.verbose) {
+                        logger.logToStderr(`Retracting app...`);
                     }
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then(_ => cb(), (rawRes) => this.handleRejectedODataPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            retractApp();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to retract the app ${args.options.id} from the app catalog?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+                    const requestOptions = {
+                        url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/retract`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        }
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    retractApp();
+                catch (err) {
+                    this.handleRejectedODataPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield retractApp();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to retract the app ${args.options.id} from the app catalog?`
+                });
+                if (result.continue) {
+                    yield retractApp();
+                }
+            }
+        });
     }
 }
 _SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelemetry = function _SpoAppRetractCommand_initTelemetry() {
@@ -106,11 +104,11 @@ _SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelem
                 return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));

package/dist/m365/spo/commands/app/app-teamspackage-download.js

@@ -37,52 +37,51 @@ class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand_1.SpoAppBaseCo
     get description() {
         return 'Downloads Teams app package for an SPFx solution deployed to tenant app catalog';
     }
-    commandAction(logger, args, cb) {
+    commandAction(logger, args) {
         var _a, _b;
-        this.appCatalogUrl = args.options.appCatalogUrl;
-        const appInfo = {
-            id: (_a = args.options.appItemId) !== null && _a !== void 0 ? _a : undefined,
-            packageFileName: (_b = args.options.fileName) !== null && _b !== void 0 ? _b : undefined
-        };
-        if (this.debug) {
-            logger.logToStderr(`appInfo: ${JSON.stringify(appInfo)}`);
-        }
-        this
-            .ensureAppInfo(logger, args, appInfo)
-            .then(_ => {
-            if (this.debug) {
-                logger.logToStderr(`ensureAppInfo: ${JSON.stringify(appInfo)}`);
-            }
-            return this.loadAppCatalogUrl(logger, args);
-        })
-            .then(_ => {
-            const requestOptions = {
-                url: `${this.appCatalogUrl}/_api/web/tenantappcatalog/downloadteamssolution(${appInfo.id})/$value`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'stream'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((file) => {
-            return new Promise((resolve, reject) => {
-                const writer = fs.createWriteStream(appInfo.packageFileName);
-                file.data.pipe(writer);
-                writer.on('error', err => {
-                    reject(err);
-                });
-                writer.on('close', () => {
-                    resolve(appInfo.packageFileName);
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.appCatalogUrl = args.options.appCatalogUrl;
+                const appInfo = {
+                    id: (_a = args.options.appItemId) !== null && _a !== void 0 ? _a : undefined,
+                    packageFileName: (_b = args.options.fileName) !== null && _b !== void 0 ? _b : undefined
+                };
+                if (this.debug) {
+                    logger.logToStderr(`appInfo: ${JSON.stringify(appInfo)}`);
+                }
+                yield this.ensureAppInfo(logger, args, appInfo);
+                if (this.debug) {
+                    logger.logToStderr(`ensureAppInfo: ${JSON.stringify(appInfo)}`);
+                }
+                yield this.loadAppCatalogUrl(logger, args);
+                const requestOptions = {
+                    url: `${this.appCatalogUrl}/_api/web/tenantappcatalog/downloadteamssolution(${appInfo.id})/$value`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'stream'
+                };
+                const file = yield request_1.default.get(requestOptions);
+                // Not possible to use async/await for this promise
+                yield new Promise((resolve, reject) => {
+                    const writer = fs.createWriteStream(appInfo.packageFileName);
+                    file.data.pipe(writer);
+                    writer.on('error', err => {
+                        return reject(err);
+                    });
+                    writer.on('close', () => {
+                        const fileName = appInfo.packageFileName;
+                        if (this.verbose) {
+                            logger.logToStderr(`Package saved to ${fileName}`);
+                        }
+                        return resolve();
+                    });
                 });
-            });
-        })
-            .then((file) => {
-            if (this.verbose) {
-                logger.logToStderr(`Package saved to ${file}`);
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     ensureAppInfo(logger, args, appInfo) {
         if (appInfo.id && appInfo.packageFileName) {

package/dist/m365/spo/commands/app/app-uninstall.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoAppUninstallCommand_instances, _SpoAppUninstallCommand_initTelemetry, _SpoAppUninstallCommand_initOptions, _SpoAppUninstallCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppUninstallCommand extends SpoCommand_1.default {
@@ -34,40 +34,41 @@ class SpoAppUninstallCommand extends SpoCommand_1.default {
     get description() {
         return 'Uninstalls an app from the site';
     }
-    commandAction(logger, args, cb) {
-        const uninstallApp = () => {
-            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-            if (this.verbose) {
-                logger.logToStderr(`Uninstalling app '${args.options.id}' from the site '${args.options.siteUrl}'...`);
-            }
-            const requestOptions = {
-                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/uninstall`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const uninstallApp = () => __awaiter(this, void 0, void 0, function* () {
+                const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
+                if (this.verbose) {
+                    logger.logToStderr(`Uninstalling app '${args.options.id}' from the site '${args.options.siteUrl}'...`);
                 }
-            };
-            request_1.default
-                .post(requestOptions)
-                .then(_ => cb(), (rawRes) => this.handleRejectedODataPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            uninstallApp();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to uninstall the app ${args.options.id} from site ${args.options.siteUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+                const requestOptions = {
+                    url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/uninstall`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    }
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    uninstallApp();
+                catch (err) {
+                    this.handleRejectedODataPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield uninstallApp();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to uninstall the app ${args.options.id} from site ${args.options.siteUrl}?`
+                });
+                if (result.continue) {
+                    yield uninstallApp();
+                }
+            }
+        });
     }
 }
 _SpoAppUninstallCommand_instances = new WeakSet(), _SpoAppUninstallCommand_initTelemetry = function _SpoAppUninstallCommand_initTelemetry() {
@@ -96,10 +97,10 @@ _SpoAppUninstallCommand_instances = new WeakSet(), _SpoAppUninstallCommand_initT
                 return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 };
 module.exports = new SpoAppUninstallCommand();

package/dist/m365/spo/commands/app/app-upgrade.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppUpgradeCommand_instances, _SpoAppUpgradeCommand_initTelemetry, _SpoAppUpgradeCommand_initOptions, _SpoAppUpgradeCommand_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 SpoAppUpgradeCommand extends SpoCommand_1.default {
@@ -33,20 +33,25 @@ class SpoAppUpgradeCommand extends SpoCommand_1.default {
     get description() {
         return 'Upgrades app in the specified site';
     }
-    commandAction(logger, args, cb) {
-        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-        if (this.verbose) {
-            logger.logToStderr(`Upgrading app '${args.options.id}' in site '${args.options.siteUrl}'...`);
-        }
-        const requestOptions = {
-            url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/upgrade`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
+            if (this.verbose) {
+                logger.logToStderr(`Upgrading app '${args.options.id}' in site '${args.options.siteUrl}'...`);
+            }
+            const requestOptions = {
+                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/upgrade`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                }
+            };
+            try {
+                yield request_1.default.post(requestOptions);
             }
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataPromise(rawRes, logger, cb));
+            catch (err) {
+                this.handleRejectedODataPromise(err);
+            }
+        });
     }
 }
 _SpoAppUpgradeCommand_instances = new WeakSet(), _SpoAppUpgradeCommand_initTelemetry = function _SpoAppUpgradeCommand_initTelemetry() {
@@ -72,10 +77,10 @@ _SpoAppUpgradeCommand_instances = new WeakSet(), _SpoAppUpgradeCommand_initTelem
                 return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 };
 module.exports = new SpoAppUpgradeCommand();

package/dist/m365/spo/commands/apppage/apppage-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppPageAddCommand_instances, _SpoAppPageAddCommand_initTelemetry, _SpoAppPageAddCommand_initOptions, _SpoAppPageAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppPageAddCommand extends SpoCommand_1.default {
@@ -33,53 +33,52 @@ class SpoAppPageAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Creates a single-part app page';
     }
-    commandAction(logger, args, cb) {
-        const createPageRequestOptions = {
-            url: `${args.options.webUrl}/_api/sitepages/Pages/CreateAppPage`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json',
-            data: {
-                webPartDataAsJson: args.options.webPartData
-            }
-        };
-        request_1.default
-            .post(createPageRequestOptions)
-            .then((page) => {
-            const pageUrl = page.value;
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/${pageUrl}')?$expand=ListItemAllFields`,
-                headers: {
-                    'content-type': 'application/json;charset=utf-8',
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((file) => {
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/sitepages/Pages/UpdateAppPage`,
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const createPageRequestOptions = {
+                url: `${args.options.webUrl}/_api/sitepages/Pages/CreateAppPage`,
                 headers: {
                     'content-type': 'application/json;odata=nometadata',
                     accept: 'application/json;odata=nometadata'
                 },
                 responseType: 'json',
                 data: {
-                    pageId: file.ListItemAllFields.Id,
-                    webPartDataAsJson: args.options.webPartData,
-                    title: args.options.title,
-                    includeInNavigation: args.options.addToQuickLaunch
+                    webPartDataAsJson: args.options.webPartData
                 }
             };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            try {
+                const page = yield request_1.default.post(createPageRequestOptions);
+                const pageUrl = page.value;
+                let requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/${pageUrl}')?$expand=ListItemAllFields`,
+                    headers: {
+                        'content-type': 'application/json;charset=utf-8',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const file = yield request_1.default.get(requestOptions);
+                requestOptions = {
+                    url: `${args.options.webUrl}/_api/sitepages/Pages/UpdateAppPage`,
+                    headers: {
+                        'content-type': 'application/json;odata=nometadata',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json',
+                    data: {
+                        pageId: file.ListItemAllFields.Id,
+                        webPartDataAsJson: args.options.webPartData,
+                        title: args.options.title,
+                        includeInNavigation: args.options.addToQuickLaunch
+                    }
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoAppPageAddCommand_instances = new WeakSet(), _SpoAppPageAddCommand_initTelemetry = function _SpoAppPageAddCommand_initTelemetry() {

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppPageSetCommand_instances, _SpoAppPageSetCommand_initOptions, _SpoAppPageSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppPageSetCommand extends SpoCommand_1.default {
@@ -32,22 +32,27 @@ class SpoAppPageSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Updates the single-part app page';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/sitepages/Pages/UpdateFullPageApp`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json',
-            data: {
-                serverRelativeUrl: `${utils_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.name}`,
-                webPartDataAsJson: args.options.webPartData
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/sitepages/Pages/UpdateFullPageApp`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    serverRelativeUrl: `${urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.name}`,
+                    webPartDataAsJson: args.options.webPartData
+                }
+            };
+            try {
+                yield request_1.default.post(requestOptions);
             }
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoAppPageSetCommand_instances = new WeakSet(), _SpoAppPageSetCommand_initOptions = function _SpoAppPageSetCommand_initOptions() {

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

@@ -15,10 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoCdnGetCommand_instances, _SpoCdnGetCommand_initTelemetry, _SpoCdnGetCommand_initOptions, _SpoCdnGetCommand_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 spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoCdnGetCommand extends SpoCommand_1.default {
@@ -35,51 +34,46 @@ class SpoCdnGetCommand extends SpoCommand_1.default {
     get description() {
         return 'View current status of the specified Microsoft 365 CDN';
     }
-    commandAction(logger, args, cb) {
-        const cdnTypeString = args.options.type || 'Public';
-        const cdnType = cdnTypeString === 'Private' ? 1 : 0;
-        let spoAdminUrl = '';
-        let tenantId = '';
-        utils_1.spo
-            .getTenantId(logger, this.debug)
-            .then((_tenantId) => {
-            tenantId = _tenantId;
-            return utils_1.spo.getSpoAdminUrl(logger, this.debug);
-        })
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving status of ${(cdnType === 1 ? 'Private' : 'Public')} CDN...`);
-            }
-            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><Method Name="GetTenantCdnEnabled" Id="12" ObjectPathId="8"><Parameters><Parameter Type="Enum">${cdnType}</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="8" Name="${tenantId}" /></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 {
-                const result = json[json.length - 1];
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cdnTypeString = args.options.type || 'Public';
+            const cdnType = cdnTypeString === 'Private' ? 1 : 0;
+            let spoAdminUrl = '';
+            let tenantId = '';
+            try {
+                tenantId = yield spo_1.spo.getTenantId(logger, this.debug);
+                spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
-                    logger.logToStderr(`${(cdnType === 0 ? 'Public' : 'Private')} CDN at ${spoAdminUrl} is ${(result === true ? 'enabled' : 'disabled')}`);
+                    logger.logToStderr(`Retrieving status of ${(cdnType === 1 ? 'Private' : 'Public')} CDN...`);
+                }
+                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><Method Name="GetTenantCdnEnabled" Id="12" ObjectPathId="8"><Parameters><Parameter Type="Enum">${cdnType}</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="8" Name="${tenantId}" /></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
                 }
                 else {
-                    logger.logToStderr(result);
+                    const result = json[json.length - 1];
+                    if (this.verbose) {
+                        logger.logToStderr(`${(cdnType === 0 ? 'Public' : 'Private')} CDN at ${spoAdminUrl} is ${(result === true ? 'enabled' : 'disabled')}`);
+                    }
+                    else {
+                        logger.logToStderr(result);
+                    }
                 }
-                cb();
             }
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
 }
 _SpoCdnGetCommand_instances = new WeakSet(), _SpoCdnGetCommand_initTelemetry = function _SpoCdnGetCommand_initTelemetry() {