@pnp/cli-microsoft365 11.0.0-beta.1f852eb → 11.0.0-beta.3655c37

package/dist/Command.js

@@ -359,6 +359,10 @@ class Command {
         const unknownOptions = optionsUtils.getUnknownOptions(options, this.options);
         optionsUtils.addUnknownOptionsToPayload(payload, unknownOptions);
     }
+    addUnknownOptionsToPayloadZod(payload, options) {
+        const unknownOptions = optionsUtils.getUnknownOptions(options, zod.schemaToOptions(this.schema));
+        optionsUtils.addUnknownOptionsToPayload(payload, unknownOptions);
+    }
     loadValuesFromAccessToken(args) {
         if (!auth.connection.accessTokens[auth.defaultResource]) {
             return;

package/dist/m365/adaptivecard/commands/adaptivecard-send.js

@@ -15,7 +15,7 @@ export const options = globalOptionsZod
     card: z.string().optional(),
     cardData: z.string().optional()
 })
-    .and(z.any());
+    .passthrough();
 class AdaptiveCardSendCommand extends AnonymousCommand {
     get name() {
         return commands.SEND;

package/dist/m365/entra/commands/administrativeunit/administrativeunit-add.js

@@ -1,12 +1,16 @@
-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 _EntraAdministrativeUnitAddCommand_instances, _EntraAdministrativeUnitAddCommand_initTelemetry, _EntraAdministrativeUnitAddCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from "../../../../request.js";
+import { zod } from '../../../../utils/zod.js';
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
+const options = globalOptionsZod
+    .extend({
+    displayName: zod.alias('n', z.string()),
+    description: zod.alias('d', z.string().optional()),
+    hiddenMembership: z.boolean().optional()
+})
+    .passthrough();
 class EntraAdministrativeUnitAddCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_ADD;
@@ -17,11 +21,8 @@ class EntraAdministrativeUnitAddCommand extends GraphCommand {
     allowUnknownOptions() {
         return true;
     }
-    constructor() {
-        super();
-        _EntraAdministrativeUnitAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitAddCommand_instances, "m", _EntraAdministrativeUnitAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitAddCommand_instances, "m", _EntraAdministrativeUnitAddCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const requestBody = {
@@ -29,7 +30,7 @@ class EntraAdministrativeUnitAddCommand extends GraphCommand {
             displayName: args.options.displayName,
             visibility: args.options.hiddenMembership ? 'HiddenMembership' : null
         };
-        this.addUnknownOptionsToPayload(requestBody, args.options);
+        this.addUnknownOptionsToPayloadZod(requestBody, args.options);
         const requestOptions = {
             url: `${this.resource}/v1.0/directory/administrativeUnits`,
             headers: {
@@ -47,20 +48,5 @@ class EntraAdministrativeUnitAddCommand extends GraphCommand {
         }
     }
 }
-_EntraAdministrativeUnitAddCommand_instances = new WeakSet(), _EntraAdministrativeUnitAddCommand_initTelemetry = function _EntraAdministrativeUnitAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            hiddenMembership: !!args.options.hiddenMembership
-        });
-    });
-}, _EntraAdministrativeUnitAddCommand_initOptions = function _EntraAdministrativeUnitAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --displayName <displayName>'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '--hiddenMembership'
-    });
-};
 export default new EntraAdministrativeUnitAddCommand();
 //# sourceMappingURL=administrativeunit-add.js.map

package/dist/m365/entra/commands/administrativeunit/administrativeunit-get.js

@@ -1,14 +1,17 @@
-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 _EntraAdministrativeUnitGetCommand_instances, _EntraAdministrativeUnitGetCommand_initTelemetry, _EntraAdministrativeUnitGetCommand_initOptions, _EntraAdministrativeUnitGetCommand_initValidators, _EntraAdministrativeUnitGetCommand_initOptionSets, _EntraAdministrativeUnitGetCommand_initTypes;
-import { validation } from "../../../../utils/validation.js";
+import { z } from 'zod';
 import request from "../../../../request.js";
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
 import { entraAdministrativeUnit } from "../../../../utils/entraAdministrativeUnit.js";
