botframework-connector - npm Package Compare versions

Comparing version 4.23.0-dev.20240405 to 4.23.0-rc1

_ts3.4/lib/auth/appCredentials.d.ts

@@ -28,3 +28,7 @@ /**
      * @param appId The App ID.
-     * @param channelAuthTenant Optional. The oauth token tenant.
+     * @param channelAuthTenant Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param oAuthScope The scope for the token.
@@ -31,0 +35,0 @@ */

_ts3.4/lib/auth/authenticationConstants.d.ts

@@ -145,2 +145,6 @@ /**
     /**
+     * Tenant ID claim name. As used in Microsoft AAD tokens.
+     */
+    const TenantIdClaim = "tid";
+    /**
      * AppId used for creating skill claims when there is no appId and password configured.
@@ -147,0 +151,0 @@ */

_ts3.4/lib/auth/botFrameworkClientImpl.d.ts

 import { Activity, InvokeResponse } from 'botframework-schema';
 import { BotFrameworkClient } from '../skills';
+import { ConnectorClientOptions } from '../connectorApi/models';
 import { ServiceClientCredentialsFactory } from './serviceClientCredentialsFactory';
+declare const botFrameworkClientFetchImpl: (connectorClientOptions: ConnectorClientOptions) => typeof fetch;
 /**
@@ -11,3 +13,4 @@ * @internal
     private readonly loginEndpoint;
-    private readonly botFrameworkClientFetch;
+    private readonly botFrameworkClientFetch?;
+    private readonly connectorClientOptions?;
     /**
@@ -17,4 +20,6 @@ * @param credentialsFactory A [ServiceClientCredentialsFactory](xref:botframework-connector.ServiceClientCredentialsFactory) instance.
      * @param botFrameworkClientFetch A custom Fetch implementation to be used in the [BotFrameworkClient](xref:botframework-connector.BotFrameworkClient).
+     * @param connectorClientOptions  A [ConnectorClientOptions](xref:botframework-connector.ConnectorClientOptions) object.
      */
-    constructor(credentialsFactory: ServiceClientCredentialsFactory, loginEndpoint: string, botFrameworkClientFetch?: typeof globalThis.fetch);
+    constructor(credentialsFactory: ServiceClientCredentialsFactory, loginEndpoint: string, botFrameworkClientFetch?: ReturnType<typeof botFrameworkClientFetchImpl>, connectorClientOptions?: ConnectorClientOptions);
+    private toJSON;
     /**
@@ -32,2 +37,3 @@ * @template T The type of body in the InvokeResponse.
 }
+export {};
 //# sourceMappingURL=botFrameworkClientImpl.d.ts.map

_ts3.4/lib/auth/certificateAppCredentials.d.ts

@@ -24,3 +24,7 @@ /**
      * @param certificatePrivateKey A PEM encoded certificate private key.
-     * @param channelAuthTenant Optional. The oauth token tenant.
+     * @param channelAuthTenant Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param oAuthScope Optional. The scope for the token.
@@ -27,0 +31,0 @@ * @param x5c Optional. Enables application developers to achieve easy certificates roll-over in Azure AD:

_ts3.4/lib/auth/certificateServiceClientCredentialsFactory.d.ts

@@ -25,3 +25,7 @@ /**
      * @param certificatePrivateKey A PEM encoded certificate private key.
-     * @param tenantId Optional. The oauth token tenant.
+     * @param tenantId Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param x5c Optional. Enables application developers to achieve easy certificates roll-over in Azure AD:
@@ -38,3 +42,7 @@ * set this parameter to send the public certificate (BEGIN CERTIFICATE) to Azure AD, so that Azure AD can use it to validate the subject name based on a trusted issuer policy.
      * @param certificatePrivateKey A PEM encoded certificate private key.
-     * @param tenantId Optional. The oauth token tenant.
+     * @param tenantId Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      */
@@ -41,0 +49,0 @@ constructor(appId: string, x5c: string, certificatePrivateKey: string, tenantId?: string);

_ts3.4/lib/auth/microsoftAppCredentials.d.ts

@@ -25,3 +25,7 @@ /**
      * @param {string} appPassword The Microsoft app password.
-     * @param {string} channelAuthTenant Optional. The oauth token tenant.
+     * @param {string} channelAuthTenant Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param {string} oAuthScope Optional. The scope for the token.
@@ -28,0 +32,0 @@ */

_ts3.4/lib/auth/passwordServiceClientCredentialFactory.d.ts

@@ -36,2 +36,6 @@ /**
      * @param tenantId Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      */
@@ -38,0 +42,0 @@ constructor(appId: string, password: string, tenantId: string);

_ts3.4/lib/connectorApi/models/index.d.ts

@@ -8,2 +8,4 @@ /// <reference types="node" />
 import { AttachmentInfo, ChannelAccount, ConversationResourceResponse, ConversationsResult, PagedMembersResult, ResourceResponse } from "botframework-schema";
+import { Agent as HttpAgent } from "http";
+import { Agent as HttpsAgent } from "https";
 export * from "botframework-schema";
@@ -19,4 +21,15 @@ /**
     baseUri?: string;
+    /**
+     * HTTP and HTTPS agents which will be used for every HTTP request (Node.js only).
+     */
+    agentSettings?: AgentSettings;
 }
 /**
+ * HTTP and HTTPS agents (Node.js only)
+ */
+export interface AgentSettings {
+    http: HttpAgent;
+    https: HttpsAgent;
+}
+/**
  * Optional Parameters.
@@ -23,0 +36,0 @@ */

lib/auth/appCredentials.d.ts

@@ -28,3 +28,7 @@ /**
      * @param appId The App ID.
-     * @param channelAuthTenant Optional. The oauth token tenant.
+     * @param channelAuthTenant Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param oAuthScope The scope for the token.
@@ -31,0 +35,0 @@ */

lib/auth/appCredentials.js

@@ -41,3 +41,7 @@ "use strict";
      * @param appId The App ID.
-     * @param channelAuthTenant Optional. The oauth token tenant.
+     * @param channelAuthTenant Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param oAuthScope The scope for the token.
@@ -44,0 +48,0 @@ */

lib/auth/authenticationConstants.d.ts

@@ -145,2 +145,6 @@ /**
     /**
+     * Tenant ID claim name. As used in Microsoft AAD tokens.
+     */
+    const TenantIdClaim = "tid";
+    /**
      * AppId used for creating skill claims when there is no appId and password configured.
@@ -147,0 +151,0 @@ */

