@pnp/cli-microsoft365 11.9.0-beta.69c1186 → 11.9.0-beta.87e70e2

package/dist/m365/entra/commands/user/user-registrationdetails-list.js

@@ -1,17 +1,50 @@
-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 _EntraUserRegistrationDetailsListCommand_instances, _EntraUserRegistrationDetailsListCommand_initTelemetry, _EntraUserRegistrationDetailsListCommand_initOptions, _EntraUserRegistrationDetailsListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { odata } from '../../../../utils/odata.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { validation } from '../../../../utils/validation.js';
 import { formatting } from '../../../../utils/formatting.js';
-const authenticationMethods = ['push', 'oath', 'voiceMobile', 'voiceAlternateMobile', 'voiceOffice', 'sms', 'none'];
-const methodsRegistered = ['mobilePhone', 'email', 'fido2', 'microsoftAuthenticatorPush', 'softwareOneTimePasscode'];
+const authenticationMethodValues = ['push', 'oath', 'voiceMobile', 'voiceAlternateMobile', 'voiceOffice', 'sms', 'none'];
+const methodsRegisteredValues = ['mobilePhone', 'email', 'fido2', 'microsoftAuthenticatorPush', 'softwareOneTimePasscode'];
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    isAdmin: z.boolean().optional(),
+    userType: z.enum(['member', 'guest']).optional(),
+    userPreferredMethodForSecondaryAuthentication: z.string().refine(val => {
+        const methods = val.split(',').map(m => m.trim());
+        return methods.every(m => authenticationMethodValues.includes(m));
+    }, {
+        error: e => `'${e.input}' is not a valid userPreferredMethodForSecondaryAuthentication value. Allowed values ${authenticationMethodValues.join(', ')}.`
+    }).optional(),
+    systemPreferredAuthenticationMethods: z.string().refine(val => {
+        const methods = val.split(',').map(m => m.trim());
+        return methods.every(m => authenticationMethodValues.includes(m));
+    }, {
+        error: e => `'${e.input}' is not a valid systemPreferredAuthenticationMethods value. Allowed values ${authenticationMethodValues.join(', ')}.`
+    }).optional(),
+    isSelfServicePasswordResetRegistered: z.boolean().optional(),
+    isSelfServicePasswordResetEnabled: z.boolean().optional(),
+    isSelfServicePasswordResetCapable: z.boolean().optional(),
+    isMfaRegistered: z.boolean().optional(),
+    isMfaCapable: z.boolean().optional(),
+    isPasswordlessCapable: z.boolean().optional(),
+    isSystemPreferredAuthenticationMethodEnabled: z.boolean().optional(),
+    methodsRegistered: z.string().refine(val => {
+        const methods = val.split(',').map(m => m.trim());
+        return methods.every(m => methodsRegisteredValues.includes(m));
+    }, {
+        error: e => `'${e.input}' is not a valid methodsRegistered value. Allowed values ${methodsRegisteredValues.join(', ')}.`
+    }).optional(),
+    userIds: z.string().refine(val => validation.isValidGuidArray(val) === true, {
+        error: e => `The following GUIDs are invalid for the option 'userIds': ${validation.isValidGuidArray(e.input)}.`
+    }).optional(),
+    userPrincipalNames: z.string().refine(val => validation.isValidUserPrincipalNameArray(val) === true, {
+        error: e => `The following user principal names are invalid for the option 'userPrincipalNames': ${validation.isValidUserPrincipalNameArray(e.input)}.`
+    }).optional(),
+    properties: z.string().optional().alias('p')
+});
 class EntraUserRegistrationDetailsListCommand extends GraphCommand {
     get name() {
         return commands.USER_REGISTRATIONDETAILS_LIST;
@@ -22,12 +55,8 @@ class EntraUserRegistrationDetailsListCommand extends GraphCommand {
     defaultProperties() {
         return ['userPrincipalName', 'methodsRegistered', 'lastUpdatedDateTime'];
     }
-    constructor() {
-        super();
-        _EntraUserRegistrationDetailsListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserRegistrationDetailsListCommand_instances, "m", _EntraUserRegistrationDetailsListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserRegistrationDetailsListCommand_instances, "m", _EntraUserRegistrationDetailsListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserRegistrationDetailsListCommand_instances, "m", _EntraUserRegistrationDetailsListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -116,104 +145,5 @@ class EntraUserRegistrationDetailsListCommand extends GraphCommand {
         return `${this.resource}/v1.0/reports/authenticationMethods/userRegistrationDetails${queryString}`;
     }
 }
-_EntraUserRegistrationDetailsListCommand_instances = new WeakSet(), _EntraUserRegistrationDetailsListCommand_initTelemetry = function _EntraUserRegistrationDetailsListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            isAdmin: !!args.options.isAdmin,
-            userType: typeof args.options.userType !== 'undefined',
-            userPreferredMethodForSecondaryAuthentication: typeof args.options.userPreferredMethodForSecondaryAuthentication !== 'undefined',
-            systemPreferredAuthenticationMethods: typeof args.options.systemPreferredAuthenticationMethods !== 'undefined',
-            isSelfServicePasswordResetRegistered: !!args.options.isSelfServicePasswordResetRegistered,
-            isSelfServicePasswordResetEnabled: !!args.options.isSelfServicePasswordResetEnabled,
-            isSelfServicePasswordResetCapable: !!args.options.isSelfServicePasswordResetCapable,
-            isMfaRegistered: !!args.options.isMfaRegistered,
-            isMfaCapable: !!args.options.isMfaCapable,
-            isPasswordlessCapable: !!args.options.isPasswordlessCapable,
-            isSystemPreferredAuthenticationMethodEnabled: !!args.options.isSystemPreferredAuthenticationMethodEnabled,
-            methodsRegistered: typeof args.options.methodsRegistered !== 'undefined',
-            userIds: typeof args.options.userIds !== 'undefined',
-            userPrincipalNames: typeof args.options.userPrincipalNames !== 'undefined',
-            properties: typeof args.options.properties !== 'undefined'
-        });
-    });
-}, _EntraUserRegistrationDetailsListCommand_initOptions = function _EntraUserRegistrationDetailsListCommand_initOptions() {
-    this.options.unshift({
-        option: '--isAdmin [isAdmin]'
-    }, {
-        option: '--userType [userType]',
-        autocomplete: ['member', 'guest']
-    }, {
-        option: '--userPreferredMethodForSecondaryAuthentication [userPreferredMethodForSecondaryAuthentication ]',
-        autocomplete: authenticationMethods
-    }, {
-        option: '--systemPreferredAuthenticationMethods [systemPreferredAuthenticationMethods ]',
-        autocomplete: authenticationMethods
-    }, {
-        option: '--isSelfServicePasswordResetRegistered [isSelfServicePasswordResetRegistered]'
-    }, {
-        option: '--isSelfServicePasswordResetEnabled [isSelfServicePasswordResetEnabled]'
-    }, {
-        option: '--isSelfServicePasswordResetCapable [isSelfServicePasswordResetCapable]'
-    }, {
-        option: '--isMfaRegistered [isMfaRegistered]'
-    }, {
-        option: '--isMfaCapable [isMfaCapable]'
-    }, {
-        option: '--isPasswordlessCapable [isPasswordlessCapable]'
-    }, {
-        option: '--isSystemPreferredAuthenticationMethodEnabled [isSystemPreferredAuthenticationMethodEnabled]'
-    }, {
-        option: '--methodsRegistered [methodsRegistered]',
-        autocomplete: methodsRegistered
-    }, {
-        option: '--userIds [userIds]'
-    }, {
-        option: '--userPrincipalNames [userPrincipalNames]'
-    }, {
-        option: '-p, --properties [properties]'
-    });
-}, _EntraUserRegistrationDetailsListCommand_initValidators = function _EntraUserRegistrationDetailsListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.userType) {
-            if (['member', 'guest'].every(type => type !== args.options.userType)) {
-                return `'${args.options.userType}' is not a valid userType value. Allowed values member, guest`;
-            }
-        }
-        if (args.options.userPreferredMethodForSecondaryAuthentication) {
-            const methods = args.options.userPreferredMethodForSecondaryAuthentication.split(',').map(m => m.trim());
-            const invalidMethods = methods.filter(m => !authenticationMethods.includes(m));
-            if (invalidMethods.length > 0) {
-                return `'${args.options.userPreferredMethodForSecondaryAuthentication}' is not a valid userPreferredMethodForSecondaryAuthentication value. Invalid values: ${invalidMethods.join(',')}. Allowed values ${authenticationMethods.join(', ')}`;
-            }
-        }
-        if (args.options.systemPreferredAuthenticationMethods) {
-            const methods = args.options.systemPreferredAuthenticationMethods.split(',').map(m => m.trim());
-            const invalidMethods = methods.filter(m => !authenticationMethods.includes(m));
-            if (invalidMethods.length > 0) {
-                return `'${args.options.systemPreferredAuthenticationMethods}' is not a valid systemPreferredAuthenticationMethods value. Invalid values: ${invalidMethods.join(',')}. Allowed values ${authenticationMethods.join(', ')}`;
-            }
-        }
-        if (args.options.methodsRegistered) {
-            const methods = args.options.methodsRegistered.split(',').map(m => m.trim());
-            const invalidMethods = methods.filter(m => !methodsRegistered.includes(m));
-            if (invalidMethods.length > 0) {
-                return `'${args.options.methodsRegistered}' is not a valid methodsRegistered value. Invalid values: ${invalidMethods.join(',')}. Allowed values ${methodsRegistered.join(', ')}`;
-            }
-        }
-        if (args.options.userIds) {
-            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.userIds);
-            if (isValidGUIDArrayResult !== true) {
-                return `The following GUIDs are invalid for the option 'userIds': ${isValidGUIDArrayResult}.`;
-            }
-        }
-        if (args.options.userPrincipalNames) {
-            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.userPrincipalNames);
-            if (isValidUPNArrayResult !== true) {
-                return `The following user principal names are invalid for the option 'userPrincipalNames': ${isValidUPNArrayResult}.`;
-            }
-        }
-        return true;
-    });
-};
 export default new EntraUserRegistrationDetailsListCommand();
 //# sourceMappingURL=user-registrationdetails-list.js.map

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