+import { globalOptionsZod } from "../../../../Command.js";
+import { zod } from "../../../../utils/zod.js";
+const options = globalOptionsZod
+    .extend({
+    id: zod.alias('i', z.string().uuid().optional()),
+    displayName: zod.alias('n', z.string().optional()),
+    properties: zod.alias('p', z.string().optional())
+})
+    .strict();
 class EntraAdministrativeUnitGetCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_GET;
@@ -16,14 +19,14 @@ class EntraAdministrativeUnitGetCommand extends GraphCommand {
     get description() {
         return 'Gets information about a specific administrative unit';
     }
-    constructor() {
-        super();
-        _EntraAdministrativeUnitGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitGetCommand_instances, "m", _EntraAdministrativeUnitGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitGetCommand_instances, "m", _EntraAdministrativeUnitGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitGetCommand_instances, "m", _EntraAdministrativeUnitGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitGetCommand_instances, "m", _EntraAdministrativeUnitGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitGetCommand_instances, "m", _EntraAdministrativeUnitGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.displayName].filter(Boolean).length === 1, {
+            message: 'Specify either id or displayName'
+        });
     }
     async commandAction(logger, args) {
         let administrativeUnit;
@@ -62,33 +65,5 @@ class EntraAdministrativeUnitGetCommand extends GraphCommand {
         return await request.get(requestOptions);
     }
 }
-_EntraAdministrativeUnitGetCommand_instances = new WeakSet(), _EntraAdministrativeUnitGetCommand_initTelemetry = function _EntraAdministrativeUnitGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined',
-            properties: typeof args.options.properties !== 'undefined'
-        });
-    });
-}, _EntraAdministrativeUnitGetCommand_initOptions = function _EntraAdministrativeUnitGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '-p, --properties [properties]'
-    });
-}, _EntraAdministrativeUnitGetCommand_initValidators = function _EntraAdministrativeUnitGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraAdministrativeUnitGetCommand_initOptionSets = function _EntraAdministrativeUnitGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'displayName'] });
-}, _EntraAdministrativeUnitGetCommand_initTypes = function _EntraAdministrativeUnitGetCommand_initTypes() {
-    this.types.string.push('displayName');
-};
 export default new EntraAdministrativeUnitGetCommand();
 //# sourceMappingURL=administrativeunit-get.js.map

package/dist/m365/entra/commands/administrativeunit/administrativeunit-list.js

@@ -1,12 +1,13 @@
-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 _EntraAdministrativeUnitListCommand_instances, _EntraAdministrativeUnitListCommand_initTelemetry, _EntraAdministrativeUnitListCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
+import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod
+    .extend({
+    properties: zod.alias('p', z.string().optional())
+}).strict();
 class EntraAdministrativeUnitListCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_LIST;
@@ -14,15 +15,12 @@ class EntraAdministrativeUnitListCommand extends GraphCommand {
     get description() {
         return 'Retrieves a list of administrative units';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['id', 'displayName', 'visibility'];
     }
-    constructor() {
-        super();
-        _EntraAdministrativeUnitListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitListCommand_instances, "m", _EntraAdministrativeUnitListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitListCommand_instances, "m", _EntraAdministrativeUnitListCommand_initOptions).call(this);
-    }
     async commandAction(logger, args) {
         const queryParameters = [];
         if (args.options.properties) {
@@ -44,14 +42,5 @@ class EntraAdministrativeUnitListCommand extends GraphCommand {
         }
     }
 }
-_EntraAdministrativeUnitListCommand_instances = new WeakSet(), _EntraAdministrativeUnitListCommand_initTelemetry = function _EntraAdministrativeUnitListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            properties: typeof args.options.properties !== 'undefined'
-        });
-    });
-}, _EntraAdministrativeUnitListCommand_initOptions = function _EntraAdministrativeUnitListCommand_initOptions() {
-    this.options.unshift({ option: '-p, --properties [properties]' });
-};
 export default new EntraAdministrativeUnitListCommand();
 //# sourceMappingURL=administrativeunit-list.js.map