lib/auth/authenticationConstants.js

@@ -150,2 +150,6 @@ "use strict";
     /**
+     * Tenant ID claim name. As used in Microsoft AAD tokens.
+     */
+    AuthenticationConstants.TenantIdClaim = 'tid';
+    /**
      * AppId used for creating skill claims when there is no appId and password configured.
@@ -152,0 +156,0 @@ */

lib/auth/botFrameworkClientImpl.d.ts

 import { Activity, InvokeResponse } from 'botframework-schema';
 import { BotFrameworkClient } from '../skills';
+import type { ConnectorClientOptions } from '../connectorApi/models';
 import { ServiceClientCredentialsFactory } from './serviceClientCredentialsFactory';
+declare const botFrameworkClientFetchImpl: (connectorClientOptions: ConnectorClientOptions) => typeof fetch;
 /**
@@ -11,3 +13,4 @@ * @internal
     private readonly loginEndpoint;
-    private readonly botFrameworkClientFetch;
+    private readonly botFrameworkClientFetch?;
+    private readonly connectorClientOptions?;
     /**
@@ -17,4 +20,6 @@ * @param credentialsFactory A [ServiceClientCredentialsFactory](xref:botframework-connector.ServiceClientCredentialsFactory) instance.
      * @param botFrameworkClientFetch A custom Fetch implementation to be used in the [BotFrameworkClient](xref:botframework-connector.BotFrameworkClient).
+     * @param connectorClientOptions  A [ConnectorClientOptions](xref:botframework-connector.ConnectorClientOptions) object.
      */
-    constructor(credentialsFactory: ServiceClientCredentialsFactory, loginEndpoint: string, botFrameworkClientFetch?: typeof globalThis.fetch);
+    constructor(credentialsFactory: ServiceClientCredentialsFactory, loginEndpoint: string, botFrameworkClientFetch?: ReturnType<typeof botFrameworkClientFetchImpl>, connectorClientOptions?: ConnectorClientOptions);
+    private toJSON;
     /**
@@ -32,2 +37,3 @@ * @template T The type of body in the InvokeResponse.
 }
+export {};
 //# sourceMappingURL=botFrameworkClientImpl.d.ts.map

lib/auth/botFrameworkClientImpl.js

 "use strict";
 // Copyright (c) Microsoft Corporation.
 // 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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -13,5 +36,19 @@ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BotFrameworkClientImpl = void 0;
-const z = require("zod");
+const z = __importStar(require("zod"));
 const botframework_schema_1 = require("botframework-schema");
@@ -22,16 +59,26 @@ const conversationConstants_1 = require("../conversationConstants");
 const assert_1 = require("assert");
-const cross_fetch_1 = require("cross-fetch");
-const botFrameworkClientFetchImpl = (input, init) => __awaiter(void 0, void 0, void 0, function* () {
-    const url = z.string().parse(input);
-    const { body, headers } = z.object({ body: z.string(), headers: z.record(z.string()).optional() }).parse(init);
-    const response = yield (0, cross_fetch_1.default)(url, {
-        method: 'POST',
-        body,
-        headers,
+const axios_1 = __importDefault(require("axios"));
+const botFrameworkClientFetchImpl = (connectorClientOptions) => {
+    var _a;
+    const { http: httpAgent, https: httpsAgent } = (_a = connectorClientOptions === null || connectorClientOptions === void 0 ? void 0 : connectorClientOptions.agentSettings) !== null && _a !== void 0 ? _a : {
+        http: undefined,
+        https: undefined,
+    };
+    const axiosInstance = axios_1.default.create({
+        httpAgent,
+        httpsAgent,
+        validateStatus: () => true,
     });
-    return {
-        status: response.status,
-        json: () => __awaiter(void 0, void 0, void 0, function* () { return response.body; }),
-    };
-});
+    return (input, init) => __awaiter(void 0, void 0, void 0, function* () {
+        const url = z.string().parse(input);
+        const { body, headers } = z.object({ body: z.string(), headers: z.record(z.string()).optional() }).parse(init);
+        const response = yield axiosInstance.post(url, body, {
+            headers,
+        });
+        return {
+            status: response.status,
+            json: () => response.data,
+        };
+    });
+};
 /**
@@ -46,9 +93,19 @@ * @internal
      * @param botFrameworkClientFetch A custom Fetch implementation to be used in the [BotFrameworkClient](xref:botframework-connector.BotFrameworkClient).
+     * @param connectorClientOptions  A [ConnectorClientOptions](xref:botframework-connector.ConnectorClientOptions) object.
      */