@@ -1,14 +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 _EntraUserRemoveCommand_instances, _EntraUserRemoveCommand_initTelemetry, _EntraUserRemoveCommand_initOptions, _EntraUserRemoveCommand_initOptionSets, _EntraUserRemoveCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import commands from '../../commands.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import { cli } from '../../../../cli/cli.js';
 import GraphCommand from '../../../base/GraphCommand.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().optional(),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid user principal name (UPN).`
+    }).optional(),
+    force: z.boolean().optional().alias('f')
+});
 class EntraUserRemoveCommand extends GraphCommand {
     get name() {
         return commands.USER_REMOVE;
@@ -16,13 +20,18 @@ class EntraUserRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a specific user';
     }
-    constructor() {
-        super();
-        _EntraUserRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserRemoveCommand_instances, "m", _EntraUserRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserRemoveCommand_instances, "m", _EntraUserRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserRemoveCommand_instances, "m", _EntraUserRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraUserRemoveCommand_instances, "m", _EntraUserRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.userName].filter(o => o !== undefined).length === 1, {
+            error: `Specify either 'id' or 'userName'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'userName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -54,34 +63,5 @@ class EntraUserRemoveCommand extends GraphCommand {
         }
     }
 }
-_EntraUserRemoveCommand_instances = new WeakSet(), _EntraUserRemoveCommand_initTelemetry = function _EntraUserRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _EntraUserRemoveCommand_initOptions = function _EntraUserRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '--id [id]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraUserRemoveCommand_initOptionSets = function _EntraUserRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'userName'] });
-}, _EntraUserRemoveCommand_initValidators = function _EntraUserRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid user principal name (UPN)`;
-        }
-        return true;
-    });
-};
 export default new EntraUserRemoveCommand();
 //# sourceMappingURL=user-remove.js.map