package/dist/m365/entra/commands/administrativeunit/administrativeunit-remove.js

@@ -1,15 +1,18 @@
-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 _EntraAdministrativeUnitRemoveCommand_instances, _EntraAdministrativeUnitRemoveCommand_initTelemetry, _EntraAdministrativeUnitRemoveCommand_initOptions, _EntraAdministrativeUnitRemoveCommand_initOptionSets, _EntraAdministrativeUnitRemoveCommand_initValidators, _EntraAdministrativeUnitRemoveCommand_initTypes;
+import { z } from 'zod';
+import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import request from '../../../../request.js';
 import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
-import { validation } from "../../../../utils/validation.js";
-import request from "../../../../request.js";
-import GraphCommand from "../../../base/GraphCommand.js";
-import commands from "../../commands.js";
-import { cli } from "../../../../cli/cli.js";
+import { zod } from '../../../../utils/zod.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+const options = globalOptionsZod
+    .extend({
+    id: zod.alias('i', z.string().uuid().optional()),
+    displayName: zod.alias('n', z.string().optional()),
+    force: zod.alias('f', z.boolean().optional())
+})
+    .strict();
 class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_REMOVE;
@@ -17,14 +20,17 @@ class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes an administrative unit';
     }
-    constructor() {
-        super();
-        _EntraAdministrativeUnitRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.id || options.displayName, {
+            message: 'Specify either id or displayName'
+        })
+            .refine(options => !(options.id && options.displayName), {
+            message: 'Specify either id or displayName but not both'
+        });
     }
     async commandAction(logger, args) {
         const removeAdministrativeUnit = async () => {
@@ -57,35 +63,5 @@ class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
         }
     }
 }
-_EntraAdministrativeUnitRemoveCommand_instances = new WeakSet(), _EntraAdministrativeUnitRemoveCommand_initTelemetry = function _EntraAdministrativeUnitRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: args.options.id !== 'undefined',
-            displayName: args.options.displayName !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _EntraAdministrativeUnitRemoveCommand_initOptions = function _EntraAdministrativeUnitRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --displayName [displayName]'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraAdministrativeUnitRemoveCommand_initOptionSets = function _EntraAdministrativeUnitRemoveCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['id', 'displayName']
-    });
-}, _EntraAdministrativeUnitRemoveCommand_initValidators = function _EntraAdministrativeUnitRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID for option id.`;
-        }
-        return true;
-    });
-}, _EntraAdministrativeUnitRemoveCommand_initTypes = function _EntraAdministrativeUnitRemoveCommand_initTypes() {
-    this.types.string.push('id', 'displayName');
-};
 export default new EntraAdministrativeUnitRemoveCommand();
 //# sourceMappingURL=administrativeunit-remove.js.map

package/dist/m365/entra/commands/app/app-add.js

@@ -425,7 +425,9 @@ _a = EntraAppAddCommand, _EntraAppAddCommand_instances = new WeakSet(), _EntraAp
             certificateBase64Encoded: typeof args.options.certificateBase64Encoded !== 'undefined',
             certificateDisplayName: typeof args.options.certificateDisplayName !== 'undefined',
             grantAdminConsent: typeof args.options.grantAdminConsent !== 'undefined',
-            allowPublicClientFlows: typeof args.options.allowPublicClientFlows !== 'undefined'
+            allowPublicClientFlows: typeof args.options.allowPublicClientFlows !== 'undefined',
+            bundleId: typeof args.options.bundleId !== 'undefined',
+            signatureHash: typeof args.options.signatureHash !== 'undefined'
         });
     });
 }, _EntraAppAddCommand_initOptions = function _EntraAppAddCommand_initOptions() {
@@ -465,6 +467,10 @@ _a = EntraAppAddCommand, _EntraAppAddCommand_instances = new WeakSet(), _EntraAp
         option: '--certificateDisplayName [certificateDisplayName]'
     }, {
         option: '--manifest [manifest]'
+    }, {
+        option: '--bundleId [bundleId]'
+    }, {
+        option: '--signatureHash [signatureHash]'
     }, {
         option: '--save'
     }, {
@@ -519,12 +525,18 @@ _a = EntraAppAddCommand, _EntraAppAddCommand_instances = new WeakSet(), _EntraAp
                 return `Error while parsing the specified manifest: ${e}`;
             }
         }
+        if (args.options.platform === 'apple' && !args.options.bundleId) {
+            return `When you use platform apple, you'll need to specify bundleId`;
+        }
+        if (args.options.platform === 'android' && (!args.options.bundleId || !args.options.signatureHash)) {
+            return `When you use platform android, you'll need to specify bundleId and signatureHash`;
+        }
         return true;
     });
 }, _EntraAppAddCommand_initOptionSets = function _EntraAppAddCommand_initOptionSets() {
     this.optionSets.push({ options: ['name', 'manifest'] });
 };