-    constructor(credentialsFactory, loginEndpoint, botFrameworkClientFetch = botFrameworkClientFetchImpl) {
+    constructor(credentialsFactory, loginEndpoint, botFrameworkClientFetch, connectorClientOptions) {
+        var _a;
         this.credentialsFactory = credentialsFactory;
         this.loginEndpoint = loginEndpoint;
         this.botFrameworkClientFetch = botFrameworkClientFetch;
-        (0, assert_1.ok)(typeof botFrameworkClientFetch === 'function');
+        this.connectorClientOptions = connectorClientOptions;
+        (_a = this.botFrameworkClientFetch) !== null && _a !== void 0 ? _a : (this.botFrameworkClientFetch = botFrameworkClientFetchImpl(this.connectorClientOptions));
+        (0, assert_1.ok)(typeof this.botFrameworkClientFetch === 'function');
     }
+    toJSON() {
+        // Ignore ConnectorClientOptions, as it could contain Circular Structure behavior.
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const _a = this, { connectorClientOptions } = _a, rest = __rest(_a, ["connectorClientOptions"]);
+        return rest;
+    }
     /**
@@ -55,0 +112,0 @@ * @template T The type of body in the InvokeResponse.

lib/auth/certificateAppCredentials.d.ts

@@ -24,3 +24,7 @@ /**
      * @param certificatePrivateKey A PEM encoded certificate private key.
-     * @param channelAuthTenant Optional. The oauth token tenant.
+     * @param channelAuthTenant Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param oAuthScope Optional. The scope for the token.
@@ -27,0 +31,0 @@ * @param x5c Optional. Enables application developers to achieve easy certificates roll-over in Azure AD:

lib/auth/certificateAppCredentials.js

@@ -33,3 +33,7 @@ "use strict";
      * @param certificatePrivateKey A PEM encoded certificate private key.
-     * @param channelAuthTenant Optional. The oauth token tenant.
+     * @param channelAuthTenant Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param oAuthScope Optional. The scope for the token.
@@ -36,0 +40,0 @@ * @param x5c Optional. Enables application developers to achieve easy certificates roll-over in Azure AD:

lib/auth/certificateServiceClientCredentialsFactory.d.ts

@@ -25,3 +25,7 @@ /**
      * @param certificatePrivateKey A PEM encoded certificate private key.
-     * @param tenantId Optional. The oauth token tenant.
+     * @param tenantId Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param x5c Optional. Enables application developers to achieve easy certificates roll-over in Azure AD:
@@ -38,3 +42,7 @@ * set this parameter to send the public certificate (BEGIN CERTIFICATE) to Azure AD, so that Azure AD can use it to validate the subject name based on a trusted issuer policy.
      * @param certificatePrivateKey A PEM encoded certificate private key.
-     * @param tenantId Optional. The oauth token tenant.
+     * @param tenantId Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      */
@@ -41,0 +49,0 @@ constructor(appId: string, x5c: string, certificatePrivateKey: string, tenantId?: string);

lib/auth/certificateServiceClientCredentialsFactory.js

@@ -9,2 +9,25 @@ "use strict";
  */
+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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -25,3 +48,3 @@ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
 const util_1 = require("util");
-const opensslWrapper = require("openssl-wrapper");
+const opensslWrapper = __importStar(require("openssl-wrapper"));
 const openssl = (0, util_1.promisify)(opensslWrapper.default);
@@ -28,0 +51,0 @@ /**

lib/auth/emulatorValidation.js

@@ -47,2 +47,3 @@ "use strict";
     function isTokenFromEmulator(authHeader) {
+        var _a;
         // The Auth Header generally looks like this:
@@ -75,3 +76,3 @@ // "Bearer eyJ0e[...Big Long String...]XAiO"
         // Is there an Issuer?
-        const issuer = token.payload.iss;
+        const issuer = token.payload[authenticationConstants_1.AuthenticationConstants.IssuerClaim];
         if (!issuer) {
@@ -81,2 +82,15 @@ // No Issuer, means it's not from the Emulator.
         }
+        //Validation to manage the issuer object as a string.
+        if (Array.isArray(tokenValidationParameters_1.ToBotFromBotOrEmulatorTokenValidationParameters.issuer)) {
+            const tenantId = (_a = token === null || token === void 0 ? void 0 : token.payload[authenticationConstants_1.AuthenticationConstants.TenantIdClaim]) !== null && _a !== void 0 ? _a : '';
+            //Validate if there is an existing issuer with the same tid value.
+            if (tenantId != '' &&
+                tokenValidationParameters_1.ToBotFromBotOrEmulatorTokenValidationParameters.issuer.find((issuer) => issuer.includes(tenantId)) ==
+                    null) {
+                //If the issuer doesn't exist, this is added using the Emulator token issuer structure.
+                //This allows use of the SingleTenant authentication through Emulator.
+                const newIssuer = authenticationConstants_1.AuthenticationConstants.ValidTokenIssuerUrlTemplateV1 + `${tenantId}/`;
+                tokenValidationParameters_1.ToBotFromBotOrEmulatorTokenValidationParameters.issuer.push(newIssuer);
+            }
+        }
         // Is the token issues by a source we consider to be the emulator?
@@ -83,0 +97,0 @@ if (EmulatorValidation.ToBotFromEmulatorTokenValidationParameters.issuer &&

lib/auth/jwtTokenValidation.js

@@ -53,3 +53,4 @@ "use strict";
             }
-            if (!authHeader.trim()) {
+            // eslint-disable-next-line prettier/prettier
+            if (!authHeader.trim()) { // CodeQL [SM01513] We manually validate incoming tokens.  Checking for empty header as part of that.
                 const isAuthDisabled = yield credentials.isAuthenticationDisabled();
@@ -110,3 +111,4 @@ if (!isAuthDisabled) {
             if (isPublicAzure(channelService)) {
-                if (serviceUrl.trim()) {
+                // eslint-disable-next-line prettier/prettier
+                if (serviceUrl.trim()) { // CodeQL [SM01513] We manually validate incoming tokens.  Checking for empty serviceUrl as part of that.
                     return yield channelValidation_1.ChannelValidation.authenticateChannelTokenWithServiceUrl(authHeader, credentials, serviceUrl, channelId);
@@ -117,3 +119,4 @@ }
             if (isGovernment(channelService)) {
-                if (serviceUrl.trim()) {
+                // eslint-disable-next-line prettier/prettier
+                if (serviceUrl.trim()) { // CodeQL [SM01513] We manually validate incoming tokens.  Checking for empty serviceUrl as part of that.
                     return yield governmentChannelValidation_1.GovernmentChannelValidation.authenticateChannelTokenWithServiceUrl(authHeader, credentials, serviceUrl, channelId);
@@ -124,3 +127,4 @@ }
             // Otherwise use Enterprise Channel Validation
-            if (serviceUrl.trim()) {
+            // eslint-disable-next-line prettier/prettier
+            if (serviceUrl.trim()) { // CodeQL [SM01513] We manually validate incoming tokens.  Checking for empty serviceUrl as part of that.
                 return yield enterpriseChannelValidation_1.EnterpriseChannelValidation.authenticateChannelTokenWithServiceUrl(authHeader, credentials, serviceUrl, channelId, channelService);
@@ -127,0 +131,0 @@ }

lib/auth/microsoftAppCredentials.d.ts

@@ -25,3 +25,7 @@ /**
      * @param {string} appPassword The Microsoft app password.
-     * @param {string} channelAuthTenant Optional. The oauth token tenant.
+     * @param {string} channelAuthTenant Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param {string} oAuthScope Optional. The scope for the token.
@@ -28,0 +32,0 @@ */

lib/auth/microsoftAppCredentials.js

@@ -31,3 +31,7 @@ "use strict";
      * @param {string} appPassword The Microsoft app password.
-     * @param {string} channelAuthTenant Optional. The oauth token tenant.
+     * @param {string} channelAuthTenant Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param {string} oAuthScope Optional. The scope for the token.
@@ -34,0 +38,0 @@ */

lib/auth/msalAppCredentials.js

@@ -47,5 +47,3 @@ "use strict";
             auth.clientSecret =
-                typeof maybeAppIdOrAppPasswordOrCertificate === 'string'
-                    ? maybeAppIdOrAppPasswordOrCertificate
-                    : undefined;
+                typeof maybeAppIdOrAppPasswordOrCertificate === 'string' ? maybeAppIdOrAppPasswordOrCertificate : '';
             this.clientApplication = new msal_node_1.ConfidentialClientApplication({ auth });
@@ -52,0 +50,0 @@ }

