@pnp/cli-microsoft365 10.8.0-beta.708bf27 → 10.8.0-beta.7160233

package/dist/Auth.js

@@ -562,19 +562,93 @@ export class Auth {
         if (debug) {
             await logger.logToStderr('Trying to retrieve access token using federated identity...');
         }
-        if (!process.env.ACTIONS_ID_TOKEN_REQUEST_URL || !process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN) {
-            throw new CommandError('Federated identity is currently only supported in GitHub Actions.');
+        if (process.env.ACTIONS_ID_TOKEN_REQUEST_URL && process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN) {
+            if (debug) {
+                await logger.logToStderr('ACTIONS_ID_TOKEN_REQUEST_URL and ACTIONS_ID_TOKEN_REQUEST_TOKEN env variables found. The context is GitHub Actions...');
+            }
+            const federationToken = await this.getFederationTokenFromGithub(logger, debug);
+            return this.getAccessTokenWithFederatedToken(resource, federationToken, logger, debug);
+        }
+        else if (process.env.SYSTEM_OIDCREQUESTURI) {
+            if (debug) {
+                await logger.logToStderr('SYSTEM_OIDCREQUESTURI env variable found. The context is Azure DevOps...');
+            }
+            if (!process.env.SYSTEM_ACCESSTOKEN) {
+                throw new CommandError(`The SYSTEM_ACCESSTOKEN environment variable is not available. Please check the Azure DevOps pipeline task configuration. It should contain 'SYSTEM_ACCESSTOKEN: $(System.AccessToken)' in the env section.`);
+            }
+            const serviceConnectionId = process.env.AZURESUBSCRIPTION_SERVICE_CONNECTION_ID;
+            const serviceConnectionAppId = process.env.AZURESUBSCRIPTION_CLIENT_ID;
+            const serviceConnectionTenantId = process.env.AZURESUBSCRIPTION_TENANT_ID;
+            const useServiceConnection = serviceConnectionId && serviceConnectionAppId && serviceConnectionTenantId;
+            if (!useServiceConnection) {
+                if (debug) {
+                    await logger.logToStderr('Not using a service connection. Run this command in an AzurePowerShell task to be able to use a service connection.');
+                }
+                if (!this.connection.appId || this.connection.tenant === 'common') {
+                    throw new CommandError('The appId and tenant parameters are required when not using a service connection.');
+                }
+            }
+            else {
+                if (debug) {
+                    if (this.connection.appId || this.connection.tenant !== 'common') {
+                        await logger.logToStderr('When using a service connection, the appId and tenant values are updated to the values of the service connection.');
+                    }
+                    await logger.logToStderr(`Using service connection '${serviceConnectionId}' with app Id '${serviceConnectionAppId}' and tenant Id '${serviceConnectionTenantId}'...`);
+                }
+                this.connection.appId = serviceConnectionAppId;
+                this.connection.tenant = serviceConnectionTenantId;
+            }
+            const federationToken = await this.getFederationTokenFromAzureDevOps(logger, debug, serviceConnectionId);
+            return this.getAccessTokenWithFederatedToken(resource, federationToken, logger, debug);
+        }
+        else {
+            throw new CommandError('Federated identity is currently only supported in GitHub Actions and Azure DevOps.');
+        }
+    }
+    async getFederationTokenFromGithub(logger, debug) {
+        if (debug) {
+            await logger.logToStderr('Retrieving GitHub federation token...');
+        }
+        const requestOptions = {
+            url: `${process.env.ACTIONS_ID_TOKEN_REQUEST_URL}&audience=${encodeURIComponent('api://AzureADTokenExchange')}`,
+            headers: {
+                Authorization: `Bearer ${process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN}`,
+                Accept: 'application/json',
+                'x-anonymous': true
+            },
+            responseType: 'json'
+        };
+        const accessTokenResponse = await request.get(requestOptions);
+        return accessTokenResponse.value;
+    }
+    async getFederationTokenFromAzureDevOps(logger, debug, serviceConnectionId) {
+        if (debug) {
+            await logger.logToStderr('Retrieving Azure DevOps federation token...');
         }
+        const urlSuffix = serviceConnectionId ? `&serviceConnectionId=${serviceConnectionId}` : '';
+        const requestOptions = {
+            url: `${process.env.SYSTEM_OIDCREQUESTURI}?api-version=7.1${urlSuffix}`,
+            headers: {
+                Authorization: `Bearer ${process.env.SYSTEM_ACCESSTOKEN}`,
+                Accept: 'application/json',
+                'Content-Type': 'application/json',
+                'x-anonymous': true
+            },
+            responseType: 'json'
+        };
+        const accessTokenResponse = await request.post(requestOptions);
+        return accessTokenResponse.oidcToken;
+    }
+    async getAccessTokenWithFederatedToken(resource, federatedToken, logger, debug) {
         if (debug) {
-            await logger.logToStderr('ACTIONS_ID_TOKEN_REQUEST_URL and ACTIONS_ID_TOKEN_REQUEST_TOKEN env variables found. The context is GitHub Actions...');
+            await logger.logToStderr('Retrieving Entra ID Access Token with federated token...');
         }
-        const federationToken = await this.getFederationTokenFromGithub(logger, debug);
         const queryParams = [
             'grant_type=client_credentials',
             `scope=${encodeURIComponent(`${resource}/.default`)}`,
             `client_id=${this.connection.appId}`,
             `client_assertion_type=${encodeURIComponent('urn:ietf:params:oauth:client-assertion-type:jwt-bearer')}`,
-            `client_assertion=${federationToken}`
+            `client_assertion=${federatedToken}`
         ];
         const requestOptions = {
             url: `https://login.microsoftonline.com/${this.connection.tenant}/oauth2/v2.0/token`,
@@ -587,27 +661,13 @@ export class Auth {
             responseType: 'json'
         };
         const accessTokenResponse = await request.post(requestOptions);
+        const expiresIn = parseInt(accessTokenResponse.expires_in) * 1000;
+        const now = new Date();
         return {
             accessToken: accessTokenResponse.access_token,
-            expiresOn: new Date(parseInt(accessTokenResponse.expires_on) * 1000)
+            expiresOn: new Date(now.getTime() + expiresIn)
         };
     }
-    async getFederationTokenFromGithub(logger, debug) {
-        if (debug) {
-            await logger.logToStderr('Retrieving GitHub federation token...');
-        }
-        const requestOptions = {
-            url: `${process.env.ACTIONS_ID_TOKEN_REQUEST_URL}&audience=${encodeURIComponent('api://AzureADTokenExchange')}`,
-            headers: {
-                Authorization: `Bearer ${process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN}`,
-                accept: 'application/json',
-                'x-anonymous': true
-            },
-            responseType: 'json'
-        };
-        const accessTokenResponse = await request.get(requestOptions);
-        return accessTokenResponse.value;
-    }
     async ensureAccessTokenWithSecret(resource, logger, debug, fetchNew) {
         this.clientApplication = await this.getConfidentialClient(logger, debug, undefined, undefined, this.connection.secret);
         return this.clientApplication.acquireTokenByClientCredential({

package/dist/cli/cli.js

@@ -406,7 +406,7 @@ async function loadCommandFromFile(commandFileUrl) {
     catch { }
 }
 function getCommandInfo(command, filePath = '', helpFilePath = '') {
-    const options = command.schema ? zod.schemaToOptions(command.schema) : getCommandOptions(command);
+    const options = command.schema ? zod.schemaToOptionInfo(command.schema) : getCommandOptions(command);
     command.optionsInfo = options;
     return {
         aliases: command.alias(),

package/dist/config.js

@@ -18,6 +18,7 @@ export default {
         'https://graph.microsoft.com/Directory.ReadWrite.All',
         'https://graph.microsoft.com/ExternalConnection.ReadWrite.All',
         'https://graph.microsoft.com/ExternalItem.ReadWrite.All',
+        'https://graph.microsoft.com/FileStorageContainer.Selected',
         'https://graph.microsoft.com/Group.ReadWrite.All',
         'https://graph.microsoft.com/IdentityProvider.ReadWrite.All',
         'https://graph.microsoft.com/InformationProtectionPolicy.Read',

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

@@ -1,13 +1,21 @@
-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 _AdaptiveCardSendCommand_instances, _AdaptiveCardSendCommand_initTelemetry, _AdaptiveCardSendCommand_initOptions, _AdaptiveCardSendCommand_initValidators, _AdaptiveCardSendCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import request from '../../../request.js';
+import { optionsUtils } from '../../../utils/optionsUtils.js';
+import { zod } from '../../../utils/zod.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
-import { optionsUtils } from '../../../utils/optionsUtils.js';
+export const options = globalOptionsZod
+    .extend({
+    url: z.string(),
+    title: zod.alias('t', z.string().optional()),
+    description: zod.alias('d', z.string().optional()),
+    imageUrl: zod.alias('i', z.string().optional()),
+    actionUrl: zod.alias('a', z.string().optional()),
+    card: z.string().optional(),
+    cardData: z.string().optional()
+})
+    .and(z.any());
 class AdaptiveCardSendCommand extends AnonymousCommand {
     get name() {
         return commands.SEND;
@@ -15,19 +23,48 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
     get description() {
         return 'Sends adaptive card to the specified URL';
     }
-    constructor() {
-        super();
-        _AdaptiveCardSendCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
     }
-    allowUnknownOptions() {
-        return true;
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !options.cardData || options.card, {
+            message: 'When you specify cardData, you must also specify card.',
+            path: ['cardData']
+        })
+            .refine(options => {
+            if (options.card) {
+                try {
+                    JSON.parse(options.card);
+                    return true;
+                }
+                catch (e) {
+                    return false;
+                }
+            }
+            return true;
+        }, {
+            message: 'Specified card is not a valid JSON string.',
+            path: ['card']
+        })
+            .refine(options => {
+            if (options.cardData) {
+                try {
+                    JSON.parse(options.cardData);
+                    return true;
+                }
+                catch (e) {
+                    return false;
+                }
+            }
+            return true;
+        }, {
+            message: 'Specified cardData is not a valid JSON string.',
+            path: ['cardData']
+        });
     }
     async commandAction(logger, args) {
-        const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
+        const unknownOptions = optionsUtils.getUnknownOptions(args.options, zod.schemaToOptions(this.schema));
         const unknownOptionNames = Object.getOwnPropertyNames(unknownOptions);
         const card = await this.getCard(args, unknownOptionNames, unknownOptions);
         const requestOptions = {
@@ -166,55 +203,5 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
         return cardData;
     }
 }
-_AdaptiveCardSendCommand_instances = new WeakSet(), _AdaptiveCardSendCommand_initTelemetry = function _AdaptiveCardSendCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            actionUrl: typeof args.options.actionUrl !== 'undefined',
-            card: typeof args.options.card !== 'undefined',
-            cardData: typeof args.options.cardData !== 'undefined',
-            description: typeof args.options.description !== 'undefined',
-            imageUrl: typeof args.options.imageUrl !== 'undefined',
-            title: typeof args.options.title !== 'undefined'
-        });
-    });
-}, _AdaptiveCardSendCommand_initOptions = function _AdaptiveCardSendCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '-i, --imageUrl [imageUrl]'
-    }, {
-        option: '-a, --actionUrl [actionUrl]'
-    }, {
-        option: '--card [card]'
-    }, {
-        option: '--cardData [cardData]'
-    });
-}, _AdaptiveCardSendCommand_initValidators = function _AdaptiveCardSendCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.card) {
-            try {
-                JSON.parse(args.options.card);
-            }
-            catch (e) {
-                return `Error while parsing the card: ${e}`;
-            }
-        }
-        if (args.options.cardData) {
-            try {
-                JSON.parse(args.options.cardData);
-            }
-            catch (e) {
-                return `Error while parsing card data: ${e}`;
-            }
-        }
-        return true;
-    });
-}, _AdaptiveCardSendCommand_initOptionSets = function _AdaptiveCardSendCommand_initOptionSets() {
-    this.optionSets.push({ options: ['title', 'card'] });
-};
 export default new AdaptiveCardSendCommand();
 //# sourceMappingURL=adaptivecard-send.js.map