package/dist/m365/entra/commands/user/user-set.js

@@ -1,16 +1,39 @@
-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 _EntraUserSetCommand_instances, _EntraUserSetCommand_initTelemetry, _EntraUserSetCommand_initOptions, _EntraUserSetCommand_initTypes, _EntraUserSetCommand_initValidators, _EntraUserSetCommand_initOptionSets;
+import { z } from 'zod';
 import auth from '../../../../Auth.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.looseObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().optional().alias('i'),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid userName.`
+    }).optional().alias('n'),
+    accountEnabled: z.boolean().optional(),
+    resetPassword: z.boolean().optional(),
+    forceChangePasswordNextSignIn: z.boolean().optional(),
+    forceChangePasswordNextSignInWithMfa: z.boolean().optional(),
+    currentPassword: z.string().optional(),
+    newPassword: z.string().optional(),
+    displayName: z.string().optional(),
+    firstName: z.string().max(64, { error: `The max length for the firstName option is 64 characters.` }).optional(),
+    lastName: z.string().max(64, { error: `The max length for the lastName option is 64 characters.` }).optional(),
+    usageLocation: z.string().regex(/^[a-zA-Z]{2}$/, { error: e => `'${e.input}' is not a valid usageLocation.` }).optional(),
+    officeLocation: z.string().optional(),
+    jobTitle: z.string().max(128, { error: `The max length for the jobTitle option is 128 characters.` }).optional(),
+    companyName: z.string().max(64, { error: `The max length for the companyName option is 64 characters.` }).optional(),
+    department: z.string().max(64, { error: `The max length for the department option is 64 characters.` }).optional(),
+    preferredLanguage: z.string().min(2, { error: e => `'${e.input}' is not a valid preferredLanguage.` }).optional(),
+    managerUserId: z.uuid().optional(),
+    managerUserName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid user principal name.`
+    }).optional(),
+    removeManager: z.boolean().optional()
+});
 class EntraUserSetCommand extends GraphCommand {
     get name() {
         return commands.USER_SET;
@@ -21,14 +44,45 @@ class EntraUserSetCommand extends GraphCommand {
     allowUnknownOptions() {
         return true;
     }
-    constructor() {
-        super();
-        _EntraUserSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserSetCommand_instances, "m", _EntraUserSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserSetCommand_instances, "m", _EntraUserSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserSetCommand_instances, "m", _EntraUserSetCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _EntraUserSetCommand_instances, "m", _EntraUserSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraUserSetCommand_instances, "m", _EntraUserSetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.userName].filter(o => o !== undefined).length === 1, {
+            error: `Specify either 'id' or 'userName'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'userName']
+            }
+        })
+            .refine(options => {
+            if (!options.managerUserId && !options.managerUserName && !options.removeManager) {
+                return true;
+            }
+            return [options.managerUserId, options.managerUserName, options.removeManager].filter(o => o !== undefined).length === 1;
+        }, {
+            error: `Specify either 'managerUserId', 'managerUserName', or 'removeManager'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['managerUserId', 'managerUserName', 'removeManager']
+            }
+        })
+            .refine(options => !(!options.resetPassword && ((options.currentPassword && !options.newPassword) || (options.newPassword && !options.currentPassword))), {
+            error: `Specify both currentPassword and newPassword when you want to change your password.`
+        })
+            .refine(options => !(options.resetPassword && options.currentPassword), {
+            error: `When resetting a user's password, don't specify the current password.`
+        })
+            .refine(options => !(options.resetPassword && !options.newPassword), {
+            error: `When resetting a user's password, specify the new password to set for the user, using the newPassword option.`
+        })
+            .refine(options => !(options.forceChangePasswordNextSignIn && !options.resetPassword), {
+            error: `The option forceChangePasswordNextSignIn can only be used in combination with the resetPassword option.`
+        })
+            .refine(options => !(options.forceChangePasswordNextSignInWithMfa && !options.resetPassword), {
+            error: `The option forceChangePasswordNextSignInWithMfa can only be used in combination with the resetPassword option.`
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -93,7 +147,7 @@ class EntraUserSetCommand extends GraphCommand {
             preferredLanguage: options.preferredLanguage,
             accountEnabled: options.accountEnabled
         };
-        this.addUnknownOptionsToPayload(requestBody, options);
+        this.addUnknownOptionsToPayloadZod(requestBody, options);
         if (options.resetPassword) {
             requestBody.passwordProfile = {
                 forceChangePasswordNextSignIn: options.forceChangePasswordNextSignIn || false,
@@ -149,139 +203,5 @@ class EntraUserSetCommand extends GraphCommand {
         await request.delete(managerRequestOptions);
     }
 }
-_EntraUserSetCommand_instances = new WeakSet(), _EntraUserSetCommand_initTelemetry = function _EntraUserSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            accountEnabled: !!args.options.accountEnabled,
-            resetPassword: !!args.options.resetPassword,
-            forceChangePasswordNextSignIn: !!args.options.forceChangePasswordNextSignIn,
-            currentPassword: typeof args.options.currentPassword !== 'undefined',
-            newPassword: typeof args.options.newPassword !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined',
-            firstName: typeof args.options.firstName !== 'undefined',
-            lastName: typeof args.options.lastName !== 'undefined',
-            forceChangePasswordNextSignInWithMfa: !!args.options.forceChangePasswordNextSignInWithMfa,
-            usageLocation: typeof args.options.usageLocation !== 'undefined',
-            officeLocation: typeof args.options.officeLocation !== 'undefined',
-            jobTitle: typeof args.options.jobTitle !== 'undefined',
-            companyName: typeof args.options.companyName !== 'undefined',
-            department: typeof args.options.department !== 'undefined',
-            preferredLanguage: typeof args.options.preferredLanguage !== 'undefined',
-            managerUserId: typeof args.options.managerUserId !== 'undefined',
-            managerUserName: typeof args.options.managerUserName !== 'undefined',
-            removeManager: typeof args.options.removeManager !== 'undefined'
-        });
-    });
-}, _EntraUserSetCommand_initOptions = function _EntraUserSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --userName [userName]'
-    }, {
-        option: '--accountEnabled [accountEnabled]',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '--resetPassword'
-    }, {
-        option: '--forceChangePasswordNextSignIn'
-    }, {
-        option: '--currentPassword [currentPassword]'
-    }, {
-        option: '--newPassword [newPassword]'
-    }, {
-        option: '--displayName [displayName]'
-    }, {
-        option: '--firstName [firstName]'
-    }, {
-        option: '--lastName [lastName]'
-    }, {
-        option: '--forceChangePasswordNextSignInWithMfa'
-    }, {
-        option: '--usageLocation [usageLocation]'
-    }, {
-        option: '--officeLocation [officeLocation]'
-    }, {
-        option: '--jobTitle [jobTitle]'
-    }, {
-        option: '--companyName [companyName]'
-    }, {
-        option: '--department [department]'
-    }, {
-        option: '--preferredLanguage [preferredLanguage]'
-    }, {
-        option: '--managerUserId [managerUserId]'
-    }, {
-        option: '--managerUserName [managerUserName]'
-    }, {
-        option: '--removeManager'
-    });
-}, _EntraUserSetCommand_initTypes = function _EntraUserSetCommand_initTypes() {
-    this.types.boolean.push('accountEnabled');
-}, _EntraUserSetCommand_initValidators = function _EntraUserSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id &&
-            !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid userName`;
-        }
-        if (!args.options.resetPassword && ((args.options.currentPassword && !args.options.newPassword) || (args.options.newPassword && !args.options.currentPassword))) {
-            return `Specify both currentPassword and newPassword when you want to change your password`;
-        }
-        if (args.options.resetPassword && args.options.currentPassword) {
-            return `When resetting a user's password, don't specify the current password`;
-        }
-        if (args.options.resetPassword && !args.options.newPassword) {
-            return `When resetting a user's password, specify the new password to set for the user, using the newPassword option`;
-        }
-        if (args.options.firstName && args.options.firstName.length > 64) {
-            return `The max lenght for the firstName option is 64 characters`;
-        }
-        if (args.options.lastName && args.options.lastName.length > 64) {
-            return `The max lenght for the lastName option is 64 characters`;
-        }
-        if (args.options.forceChangePasswordNextSignIn && !args.options.resetPassword) {
-            return `The option forceChangePasswordNextSignIn can only be used in combination with the resetPassword option`;
-        }
-        if (args.options.forceChangePasswordNextSignInWithMfa && !args.options.resetPassword) {
-            return `The option forceChangePasswordNextSignInWithMfa can only be used in combination with the resetPassword option`;
-        }
-        if (args.options.usageLocation) {
-            const regex = new RegExp('^[a-zA-Z]{2}$');
-            if (!regex.test(args.options.usageLocation)) {
-                return `'${args.options.usageLocation}' is not a valid usageLocation.`;
-            }
-        }
-        if (args.options.jobTitle && args.options.jobTitle.length > 128) {
-            return `The max lenght for the jobTitle option is 128 characters`;
-        }
-        if (args.options.companyName && args.options.companyName.length > 64) {
-            return `The max lenght for the companyName option is 64 characters`;
-        }
-        if (args.options.department && args.options.department.length > 64) {
-            return `The max lenght for the department option is 64 characters`;
-        }
-        if (args.options.preferredLanguage && args.options.preferredLanguage.length < 2) {
-            return `'${args.options.preferredLanguage}' is not a valid preferredLanguage`;
-        }
-        if (args.options.managerUserName && !validation.isValidUserPrincipalName(args.options.managerUserName)) {
-            return `'${args.options.managerUserName}' is not a valid user principal name`;
-        }
-        if (args.options.managerUserId && !validation.isValidGuid(args.options.managerUserId)) {
-            return `'${args.options.managerUserId}' is not a valid GUID`;
-        }
-        return true;
-    });
-}, _EntraUserSetCommand_initOptionSets = function _EntraUserSetCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['id', 'userName']
-    }, {
-        options: ['managerUserId', 'managerUserName', 'removeManager'],
-        runsWhen: (args) => args.options.managerUserId || args.options.managerUserName || args.options.removeManager
-    });
-};
 export default new EntraUserSetCommand();
 //# sourceMappingURL=user-set.js.map