lib/auth/openIdMetadata.js

@@ -18,7 +18,10 @@ "use strict";
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenIdMetadata = void 0;
-const getPem = require("rsa-pem-from-mod-exp");
-const base64url_1 = require("base64url");
-const node_fetch_1 = require("node-fetch");
+const rsa_pem_from_mod_exp_1 = __importDefault(require("rsa-pem-from-mod-exp"));
+const base64url_1 = __importDefault(require("base64url"));
+const node_fetch_1 = __importDefault(require("node-fetch"));
 const https_proxy_agent_1 = require("https-proxy-agent");
@@ -112,3 +115,3 @@ const authenticationError_1 = require("./authenticationError");
                 return {
-                    key: getPem(modulus, exponent),
+                    key: (0, rsa_pem_from_mod_exp_1.default)(modulus, exponent),
                     endorsements: key.endorsements,
@@ -115,0 +118,0 @@ };

lib/auth/parameterizedBotFrameworkAuthentication.js

@@ -168,3 +168,3 @@ "use strict";
     createBotFrameworkClient() {
-        return new botFrameworkClientImpl_1.BotFrameworkClientImpl(this.credentialsFactory, this.toChannelFromBotLoginUrl, this.botFrameworkClientFetch);
+        return new botFrameworkClientImpl_1.BotFrameworkClientImpl(this.credentialsFactory, this.toChannelFromBotLoginUrl, this.botFrameworkClientFetch, this.connectorClientOptions);
     }
@@ -171,0 +171,0 @@ JwtTokenValidation_authenticateRequest(activity, authHeader) {

lib/auth/passwordServiceClientCredentialFactory.d.ts

@@ -36,2 +36,6 @@ /**
      * @param tenantId Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      */
@@ -38,0 +42,0 @@ constructor(appId: string, password: string, tenantId: string);

lib/auth/userTokenClient.js

 "use strict";
 // Copyright (c) Microsoft Corporation.
 // 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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserTokenClient = void 0;
-const z = require("zod");
+const z = __importStar(require("zod"));
 const botframework_schema_1 = require("botframework-schema");
@@ -8,0 +31,0 @@ /**

lib/auth/userTokenClientImpl.js

 "use strict";
 // Copyright (c) Microsoft Corporation.
 // 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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -15,3 +38,3 @@ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
 exports.UserTokenClientImpl = void 0;
-const z = require("zod");
+const z = __importStar(require("zod"));
 const tokenApiClient_1 = require("../tokenApi/tokenApiClient");
@@ -18,0 +41,0 @@ const userTokenClient_1 = require("./userTokenClient");

lib/connectorApi/connectorClient.js

@@ -17,2 +17,14 @@ "use strict";
 }));
+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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
@@ -23,7 +35,7 @@ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 exports.ConnectorMappers = exports.ConnectorModels = exports.ConnectorClientContext = exports.ConnectorClient = void 0;
-const Mappers = require("./models/mappers");
+const Mappers = __importStar(require("./models/mappers"));
 exports.ConnectorMappers = Mappers;
-const Models = require("./models");
+const Models = __importStar(require("./models"));
 exports.ConnectorModels = Models;
-const operations = require("./operations");
+const operations = __importStar(require("./operations"));
 const connectorClientContext_1 = require("./connectorClientContext");
@@ -30,0 +42,0 @@ Object.defineProperty(exports, "ConnectorClientContext", { enumerable: true, get: function () { return connectorClientContext_1.ConnectorClientContext; } });

lib/connectorApi/models/index.d.ts

@@ -6,4 +6,8 @@ /**
 /// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import { ServiceClientOptions, RequestOptionsBase, HttpResponse } from "@azure/core-http";
 import { AttachmentInfo, ChannelAccount, ConversationResourceResponse, ConversationsResult, PagedMembersResult, ResourceResponse } from "botframework-schema";
+import type { Agent as HttpAgent } from "http";
+import type { Agent as HttpsAgent } from "https";
 export * from "botframework-schema";
@@ -19,4 +23,15 @@ /**
     baseUri?: string;
+    /**
+     * HTTP and HTTPS agents which will be used for every HTTP request (Node.js only).
+     */
+    agentSettings?: AgentSettings;
 }
 /**
+ * HTTP and HTTPS agents (Node.js only)
+ */
+export interface AgentSettings {
+    http: HttpAgent;
+    https: HttpsAgent;
+}
+/**
  * Optional Parameters.
@@ -23,0 +38,0 @@ */

lib/connectorApi/operations/attachments.js

@@ -6,7 +6,30 @@ "use strict";
  */
+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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Attachments = void 0;
 const core_http_1 = require("@azure/core-http");
-const Mappers = require("../models/attachmentsMappers");
-const Parameters = require("../models/parameters");
+const Mappers = __importStar(require("../models/attachmentsMappers"));
+const Parameters = __importStar(require("../models/parameters"));
 /** Class representing a Attachments. */