-EntraAppAddCommand.entraApplicationPlatform = ['spa', 'web', 'publicClient'];
+EntraAppAddCommand.entraApplicationPlatform = ['spa', 'web', 'publicClient', 'apple', 'android'];
 EntraAppAddCommand.entraAppScopeConsentBy = ['admins', 'adminsAndUsers'];
 export default new EntraAppAddCommand();
 //# sourceMappingURL=app-add.js.map

package/dist/m365/entra/commands/roleassignment/roleassignment-add.js

@@ -0,0 +1,146 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import request from '../../../../request.js';
+import { validation } from '../../../../utils/validation.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
+import { entraApp } from '../../../../utils/entraApp.js';
+import { entraServicePrincipal } from '../../../../utils/entraServicePrincipal.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { roleDefinition } from '../../../../utils/roleDefinition.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+const options = globalOptionsZod
+    .extend({
+    roleDefinitionId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    roleDefinitionName: z.string().optional(),
+    principal: z.string().refine(principal => validation.isValidGuid(principal) || validation.isValidUserPrincipalName(principal) || validation.isValidMailNickname(principal), principal => ({
+        message: `'${principal}' is not a valid GUID, UPN or group mail nickname.`
+    })),
+    userId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    userName: z.string().refine(upn => validation.isValidUserPrincipalName(upn), upn => ({
+        message: `'${upn}' is not a valid UPN.`
+    })).optional(),
+    administrativeUnitId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    administrativeUnitName: z.string().optional(),
+    applicationId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    applicationObjectId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    applicationName: z.string().optional(),
+    servicePrincipalId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    servicePrincipalName: z.string().optional(),
+    groupId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    groupName: z.string().optional()
+})
+    .strict();
+class EntraRoleAssignmentAddCommand extends GraphCommand {
+    get name() {
+        return commands.ROLEASSIGNMENT_ADD;
+    }
+    get description() {
+        return 'Assign a Entra ID role to a user and specify the scope for which the user has been granted access';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.roleDefinitionId, options.roleDefinitionName].filter(o => o !== undefined).length === 1, {
+            message: 'Specify either roleDefinitionId or roleDefinitionName'
+        })
+            .refine(options => Object.values([options.userId, options.userName, options.administrativeUnitId, options.administrativeUnitName, options.applicationId, options.applicationObjectId, options.applicationName,
+            options.servicePrincipalId, options.servicePrincipalName, options.groupId, options.groupName]).filter(v => typeof v !== 'undefined').length < 2, {
+            message: 'Provide value for only one of the following parameters: userId, userName, administrativeUnitId, administrativeUnitName, applicationId, applicationObjectId, applicationName, servicePrincipalId, servicePrincipalName, groupId or groupName'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            const roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
+            const data = {
+                roleDefinitionId: roleDefinitionId,
+                principalId: await this.getPrincipalId(args.options, logger),
+                directoryScopeId: await this.getDirectoryScopeId(args.options)
+            };
+            const requestOptions = {
+                url: `${this.resource}/v1.0/roleManagement/directory/roleAssignments`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: data
+            };
+            const response = await request.post(requestOptions);
+            await logger.log(response);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getRoleDefinitionId(options, logger) {
+        if (options.roleDefinitionId) {
+            return options.roleDefinitionId;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving role definition by its name '${options.roleDefinitionName}'`);
+        }
+        const role = await roleDefinition.getRoleDefinitionByDisplayName(options.roleDefinitionName);
+        return role.id;
+    }
+    async getPrincipalId(options, logger) {
+        if (validation.isValidGuid(options.principal)) {
+            return options.principal;
+        }
+        if (validation.isValidUserPrincipalName(options.principal)) {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving user id by UPN '${options.principal}'`);
+            }
+            return await entraUser.getUserIdByUpn(options.principal);
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving group id by mail nickname '${options.principal}'`);
+        }
+        return await entraGroup.getGroupIdByMailNickname(options.principal);
+    }
+    async getDirectoryScopeId(options) {
+        let prefix = '/';
+        let resourceId = '';
+        if (options.userId || options.userName) {
+            resourceId = options.userId || await entraUser.getUserIdByUpn(options.userName);
+        }
+        else if (options.administrativeUnitId || options.administrativeUnitName) {
+            prefix = '/administrativeUnits/';
+            resourceId = options.administrativeUnitId || (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(options.administrativeUnitName, "id")).id;
+        }
+        else if (options.applicationId || options.applicationObjectId || options.applicationName) {
+            resourceId = options.applicationObjectId;
+            if (options.applicationId) {
+                resourceId = (await entraApp.getAppRegistrationByAppId(options.applicationId, ["id"])).id;
+            }
+            else if (options.applicationName) {
+                resourceId = (await entraApp.getAppRegistrationByAppName(options.applicationName, ["id"])).id;
+            }
+        }
+        else if (options.servicePrincipalId || options.servicePrincipalName) {
+            resourceId = options.servicePrincipalId || (await entraServicePrincipal.getServicePrincipalByAppName(options.servicePrincipalName, "id")).id;
+        }
+        else if (options.groupId || options.groupName) {
+            resourceId = options.groupId || (await entraGroup.getGroupIdByDisplayName(options.groupName));
+        }
+        return `${prefix}${resourceId}`;
+    }
+}
+export default new EntraRoleAssignmentAddCommand();
+//# sourceMappingURL=roleassignment-add.js.map

package/dist/m365/entra/commands.js

@@ -92,6 +92,7 @@ export default {
     PIM_ROLE_REQUEST_LIST: `${prefix} pim role request list`,
     POLICY_LIST: `${prefix} policy list`,
     RESOURCENAMESPACE_LIST: `${prefix} resourcenamespace list`,
+    ROLEASSIGNMENT_ADD: `${prefix} roleassignment add`,
     ROLEDEFINITION_ADD: `${prefix} roledefinition add`,
     ROLEDEFINITION_LIST: `${prefix} roledefinition list`,
     ROLEDEFINITION_GET: `${prefix} roledefinition get`,

package/dist/m365/flow/commands/environment/environment-get.js

@@ -1,13 +1,16 @@
-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 _FlowEnvironmentGetCommand_instances, _FlowEnvironmentGetCommand_initOptions, _FlowEnvironmentGetCommand_initTelemetry;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { zod } from '../../../../utils/zod.js';
 import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod
+    .extend({
+    name: zod.alias('n', z.string().optional()),
+    default: z.boolean().optional()
+})
+    .strict();
 class FlowEnvironmentGetCommand extends PowerAutomateCommand {
     get name() {
         return commands.ENVIRONMENT_GET;
@@ -15,23 +18,21 @@ class FlowEnvironmentGetCommand extends PowerAutomateCommand {
     get description() {
         return 'Gets information about the specified Microsoft Flow environment';
     }
-    constructor() {
-        super();
-        _FlowEnvironmentGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _FlowEnvironmentGetCommand_instances, "m", _FlowEnvironmentGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _FlowEnvironmentGetCommand_instances, "m", _FlowEnvironmentGetCommand_initTelemetry).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !!options.name !== !!options.default, {
+            message: `Specify either name or default, but not both.`
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving information about Microsoft Flow environment ${args.options.name ?? ''}...`);
+            await logger.logToStderr(`Retrieving information about Microsoft Flow environment ${args.options.name ?? 'default'}...`);
         }
         let requestUrl = `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/`;
