@microsoft/agents-hosting 1.5.0-beta.6.ga236d9a19c → 1.5.1

package/dist/src/app/auth/handlers/agenticAuthorization.d.ts

@@ -7,24 +7,30 @@ import { AuthorizationHandler, AuthorizationHandlerSettings, AuthorizationHandle
 import { TokenResponse } from '../../../oauth';
 /**
  * Options for configuring the Agentic authorization handler.
+ * @remarks
+ * Properties can be configured via environment variables (case-insensitive).
+ * Use the format: `AgentApplication__UserAuthorization__handlers__{handlerId}__settings__{propertyName}`
+ * where `{handlerId}` is the handler's unique identifier and `{propertyName}` matches the property name.
+ *
+ * @example
+ * ```env
+ * # For a handler with id "myAuth":
+ * AgentApplication__UserAuthorization__handlers__myAuth__settings__type=AgenticUserAuthorization
+ * AgentApplication__UserAuthorization__handlers__myAuth__settings__scopes=api://scope1 api://scope2
+ * ```
  */
 export interface AgenticAuthorizationOptions {
     /**
      * The type of authorization handler.
-     * @remarks
-     * When using environment variables, this can be set using the `${authHandlerId}_type` variable.
      */
-    type: 'agentic';
+    type: 'AgenticUserAuthorization' | 'agentic';
     /**
      * The scopes required for the authorization.
-     * @remarks
-     * When using environment variables, this can be set using the `${authHandlerId}_scopes` variable (comma-separated values, e.g. `scope1,scope2`).
+     * @remarks When set via environment variable, use comma or space-separated values (e.g. `scope1,scope2` or `scope1 scope2`).
      */
     scopes?: string[];
     /**
-     * (Optional) An alternative connection name to use for the authorization process.
-     * @remarks
-     * When using environment variables, this can be set using the `${authHandlerId}_altBlueprintConnectionName` variable.
+     * An alternative connection name to use for the authorization process.
      */
     altBlueprintConnectionName?: string;
 }
@@ -38,21 +44,22 @@ export interface AgenticAuthorizationSettings extends AuthorizationHandlerSettin
  */
 export declare class AgenticAuthorization implements AuthorizationHandler {
     readonly id: string;
+    private options;
     private settings;
-    private _options;
     private _onSuccess?;
     private _onFailure?;
     /**
      * Creates an instance of the AgenticAuthorization class.
      * @param id The unique identifier for the authorization handler.
-     * @param options The options for configuring the authorization handler.
+     * @param options The options for configuring the authorization handler (must be fully resolved).
      * @param settings The settings for the authorization handler.
      */
     constructor(id: string, options: AgenticAuthorizationOptions, settings: AgenticAuthorizationSettings);
+    readonly type = "agentic";
     /**
-     * Loads and validates the authorization handler options.
+     * The scopes configured for this handler.
      */
-    private loadOptions;
+    get scopes(): string[] | undefined;
     /**
      * @inheritdoc
      */
@@ -90,8 +97,4 @@ export declare class AgenticAuthorization implements AuthorizationHandler {
      * @param scopes The OAuth scopes for which the context is being retrieved.
      */
     private getContext;
-    /**
-     * Loads the OAuth scopes from the environment variables.
-     */
-    private loadScopes;
 }

package/dist/src/app/auth/handlers/agenticAuthorization.js

@@ -6,8 +6,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgenticAuthorization = void 0;
 const agents_activity_1 = require("@microsoft/agents-activity");
+const agents_telemetry_1 = require("@microsoft/agents-telemetry");
 const types_1 = require("../types");
-const logger = (0, agents_activity_1.debug)('agents:authorization:agentic');
+const observability_1 = require("../../../observability");
+const errorHelper_1 = require("../../../errorHelper");
+const logger = (0, agents_telemetry_1.debug)('agents:authorization:agentic');
 /**
  * Authorization handler for Agentic authentication.
  */
@@ -15,32 +18,27 @@ class AgenticAuthorization {
     /**
      * Creates an instance of the AgenticAuthorization class.
      * @param id The unique identifier for the authorization handler.
-     * @param options The options for configuring the authorization handler.
+     * @param options The options for configuring the authorization handler (must be fully resolved).
      * @param settings The settings for the authorization handler.
      */
     constructor(id, options, settings) {
         this.id = id;
+        this.options = options;
         this.settings = settings;
+        this.type = 'agentic';
         this._key = `${AgenticAuthorization.name}/${this.id}`;
         if (!this.settings.connections) {
-            throw new Error(this.prefix('The \'connections\' option is not available in the app options. Ensure that the app is properly configured.'));
+            throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.ConnectionsOptionNotAvailable);
+        }
+        if (!options.scopes || options.scopes.length === 0) {
+            throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.AtLeastOneScopeRequired);
         }
-        this._options = this.loadOptions(options);
     }
     /**
-     * Loads and validates the authorization handler options.
+     * The scopes configured for this handler.
      */
-    loadOptions(settings) {
-        var _a, _b;
-        const result = {
-            type: 'agentic',
-            altBlueprintConnectionName: (_a = settings.altBlueprintConnectionName) !== null && _a !== void 0 ? _a : (process.env[`${this.id}_altBlueprintConnectionName`]),
-            scopes: (_b = settings.scopes) !== null && _b !== void 0 ? _b : this.loadScopes(process.env[`${this.id}_scopes`]),
-        };
-        if (!result.scopes || result.scopes.length === 0) {
-            throw new Error(this.prefix('At least one scope must be specified for the Agentic authorization handler.'));
-        }
-        return result;
+    get scopes() {
+        return this.options.scopes;
     }
     /**
      * @inheritdoc
@@ -58,32 +56,41 @@ class AgenticAuthorization {
      * @inheritdoc
      */
     async token(context, options) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        try {
-            const scopes = (options === null || options === void 0 ? void 0 : options.scopes) || this._options.scopes;
-            const tokenResponse = this.getContext(context, scopes);
-            if (tokenResponse.token) {
-                logger.debug(this.prefix('Using cached Agentic user token'));
-                return tokenResponse;
-            }
+        return (0, agents_telemetry_1.trace)(observability_1.AuthorizationTraceDefinitions.agenticToken, async ({ record }) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             let connection;
-            if ((_a = this._options.altBlueprintConnectionName) === null || _a === void 0 ? void 0 : _a.trim()) {
-                connection = this.settings.connections.getConnection(this._options.altBlueprintConnectionName);
+            const scopes = (options === null || options === void 0 ? void 0 : options.scopes) || this.options.scopes;
+            try {
+                const tokenResponse = this.getContext(context, scopes);
+                if (tokenResponse.token) {
+                    logger.debug(this.prefix('Using cached Agentic user token'));
+                    return tokenResponse;
+                }
+                if ((_a = this.options.altBlueprintConnectionName) === null || _a === void 0 ? void 0 : _a.trim()) {
+                    connection = this.settings.connections.getConnection(this.options.altBlueprintConnectionName);
+                }
+                else {
+                    connection = this.settings.connections.getTokenProvider(context.identity, (_b = context.activity.serviceUrl) !== null && _b !== void 0 ? _b : '');
+                }
+                const token = await connection.getAgenticUserToken((_c = context.activity.getAgenticTenantId()) !== null && _c !== void 0 ? _c : '', (_d = context.activity.getAgenticInstanceId()) !== null && _d !== void 0 ? _d : '', (_e = context.activity.getAgenticUser()) !== null && _e !== void 0 ? _e : '', scopes);
+                this.setContext(context, scopes, { token });
+                (_f = this._onSuccess) === null || _f === void 0 ? void 0 : _f.call(this, context);
+                return { token };
             }
-            else {
-                connection = this.settings.connections.getTokenProvider(context.identity, (_b = context.activity.serviceUrl) !== null && _b !== void 0 ? _b : '');
+            catch (error) {
+                const reason = 'Error retrieving Agentic user token';
+                logger.error(this.prefix(reason), error);
+                (_g = this._onFailure) === null || _g === void 0 ? void 0 : _g.call(this, context, `${reason}: ${error.message}`);
+                return { token: undefined };
             }
-            const token = await connection.getAgenticUserToken((_c = context.activity.getAgenticTenantId()) !== null && _c !== void 0 ? _c : '', (_d = context.activity.getAgenticInstanceId()) !== null && _d !== void 0 ? _d : '', (_e = context.activity.getAgenticUser()) !== null && _e !== void 0 ? _e : '', scopes);
-            this.setContext(context, scopes, { token });
-            (_f = this._onSuccess) === null || _f === void 0 ? void 0 : _f.call(this, context);
-            return { token };
-        }
-        catch (error) {
-            const reason = 'Error retrieving Agentic user token';
-            logger.error(this.prefix(reason), error);
-            (_g = this._onFailure) === null || _g === void 0 ? void 0 : _g.call(this, context, `${reason}: ${error.message}`);
-            return { token: undefined };
-        }
+            finally {
+                record({
+                    handlerId: this.id,
+                    connectionName: (_k = (_j = (_h = connection === null || connection === void 0 ? void 0 : connection.connectionSettings) === null || _h === void 0 ? void 0 : _h.connectionName) !== null && _j !== void 0 ? _j : this.options.altBlueprintConnectionName) !== null && _k !== void 0 ? _k : 'unknown',
+                    authScopes: scopes !== null && scopes !== void 0 ? scopes : []
+                });
+            }
+        });
     }
     /**
      * @inheritdoc
@@ -121,19 +128,6 @@ class AgenticAuthorization {
         const result = context.turnState.get(`${this._key}:${scopes.join(';')}`);
         return (_a = result === null || result === void 0 ? void 0 : result()) !== null && _a !== void 0 ? _a : { token: undefined };
     }
-    /**
-     * Loads the OAuth scopes from the environment variables.
-     */
-    loadScopes(value) {
-        var _a;
-        return (_a = value === null || value === void 0 ? void 0 : value.split(',').reduce((acc, scope) => {
-            const trimmed = scope.trim();
-            if (trimmed) {
-                acc.push(trimmed);
-            }
-            return acc;
-        }, [])) !== null && _a !== void 0 ? _a : [];
-    }
 }
 exports.AgenticAuthorization = AgenticAuthorization;
 //# sourceMappingURL=agenticAuthorization.js.map

package/dist/src/app/auth/handlers/agenticAuthorization.js.map

@@ -1 +1 @@
-{"version":3,"file":"agenticAuthorization.js","sourceRoot":"","sources":["../../../../../src/app/auth/handlers/agenticAuthorization.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,gEAAkD;AAElD,oCAA2I;AAI3I,MAAM,MAAM,GAAG,IAAA,uBAAK,EAAC,8BAA8B,CAAC,CAAA;AA+BpD;;GAEG;AACH,MAAa,oBAAoB;IAK/B;;;;;OAKG;IACH,YAA6B,EAAU,EAAE,OAAoC,EAAU,QAAsC;QAAhG,OAAE,GAAF,EAAE,CAAQ;QAAgD,aAAQ,GAAR,QAAQ,CAA8B;QAmGrH,SAAI,GAAG,GAAG,oBAAoB,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,EAAE,CAAA;QAlGtD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,6GAA6G,CAAC,CAAC,CAAA;QAC7I,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;IAC3C,CAAC;IAED;;OAEG;IACK,WAAW,CAAE,QAAqC;;QACxD,MAAM,MAAM,GAAgC;YAC1C,IAAI,EAAE,SAAS;YACf,0BAA0B,EAAE,MAAA,QAAQ,CAAC,0BAA0B,mCAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,6BAA6B,CAAC,CAAC;YACzH,MAAM,EAAE,MAAA,QAAQ,CAAC,MAAM,mCAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC;SAC7E,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjD,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,6EAA6E,CAAC,CAAC,CAAA;QAC7G,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,OAAO,OAAO,CAAC,OAAO,CAAC,kCAA0B,CAAC,OAAO,CAAC,CAAA;IAC5D,CAAC;IAED;;OAEG;IACH,OAAO;QACL,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC/B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK,CAAE,OAAoB,EAAE,OAA0C;;QAC3E,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,KAAI,IAAI,CAAC,QAAQ,CAAC,MAAO,CAAA;YAEvD,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;YACtD,IAAI,aAAa,CAAC,KAAK,EAAE,CAAC;gBACxB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,iCAAiC,CAAC,CAAC,CAAA;gBAC5D,OAAO,aAAa,CAAA;YACtB,CAAC;YAED,IAAI,UAAwB,CAAA;YAE5B,IAAI,MAAA,IAAI,CAAC,QAAQ,CAAC,0BAA0B,0CAAE,IAAI,EAAE,EAAE,CAAC;gBACrD,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAA;YAChG,CAAC;iBAAM,CAAC;gBACN,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAA,OAAO,CAAC,QAAQ,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAA;YAC9G,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,mBAAmB,CAChD,MAAA,OAAO,CAAC,QAAQ,CAAC,kBAAkB,EAAE,mCAAI,EAAE,EAC3C,MAAA,OAAO,CAAC,QAAQ,CAAC,oBAAoB,EAAE,mCAAI,EAAE,EAC7C,MAAA,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE,mCAAI,EAAE,EACvC,MAAM,CACP,CAAA;YAED,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;YAC3C,MAAA,IAAI,CAAC,UAAU,qDAAG,OAAO,CAAC,CAAA;YAC1B,OAAO,EAAE,KAAK,EAAE,CAAA;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,MAAM,GAAG,qCAAqC,CAAA;YACpD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAA;YACxC,MAAA,IAAI,CAAC,UAAU,qDAAG,OAAO,EAAE,GAAG,MAAM,KAAM,KAAe,CAAC,OAAO,EAAE,CAAC,CAAA;YACpE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QAC7B,CAAC;IACH,CAAC;IAED;;OAEG;IACH,SAAS,CAAE,QAAwC;QACjD,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAA;IAC5B,CAAC;IAED;;OAEG;IACH,SAAS,CAAE,QAAyD;QAClE,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAA;IAC5B,CAAC;IAED;;OAEG;IACK,MAAM,CAAE,OAAe;QAC7B,OAAO,YAAY,IAAI,CAAC,EAAE,KAAK,OAAO,EAAE,CAAA;IAC1C,CAAC;IAID;;;;;OAKG;IACK,UAAU,CAAE,OAAoB,EAAE,MAAgB,EAAE,IAAmB;QAC7E,OAAO,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAA;IAC9E,CAAC;IAED;;;OAGG;IACK,UAAU,CAAE,OAAoB,EAAE,MAAgB;;QACxD,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACxE,OAAO,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,EAAI,mCAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;IAC3C,CAAC;IAED;;OAEG;IACK,UAAU,CAAE,KAAwB;;QAC1C,OAAO,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,CAAC,GAAG,EAAE,MAAM,CAAW,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACvD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;YAC5B,IAAI,OAAO,EAAE,CAAC;gBACZ,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACnB,CAAC;YACD,OAAO,GAAG,CAAA;QACZ,CAAC,EAAE,EAAE,CAAC,mCAAI,EAAE,CAAA;IACd,CAAC;CACF;AA/ID,oDA+IC"}
+{"version":3,"file":"agenticAuthorization.js","sourceRoot":"","sources":["../../../../../src/app/auth/handlers/agenticAuthorization.ts"],"names":[],"mappings":"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"}

package/dist/src/app/auth/handlers/azureBotAuthorization.d.ts

@@ -22,44 +22,19 @@ interface AzureBotActiveHandler extends ActiveAuthorizationHandler {
      */
     category?: Category;
 }
-/**
- * Messages configuration for the AzureBotAuthorization handler.
- */
-export interface AzureBotAuthorizationOptionsMessages {
-    /**
-     * Message displayed when an invalid code is entered.
-     * Use `{code}` as a placeholder for the entered code.
-     * Defaults to: 'The code entered is invalid. Please sign-in again to continue.'
-     */
-    invalidCode?: string;
-    /**
-     * Message displayed when the entered code format is invalid.
-     * Use `{attemptsLeft}` as a placeholder for the number of attempts left.
-     * Defaults to: 'Please enter a valid **6-digit** code format (_e.g. 123456_).\r\n**{attemptsLeft} attempt(s) left...**'
-     */
-    invalidCodeFormat?: string;
-    /**
-     * Message displayed when the maximum number of attempts is exceeded.
-     * Use `{maxAttempts}` as a placeholder for the maximum number of attempts.
-     * Defaults to: 'You have exceeded the maximum number of sign-in attempts ({maxAttempts}).'
-     */
-    maxAttemptsExceeded?: string;
-}
-/**
- * Settings for on-behalf-of token acquisition.
- */
-export interface AzureBotAuthorizationOptionsOBO {
-    /**
-     * Connection name to use for on-behalf-of token acquisition.
-     */
-    connection?: string;
-    /**
-     * Scopes to request for on-behalf-of token acquisition.
-     */
-    scopes?: string[];
-}
 /**
  * Interface defining an authorization handler configuration.
+ * @remarks
+ * Properties can be configured via environment variables (case-insensitive).
+ * Use the format: `AgentApplication__UserAuthorization__handlers__{handlerId}__settings__{propertyName}`
+ * where `{handlerId}` is the handler's unique identifier and `{propertyName}` matches the property name.
+ *
+ * @example
+ * ```env
+ * # For a handler with id "myAuth":
+ * AgentApplication__UserAuthorization__handlers__myAuth__settings__azureBotOAuthConnectionName=MyConnection
+ * AgentApplication__UserAuthorization__handlers__myAuth__settings__oboScopes=api://scope1 api://scope2
+ * ```
  */
 export interface AzureBotAuthorizationOptions {
     /**
@@ -67,48 +42,50 @@ export interface AzureBotAuthorizationOptions {
      * This property is optional and should not be set when configuring this handler.
      * It is included here for completeness and type safety.
      */
-    type?: undefined;
+    type?: 'AzureBotUserAuthorization' | undefined;
     /**
      * Connection name for the auth provider.
-     * @remarks
-     * When using environment variables, this can be set using the `${authHandlerId}_connectionName` variable.
      */
-    name?: string;
+    azureBotOAuthConnectionName?: string;
     /**
      * Title to display on auth cards/UI.
-     * @remarks
-     * When using environment variables, this can be set using the `${authHandlerId}_connectionTitle` variable.
      */
     title?: string;
     /**
      * Text to display on auth cards/UI.
-     * @remarks
-     * When using environment variables, this can be set using the `${authHandlerId}_connectionText` variable.
      */
     text?: string;
     /**
      * Maximum number of attempts for entering the magic code. Defaults to 2.
-     * @remarks
-     * When using environment variables, this can be set using the `${authHandlerId}_maxAttempts` variable.
      */
-    maxAttempts?: number;
+    invalidSignInRetryMax?: number;
+    /**
+     * Message displayed when an invalid code is entered.
+     * Use `{code}` as a placeholder to display the entered code.
+     * Defaults to: 'The code entered is invalid. Please sign-in again to continue.'
+     */
+    invalidSignInRetryMessage?: string;
+    /**
+     * Message displayed when the entered code format is invalid.
+     * Use `{attemptsLeft}` as a placeholder to display the number of attempts left.
+     * Defaults to: 'Please enter a valid **6-digit** code format (_e.g. 123456_).\r\n**{attemptsLeft} attempt(s) left...**'
+     */
+    invalidSignInRetryMessageFormat?: string;
+    /**
+     * Message displayed when the maximum number of attempts is exceeded.
+     * Use `{maxAttempts}` as a placeholder to display the maximum number of attempts.
+     * Defaults to: 'You have exceeded the maximum number of sign-in attempts ({maxAttempts}).'
+     */
+    invalidSignInRetryMaxExceededMessage?: string;
     /**
-     * Messages to display for various authentication scenarios.
-     * @remarks
-     * When using environment variables, these can be set using the following variables:
-     * - `${authHandlerId}_messages_invalidCode`
-     * - `${authHandlerId}_messages_invalidCodeFormat`
-     * - `${authHandlerId}_messages_maxAttemptsExceeded`
+     * Connection name to use for on-behalf-of token acquisition.
      */
-    messages?: AzureBotAuthorizationOptionsMessages;
+    oboConnectionName?: string;
     /**
-     * Settings for on-behalf-of token acquisition.
-     * @remarks
-     * When using environment variables, these can be set using the following variables:
-     * - `${authHandlerId}_obo_connection`
-     * - `${authHandlerId}_obo_scopes` (comma-separated values, e.g. `scope1,scope2`)
+     * Scopes to request for on-behalf-of token acquisition.
+     * @remarks When set via environment variable, use comma or space-separated values (e.g. `scope1,scope2` or `scope1 scope2`).
      */
-    obo?: AzureBotAuthorizationOptionsOBO;
+    oboScopes?: string[];
     /**
      * Option to enable SSO when authenticating using Azure Active Directory (AAD). Defaults to true.
      */
@@ -124,21 +101,22 @@ export interface AzureBotAuthorizationSettings extends AuthorizationHandlerSetti
  */
 export declare class AzureBotAuthorization implements AuthorizationHandler {
     readonly id: string;
+    private options;
     private settings;
-    private _options;
     private _onSuccess?;
     private _onFailure?;
     /**
      * Creates an instance of the AzureBotAuthorization.
      * @param id The unique identifier for the handler.
-     * @param options The settings for the handler.
-     * @param app The agent application instance.
+     * @param options The settings for the handler (must be fully resolved).
+     * @param settings The authorization handler settings.
      */
     constructor(id: string, options: AzureBotAuthorizationOptions, settings: AzureBotAuthorizationSettings);
+    readonly type = "azurebot";
     /**
-     * Loads and validates the authorization handler options.
+     * The OBO scopes configured for this handler.
      */
-    private loadOptions;
+    get scopes(): string[] | undefined;
     /**
      * Maximum number of attempts for magic code entry.
      */
@@ -174,9 +152,15 @@ export declare class AzureBotAuthorization implements AuthorizationHandler {
      */
     signin(context: TurnContext, active?: AzureBotActiveHandler): Promise<AuthorizationHandlerStatus>;
     /**
-     * Handles on-behalf-of token acquisition.
+     * Retrieves the base token from the turn state or the user token client.
+     * @param context The turn context.
+     * @returns The token string or undefined if not available.
      */
-    private handleOBO;
+    private getBaseToken;
+    /**
+     * Acquires an on-behalf-of token for the user based on the provided scopes and connection.
+     */
+    private getOBOToken;
     /**
      * Checks if a token is exchangeable for an on-behalf-of flow.
      */
@@ -206,10 +190,6 @@ export declare class AzureBotAuthorization implements AuthorizationHandler {
      * Gets the user token client from the turn context.
      */
     private getUserTokenClient;
-    /**
-     * Sends an InvokeResponse activity if the channel is Microsoft Teams, including Copilot within MS Teams.
-     */
-    private sendInvokeResponse;
     /**
      * Prefixes a message with the handler ID.
      */
@@ -218,9 +198,5 @@ export declare class AzureBotAuthorization implements AuthorizationHandler {
      * Predefined messages with dynamic placeholders.
      */
     private messages;
-    /**
-     * Loads the OAuth scopes from the environment variables.
-     */
-    private loadScopes;
 }
 export {};