@@ -13,0 +36,0 @@ class Attachments {

lib/connectorApi/operations/conversations.js

@@ -6,6 +6,29 @@ "use strict";
  */
+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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Conversations = void 0;
-const Mappers = require("../models/conversationsMappers");
-const Parameters = require("../models/parameters");
+const Mappers = __importStar(require("../models/conversationsMappers"));
+const Parameters = __importStar(require("../models/parameters"));
 const core_http_1 = require("@azure/core-http");
@@ -12,0 +35,0 @@ const conversationConstants_1 = require("../../conversationConstants");

lib/emulatorApiClient.js

@@ -18,5 +18,8 @@ "use strict";
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmulatorApiClient = void 0;
-const cross_fetch_1 = require("cross-fetch");
+const cross_fetch_1 = __importDefault(require("cross-fetch"));
 /**
@@ -23,0 +26,0 @@ * The purpose of this class is to emulate an api client.

lib/index.js

@@ -20,5 +20,17 @@ "use strict";
 }));
+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 __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -36,3 +48,3 @@ exports.ConversationConstants = exports.TokenApiModels = exports.TokenApiClient = exports.EmulatorApiClient = exports.ConnectorClient = void 0;
 Object.defineProperty(exports, "TokenApiModels", { enumerable: true, get: function () { return tokenApiClient_1.TokenApiModels; } });
-exports.ConversationConstants = require("./conversationConstants");
+exports.ConversationConstants = __importStar(require("./conversationConstants"));
 //# sourceMappingURL=index.js.map

lib/teams/operations/teams.js

@@ -7,7 +7,30 @@ "use strict";
  */
+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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Teams = void 0;
 const core_http_1 = require("@azure/core-http");
-const Mappers = require("../models/teamsMappers");
-const Parameters = require("../models/parameters");
+const Mappers = __importStar(require("../models/teamsMappers"));
+const Parameters = __importStar(require("../models/parameters"));
 const __1 = require("../");
@@ -14,0 +37,0 @@ /** Class representing a Teams. */

lib/teams/teamsConnectorClient.js

@@ -17,2 +17,14 @@ "use strict";
 }));
+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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
@@ -23,7 +35,7 @@ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 exports.TeamsConnectorMappers = exports.TeamsConnectorModels = exports.TeamsConnectorClientContext = exports.TeamsConnectorClient = void 0;
-const Models = require("./models");
+const Models = __importStar(require("./models"));
 exports.TeamsConnectorModels = Models;
-const Mappers = require("./models/mappers");
+const Mappers = __importStar(require("./models/mappers"));
 exports.TeamsConnectorMappers = Mappers;
-const operations = require("./operations");
+const operations = __importStar(require("./operations"));
 const teamsConnectorClientContext_1 = require("./teamsConnectorClientContext");
@@ -30,0 +42,0 @@ Object.defineProperty(exports, "TeamsConnectorClientContext", { enumerable: true, get: function () { return teamsConnectorClientContext_1.TeamsConnectorClientContext; } });

lib/tokenApi/operations/botSignIn.js

@@ -6,7 +6,30 @@ "use strict";
  */
+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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BotSignIn = void 0;
 const core_http_1 = require("@azure/core-http");
-const Mappers = require("../models/botSignInMappers");
-const Parameters = require("../models/parameters");
+const Mappers = __importStar(require("../models/botSignInMappers"));
+const Parameters = __importStar(require("../models/parameters"));
 /** Class representing a BotSignIn. */
@@ -13,0 +36,0 @@ class BotSignIn {

lib/tokenApi/operations/userToken.js

@@ -6,7 +6,30 @@ "use strict";
  */
+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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserToken = void 0;
 const core_http_1 = require("@azure/core-http");
-const Mappers = require("../models/userTokenMappers");
-const Parameters = require("../models/parameters");
+const Mappers = __importStar(require("../models/userTokenMappers"));
+const Parameters = __importStar(require("../models/parameters"));
 /** Class representing a UserToken. */
@@ -13,0 +36,0 @@ class UserToken {

lib/tokenApi/tokenApiClient.js

@@ -17,2 +17,14 @@ "use strict";
 }));
+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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
@@ -23,7 +35,7 @@ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 exports.TokenApiMappers = exports.TokenApiModels = exports.TokenApiClientContext = exports.TokenApiClient = void 0;
-const Models = require("./models");
+const Models = __importStar(require("./models"));
 exports.TokenApiModels = Models;
-const Mappers = require("./models/mappers");
+const Mappers = __importStar(require("./models/mappers"));
 exports.TokenApiMappers = Mappers;
-const operations = require("./operations");
+const operations = __importStar(require("./operations"));
 const tokenApiClientContext_1 = require("./tokenApiClientContext");
@@ -30,0 +42,0 @@ Object.defineProperty(exports, "TokenApiClientContext", { enumerable: true, get: function () { return tokenApiClientContext_1.TokenApiClientContext; } });

package.json

