@pnp/cli-microsoft365 6.0.0 → 6.1.0-beta.3065124

package/dist/m365/spo/commands/page/page-text-add.js

@@ -25,6 +25,12 @@ const commands_1 = require("../../commands");
 const clientsidepages_1 = require("./clientsidepages");
 const Page_1 = require("./Page");
 class SpoPageTextAddCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.PAGE_TEXT_ADD;
+    }
+    get description() {
+        return 'Adds text to a modern page';
+    }
     constructor() {
         super();
         _SpoPageTextAddCommand_instances.add(this);
@@ -32,12 +38,6 @@ class SpoPageTextAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoPageTextAddCommand_instances, "m", _SpoPageTextAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPageTextAddCommand_instances, "m", _SpoPageTextAddCommand_initValidators).call(this);
     }
-    get name() {
-        return commands_1.default.PAGE_TEXT_ADD;
-    }
-    get description() {
-        return 'Adds text to a modern page';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             let requestDigest = '';

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

@@ -20,6 +20,12 @@ const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagGetCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
+    get name() {
+        return commands_1.default.PROPERTYBAG_GET;
+    }
+    get description() {
+        return 'Gets the value of the specified property from the property bag';
+    }
     constructor() {
         super();
         _SpoPropertyBagGetCommand_instances.add(this);
@@ -27,12 +33,6 @@ class SpoPropertyBagGetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
         __classPrivateFieldGet(this, _SpoPropertyBagGetCommand_instances, "m", _SpoPropertyBagGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPropertyBagGetCommand_instances, "m", _SpoPropertyBagGetCommand_initValidators).call(this);
     }
-    get name() {
-        return commands_1.default.PROPERTYBAG_GET;
-    }
-    get description() {
-        return 'Gets the value of the specified property from the property bag';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

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

@@ -20,6 +20,12 @@ const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagListCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
+    get name() {
+        return commands_1.default.PROPERTYBAG_LIST;
+    }
+    get description() {
+        return 'Gets property bag values';
+    }
     constructor() {
         super();
         _SpoPropertyBagListCommand_instances.add(this);
@@ -27,12 +33,6 @@ class SpoPropertyBagListCommand extends propertybag_base_1.SpoPropertyBagBaseCom
         __classPrivateFieldGet(this, _SpoPropertyBagListCommand_instances, "m", _SpoPropertyBagListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPropertyBagListCommand_instances, "m", _SpoPropertyBagListCommand_initValidators).call(this);
     }
-    get name() {
-        return commands_1.default.PROPERTYBAG_LIST;
-    }
-    get description() {
-        return 'Gets property bag values';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

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

@@ -24,6 +24,12 @@ const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
+    get name() {
+        return commands_1.default.PROPERTYBAG_REMOVE;
+    }
+    get description() {
+        return 'Removes specified property from the property bag';
+    }
     constructor() {
         super();
         _SpoPropertyBagRemoveCommand_instances.add(this);
@@ -31,12 +37,6 @@ class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseC
         __classPrivateFieldGet(this, _SpoPropertyBagRemoveCommand_instances, "m", _SpoPropertyBagRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPropertyBagRemoveCommand_instances, "m", _SpoPropertyBagRemoveCommand_initValidators).call(this);
     }
-    get name() {
-        return commands_1.default.PROPERTYBAG_REMOVE;
-    }
-    get description() {
-        return 'Removes specified property from the property bag';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const removeProperty = () => __awaiter(this, void 0, void 0, function* () {

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

@@ -20,6 +20,12 @@ const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagSetCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
+    get name() {
+        return commands_1.default.PROPERTYBAG_SET;
+    }
+    get description() {
+        return 'Sets the value of the specified property in the property bag. Adds the property if it does not exist';
+    }
     constructor() {
         super();
         _SpoPropertyBagSetCommand_instances.add(this);
@@ -27,12 +33,6 @@ class SpoPropertyBagSetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
         __classPrivateFieldGet(this, _SpoPropertyBagSetCommand_instances, "m", _SpoPropertyBagSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPropertyBagSetCommand_instances, "m", _SpoPropertyBagSetCommand_initValidators).call(this);
     }
-    get name() {
-        return commands_1.default.PROPERTYBAG_SET;
-    }
-    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) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

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

@@ -21,13 +21,6 @@ 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;
     }
@@ -43,6 +36,13 @@ class SpoRoleDefinitionAddCommand extends SpoCommand_1.default {
         }
         return result;
     }
+    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);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {

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

@@ -22,18 +22,18 @@ const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
 const RoleType_1 = require("./RoleType");
 class SpoRoleDefinitionGetCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoRoleDefinitionGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionGetCommand_instances, "m", _SpoRoleDefinitionGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionGetCommand_instances, "m", _SpoRoleDefinitionGetCommand_initValidators).call(this);
-    }
     get name() {
         return commands_1.default.ROLEDEFINITION_GET;
     }
     get description() {
         return 'Gets specified role definition from web by id';
     }
+    constructor() {
+        super();
+        _SpoRoleDefinitionGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionGetCommand_instances, "m", _SpoRoleDefinitionGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionGetCommand_instances, "m", _SpoRoleDefinitionGetCommand_initValidators).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {

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

@@ -16,18 +16,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoRoleDefinitionListCommand_instances, _SpoRoleDefinitionListCommand_initOptions, _SpoRoleDefinitionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const odata_1 = require("../../../../utils/odata");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
-const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
-const RoleType_1 = require("./RoleType");
 class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoRoleDefinitionListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionListCommand_instances, "m", _SpoRoleDefinitionListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoRoleDefinitionListCommand_instances, "m", _SpoRoleDefinitionListCommand_initValidators).call(this);
-    }
     get name() {
         return commands_1.default.ROLEDEFINITION_LIST;
     }