-        if (args.options.name) {
-            requestUrl += `${formatting.encodeQueryParameter(args.options.name)}`;
-        }
-        else {
-            requestUrl += `~default`;
-        }
+        requestUrl += args.options.default ? '~default' : formatting.encodeQueryParameter(args.options.name);
         const requestOptions = {
             url: `${requestUrl}?api-version=2016-11-01`,
             headers: {
@@ -55,16 +56,5 @@ class FlowEnvironmentGetCommand extends PowerAutomateCommand {
         }
     }
 }
-_FlowEnvironmentGetCommand_instances = new WeakSet(), _FlowEnvironmentGetCommand_initOptions = function _FlowEnvironmentGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name [name]'
-    });
-}, _FlowEnvironmentGetCommand_initTelemetry = function _FlowEnvironmentGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-};
 export default new FlowEnvironmentGetCommand();
 //# sourceMappingURL=environment-get.js.map

package/dist/m365/graph/commands/openextension/openextension-add.js

@@ -12,7 +12,7 @@ const options = globalOptionsZod
     resourceId: zod.alias('i', z.string()),
     resourceType: zod.alias('t', z.enum(['user', 'group', 'device', 'organization']))
 })
-    .and(z.any());
+    .passthrough();
 class GraphOpenExtensionAddCommand extends GraphCommand {
     get name() {
         return commands.OPENEXTENSION_ADD;
@@ -38,7 +38,7 @@ class GraphOpenExtensionAddCommand extends GraphCommand {
         try {
             const requestBody = {};
             requestBody["extensionName"] = args.options.name;
-            const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
+            const unknownOptions = optionsUtils.getUnknownOptions(args.options, zod.schemaToOptions(this.schema));
             const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
             unknownOptionsNames.forEach(async (o) => {
                 try {

package/dist/m365/graph/commands/openextension/openextension-set.js

@@ -13,11 +13,10 @@ const options = globalOptionsZod
     resourceType: zod.alias('t', z.enum(['user', 'group', 'device', 'organization'])),
     keepUnchangedProperties: zod.alias('k', z.boolean().optional())
 })
-    .and(z.any());
+    .passthrough();
 class GraphOpenExtensionSetCommand extends GraphCommand {
     constructor() {
         super(...arguments);
-        this.commandOptions = ['keepUnchangedProperties', 'resourceType', 'resourceId', 'name'];
         this.defaultOpenExtensionProperties = ['id', 'extensionName'];
     }
     get name() {
@@ -46,12 +45,9 @@ class GraphOpenExtensionSetCommand extends GraphCommand {
             const currentExtensionNames = Object.getOwnPropertyNames(currentExtension);
             const requestBody = {};
             requestBody["@odata.type"] = '#microsoft.graph.openTypeExtension';
-            const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
+            const unknownOptions = optionsUtils.getUnknownOptions(args.options, zod.schemaToOptions(this.schema));
             const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
             unknownOptionsNames.forEach(async (option) => {
-                if (this.commandOptions.includes(option)) {
-                    return;
-                }
                 const value = unknownOptions[option];
                 if (value === "") {
                     requestBody[option] = null;