package/dist/m365/app/commands/app-get.js

@@ -1,6 +1,6 @@
-import AppCommand from '../../base/AppCommand.js';
-import commands from '../commands.js';
 import { entraApp } from '../../../utils/entraApp.js';
+import AppCommand, { appCommandOptions } from '../../base/AppCommand.js';
+import commands from '../commands.js';
 class AppGetCommand extends AppCommand {
     get name() {
         return commands.GET;
@@ -8,6 +8,9 @@ class AppGetCommand extends AppCommand {
     get description() {
         return 'Retrieves information about the current Microsoft Entra app';
     }
+    get schema() {
+        return appCommandOptions;
+    }
     async commandAction(logger, args) {
         try {
             const app = await entraApp.getAppRegistrationByAppId(args.options.appId);

package/dist/m365/app/commands/app-open.js

@@ -1,14 +1,14 @@
-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 _AppOpenCommand_instances, _AppOpenCommand_initTelemetry, _AppOpenCommand_initOptions;
+import { z } from 'zod';
 import { cli } from '../../../cli/cli.js';
 import { settingsNames } from '../../../settingsNames.js';
 import { browserUtil } from '../../../utils/browserUtil.js';
-import AppCommand from '../../base/AppCommand.js';
+import AppCommand, { appCommandOptions } from '../../base/AppCommand.js';
 import commands from '../commands.js';
+const options = appCommandOptions
+    .extend({
+    preview: z.boolean().optional().default(false)
+})
+    .strict();
 class AppOpenCommand extends AppCommand {
     get name() {
         return commands.OPEN;
@@ -16,11 +16,8 @@ class AppOpenCommand extends AppCommand {
     get description() {
         return 'Opens Microsoft Entra app in the Microsoft Entra ID portal';
     }
-    constructor() {
-        super();
-        _AppOpenCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AppOpenCommand_instances, "m", _AppOpenCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AppOpenCommand_instances, "m", _AppOpenCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -41,15 +38,5 @@ class AppOpenCommand extends AppCommand {
         await browserUtil.open(url);
     }
 }
-_AppOpenCommand_instances = new WeakSet(), _AppOpenCommand_initTelemetry = function _AppOpenCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            preview: typeof args.options.preview !== 'undefined'
-        });
-    });
-}, _AppOpenCommand_initOptions = function _AppOpenCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--preview' });
-};
 export default new AppOpenCommand();
 //# sourceMappingURL=app-open.js.map

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

@@ -1,14 +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 _AppPermissionAddCommand_instances, _AppPermissionAddCommand_initTelemetry, _AppPermissionAddCommand_initOptions, _AppPermissionAddCommand_initOptionSets;
+import { z } from 'zod';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
-import AppCommand from '../../../base/AppCommand.js';
+import AppCommand, { appCommandOptions } from '../../../base/AppCommand.js';
 import commands from '../../commands.js';
+const options = appCommandOptions
+    .extend({
+    applicationPermissions: z.string().optional(),
+    delegatedPermissions: z.string().optional(),
+    grantAdminConsent: z.boolean().optional()
+})
+    .strict();
 var ScopeType;
 (function (ScopeType) {
     ScopeType["Role"] = "Role";
@@ -21,12 +23,15 @@ class AppPermissionAddCommand extends AppCommand {
     get description() {
         return 'Adds the specified application and/or delegated permissions to the current Microsoft Entra app API permissions';
     }
-    constructor() {
-        super();
-        _AppPermissionAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AppPermissionAddCommand_instances, "m", _AppPermissionAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AppPermissionAddCommand_instances, "m", _AppPermissionAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AppPermissionAddCommand_instances, "m", _AppPermissionAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.applicationPermissions || options.delegatedPermissions, {
+            message: 'Specify at least one of applicationPermissions or delegatedPermissions, or both.',
+            path: ['delegatedPermissions']
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -194,22 +199,5 @@ class AppPermissionAddCommand extends AppCommand {
         return request.post(requestOptions);
     }
 }
-_AppPermissionAddCommand_instances = new WeakSet(), _AppPermissionAddCommand_initTelemetry = function _AppPermissionAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            applicationPermissions: typeof args.options.applicationPermissions !== 'undefined',
-            delegatedPermissions: typeof args.options.delegatedPermissions !== 'undefined',
-            grantAdminConsent: !!args.options.grantAdminConsent
-        });
-    });
-}, _AppPermissionAddCommand_initOptions = function _AppPermissionAddCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--applicationPermissions [applicationPermissions]' }, { option: '--delegatedPermissions [delegatedPermissions]' }, { option: '--grantAdminConsent' });
-}, _AppPermissionAddCommand_initOptionSets = function _AppPermissionAddCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['applicationPermissions', 'delegatedPermissions'],
-        runsWhen: (args) => args.options.delegatedPermissions === undefined && args.options.applicationPermissions === undefined
-    });
-};
 export default new AppPermissionAddCommand();
 //# sourceMappingURL=permission-add.js.map