@@ -37,6 +30,12 @@ class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Id', 'Name'];
     }
+    constructor() {
+        super();
+        _SpoRoleDefinitionListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionListCommand_instances, "m", _SpoRoleDefinitionListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionListCommand_instances, "m", _SpoRoleDefinitionListCommand_initValidators).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
@@ -44,7 +43,7 @@ class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
             }
             try {
                 const res = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/roledefinitions`);
-                const response = this.setFriendlyPermissions(res);
+                const response = formatting_1.formatting.setFriendlyPermissions(res);
                 logger.log(response);
             }
             catch (err) {
@@ -52,16 +51,6 @@ class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
             }
         });
     }
-    setFriendlyPermissions(response) {
-        response.forEach((r) => {
-            const permissions = new base_permissions_1.BasePermissions();
-            permissions.high = r.BasePermissions.High;
-            permissions.low = r.BasePermissions.Low;
-            r.BasePermissionsValue = permissions.parse();
-            r.RoleTypeKindValue = RoleType_1.RoleType[r.RoleTypeKind];
-        });
-        return response;
-    }
 }
 _SpoRoleDefinitionListCommand_instances = new WeakSet(), _SpoRoleDefinitionListCommand_initOptions = function _SpoRoleDefinitionListCommand_initOptions() {
     this.options.unshift({

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

@@ -21,6 +21,12 @@ const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.ROLEDEFINITION_REMOVE;
+    }
+    get description() {
+        return 'Removes the role definition from the specified site';
+    }
     constructor() {
         super();
         _SpoRoleDefinitionRemoveCommand_instances.add(this);
@@ -28,12 +34,6 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoRoleDefinitionRemoveCommand_instances, "m", _SpoRoleDefinitionRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoRoleDefinitionRemoveCommand_instances, "m", _SpoRoleDefinitionRemoveCommand_initValidators).call(this);
     }
-    get name() {
-        return commands_1.default.ROLEDEFINITION_REMOVE;
-    }
-    get description() {
-        return 'Removes the role definition from the specified site';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const removeRoleDefinition = () => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-add.js

@@ -22,11 +22,6 @@ const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalGrantAddCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoServicePrincipalGrantAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalGrantAddCommand_instances, "m", _SpoServicePrincipalGrantAddCommand_initOptions).call(this);
-    }
     get name() {
         return commands_1.default.SERVICEPRINCIPAL_GRANT_ADD;
     }
@@ -36,6 +31,11 @@ class SpoServicePrincipalGrantAddCommand extends SpoCommand_1.default {
     alias() {
         return [commands_1.default.SP_GRANT_ADD];
     }
+    constructor() {
+        super();
+        _SpoServicePrincipalGrantAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalGrantAddCommand_instances, "m", _SpoServicePrincipalGrantAddCommand_initOptions).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-revoke.js

@@ -22,11 +22,6 @@ const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalGrantRevokeCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoServicePrincipalGrantRevokeCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalGrantRevokeCommand_instances, "m", _SpoServicePrincipalGrantRevokeCommand_initOptions).call(this);
-    }
     get name() {
         return commands_1.default.SERVICEPRINCIPAL_GRANT_REVOKE;
     }
@@ -36,6 +31,11 @@ class SpoServicePrincipalGrantRevokeCommand extends SpoCommand_1.default {
     alias() {
         return [commands_1.default.SP_GRANT_REVOKE];
     }
+    constructor() {
+        super();
+        _SpoServicePrincipalGrantRevokeCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalGrantRevokeCommand_instances, "m", _SpoServicePrincipalGrantRevokeCommand_initOptions).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-approve.js

@@ -13,8 +13,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoServicePrincipalPermissionRequestApproveCommand_instances, _SpoServicePrincipalPermissionRequestApproveCommand_initOptions, _SpoServicePrincipalPermissionRequestApproveCommand_initValidators;
+var _SpoServicePrincipalPermissionRequestApproveCommand_instances, _SpoServicePrincipalPermissionRequestApproveCommand_initOptions, _SpoServicePrincipalPermissionRequestApproveCommand_initValidators, _SpoServicePrincipalPermissionRequestApproveCommand_initTelemetry, _SpoServicePrincipalPermissionRequestApproveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -22,13 +23,8 @@ const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const SpoServicePrincipalPermissionRequestListCommand = require("./serviceprincipal-permissionrequest-list");
 class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoServicePrincipalPermissionRequestApproveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestApproveCommand_instances, "m", _SpoServicePrincipalPermissionRequestApproveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestApproveCommand_instances, "m", _SpoServicePrincipalPermissionRequestApproveCommand_initValidators).call(this);
-    }
     get name() {
         return commands_1.default.SERVICEPRINCIPAL_PERMISSIONREQUEST_APPROVE;
     }
@@ -38,6 +34,14 @@ class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand_1.de
     alias() {
         return [commands_1.default.SP_PERMISSIONREQUEST_APPROVE];
     }
+    constructor() {
+        super();
+        _SpoServicePrincipalPermissionRequestApproveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestApproveCommand_instances, "m", _SpoServicePrincipalPermissionRequestApproveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestApproveCommand_instances, "m", _SpoServicePrincipalPermissionRequestApproveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestApproveCommand_instances, "m", _SpoServicePrincipalPermissionRequestApproveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestApproveCommand_instances, "m", _SpoServicePrincipalPermissionRequestApproveCommand_initOptionSets).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -45,43 +49,88 @@ class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand_1.de
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving request digest...`);
                 }
