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

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

@@ -32,30 +32,32 @@ class SpoPropertyBagGetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
     get description() {
         return 'Gets the value of the specified property from the property bag';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getRequestDigest(args.options.webUrl)
-            .then((contextResponse) => {
-            this.formDigestValue = contextResponse.FormDigestValue;
-            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
-        })
-            .then((identityResp) => {
-            const opts = args.options;
-            if (opts.folder) {
-                return this.getFolderPropertyBag(identityResp, opts.webUrl, opts.folder, logger);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const contextResponse = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                this.formDigestValue = contextResponse.FormDigestValue;
+                const identityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
+                let propertyBagData;
+                const opts = args.options;
+                if (opts.folder) {
+                    propertyBagData = yield this.getFolderPropertyBag(identityResp, opts.webUrl, opts.folder, logger);
+                }
+                else {
+                    propertyBagData = yield this.getWebPropertyBag(identityResp, opts.webUrl, logger);
+                }
+                const property = this.filterByKey(propertyBagData, args.options.key);
+                if (property) {
+                    logger.log(property.value);
+                }
+                else if (this.verbose) {
+                    logger.logToStderr('Property not found.');
+                }
             }
-            return this.getWebPropertyBag(identityResp, opts.webUrl, logger);
-        })
-            .then((propertyBagData) => {
-            const property = this.filterByKey(propertyBagData, args.options.key);
-            if (property) {
-                logger.log(property.value);
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            else if (this.verbose) {
-                logger.logToStderr('Property not found.');
-            }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     filterByKey(propertyBag, key) {
         const keys = Object.keys(propertyBag);

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

@@ -32,24 +32,26 @@ class SpoPropertyBagListCommand extends propertybag_base_1.SpoPropertyBagBaseCom
     get description() {
         return 'Gets property bag values';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getRequestDigest(args.options.webUrl)
-            .then((contextResponse) => {
-            this.formDigestValue = contextResponse.FormDigestValue;
-            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
-        })
-            .then((identityResp) => {
-            const opts = args.options;
-            if (opts.folder) {
-                return this.getFolderPropertyBag(identityResp, opts.webUrl, opts.folder, logger);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const contextResponse = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                this.formDigestValue = contextResponse.FormDigestValue;
+                const identityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
+                let propertyBagData;
+                const opts = args.options;
+                if (opts.folder) {
+                    propertyBagData = yield this.getFolderPropertyBag(identityResp, opts.webUrl, opts.folder, logger);
+                }
+                else {
+                    propertyBagData = yield this.getWebPropertyBag(identityResp, opts.webUrl, logger);
+                }
+                logger.log(this.formatOutput(propertyBagData));
             }
-            return this.getWebPropertyBag(identityResp, opts.webUrl, logger);
-        })
-            .then((propertyBagData) => {
-            logger.log(this.formatOutput(propertyBagData));
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
     /**
      * The property bag data returned from the client.svc/ProcessQuery response

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

@@ -35,45 +35,39 @@ class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseC
     get description() {
         return 'Removes specified property from the property bag';
     }
-    commandAction(logger, args, cb) {
-        const removeProperty = () => {
-            utils_1.spo
-                .getRequestDigest(args.options.webUrl)
-                .then((contextResponse) => {
-                this.formDigestValue = contextResponse.FormDigestValue;
-                return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
-            })
-                .then((identityResp) => {
-                const opts = args.options;
-                if (opts.folder) {
-                    // get the folder guid instead of the web guid
-                    return utils_1.spo.getFolderIdentity(identityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeProperty = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const contextResponse = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                    this.formDigestValue = contextResponse.FormDigestValue;
+                    let identityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
+                    const opts = args.options;
+                    if (opts.folder) {
+                        // get the folder guid instead of the web guid
+                        identityResp = yield utils_1.spo.getFolderIdentity(identityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
+                    }
+                    yield this.removeProperty(identityResp, args.options);
                 }
-                return new Promise(resolve => { return resolve(identityResp); });
-            })
-                .then((identityResp) => {
-                return this.removeProperty(identityResp, args.options);
-            })
-                .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeProperty();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the ${args.options.key} property?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    removeProperty();
+                catch (err) {
+                    this.handleRejectedPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeProperty();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the ${args.options.key} property?`
+                });
+                if (result.continue) {
+                    yield removeProperty();
+                }
+            }
+        });
     }
     removeProperty(identityResp, options) {
         let objectType = 'AllProperties';

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

@@ -32,35 +32,30 @@ class SpoPropertyBagSetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
     get description() {
         return 'Sets the value of the specified property in the property bag. Adds the property if it does not exist';
     }
-    commandAction(logger, args, cb) {
-        let webIdentityResp;
-        utils_1.spo
-            .getRequestDigest(args.options.webUrl)
-            .then((contextResponse) => {
-            this.formDigestValue = contextResponse.FormDigestValue;
-            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
-        })
-            .then((identityResp) => {
-            webIdentityResp = identityResp;
-            // Check if web no script enabled or not
-            // Cannot set property bag value if no script is enabled
-            return this.isNoScriptSite(identityResp, args.options, logger);
-        })
-            .then((isNoScriptSite) => {
-            if (isNoScriptSite) {
-                return Promise.reject('Site has NoScript enabled, and setting property bag values is not supported');
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const contextResponse = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                this.formDigestValue = contextResponse.FormDigestValue;
+                let identityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
+                const webIdentityResp = identityResp;
+                // Check if web no script enabled or not
+                // Cannot set property bag value if no script is enabled
+                const isNoScriptSite = yield this.isNoScriptSite(identityResp, args.options, logger);
+                if (isNoScriptSite) {
+                    throw 'Site has NoScript enabled, and setting property bag values is not supported';
+                }
+                const opts = args.options;
+                if (opts.folder) {
+                    // get the folder guid instead of the web guid
+                    identityResp = yield utils_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
+                }
+                yield this.setProperty(identityResp, args.options, logger);
             }
-            const opts = args.options;
-            if (opts.folder) {
-                // get the folder guid instead of the web guid
-                return utils_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            return new Promise(resolve => { return resolve(webIdentityResp); });
-        })
-            .then((identityResp) => {
-            return this.setProperty(identityResp, args.options, logger);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     setProperty(identityResp, options, logger) {
         return propertybag_base_1.SpoPropertyBagBaseCommand.setProperty(options.key, options.value, options.webUrl, this.formDigestValue, identityResp, logger, this.debug, options.folder);

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

@@ -0,0 +1,117 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoRoleDefinitionAddCommand_instances, _SpoRoleDefinitionAddCommand_initTelemetry, _SpoRoleDefinitionAddCommand_initOptions, _SpoRoleDefinitionAddCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const base_permissions_1 = require("../../base-permissions");
+const commands_1 = require("../../commands");
+class SpoRoleDefinitionAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoRoleDefinitionAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.ROLEDEFINITION_ADD;
+    }
+    get description() {
+        return 'Adds a new roledefinition to web';
+    }
+    get permissionsKindMap() {
+        const result = [];
+        for (const kind in base_permissions_1.PermissionKind) {
+            if (typeof base_permissions_1.PermissionKind[kind] === 'number') {
+                result.push(kind);
+            }
+        }
+        return result;
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Adding role definition to ${args.options.webUrl}...`);
+            }
+            const description = args.options.description || '';
+            const permissions = new base_permissions_1.BasePermissions();
+            if (args.options.rights) {
+                const rights = args.options.rights.split(',');
+                for (const item of rights) {
+                    const kind = base_permissions_1.PermissionKind[item.trim()];
+                    permissions.set(kind);
+                }
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/roledefinitions`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    'BasePermissions': {
+                        'High': permissions.high.toString(),
+                        'Low': permissions.low.toString()
+                    },
+                    'Description': `${description}`,
+                    'Name': `${args.options.name}`
+                }
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoRoleDefinitionAddCommand_instances = new WeakSet(), _SpoRoleDefinitionAddCommand_initTelemetry = function _SpoRoleDefinitionAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            rights: args.options.rights,
+            description: (!(!args.options.description)).toString()
+        });
+    });
+}, _SpoRoleDefinitionAddCommand_initOptions = function _SpoRoleDefinitionAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-n, --name <name>'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '--rights [rights]',
+        autocomplete: this.permissionsKindMap
+    });
+}, _SpoRoleDefinitionAddCommand_initValidators = function _SpoRoleDefinitionAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.rights) {
+            const rights = args.options.rights.split(',');
+            for (const item of rights) {
+                const kind = base_permissions_1.PermissionKind[item.trim()];
+                if (!kind) {
+                    return `Rights option '${item}' is not recognized as valid PermissionKind choice. Please note it is case-sensitive. Allowed values are ${this.permissionsKindMap.join('|')}.`;
+                }
+            }
+        }
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+};
+module.exports = new SpoRoleDefinitionAddCommand();
+//# sourceMappingURL=roledefinition-add.js.map

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

@@ -34,28 +34,31 @@ class SpoRoleDefinitionGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets specified role definition from web by id';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Getting role definition from ${args.options.webUrl}...`);
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/roledefinitions(${args.options.id})`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((response) => {
-            const permissions = new base_permissions_1.BasePermissions();
-            permissions.high = response.BasePermissions.High;
-            permissions.low = response.BasePermissions.Low;
-            response.BasePermissionsValue = permissions.parse();
-            response.RoleTypeKindValue = RoleType_1.RoleType[response.RoleTypeKind];
-            logger.log(response);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Getting role definition from ${args.options.webUrl}...`);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/roledefinitions(${args.options.id})`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const response = yield request_1.default.get(requestOptions);
+                const permissions = new base_permissions_1.BasePermissions();
+                permissions.high = response.BasePermissions.High;
+                permissions.low = response.BasePermissions.Low;
+                response.BasePermissionsValue = permissions.parse();
+                response.RoleTypeKindValue = RoleType_1.RoleType[response.RoleTypeKind];
+                logger.log(response);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoRoleDefinitionGetCommand_instances = new WeakSet(), _SpoRoleDefinitionGetCommand_initOptions = function _SpoRoleDefinitionGetCommand_initOptions() {

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

@@ -35,23 +35,26 @@ class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Id', 'Name'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Getting role definitions list from ${args.options.webUrl}...`);
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/roledefinitions`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((response) => {
-            logger.log(response.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Getting role definitions list from ${args.options.webUrl}...`);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/roledefinitions`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const response = yield request_1.default.get(requestOptions);
+                logger.log(response.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoRoleDefinitionListCommand_instances = new WeakSet(), _SpoRoleDefinitionListCommand_initOptions = function _SpoRoleDefinitionListCommand_initOptions() {

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

@@ -34,43 +34,44 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the role definition from the specified site';
     }
-    commandAction(logger, args, cb) {
-        const removeRoleDefinition = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing role definition from site ${args.options.webUrl}...`);
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/roledefinitions(${args.options.id})`,
-                method: 'delete',
-                headers: {
-                    'X-HTTP-Method': 'DELETE',
-                    'If-Match': '*',
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .delete(requestOptions)
-                .then(() => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeRoleDefinition();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the role definition with id ${args.options.id} from site ${args.options.webUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeRoleDefinition = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing role definition from site ${args.options.webUrl}...`);
                 }
-                else {
-                    removeRoleDefinition();
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/roledefinitions(${args.options.id})`,
+                    method: 'delete',
+                    headers: {
+                        'X-HTTP-Method': 'DELETE',
+                        'If-Match': '*',
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.delete(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeRoleDefinition();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the role definition with id ${args.options.id} from site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield removeRoleDefinition();
+                }
+            }
+        });
     }
 }
 _SpoRoleDefinitionRemoveCommand_instances = new WeakSet(), _SpoRoleDefinitionRemoveCommand_initTelemetry = function _SpoRoleDefinitionRemoveCommand_initTelemetry() {

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-add.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());
+    });
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
@@ -6,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoServicePrincipalGrantAddCommand_instances, _SpoServicePrincipalGrantAddCommand_initOptions;
 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");
@@ -27,41 +35,37 @@ class SpoServicePrincipalGrantAddCommand extends SpoCommand_1.default {
     alias() {
         return [commands_1.default.SP_GRANT_ADD];
     }
-    commandAction(logger, args, cb) {
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving request digest...`);
-            }
-            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="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><ObjectPath Id="8" ObjectPathId="7" /><Query Id="9" ObjectPathId="7"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="5" ParentId="3" Name="PermissionRequests" /><Method Id="7" ParentId="5" Name="Approve"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.resource)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.scope)}</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);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving request digest...`);
+                }
+                const resDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': resDigest.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="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><ObjectPath Id="8" ObjectPathId="7" /><Query Id="9" ObjectPathId="7"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="5" ParentId="3" Name="PermissionRequests" /><Method Id="7" ParentId="5" Name="Approve"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.resource)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.scope)}</Parameter></Parameters></Method></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 {
+                    const result = json[json.length - 1];
+                    delete result._ObjectType_;
+                    logger.log(result);
+                }
             }
-            else {
-                const result = json[json.length - 1];
-                delete result._ObjectType_;
-                logger.log(result);
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
 }
 _SpoServicePrincipalGrantAddCommand_instances = new WeakSet(), _SpoServicePrincipalGrantAddCommand_initOptions = function _SpoServicePrincipalGrantAddCommand_initOptions() {