package/dist/m365/app/commands/permission/permission-list.js

@@ -1,7 +1,7 @@
 import request from '../../../../request.js';
-import AppCommand from '../../../base/AppCommand.js';
-import commands from '../../commands.js';
 import { entraApp } from '../../../../utils/entraApp.js';
+import AppCommand, { appCommandOptions } from '../../../base/AppCommand.js';
+import commands from '../../commands.js';
 var GetServicePrincipal;
 (function (GetServicePrincipal) {
     GetServicePrincipal[GetServicePrincipal["withPermissions"] = 0] = "withPermissions";
@@ -14,6 +14,9 @@ class AppPermissionListCommand extends AppCommand {
     get description() {
         return 'Lists API permissions for the current Microsoft Entra app';
     }
+    get schema() {
+        return appCommandOptions;
+    }
     async commandAction(logger) {
         try {
             const servicePrincipal = await this.getServicePrincipal({ appId: this.appId }, logger, GetServicePrincipal.withPermissions);

package/dist/m365/base/AppCommand.js

@@ -1,23 +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 _AppCommand_instances, _AppCommand_initOptions, _AppCommand_initValidators;
 import fs from 'fs';
+import { z } from 'zod';
 import { cli } from '../../cli/cli.js';
-import Command, { CommandError } from '../../Command.js';
-import { validation } from '../../utils/validation.js';
+import Command, { CommandError, globalOptionsZod } from '../../Command.js';
 import { formatting } from '../../utils/formatting.js';
-class AppCommand extends Command {
+export const appCommandOptions = globalOptionsZod
+    .extend({
+    appId: z.string().uuid().optional()
+});
+export default class AppCommand extends Command {
     get resource() {
         return 'https://graph.microsoft.com';
     }
-    constructor() {
-        super();
-        _AppCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AppCommand_instances, "m", _AppCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AppCommand_instances, "m", _AppCommand_initValidators).call(this);
+    get schema() {
+        return appCommandOptions;
     }
     async action(logger, args) {
         const m365rcJsonPath = '.m365rc.json';
@@ -63,15 +58,4 @@ class AppCommand extends Command {
         }
     }
 }
-_AppCommand_instances = new WeakSet(), _AppCommand_initOptions = function _AppCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' });
-}, _AppCommand_initValidators = function _AppCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        return true;
-    });
-};
-export default AppCommand;
 //# sourceMappingURL=AppCommand.js.map

package/dist/m365/booking/commands/business/business-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 _BookingBusinessGetCommand_instances, _BookingBusinessGetCommand_initTelemetry, _BookingBusinessGetCommand_initOptions, _BookingBusinessGetCommand_initOptionSets;
+import { z } from 'zod';
+import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { cli } from '../../../../cli/cli.js';
+const options = globalOptionsZod
+    .extend({
+    id: zod.alias('i', z.string().optional()),
+    name: zod.alias('n', z.string().optional())
+})
+    .strict();
 class BookingBusinessGetCommand extends GraphCommand {
     get name() {
         return commands.BUSINESS_GET;
@@ -16,12 +19,14 @@ class BookingBusinessGetCommand extends GraphCommand {
     get description() {
         return 'Retrieve the specified Microsoft Bookings business.';
     }
-    constructor() {
-        super();
-        _BookingBusinessGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _BookingBusinessGetCommand_instances, "m", _BookingBusinessGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _BookingBusinessGetCommand_instances, "m", _BookingBusinessGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _BookingBusinessGetCommand_instances, "m", _BookingBusinessGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.id || options.name, {
+            message: 'Specify either id or name'
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -65,17 +70,5 @@ class BookingBusinessGetCommand extends GraphCommand {
         return bookingBusinesses[0].id;
     }
 }
-_BookingBusinessGetCommand_instances = new WeakSet(), _BookingBusinessGetCommand_initTelemetry = function _BookingBusinessGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-}, _BookingBusinessGetCommand_initOptions = function _BookingBusinessGetCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id [id]' }, { option: '-n, --name [name]' });
-}, _BookingBusinessGetCommand_initOptionSets = function _BookingBusinessGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new BookingBusinessGetCommand();
 //# sourceMappingURL=business-get.js.map