+                const permissionRequestIds = yield this.getAllPendingPermissionRequests(args);
                 const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': reqDigest.FormDigestValue
-                    },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="16" ObjectPathId="15" /><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectPath Id="22" ObjectPathId="21" /><Query Id="23" ObjectPathId="21"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="15" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="17" ParentId="15" Name="PermissionRequests" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting_1.formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method><Method Id="21" ParentId="19" Name="Approve" /></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 output = json[json.length - 1];
-                    delete output._ObjectType_;
-                    logger.log(output);
-                }
+                const response = [];
+                yield permissionRequestIds.reduce((previousPromise, nextPermissionRequestId) => __awaiter(this, void 0, void 0, function* () {
+                    return previousPromise.then(() => {
+                        return this.approvePermissionRequest(nextPermissionRequestId, reqDigest, spoAdminUrl).then(result => response.push(result));
+                    });
+                }), Promise.resolve());
+                logger.log(response.length === 1 ? response[0] : response);
             }
             catch (err) {
                 this.handleRejectedPromise(err);
             }
         });
     }
+    getAllPendingPermissionRequests(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                return [args.options.id];
+            }
+            else {
+                const options = {
+                    debug: this.debug,
+                    verbose: this.verbose
+                };
+                const output = yield Cli_1.Cli.executeCommandWithOutput(SpoServicePrincipalPermissionRequestListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+                const getPermissionRequestsOutput = JSON.parse(output.stdout);
+                if (args.options.resource) {
+                    return getPermissionRequestsOutput.filter((x) => x.Resource === args.options.resource).map((x) => { return x.Id; });
+                }
+                return getPermissionRequestsOutput.map((x) => { return x.Id; });
+            }
+        });
+    }
+    approvePermissionRequest(permissionRequestId, reqDigest, spoAdminUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': reqDigest.FormDigestValue
+                },
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="16" ObjectPathId="15" /><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectPath Id="22" ObjectPathId="21" /><Query Id="23" ObjectPathId="21"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="15" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="17" ParentId="15" Name="PermissionRequests" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting_1.formatting.escapeXml(permissionRequestId)}}</Parameter></Parameters></Method><Method Id="21" ParentId="19" Name="Approve" /></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 output = json[json.length - 1];
+                delete output._ObjectType_;
+                return output;
+            }
+        });
+    }
 }
 _SpoServicePrincipalPermissionRequestApproveCommand_instances = new WeakSet(), _SpoServicePrincipalPermissionRequestApproveCommand_initOptions = function _SpoServicePrincipalPermissionRequestApproveCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