package/dist/m365/entra/commands/user/user-signin-list.js

@@ -1,14 +1,19 @@
-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 _EntraUserSigninListCommand_instances, _EntraUserSigninListCommand_initTelemetry, _EntraUserSigninListCommand_initOptions, _EntraUserSigninListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid userName.`
+    }).optional().alias('n'),
+    userId: z.uuid().optional(),
+    appDisplayName: z.string().optional(),
+    appId: z.uuid().optional()
+});
 class EntraUserSigninListCommand extends GraphCommand {
     get name() {
         return commands.USER_SIGNIN_LIST;
@@ -16,12 +21,17 @@ class EntraUserSigninListCommand extends GraphCommand {
     get description() {
         return 'Retrieves the Entra ID user sign-ins for the tenant';
     }
-    constructor() {
-        super();
-        _EntraUserSigninListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraUserSigninListCommand_instances, "m", _EntraUserSigninListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraUserSigninListCommand_instances, "m", _EntraUserSigninListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraUserSigninListCommand_instances, "m", _EntraUserSigninListCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !(options.userId && options.userName), {
+            error: `Specify either 'userId' or 'userName', but not both.`
+        })
+            .refine(options => !(options.appId && options.appDisplayName), {
+            error: `Specify either 'appId' or 'appDisplayName', but not both.`
+        });
     }
     defaultProperties() {
         return ['id', 'userPrincipalName', 'appId', 'appDisplayName', 'createdDateTime'];
@@ -50,44 +60,5 @@ class EntraUserSigninListCommand extends GraphCommand {
         }
     }
 }
-_EntraUserSigninListCommand_instances = new WeakSet(), _EntraUserSigninListCommand_initTelemetry = function _EntraUserSigninListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userName: typeof args.options.userName !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
-            appId: typeof args.options.appId !== 'undefined'
-        });
-    });
-}, _EntraUserSigninListCommand_initOptions = function _EntraUserSigninListCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --userName [userName]'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--appDisplayName [appDisplayName]'
-    }, {
-        option: '--appId [appId]'
-    });
-}, _EntraUserSigninListCommand_initValidators = function _EntraUserSigninListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.userId && args.options.userName) {
-            return 'Specify either userId or userName, but not both';
-        }
-        if (args.options.appId && args.options.appDisplayName) {
-            return 'Specify either appId or appDisplayName, but not both';
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid userName`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        return true;
-    });
-};
 export default new EntraUserSigninListCommand();
 //# sourceMappingURL=user-signin-list.js.map