@microsoft/agents-hosting 1.1.0-alpha.85 → 1.1.1

package/dist/src/transcript/fileTranscriptLogger.d.ts

@@ -0,0 +1,109 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import { PagedResult, TranscriptInfo } from './transcriptLogger';
+import { TranscriptStore } from './transcriptStore';
+import { Activity } from '@microsoft/agents-activity';
+/**
+ * FileTranscriptLogger which creates a .transcript file for each conversationId.
+ * @remarks
+ * This is a useful class for unit tests.
+ *
+ * Concurrency Safety:
+ * - Uses an in-memory promise chain to serialize writes within the same Node.js process
+ * - Prevents race conditions and file corruption when multiple concurrent writes occur
+ * - Optimized for performance with minimal overhead (no file-based locking)
+ *
+ * Note: This implementation is designed for single-process scenarios. For multi-server
+ * deployments, consider using a database-backed transcript store.
+ */
+export declare class FileTranscriptLogger implements TranscriptStore {
+    private static readonly TRANSCRIPT_FILE_EXTENSION;
+    private static readonly MAX_FILE_NAME_SIZE;
+    private readonly _folder;
+    private readonly _fileLocks;
+    /**
+     * Initializes a new instance of the FileTranscriptLogger class.
+     * @param folder - Folder to place the transcript files (Default current directory).
+     */
+    constructor(folder?: string);
+    /**
+     * Log an activity to the transcript.
+     * @param activity - The activity to transcribe.
+     * @returns A promise that represents the work queued to execute.
+     */
+    logActivity(activity: Activity): Promise<void>;
+    /**
+     * Gets from the store activities that match a set of criteria.
+     * @param channelId - The ID of the channel the conversation is in.
+     * @param conversationId - The ID of the conversation.
+     * @param continuationToken - The continuation token (if available).
+     * @param startDate - A cutoff date. Activities older than this date are not included.
+     * @returns A promise that resolves with the matching activities.
+     */
+    getTranscriptActivities(channelId: string, conversationId: string, continuationToken?: string, startDate?: Date): Promise<PagedResult<Activity>>;
+    /**
+     * Gets the conversations on a channel from the store.
+     * @param channelId - The ID of the channel.
+     * @param continuationToken - Continuation token (if available).
+     * @returns A promise that resolves with all transcripts for the given ChannelID.
+     */
+    listTranscripts(channelId: string, continuationToken?: string): Promise<PagedResult<TranscriptInfo>>;
+    /**
+     * Deletes conversation data from the store.
+     * @param channelId - The ID of the channel the conversation is in.
+     * @param conversationId - The ID of the conversation to delete.
+     * @returns A promise that represents the work queued to execute.
+     */
+    deleteTranscript(channelId: string, conversationId: string): Promise<void>;
+    /**
+     * Loads a transcript from a file.
+     */
+    private loadTranscriptAsync;
+    /**
+     * Executes a file operation with exclusive locking per file.
+     * This ensures that concurrent writes to the same transcript file are serialized.
+     */
+    private withFileLock;
+    /**
+     * Performs the actual write operation to the transcript file.
+     */
+    private logActivityToFile;
+    /**
+     * Updates a message in the transcript.
+     */
+    private messageUpdateAsync;
+    /**
+     * Deletes a message from the transcript (tombstones it).
+     */
+    private messageDeleteAsync;
+    /**
+     * Sanitizes a string by removing invalid characters.
+     */
+    private static sanitizeString;
+    /**
+     * Gets the transcript file path for a conversation.
+     */
+    private getTranscriptFile;
+    /**
+     * Gets the channel folder path, creating it if necessary.
+     */
+    private getChannelFolder;
+    /**
+     * Checks if a file or directory exists.
+     */
+    private pathExists;
+    /**
+     * Gets invalid filename characters for the current platform.
+     */
+    private getInvalidFileNameChars;
+    /**
+     * Gets invalid path characters for the current platform.
+     */
+    private getInvalidPathChars;
+    /**
+     * Adds file:// protocol to a file path.
+     */
+    private protocol;
+}