+    }, {
+        option: '--all'
+    }, {
+        option: '--resource [resource]'
     });
 }, _SpoServicePrincipalPermissionRequestApproveCommand_initValidators = function _SpoServicePrincipalPermissionRequestApproveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!validation_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
+}, _SpoServicePrincipalPermissionRequestApproveCommand_initTelemetry = function _SpoServicePrincipalPermissionRequestApproveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            resource: typeof args.options.resource !== 'undefined',
+            all: !!args.options.all
+        });
+    });
+}, _SpoServicePrincipalPermissionRequestApproveCommand_initOptionSets = function _SpoServicePrincipalPermissionRequestApproveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'all', 'resource'] });
 };
 module.exports = new SpoServicePrincipalPermissionRequestApproveCommand();
 //# sourceMappingURL=serviceprincipal-permissionrequest-approve.js.map

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-deny.js

@@ -23,12 +23,6 @@ const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalPermissionRequestDenyCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoServicePrincipalPermissionRequestDenyCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestDenyCommand_instances, "m", _SpoServicePrincipalPermissionRequestDenyCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestDenyCommand_instances, "m", _SpoServicePrincipalPermissionRequestDenyCommand_initValidators).call(this);
-    }
     get name() {
         return commands_1.default.SERVICEPRINCIPAL_PERMISSIONREQUEST_DENY;
     }
@@ -38,6 +32,12 @@ class SpoServicePrincipalPermissionRequestDenyCommand extends SpoCommand_1.defau
     get description() {
         return 'Denies the specified permission request';
     }
+    constructor() {
+        super();
+        _SpoServicePrincipalPermissionRequestDenyCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestDenyCommand_instances, "m", _SpoServicePrincipalPermissionRequestDenyCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalPermissionRequestDenyCommand_instances, "m", _SpoServicePrincipalPermissionRequestDenyCommand_initValidators).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoServicePrincipalSetCommand_instances, _SpoServicePrincipalSetCommand_initTelemetry, _SpoServicePrincipalSetCommand_initOptions, _SpoServicePrincipalSetCommand_initValidators;
+var _SpoServicePrincipalSetCommand_instances, _SpoServicePrincipalSetCommand_initTelemetry, _SpoServicePrincipalSetCommand_initOptions, _SpoServicePrincipalSetCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
@@ -22,38 +22,37 @@ const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalSetCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoServicePrincipalSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalSetCommand_instances, "m", _SpoServicePrincipalSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalSetCommand_instances, "m", _SpoServicePrincipalSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoServicePrincipalSetCommand_instances, "m", _SpoServicePrincipalSetCommand_initValidators).call(this);
-    }
     get name() {
         return commands_1.default.SERVICEPRINCIPAL_SET;
     }
     get description() {
         return 'Enable or disable the service principal';
     }