@@ -5,3 +5,3 @@ {
   "description": "Bot Connector is autorest generated connector client.",
-  "version": "4.23.0-dev.20240405",
+  "version": "4.23.0-rc1",
   "license": "MIT",
@@ -32,34 +32,42 @@ "keywords": [
     "@azure/core-http": "^3.0.2",
-    "@azure/identity": "^2.0.4",
-    "@azure/msal-node": "^1.18.4",
+    "@azure/identity": "^4.4.1",
+    "@azure/msal-node": "^2.13.0",
+    "@types/jsonwebtoken": "8.3.5",
+    "axios": "^1.7.4",
     "base64url": "^3.0.0",
-    "botbuilder-stdlib": "4.23.0-dev.internal.20240405",
-    "botframework-schema": "4.23.0-dev.20240405",
+    "botbuilder-stdlib": "4.23.0-rc1.internal",
+    "botframework-schema": "4.23.0-rc1",
+    "browserify-fs": "^1.0.0",
+    "buffer": "^6.0.3",
     "cross-fetch": "^3.0.5",
+    "crypto-browserify": "^3.12.0",
+    "https-browserify": "^1.0.0",
     "https-proxy-agent": "^7.0.2",
-    "jsonwebtoken": "^9.0.0",
+    "jsonwebtoken": "^9.0.2",
     "node-fetch": "^2.6.7",
+    "openssl-wrapper": "^0.3.4",
     "rsa-pem-from-mod-exp": "^0.8.4",
-    "zod": "^3.22.4",
-    "openssl-wrapper": "^0.3.4"
+    "stream-browserify": "^3.0.0",
+    "stream-http": "^3.2.0",
+    "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@types/jsonwebtoken": "8.3.5",
     "@types/node": "^10.17.27",
-    "botbuilder-test-utils": "0.0.0-dev.20240405",
+    "botbuilder-test-utils": "0.0.0-rc1",
     "dotenv": "^6.2.0",
+    "esbuild-plugin-polyfill-node": "^0.3.0",
     "nock": "^11.9.1",
-    "should": "^13.2.3"
+    "should": "^13.2.3",
+    "tsup": "^8.2.4"
   },
   "scripts": {
     "build": "tsc -b",
-    "build:browserify": "npm-run-all build:browserify:clean build:browserify:init build:browserify:run",
-    "build:browserify:clean": "rimraf lib/browser.*",
-    "build:browserify:init": "shx cp lib/index.js lib/browser.js",
-    "build:browserify:run": "browserify -s BFC --debug lib/browser.js | exorcist lib/browser.js.map | sponge lib/browser.js",
+    "build:tsup": "npm-run-all build:tsup:clean build:tsup:run",
+    "build:tsup:clean": "rimraf lib/browser.*",
+    "build:tsup:run": "tsup",
     "build:downlevel-dts": "downlevel-dts lib _ts3.4/lib --checksum",
     "clean": "rimraf _ts3.4 lib tsconfig.tsbuildinfo",
-    "depcheck": "depcheck --config ../../.depcheckrc --ignores azure,sinon",
+    "depcheck": "depcheck --config ../../.depcheckrc --ignores azure,sinon,browserify-fs,buffer,crypto-browserify,https-browserify,stream-browserify,stream-http",
     "lint": "eslint . --ext .js,.ts",
-    "postbuild": "npm-run-all -p build:browserify build:downlevel-dts",
+    "postbuild": "npm-run-all -p build:tsup build:downlevel-dts",
     "test": "yarn build && yarn test:mocha",
@@ -66,0 +74,0 @@ "test:mocha": "nyc mocha tests --recursive"

src/auth/appCredentials.ts

@@ -45,3 +45,7 @@ /**
      * @param appId The App ID.
-     * @param channelAuthTenant Optional. The oauth token tenant.
+     * @param channelAuthTenant Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param oAuthScope The scope for the token.
@@ -48,0 +52,0 @@ */

src/auth/authenticationConstants.ts

@@ -176,2 +176,7 @@ /**
     /**
+     * Tenant ID claim name. As used in Microsoft AAD tokens.
+     */
+    export const TenantIdClaim = 'tid';
+
+    /**
      * AppId used for creating skill claims when there is no appId and password configured.
@@ -178,0 +183,0 @@ */

src/auth/botFrameworkClientImpl.ts

@@ -7,2 +7,3 @@ // Copyright (c) Microsoft Corporation.
 import { BotFrameworkClient } from '../skills';
+import type { ConnectorClientOptions } from '../connectorApi/models';
 import { ConversationIdHttpHeaderName } from '../conversationConstants';
@@ -13,18 +14,27 @@ import { ServiceClientCredentialsFactory } from './serviceClientCredentialsFactory';
 import { ok } from 'assert';
-import fetch from 'cross-fetch';
+import axios from 'axios';
 
-const botFrameworkClientFetchImpl: typeof fetch = async (input, init) => {
-    const url = z.string().parse(input);
-    const { body, headers } = z.object({ body: z.string(), headers: z.record(z.string()).optional() }).parse(init);
-
-    const response = await fetch(url, {
-        method: 'POST',
-        body,
-        headers,
+const botFrameworkClientFetchImpl = (connectorClientOptions: ConnectorClientOptions): typeof fetch => {
+    const { http: httpAgent, https: httpsAgent } = connectorClientOptions?.agentSettings ?? {
+        http: undefined,
+        https: undefined,
+    };
+    const axiosInstance = axios.create({
+        httpAgent,
+        httpsAgent,
+        validateStatus: (): boolean => true,
     });
 
-    return {
-        status: response.status,
-        json: async () => response.body,
-    } as Response;
+    return async (input, init?): Promise<Response> => {
+        const url = z.string().parse(input);
+        const { body, headers } = z.object({ body: z.string(), headers: z.record(z.string()).optional() }).parse(init);
+
+        const response = await axiosInstance.post(url, body, {
+            headers,
+        });
+        return {
+            status: response.status,
+            json: () => response.data,
+        } as Response;
+    };
 };
@@ -41,2 +51,3 @@
      * @param botFrameworkClientFetch A custom Fetch implementation to be used in the [BotFrameworkClient](xref:botframework-connector.BotFrameworkClient).
+     * @param connectorClientOptions  A [ConnectorClientOptions](xref:botframework-connector.ConnectorClientOptions) object.
      */
@@ -46,7 +57,17 @@ constructor(
         private readonly loginEndpoint: string,
-        private readonly botFrameworkClientFetch = botFrameworkClientFetchImpl
+        private readonly botFrameworkClientFetch?: ReturnType<typeof botFrameworkClientFetchImpl>,
+        private readonly connectorClientOptions?: ConnectorClientOptions
     ) {
-        ok(typeof botFrameworkClientFetch === 'function');
+        this.botFrameworkClientFetch ??= botFrameworkClientFetchImpl(this.connectorClientOptions);
+
+        ok(typeof this.botFrameworkClientFetch === 'function');
     }
 
+    private toJSON() {
+        // Ignore ConnectorClientOptions, as it could contain Circular Structure behavior.
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { connectorClientOptions, ...rest } = this;
+        return rest;
+    }
+
     /**
@@ -53,0 +74,0 @@ * @template T The type of body in the InvokeResponse.

src/auth/certificateAppCredentials.ts

@@ -30,3 +30,7 @@ /**
      * @param certificatePrivateKey A PEM encoded certificate private key.
-     * @param channelAuthTenant Optional. The oauth token tenant.
+     * @param channelAuthTenant Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param oAuthScope Optional. The scope for the token.
@@ -33,0 +37,0 @@ * @param x5c Optional. Enables application developers to achieve easy certificates roll-over in Azure AD:

src/auth/certificateServiceClientCredentialsFactory.ts

@@ -33,3 +33,7 @@ /**
      * @param certificatePrivateKey A PEM encoded certificate private key.
-     * @param tenantId Optional. The oauth token tenant.
+     * @param tenantId Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param x5c Optional. Enables application developers to achieve easy certificates roll-over in Azure AD:
@@ -53,3 +57,7 @@ * set this parameter to send the public certificate (BEGIN CERTIFICATE) to Azure AD, so that Azure AD can use it to validate the subject name based on a trusted issuer policy.
      * @param certificatePrivateKey A PEM encoded certificate private key.
-     * @param tenantId Optional. The oauth token tenant.
+     * @param tenantId Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      */
@@ -56,0 +64,0 @@ constructor(appId: string, x5c: string, certificatePrivateKey: string, tenantId?: string);

src/auth/emulatorValidation.ts

@@ -72,3 +72,3 @@ /**
         // Is there an Issuer?
-        const issuer: string = token.payload.iss;
+        const issuer: string = token.payload[AuthenticationConstants.IssuerClaim];
         if (!issuer) {
@@ -79,2 +79,19 @@ // No Issuer, means it's not from the Emulator.
 
+        //Validation to manage the issuer object as a string.
+        if (Array.isArray(ToBotFromBotOrEmulatorTokenValidationParameters.issuer)) {
+            const tenantId = token?.payload[AuthenticationConstants.TenantIdClaim] ?? '';
+
+            //Validate if there is an existing issuer with the same tid value.
+            if (
+                tenantId != '' &&
+                ToBotFromBotOrEmulatorTokenValidationParameters.issuer.find((issuer) => issuer.includes(tenantId)) ==
+                    null
+            ) {
+                //If the issuer doesn't exist, this is added using the Emulator token issuer structure.
+                //This allows use of the SingleTenant authentication through Emulator.
+                const newIssuer = AuthenticationConstants.ValidTokenIssuerUrlTemplateV1 + `${tenantId}/`;
+                ToBotFromBotOrEmulatorTokenValidationParameters.issuer.push(newIssuer);
+            }
+        }
+
         // Is the token issues by a source we consider to be the emulator?
@@ -81,0 +98,0 @@ if (

src/auth/jwtTokenValidation.ts

@@ -50,3 +50,4 @@ /**
 
-        if (!authHeader.trim()) {
+        // eslint-disable-next-line prettier/prettier
+        if (!authHeader.trim()) {  // CodeQL [SM01513] We manually validate incoming tokens.  Checking for empty header as part of that.
             const isAuthDisabled = await credentials.isAuthenticationDisabled();
@@ -157,3 +158,4 @@ if (!isAuthDisabled) {
         if (isPublicAzure(channelService)) {
-            if (serviceUrl.trim()) {
+            // eslint-disable-next-line prettier/prettier
+            if (serviceUrl.trim()) { // CodeQL [SM01513] We manually validate incoming tokens.  Checking for empty serviceUrl as part of that.
                 return await ChannelValidation.authenticateChannelTokenWithServiceUrl(
@@ -171,3 +173,4 @@ authHeader,
         if (isGovernment(channelService)) {
-            if (serviceUrl.trim()) {
+            // eslint-disable-next-line prettier/prettier
+            if (serviceUrl.trim()) { // CodeQL [SM01513] We manually validate incoming tokens.  Checking for empty serviceUrl as part of that.
                 return await GovernmentChannelValidation.authenticateChannelTokenWithServiceUrl(
@@ -185,3 +188,4 @@ authHeader,
         // Otherwise use Enterprise Channel Validation
-        if (serviceUrl.trim()) {
+        // eslint-disable-next-line prettier/prettier
+        if (serviceUrl.trim()) { // CodeQL [SM01513] We manually validate incoming tokens.  Checking for empty serviceUrl as part of that.
             return await EnterpriseChannelValidation.authenticateChannelTokenWithServiceUrl(
@@ -188,0 +192,0 @@ authHeader,

src/auth/microsoftAppCredentials.ts

@@ -29,3 +29,7 @@ /**
      * @param {string} appPassword The Microsoft app password.
-     * @param {string} channelAuthTenant Optional. The oauth token tenant.
+     * @param {string} channelAuthTenant Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      * @param {string} oAuthScope Optional. The scope for the token.
@@ -32,0 +36,0 @@ */

src/auth/msalAppCredentials.ts

@@ -92,5 +92,3 @@ /**
             auth.clientSecret =
-                typeof maybeAppIdOrAppPasswordOrCertificate === 'string'
-                    ? maybeAppIdOrAppPasswordOrCertificate
-                    : undefined;
+                typeof maybeAppIdOrAppPasswordOrCertificate === 'string' ? maybeAppIdOrAppPasswordOrCertificate : '';
 
@@ -97,0 +95,0 @@ this.clientApplication = new ConfidentialClientApplication({ auth });

src/auth/openIdMetadata.ts

@@ -9,3 +9,3 @@ /**
 
-import * as getPem from 'rsa-pem-from-mod-exp';
+import getPem from 'rsa-pem-from-mod-exp';
 import base64url from 'base64url';
@@ -12,0 +12,0 @@ import fetch from 'node-fetch';

src/auth/parameterizedBotFrameworkAuthentication.ts

@@ -207,3 +207,4 @@ // Copyright (c) Microsoft Corporation.
             this.toChannelFromBotLoginUrl,
-            this.botFrameworkClientFetch
+            this.botFrameworkClientFetch,
+            this.connectorClientOptions
         );
@@ -210,0 +211,0 @@ }

src/auth/passwordServiceClientCredentialFactory.ts

@@ -56,2 +56,6 @@ /**
      * @param tenantId Tenant ID of the Azure AD tenant where the bot is created.
+     *   * Required for SingleTenant app types.
+     *   * Optional for MultiTenant app types. **Note**: '_botframework.com_' is the default tenant when no value is provided.
+     *
+     * More information: https://learn.microsoft.com/en-us/security/zero-trust/develop/identity-supported-account-types.
      */
@@ -58,0 +62,0 @@ constructor(appId: string, password: string, tenantId: string);

src/connectorApi/models/index.ts

@@ -9,2 +9,4 @@ /**
 import { AttachmentInfo, ChannelAccount, ConversationResourceResponse, ConversationsResult, PagedMembersResult, ResourceResponse } from "botframework-schema";
+import type { Agent as HttpAgent } from "http";
+import type { Agent as HttpsAgent } from "https";
 export * from "botframework-schema";
@@ -21,5 +23,18 @@
   baseUri?: string;
+
+  /**
+   * HTTP and HTTPS agents which will be used for every HTTP request (Node.js only).
+   */
+  agentSettings?: AgentSettings;
 }
 
 /**
+ * HTTP and HTTPS agents (Node.js only)
+ */
+export interface AgentSettings {
+  http: HttpAgent;
+  https: HttpsAgent;
+}
+
+/**
  * Optional Parameters.
@@ -26,0 +41,0 @@ */

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

39298

increased by15.04%

Worsened metrics

Total package byte prevSize

9388614

decreased by-23.93%

Dependency count

21

increased by61.54%

Dev dependency count

7

increased by16.67%

Number of medium supply chain risk alerts

2

increased by100%

Dependency changes

• + Added@types/jsonwebtoken@8.3.5

• + Addedaxios@^1.7.4

• + Addedbrowserify-fs@^1.0.0

• + Addedbuffer@^6.0.3

• + Addedcrypto-browserify@^3.12.0

• + Addedhttps-browserify@^1.0.0

• + Addedstream-browserify@^3.0.0

• + Addedstream-http@^3.2.0

• + Added@azure/identity@4.4.1(transitive)

• + Added@azure/msal-browser@3.23.0(transitive)

• + Added@azure/msal-common@14.14.2(transitive)

• + Added@azure/msal-node@2.13.1(transitive)

• + Added@types/jsonwebtoken@8.3.5(transitive)

• + Addedabstract-leveldown@0.12.4(transitive)

• + Addedasn1.js@4.10.1(transitive)

• + Addedaxios@1.7.7(transitive)

• + Addedbase64-js@1.5.1(transitive)

• + Addedbl@0.8.2(transitive)

• + Addedbn.js@4.12.05.2.1(transitive)

• + [e-mail](transitive)

• + Addedbotframework-schema@4.23.0-rc1(transitive)

• + Addedbrorand@1.1.0(transitive)

• + Addedbrowserify-aes@1.2.0(transitive)

• + Addedbrowserify-cipher@1.0.1(transitive)

• + Addedbrowserify-des@1.0.2(transitive)

• + Addedbrowserify-fs@1.0.0(transitive)

• + Addedbrowserify-rsa@4.1.0(transitive)

• + Addedbrowserify-sign@4.2.3(transitive)

• + Addedbuffer@6.0.3(transitive)

• + Addedbuffer-from@1.1.2(transitive)

• + Addedbuffer-xor@1.0.3(transitive)

• + Addedbuiltin-status-codes@3.0.0(transitive)

• + Addedcipher-base@1.0.4(transitive)

• + Addedclone@0.1.19(transitive)

• + Addedconcat-stream@1.6.2(transitive)

• + Addedcore-util-is@1.0.3(transitive)

• + Addedcreate-ecdh@4.0.4(transitive)

• + Addedcreate-hash@1.2.0(transitive)

• + Addedcreate-hmac@1.1.7(transitive)

• + Addedcrypto-browserify@3.12.0(transitive)

• + Addeddeferred-leveldown@0.2.0(transitive)

• + Addeddes.js@1.1.0(transitive)

• + Addeddiffie-hellman@5.0.3(transitive)

• + Addedelliptic@6.5.7(transitive)

• + Addederrno@0.1.8(transitive)

• + Addedevp_bytestokey@1.0.3(transitive)

• + Addedfollow-redirects@1.15.9(transitive)

• + Addedforeach@2.0.6(transitive)

• + Addedfwd-stream@1.0.4(transitive)

• + Addedhash-base@3.0.4(transitive)

• + Addedhash.js@1.1.7(transitive)

• + Addedhmac-drbg@1.0.1(transitive)

• + Addedhttps-browserify@1.0.0(transitive)

• + Addedidb-wrapper@1.7.2(transitive)

• + Addedieee754@1.2.1(transitive)

• + Addedindexof@0.0.1(transitive)

• + Addedinherits@2.0.4(transitive)

• + Addedis@0.2.7(transitive)

• + Addedis-object@0.1.2(transitive)

• + Addedisarray@0.0.11.0.0(transitive)

• + Addedisbuffer@0.0.0(transitive)

• + Addedlevel-blobs@0.1.7(transitive)

• + Addedlevel-filesystem@1.2.0(transitive)

• + Addedlevel-fix-range@1.0.22.0.0(transitive)

• + Addedlevel-hooks@4.5.0(transitive)

• + Addedlevel-js@2.2.4(transitive)

• + Addedlevel-peek@1.0.6(transitive)

• + Addedlevel-sublevel@5.2.3(transitive)

• + Addedlevelup@0.18.6(transitive)

• + Addedltgt@2.2.1(transitive)

• + Addedmd5.js@1.3.5(transitive)

• + Addedmiller-rabin@4.0.1(transitive)

• + Addedminimalistic-assert@1.0.1(transitive)

• + Addedminimalistic-crypto-utils@1.0.1(transitive)

• + Addedobject-keys@0.2.00.4.0(transitive)

• + Addedoctal@1.0.0(transitive)

• + Addedonce@1.4.0(transitive)

• + Addedparse-asn1@5.1.7(transitive)

• + Addedpbkdf2@3.1.2(transitive)

• + Addedprocess-nextick-args@2.0.1(transitive)

• + Addedproxy-from-env@1.1.0(transitive)

• + Addedprr@0.0.01.0.1(transitive)

• + Addedpublic-encrypt@4.0.3(transitive)

• + Addedrandombytes@2.1.0(transitive)

• + Addedrandomfill@1.0.4(transitive)

• + Addedreadable-stream@1.0.341.1.142.3.83.6.2(transitive)

• + Addedripemd160@2.0.2(transitive)

• + Addedsafe-buffer@5.1.2(transitive)

• + Addedsemver@2.3.2(transitive)

• + Addedsha.js@2.4.11(transitive)

• + Addedstream-browserify@3.0.0(transitive)

• + Addedstream-http@3.2.0(transitive)

• + Addedstring-range@1.2.2(transitive)

• + Addedstring_decoder@0.10.311.1.11.3.0(transitive)

• + Addedtypedarray@0.0.6(transitive)

• + Addedtypedarray-to-buffer@1.0.4(transitive)

• + Addedutil-deprecate@1.0.2(transitive)

• + Addedwrappy@1.0.2(transitive)

• + Addedxtend@2.0.62.1.22.2.03.0.04.0.2(transitive)

• - Removed@azure/identity@2.1.0(transitive)

• - Removed@azure/msal-browser@2.39.0(transitive)

• - Removed@azure/msal-common@13.3.113.3.37.6.0(transitive)

• - Removed@azure/msal-node@1.18.4(transitive)

• - [e-mail].20240405(transitive)

• - Removedbotframework-schema@4.23.0-dev.20240405(transitive)

• Updated@azure/identity@^4.4.1

• Updated@azure/msal-node@^2.13.0

• [e-mail]

• Updatedbotframework-schema@4.23.0-rc1

• Updatedjsonwebtoken@^9.0.2