package/dist/src/transcript/fileTranscriptLogger.js

@@ -0,0 +1,398 @@
+"use strict";
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileTranscriptLogger = void 0;
+const logger_1 = require("@microsoft/agents-activity/logger");
+const fs = __importStar(require("fs/promises"));
+const path = __importStar(require("path"));
+const os_1 = require("os");
+const agents_activity_1 = require("@microsoft/agents-activity");
+const logger = (0, logger_1.debug)('agents:file-transcript-logger');
+/**
+ * FileTranscriptLogger which creates a .transcript file for each conversationId.
+ * @remarks
+ * This is a useful class for unit tests.
+ *
+ * Concurrency Safety:
+ * - Uses an in-memory promise chain to serialize writes within the same Node.js process
+ * - Prevents race conditions and file corruption when multiple concurrent writes occur
+ * - Optimized for performance with minimal overhead (no file-based locking)
+ *
+ * Note: This implementation is designed for single-process scenarios. For multi-server
+ * deployments, consider using a database-backed transcript store.
+ */
+class FileTranscriptLogger {
+    /**
+     * Initializes a new instance of the FileTranscriptLogger class.
+     * @param folder - Folder to place the transcript files (Default current directory).
+     */
+    constructor(folder) {
+        this._fileLocks = new Map();
+        this._folder = path.normalize(folder !== null && folder !== void 0 ? folder : process.cwd());
+    }
+    /**
+     * Log an activity to the transcript.
+     * @param activity - The activity to transcribe.
+     * @returns A promise that represents the work queued to execute.
+     */
+    async logActivity(activity) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        if (!activity) {
+            throw new Error('activity is required.');
+        }
+        const transcriptFile = this.getTranscriptFile(activity.channelId, (_a = activity.conversation) === null || _a === void 0 ? void 0 : _a.id);
+        if (activity.type === agents_activity_1.ActivityTypes.Message) {
+            const sender = (_e = (_c = (_b = activity.from) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : (_d = activity.from) === null || _d === void 0 ? void 0 : _d.id) !== null && _e !== void 0 ? _e : (_f = activity.from) === null || _f === void 0 ? void 0 : _f.role;
+            logger.debug(`${sender} [${activity.type}] ${activity.text}`);
+        }
+        else {
+            const sender = (_k = (_h = (_g = activity.from) === null || _g === void 0 ? void 0 : _g.name) !== null && _h !== void 0 ? _h : (_j = activity.from) === null || _j === void 0 ? void 0 : _j.id) !== null && _k !== void 0 ? _k : (_l = activity.from) === null || _l === void 0 ? void 0 : _l.role;
+            logger.debug(`${sender} [${activity.type}]`);
+        }
+        await this.withFileLock(transcriptFile, async () => {
+            const maxRetries = 3;
+            for (let i = 1; i <= maxRetries; i++) {
+                try {
+                    switch (activity.type) {
+                        case agents_activity_1.ActivityTypes.MessageDelete:
+                            return await this.messageDeleteAsync(activity, transcriptFile);
+                        case agents_activity_1.ActivityTypes.MessageUpdate:
+                            return await this.messageUpdateAsync(activity, transcriptFile);
+                        default: // Append activity
+                            return await this.logActivityToFile(activity, transcriptFile);
+                    }
+                }
+                catch (error) {
+                    // Try again
+                    logger.warn(`Try ${i} - Failed to log activity because:`, error);
+                    if (i === maxRetries) {
+                        throw error;
+                    }
+                }
+            }
+        });
+    }
+    /**
+     * Gets from the store activities that match a set of criteria.
+     * @param channelId - The ID of the channel the conversation is in.
+     * @param conversationId - The ID of the conversation.
+     * @param continuationToken - The continuation token (if available).
+     * @param startDate - A cutoff date. Activities older than this date are not included.
+     * @returns A promise that resolves with the matching activities.
+     */
+    async getTranscriptActivities(channelId, conversationId, continuationToken, startDate) {
+        const transcriptFile = this.getTranscriptFile(channelId, conversationId);
+        if (!await this.pathExists(transcriptFile)) {
+            logger.debug(`Transcript file does not exist: ${this.protocol(transcriptFile)}`);
+            return { items: [], continuationToken: undefined };
+        }
+        const transcript = await this.loadTranscriptAsync(transcriptFile);
+        const filterDate = startDate !== null && startDate !== void 0 ? startDate : new Date(0);
+        const items = transcript.filter(activity => {
+            const activityDate = activity.timestamp ? new Date(activity.timestamp) : new Date(0);
+            return activityDate >= filterDate;
+        });
+        return { items, continuationToken: undefined };
+    }
+    /**
+     * Gets the conversations on a channel from the store.
+     * @param channelId - The ID of the channel.
+     * @param continuationToken - Continuation token (if available).
+     * @returns A promise that resolves with all transcripts for the given ChannelID.
+     */
+    async listTranscripts(channelId, continuationToken) {
+        const channelFolder = this.getChannelFolder(channelId);
+        if (!await this.pathExists(channelFolder)) {
+            logger.debug(`Channel folder does not exist: ${this.protocol(channelFolder)}`);
+            return { items: [], continuationToken: undefined };
+        }
+        const files = await fs.readdir(channelFolder);
+        const items = [];
+        for (const file of files) {
+            if (!file.endsWith('.transcript')) {
+                continue;
+            }
+            const filePath = path.join(channelFolder, file);
+            const stats = await fs.stat(filePath);
+            items.push({
+                channelId,
+                id: path.parse(file).name,
+                created: stats.birthtime
+            });
+        }
+        return { items, continuationToken: undefined };
+    }
+    /**
+     * Deletes conversation data from the store.
+     * @param channelId - The ID of the channel the conversation is in.
+     * @param conversationId - The ID of the conversation to delete.
+     * @returns A promise that represents the work queued to execute.
+     */
+    async deleteTranscript(channelId, conversationId) {
+        const file = this.getTranscriptFile(channelId, conversationId);
+        await this.withFileLock(file, async () => {
+            if (!await this.pathExists(file)) {
+                logger.debug(`Transcript file does not exist: ${this.protocol(file)}`);
+                return;
+            }
+            await fs.unlink(file);
+        });
+    }
+    /**
+     * Loads a transcript from a file.
+     */
+    async loadTranscriptAsync(transcriptFile) {
+        if (!await this.pathExists(transcriptFile)) {
+            return [];
+        }
+        const json = await fs.readFile(transcriptFile, 'utf-8');
+        const result = JSON.parse(json);
+        return result.map(agents_activity_1.Activity.fromObject);
+    }
+    /**
+     * Executes a file operation with exclusive locking per file.
+     * This ensures that concurrent writes to the same transcript file are serialized.
+     */
+    async withFileLock(transcriptFile, operation) {
+        var _a;
+        // Get the current lock chain for this file
+        const existingLock = (_a = this._fileLocks.get(transcriptFile)) !== null && _a !== void 0 ? _a : Promise.resolve();
+        // Create a new lock that waits for the existing one and then performs the operation
+        const newLock = existingLock.then(async () => {
+            return await operation();
+        }).catch(error => {
+            logger.warn('Error in write chain:', error);
+            throw error;
+        });
+        // Update the lock chain
+        this._fileLocks.set(transcriptFile, newLock);
+        // Wait for this operation to complete
+        try {
+            return await newLock;
+        }
+        finally {
+            // Clean up if this was the last operation in the chain
+            if (this._fileLocks.get(transcriptFile) === newLock) {
+                this._fileLocks.delete(transcriptFile);
+            }
+        }
+    }
+    /**
+     * Performs the actual write operation to the transcript file.
+     */
+    async logActivityToFile(activity, transcriptFile) {
+        const activityStr = JSON.stringify(activity);
+        if (!await this.pathExists(transcriptFile)) {
+            const folder = path.dirname(transcriptFile);
+            if (!await this.pathExists(folder)) {
+                await fs.mkdir(folder, { recursive: true });
+            }
+            await fs.writeFile(transcriptFile, `[${activityStr}]`, 'utf-8');
+            return;
+        }
+        // Use file handle to append efficiently
+        const fileHandle = await fs.open(transcriptFile, 'r+');
+        try {
+            const stats = await fileHandle.stat();
+            // Seek to before the closing bracket
+            const position = Math.max(0, stats.size - 1);
+            // Write the comma, new activity, and closing bracket
+            const appendContent = `,${os_1.EOL}${activityStr}]`;
+            await fileHandle.write(appendContent, position);
+            // Truncate any remaining content (in case the file had trailing data)
+            await fileHandle.truncate(position + Buffer.byteLength(appendContent));
+        }
+        finally {
+            await fileHandle.close();
+        }
+    }
+    /**
+     * Updates a message in the transcript.
+     */
+    async messageUpdateAsync(activity, transcriptFile) {
+        // Load all activities
+        const transcript = await this.loadTranscriptAsync(transcriptFile);
+        for (let i = 0; i < transcript.length; i++) {
+            const originalActivity = transcript[i];
+            if (originalActivity.id === activity.id) {
+                // Clone and update the activity
+                const updatedActivity = { ...activity };
+                updatedActivity.type = originalActivity.type; // Fixup original type (should be Message)
+                updatedActivity.localTimestamp = originalActivity.localTimestamp;
+                updatedActivity.timestamp = originalActivity.timestamp;
+                transcript[i] = updatedActivity;
+                const json = JSON.stringify(transcript);
+                await fs.writeFile(transcriptFile, json, 'utf-8');
+                return;
+            }
+        }
+    }
+    /**
+     * Deletes a message from the transcript (tombstones it).
+     */
+    async messageDeleteAsync(activity, transcriptFile) {
+        var _a, _b;
+        // Load all activities
+        const transcript = await this.loadTranscriptAsync(transcriptFile);
+        // If message delete comes in, tombstone the message in the transcript
+        for (let index = 0; index < transcript.length; index++) {
+            const originalActivity = transcript[index];
+            if (originalActivity.id === activity.id) {
+                // Tombstone the original message
+                transcript[index] = {
+                    type: agents_activity_1.ActivityTypes.MessageDelete,
+                    id: originalActivity.id,
+                    from: {
+                        id: 'deleted',
+                        role: (_a = originalActivity.from) === null || _a === void 0 ? void 0 : _a.role
+                    },
+                    recipient: {
+                        id: 'deleted',
+                        role: (_b = originalActivity.recipient) === null || _b === void 0 ? void 0 : _b.role
+                    },
+                    locale: originalActivity.locale,
+                    localTimestamp: originalActivity.timestamp,
+                    timestamp: originalActivity.timestamp,
+                    channelId: originalActivity.channelId,
+                    conversation: originalActivity.conversation,
+                    serviceUrl: originalActivity.serviceUrl,
+                    replyToId: originalActivity.replyToId
+                };
+                const json = JSON.stringify(transcript);
+                await fs.writeFile(transcriptFile, json, 'utf-8');
+                return;
+            }
+        }
+    }
+    /**
+     * Sanitizes a string by removing invalid characters.
+     */
+    static sanitizeString(str, invalidChars) {
+        if (!(str === null || str === void 0 ? void 0 : str.trim())) {
+            return str;
+        }
+        // Preemptively check for : in string and replace with _
+        let result = str.replaceAll(':', '_');
+        // Remove invalid characters
+        for (const invalidChar of invalidChars) {
+            result = result.replaceAll(invalidChar, '');
+        }
+        return result;
+    }
+    /**
+     * Gets the transcript file path for a conversation.
+     */
+    getTranscriptFile(channelId, conversationId) {
+        if (!(channelId === null || channelId === void 0 ? void 0 : channelId.trim())) {
+            throw new Error('channelId is required.');
+        }
+        if (!(conversationId === null || conversationId === void 0 ? void 0 : conversationId.trim())) {
+            throw new Error('conversationId is required.');
+        }
+        // Get invalid filename characters (cross-platform)
+        const invalidChars = this.getInvalidFileNameChars();
+        let fileName = FileTranscriptLogger.sanitizeString(conversationId, invalidChars);
+        const maxLength = FileTranscriptLogger.MAX_FILE_NAME_SIZE - FileTranscriptLogger.TRANSCRIPT_FILE_EXTENSION.length;
+        if (fileName && fileName.length > maxLength) {
+            fileName = fileName.substring(0, maxLength);
+        }
+        const channelFolder = this.getChannelFolder(channelId);
+        return path.join(channelFolder, fileName + FileTranscriptLogger.TRANSCRIPT_FILE_EXTENSION);
+    }
+    /**
+     * Gets the channel folder path, creating it if necessary.
+     */
+    getChannelFolder(channelId) {
+        if (!(channelId === null || channelId === void 0 ? void 0 : channelId.trim())) {
+            throw new Error('channelId is required.');
+        }
+        const invalidChars = this.getInvalidPathChars();
+        const folderName = FileTranscriptLogger.sanitizeString(channelId, invalidChars);
+        return path.join(this._folder, folderName);
+    }
+    /**
+     * Checks if a file or directory exists.
+     */
+    async pathExists(path) {
+        try {
+            await fs.stat(path);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * Gets invalid filename characters for the current platform.
+     */
+    getInvalidFileNameChars() {
+        // Windows invalid filename chars: < > : " / \ | ? *
+        // Unix systems are more permissive, but / is always invalid
+        const invalid = this.getInvalidPathChars();
+        if (process.platform === 'win32') {
+            return [...invalid, '/', '\\'];
+        }
+        else {
+            return [...invalid, '/'];
+        }
+    }
+    /**
+     * Gets invalid path characters for the current platform.
+     */
+    getInvalidPathChars() {
+        // Similar to filename chars but allows directory separators in the middle
+        if (process.platform === 'win32') {
+            return ['<', '>', ':', '"', '|', '?', '*', '\0'];
+        }
+        else {
+            // Unix/Linux: only null byte is invalid in paths
+            return ['\0'];
+        }
+    }
+    /**
+     * Adds file:// protocol to a file path.
+     */
+    protocol(filePath) {
+        return `file://${filePath.replace(/\\/g, '/')}`;
+    }
+}
+exports.FileTranscriptLogger = FileTranscriptLogger;
+FileTranscriptLogger.TRANSCRIPT_FILE_EXTENSION = '.transcript';
+FileTranscriptLogger.MAX_FILE_NAME_SIZE = 100;
+//# sourceMappingURL=fileTranscriptLogger.js.map

package/dist/src/transcript/fileTranscriptLogger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fileTranscriptLogger.js","sourceRoot":"","sources":["../../../src/transcript/fileTranscriptLogger.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@microsoft/agents-hosting",
-  "version": "1.1.0-alpha.85",
+  "version": "1.1.1",
   "homepage": "https://github.com/microsoft/Agents-for-js",
   "repository": {
     "type": "git",
@@ -20,9 +20,9 @@
   "types": "dist/src/index.d.ts",
   "dependencies": {
     "@azure/core-auth": "^1.10.1",
-    "@azure/msal-node": "^3.8.1",
-    "@microsoft/agents-activity": "1.1.0-alpha.85",
-    "axios": "^1.13.1",
+    "@azure/msal-node": "^3.8.2",
+    "@microsoft/agents-activity": "1.1.1",
+    "axios": "^1.13.2",
     "jsonwebtoken": "^9.0.2",
     "jwks-rsa": "^3.2.0",
     "object-path": "^0.11.8"

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

@@ -113,6 +113,7 @@ export class AgenticAuthorization implements AuthorizationHandler {
       }
 
       const token = await connection.getAgenticUserToken(
+        context.activity.getAgenticTenantId() ?? '',
         context.activity.getAgenticInstanceId() ?? '',
         context.activity.getAgenticUser() ?? '',
         options?.scopes || this._options.scopes!

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

@@ -126,6 +126,11 @@ export interface AzureBotAuthorizationOptions {
    * - `${authHandlerId}_obo_scopes` (comma-separated values, e.g. `scope1,scope2`)
    */
   obo?: AzureBotAuthorizationOptionsOBO
+
+  /**
+   * Option to enable SSO when authenticating using Azure Active Directory (AAD). Defaults to true.
+   */
+  enableSso?: boolean
 }
 
 /**
@@ -191,7 +196,8 @@ export class AzureBotAuthorization implements AuthorizationHandler {
       obo: {
         connection: settings.obo?.connection ?? process.env[`${this.id}_obo_connection`],
         scopes: settings.obo?.scopes ?? this.loadScopes(process.env[`${this.id}_obo_scopes`]),
-      }
+      },
+      enableSso: process.env[`${this.id}_enableSso`] !== 'false' // default value is true
     }
 
     if (!result.name) {
@@ -393,7 +399,8 @@ export class AzureBotAuthorization implements AuthorizationHandler {
 
     if (!tokenResponse) {
       logger.debug(this.prefix('Cannot find token. Sending sign-in card'), activity)
-      const oCard = CardFactory.oauthCard(this._options.name!, this._options.title!, this._options.text!, signInResource)
+
+      const oCard = CardFactory.oauthCard(this._options.name!, this._options.title!, this._options.text!, signInResource, this._options.enableSso)
       await context.sendActivity(MessageFactory.attachment(oCard))
       await storage.write({ activity, id: this.id, ...(active ?? {}), attemptsLeft: this.maxAttempts })
       return AuthorizationHandlerStatus.PENDING

package/src/auth/authProvider.ts

@@ -19,26 +19,29 @@ export interface AuthProvider {
 
   /**
    * Get an access token for the agentic application
+   * @param tenantId
    * @param agentAppInstanceId
    * @returns a promise that resolves to the access token.
    */
-  getAgenticApplicationToken: (agentAppInstanceId: string) => Promise<string>
+  getAgenticApplicationToken: (tenantId: string, agentAppInstanceId: string) => Promise<string>
 
   /**
    * Get an access token for the agentic instance
+   * @param tenantId
    * @param agentAppInstanceId
    * @returns a promise that resolves to the access token.
    */
-  getAgenticInstanceToken: (agentAppInstanceId: string) => Promise<string>
+  getAgenticInstanceToken: (tenantId: string, agentAppInstanceId: string) => Promise<string>
 
   /**
    * Get an access token for the agentic user
+   * @param tenantId
    * @param agentAppInstanceId
    * @param upn
    * @param scopes
    * @returns a promise that resolves to the access token.
    */
-  getAgenticUserToken: (agentAppInstanceId: string, upn: string, scopes: string[]) => Promise<string>
+  getAgenticUserToken: (tenantId: string, agentAppInstanceId: string, upn: string, scopes: string[]) => Promise<string>
 
   acquireTokenOnBehalfOf (scopes: string[], oboAssertion: string): Promise<string>
   acquireTokenOnBehalfOf (authConfig: AuthConfiguration, scopes: string[], oboAssertion: string): Promise<string>