+    constructor() {
+        super();
+        _SpoServicePrincipalSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalSetCommand_instances, "m", _SpoServicePrincipalSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalSetCommand_instances, "m", _SpoServicePrincipalSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoServicePrincipalSetCommand_instances, "m", _SpoServicePrincipalSetCommand_initTypes).call(this);
+    }
     alias() {
         return [commands_1.default.SP_SET];
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const enabled = args.options.enabled === 'true';
             const toggleServicePrincipal = () => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                     const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                     if (this.verbose) {
-                        logger.logToStderr(`${(enabled ? 'Enabling' : 'Disabling')} service principal...`);
+                        logger.logToStderr(`${(args.options.enabled ? 'Enabling' : 'Disabling')} service principal...`);
                     }
                     const requestOptions = {
                         url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
                             'X-RequestDigest': reqDigest.FormDigestValue
                         },
-                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="28" ObjectPathId="27" /><SetProperty Id="29" ObjectPathId="27" Name="AccountEnabled"><Parameter Type="Boolean">${enabled}</Parameter></SetProperty><Method Name="Update" Id="30" ObjectPathId="27" /><Query Id="31" ObjectPathId="27"><Query SelectAllProperties="true"><Properties><Property Name="AccountEnabled" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="27" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /></ObjectPaths></Request>`
+                        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="28" ObjectPathId="27" /><SetProperty Id="29" ObjectPathId="27" Name="AccountEnabled"><Parameter Type="Boolean">${args.options.enabled}</Parameter></SetProperty><Method Name="Update" Id="30" ObjectPathId="27" /><Query Id="31" ObjectPathId="27"><Query SelectAllProperties="true"><Properties><Property Name="AccountEnabled" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="27" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /></ObjectPaths></Request>`
                     };
                     const res = yield request_1.default.post(requestOptions);
                     const json = JSON.parse(res);
@@ -79,7 +78,7 @@ class SpoServicePrincipalSetCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to ${enabled ? 'enable' : 'disable'} the service principal?`
+                    message: `Are you sure you want to ${args.options.enabled ? 'enable' : 'disable'} the service principal?`
                 });
                 if (result.continue) {
                     yield toggleServicePrincipal();
@@ -91,7 +90,7 @@ class SpoServicePrincipalSetCommand extends SpoCommand_1.default {
 _SpoServicePrincipalSetCommand_instances = new WeakSet(), _SpoServicePrincipalSetCommand_initTelemetry = function _SpoServicePrincipalSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            enabled: args.options.enabled === 'true'
+            enabled: args.options.enabled
         });
     });
 }, _SpoServicePrincipalSetCommand_initOptions = function _SpoServicePrincipalSetCommand_initOptions() {
@@ -101,15 +100,8 @@ _SpoServicePrincipalSetCommand_instances = new WeakSet(), _SpoServicePrincipalSe
     }, {
         option: '--confirm'
     });
-}, _SpoServicePrincipalSetCommand_initValidators = function _SpoServicePrincipalSetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const enabled = args.options.enabled.toLowerCase();
-        if (enabled !== 'true' &&
-            enabled !== 'false') {
-            return `${args.options.enabled} is not a valid boolean value. Allowed values are true|false`;
-        }
-        return true;
-    }));
+}, _SpoServicePrincipalSetCommand_initTypes = function _SpoServicePrincipalSetCommand_initTypes() {
+    this.types.boolean.push('enabled');
 };
 module.exports = new SpoServicePrincipalSetCommand();
 //# sourceMappingURL=serviceprincipal-set.js.map

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

@@ -23,13 +23,6 @@ const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAddCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoSiteAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteAddCommand_instances, "m", _SpoSiteAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteAddCommand_instances, "m", _SpoSiteAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteAddCommand_instances, "m", _SpoSiteAddCommand_initValidators).call(this);
-    }
     get supportedLcids() {
         // Languages supported by SharePoint
         // https://support.microsoft.com/en-us/office/languages-supported-by-sharepoint-dfbf3652-2902-4809-be21-9080b6512fff
@@ -42,6 +35,13 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Creates new SharePoint Online site';
     }
+    constructor() {
+        super();
+        _SpoSiteAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteAddCommand_instances, "m", _SpoSiteAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAddCommand_instances, "m", _SpoSiteAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAddCommand_instances, "m", _SpoSiteAddCommand_initValidators).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const isClassicSite = args.options.type === 'ClassicSite';