@microsoft/teams.apps 2.0.0-preview.9 → 2.0.1

package/dist/routes/index.js

@@ -15,10 +15,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./activity"), exports);
+__exportStar(require("./conversation-update"), exports);
+__exportStar(require("./event"), exports);
 __exportStar(require("./install"), exports);
 __exportStar(require("./invoke"), exports);
-__exportStar(require("./conversation-update"), exports);
-__exportStar(require("./message-update"), exports);
 __exportStar(require("./message-delete"), exports);
-__exportStar(require("./event"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcm91dGVzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7QUF1QkEsNkNBQTJCO0FBQzNCLDRDQUEwQjtBQUMxQiwyQ0FBeUI7QUFDekIsd0RBQXNDO0FBQ3RDLG1EQUFpQztBQUNqQyxtREFBaUM7QUFDakMsMENBQXdCIn0=
+__exportStar(require("./message-update"), exports);
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcm91dGVzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7QUF5QkEsNkNBQTJCO0FBQzNCLHdEQUFzQztBQUN0QywwQ0FBd0I7QUFDeEIsNENBQTBCO0FBQzFCLDJDQUF5QjtBQUN6QixtREFBaUM7QUFDakMsbURBQWlDIn0=

package/dist/routes/install.d.ts

@@ -1,8 +1,8 @@
 import { InstallUpdateActivity } from '@microsoft/teams.api';
 import { IActivityContext } from '../contexts';
 import { RouteHandler } from '../types';
-export type InstallActivityRoutes = {
+export type InstallActivityRoutes<TExtraCtx extends Record<string, any> = Record<string, any>> = {
     [K in InstallUpdateActivity['action'] as `install.${K}`]?: RouteHandler<IActivityContext<Extract<InstallUpdateActivity, {
         action: K;
-    }>>, void>;
+    }>, TExtraCtx>, void>;
 };

package/dist/routes/invoke/index.d.ts

@@ -4,10 +4,10 @@ import { RouteHandler } from '../../types';
 import { FileConsentActivityRoutes } from './file-consent';
 import { MessageExtensionSubmitActivityRoutes } from './message-extension-submit';
 import { MessageSubmitActivityRoutes } from './message-submit';
-export type InvokeActivityRoutes = {
+export type InvokeActivityRoutes<TExtraCtx extends Record<string, any> = Record<string, any>> = {
     [K in InvokeActivity['name'] as InvokeAliases[K]]?: RouteHandler<IActivityContext<Extract<InvokeActivity, {
         name: K;
-    }>>, InvokeResponse<K> | InvokeResponse<K>['body']>;
+    }>, TExtraCtx>, InvokeResponse<K> | InvokeResponse<K>['body']>;
 } & FileConsentActivityRoutes & MessageExtensionSubmitActivityRoutes & MessageSubmitActivityRoutes;
 type InvokeAliases = {
     'config/fetch': 'config.open';

package/dist/routes/message-delete.d.ts

@@ -1,6 +1,6 @@
 import { IMessageDeleteActivity } from '@microsoft/teams.api';
 import { IActivityContext } from '../contexts';
 import { RouteHandler } from '../types';
-export type MessageDeleteActivityRoutes = {
-    [K in IMessageDeleteActivity['channelData']['eventType'] as K]?: RouteHandler<IActivityContext<IMessageDeleteActivity>, void>;
+export type MessageDeleteActivityRoutes<TExtraCtx extends Record<string, any> = Record<string, any>> = {
+    [K in IMessageDeleteActivity['channelData']['eventType'] as K]?: RouteHandler<IActivityContext<IMessageDeleteActivity, TExtraCtx>, void>;
 };

package/dist/routes/message-update.d.ts

@@ -1,6 +1,6 @@
 import { IMessageUpdateActivity } from '@microsoft/teams.api';
 import { IActivityContext } from '../contexts';
 import { RouteHandler } from '../types';
-export type MessageUpdateActivityRoutes = {
-    [K in IMessageUpdateActivity['channelData']['eventType'] as K]?: RouteHandler<IActivityContext<IMessageUpdateActivity>, void>;
+export type MessageUpdateActivityRoutes<TExtraCtx extends Record<string, any> = Record<string, any>> = {
+    [K in IMessageUpdateActivity['channelData']['eventType'] as K]?: RouteHandler<IActivityContext<IMessageUpdateActivity, TExtraCtx>, void>;
 };

package/dist/types/app-events.d.ts

@@ -4,7 +4,7 @@ import { UnionToIntersection } from './union-to-intersection';
 /**
  * Extracts the events from a plugin if it extends PluginWithEvents
  */
-export type PluginEvents<T> = T extends IPlugin<infer Events> ? Events : {};
+export type PluginEvents<T> = T extends IPlugin<any, infer Events> ? Events : {};
 type MergePluginEventMaps<TPlugins> = UnionToIntersection<TPlugins extends readonly unknown[] ? PluginEvents<TPlugins[number]> : PluginEvents<TPlugins>>;
 /**
  * Combines two sets of event types:

package/dist/types/app-routing.d.ts

@@ -0,0 +1,11 @@
+import { IPlugin } from './plugin';
+import { UnionToIntersection } from './union-to-intersection';
+import type { App } from '../app';
+import type { IRoutes } from '../routes';
+/**
+ * Extracts the events from a plugin if it extends PluginWithEvents
+ */
+export type PluginAdditionalContext<T> = UnionToIntersection<T extends IPlugin<infer Ctx, any> ? Ctx : {}> extends infer R ? R extends Record<string, any> ? R : {} : {};
+type AppPlugin<TApp extends App> = TApp extends App<infer TPlugin> ? TPlugin : never;
+export type AppRoutingHandler<Name extends keyof IRoutes, TApp extends App<any>> = Exclude<IRoutes<PluginAdditionalContext<AppPlugin<TApp>>>[Name], undefined>;
+export {};

package/dist/types/app-routing.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLXJvdXRpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHlwZXMvYXBwLXJvdXRpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/dist/types/plugin/plugin-start-event.d.ts

@@ -7,5 +7,5 @@ export interface IPluginStartEvent {
      * the port given to the
      * `app.start()` method
      */
-    readonly port: number;
+    readonly port: number | string;
 }

package/dist/types/plugin/plugin.d.ts

@@ -21,7 +21,7 @@ export type OnErrorPluginEvent = (event: IErrorEvent) => void;
  * receives an activity
  */
 export type OnActivityPluginEvent = (event: IActivityEvent) => void;
-export interface IPlugin<TEvents extends {} = {}> {
+export interface IPlugin<TActivityContext extends {} = {}, TEvents extends {} = {}> {
     /**
      * The event types that this plugin can emit. This is just a type, but we need it
      * for the type system to pick it up. You don't actually need to assign this to
@@ -53,7 +53,7 @@ export interface IPlugin<TEvents extends {} = {}> {
      * called by the `App`
      * when an activity is received
      */
-    onActivity?(event: IPluginActivityEvent): void | Promise<void>;
+    onActivity?(event: IPluginActivityEvent): void | TActivityContext | Promise<void | TActivityContext>;
     /**
      * called by the `App`
      * when an activity is sent

package/dist/types/route-handler.d.ts

@@ -1,2 +1,2 @@
 import { IActivityContext } from '../contexts';
-export type RouteHandler<In extends IActivityContext<any>, Out = void> = (ctx: In) => Out | Promise<Out>;
+export type RouteHandler<In extends IActivityContext<any, any>, Out = void> = (ctx: In) => Out | Promise<Out>;

package/dist/types/streamer.d.ts

@@ -24,6 +24,11 @@ export interface IStreamer {
      * @param activity the activity to send
      */
     emit(activity: Partial<IMessageActivity | ITypingActivity> | string): void;
+    /**
+     * send status updates before emitting (ex. "Thinking...")
+     * @param text the status text to send
+     */
+    update(text: string): void;
     /**
      * close the stream
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teams.apps",
-  "version": "2.0.0-preview.9",
+  "version": "2.0.1",
   "license": "MIT",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -46,12 +46,12 @@
     "reflect-metadata": "^0.2.2"
   },
   "peerDependencies": {
-    "@microsoft/teams.api": "2.0.0-preview.9",
-    "@microsoft/teams.common": "2.0.0-preview.9",
-    "@microsoft/teams.graph": "2.0.0-preview.9"
+    "@microsoft/teams.api": "2.0.1",
+    "@microsoft/teams.common": "2.0.1",
+    "@microsoft/teams.graph": "2.0.1"
   },
   "devDependencies": {
-    "@microsoft/teams.config": "2.0.0-preview.9",
+    "@microsoft/teams.config": "2.0.1",
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.12",

package/dist/middleware/entra-token-validator.d.ts

@@ -1,75 +0,0 @@
-import jwt, { type JwtPayload } from 'jsonwebtoken';
-import jwksClient, { JwksClient } from 'jwks-rsa';
-import { ILogger } from '@microsoft/teams.common';
-/**
- * Entra token validator parameters
- */
-type EntraTokenValidatorParams = {
-    /**
-     *  App tenant ID. Used to find public keys to validate token signature, and to validate issuer for single-tenant apps.
-     *  This can be 'common', 'organization', or 'consumers' for a multi-tenant app, or a specific tenant ID for a single-tenant app.
-     */
-    tenantId: string;
-    /** App client ID. Used to validate token audience. */
-    clientId: string;
-    options?: {
-        /**
-         * For multi-tenant apps that only allows sign-in from specific tenants, this is the list of allowed tenant IDs.
-         * If empty or not provided, any tenant is considered valid.
-         * This is ignored for single-tenant apps.
-         */
-        allowedTenantIds?: string[];
-    };
-};
-export declare const getJwksClient: (options: jwksClient.Options) => JwksClient;
-/**
- * And Entra token validator that can validate access tokens issued by Microsoft Entra for app specific use.
- */
-export declare class EntraTokenValidator {
-    readonly tenantId: string;
-    readonly clientId: string;
-    readonly validIssuerTenantIds: string[];
-    private keyClient;
-    constructor({ tenantId, clientId, options }: EntraTokenValidatorParams);
-    /**
-     * Validates a JWT access token
-     * @param {ILogger} logger The logger to use.
-     * @param {string} rawAccessToken The access token as a string.
-     * @param { string | undefined } requiredScope If provided, the token will only be considered valid if issued for this scope.
-     * @returns {Promise<jwt.Jwt | null>} The validated token if the signature is valid and the claims are valid.
-     */
-    validateAccessToken(logger: ILogger, rawAccessToken: string, requiredScope?: string): Promise<jwt.Jwt | null>;
-    getTokenPayload(token: jwt.Jwt): JwtPayload | null;
-    /**
-     * Validates the token claims: that it's valid for the intended purpose, it's not expired, it has the right audience & issuer,
-     * it's issued for the requisite scope.
-     * @param {ILogger} logger The logger to use.
-     * @param {jwt.Jwt} token The token to validate.
-     * @param { string | undefined } requiredScope If provided, the token will only be considered valid if issued for this scope.
-     * @returns {boolean} True if the claims validation passed.
-     */
-    private validateAccessTokenClaims;
-    /**
-     * Decodes an access token without verifying if the signature is valid.
-     * @param {ILogger} logger The logger to use.
-     * @param {string} rawAccessToken the raw access token.
-     * @returns {jwt.JWT | null} A decoded token if the raw access token is well formed.
-     */
-    private decodeToken;
-    /**
-     * Gets the public key from the key identifier in a token header
-     * @param {ILogger} logger The logger to use.
-     * @param {jwt.JwtHeader} header the token header
-     * @returns {Promise<string | undefined>} the public key corresponding to the header key identifier, if available
-     */
-    private getPublicKey;
-    /**
-     * Decodes the access token and verifies it against the public key
-     * @param {ILogger} logger The logger to use.
-     * @param {string} rawAccessToken the raw access token.
-     * @param {string} publicKey the public key to verify signature against.
-     * @returns {Promise<jwt.JWT | null>} A decoded token if the raw token is well formed and the signature is valid.
-     */
-    private validateTokenSignature;
-}
-export {};

package/dist/middleware/entra-token-validator.js

@@ -1,169 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntraTokenValidator = exports.getJwksClient = void 0;
-const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const jwks_rsa_1 = __importDefault(require("jwks-rsa"));
-const getJwksClient = (options) => (0, jwks_rsa_1.default)(options);
-exports.getJwksClient = getJwksClient;
-/**
- * And Entra token validator that can validate access tokens issued by Microsoft Entra for app specific use.
- */
-class EntraTokenValidator {
-    tenantId;
-    clientId;
-    validIssuerTenantIds;
-    keyClient;
-    constructor({ tenantId, clientId, options }) {
-        this.tenantId = tenantId;
-        this.clientId = clientId;
-        // single-tenant applications only allow tokens issued by this app's tenant
-        // multi tenant applications allow tokens issued by any tenant, unless the
-        // allowedTenantIds option is provided to limit the set of allowed issuers.
-        const isMultiTenant = ['common', 'organizations', 'consumers'].some((val) => tenantId === val);
-        this.validIssuerTenantIds = isMultiTenant ? options?.allowedTenantIds ?? [] : [this.tenantId];
-        this.keyClient = (0, exports.getJwksClient)({
-            jwksUri: `https://login.microsoftonline.com/${tenantId}/discovery/v2.0/keys`,
-        });
-    }
-    /**
-     * Validates a JWT access token
-     * @param {ILogger} logger The logger to use.
-     * @param {string} rawAccessToken The access token as a string.
-     * @param { string | undefined } requiredScope If provided, the token will only be considered valid if issued for this scope.
-     * @returns {Promise<jwt.Jwt | null>} The validated token if the signature is valid and the claims are valid.
-     */
-    async validateAccessToken(logger, rawAccessToken, requiredScope) {
-        if (!rawAccessToken) {
-            logger.error('No token provided');
-            return null;
-        }
-        const token = this.decodeToken(logger, rawAccessToken);
-        if (!token) {
-            logger.error('Failed to decode the access token');
-            return null;
-        }
-        const publicKey = await this.getPublicKey(logger, token.header);
-        if (!publicKey) {
-            logger.error(`Failed to find public key for the key identifier "${token.header.kid}"`);
-            return null;
-        }
-        const validatedToken = this.validateTokenSignature(logger, rawAccessToken, publicKey);
-        if (!validatedToken) {
-            logger.error('Failed to validate the token signature');
-            return null;
-        }
-        if (!this.validateAccessTokenClaims(logger, validatedToken, requiredScope)) {
-            logger.error('Failed to validate the access token claims');
-            return null;
-        }
-        return validatedToken;
-    }
-    getTokenPayload(token) {
-        return token.payload instanceof Object ? token.payload : null;
-    }
-    /**
-     * Validates the token claims: that it's valid for the intended purpose, it's not expired, it has the right audience & issuer,
-     * it's issued for the requisite scope.
-     * @param {ILogger} logger The logger to use.
-     * @param {jwt.Jwt} token The token to validate.
-     * @param { string | undefined } requiredScope If provided, the token will only be considered valid if issued for this scope.
-     * @returns {boolean} True if the claims validation passed.
-     */
-    validateAccessTokenClaims(logger, token, requiredScope) {
-        const payload = this.getTokenPayload(token);
-        if (!payload) {
-            logger.error('Invalid token payload.');
-            return false;
-        }
-        // validate iat (issued at) and exp (expiration) fields.
-        // these are expressed as number of seconds since Unix epoch.
-        const now = Math.round(new Date().getTime() / 1000.0);
-        const checkTimestamp = payload.iat && payload.iat <= now && payload.exp && payload.exp >= now;
-        if (!checkTimestamp) {
-            logger.error('The token is expired or not yet valid.');
-            return false;
-        }
-        // validate audience
-        const checkAudience = payload.aud === this.clientId || payload.aud === `api://${this.clientId}`;
-        if (!checkAudience) {
-            logger.error('The token is not issued for the expected audience.');
-            return false;
-        }
-        const tokenIssuer = payload.iss;
-        if (!tokenIssuer) {
-            logger.error('Invalid token issuer.');
-            return false;
-        }
-        // validate token issuer
-        //  - if this is a single-tenant application, validate that the token is issued by the expected tenant
-        //  - if this is a multi-tenant application that only allows sign-in from specific tenants, validate that
-        //    the token is issued by one of those
-        //  - if this is a multi-tenant that does not limit sign-in to specific tenants, any issuer is considered valid.
-        const checkIssuer = !this.validIssuerTenantIds.length ||
-            this.validIssuerTenantIds.some((tenantId) => tokenIssuer.startsWith(`https://login.microsoftonline.com/${tenantId}/`));
-        if (!checkIssuer) {
-            logger.error(`The token is issued by unexpected tenant: ${payload.iss}`);
-            return false;
-        }
-        // validate that the token is issued for the required scope
-        const checkRequiredScope = !requiredScope || payload.scp?.includes(requiredScope);
-        if (!checkRequiredScope) {
-            logger.error(`The token is not issued for the required scope: ${requiredScope}`);
-            return false;
-        }
-        // all checks passed
-        return true;
-    }
-    /**
-     * Decodes an access token without verifying if the signature is valid.
-     * @param {ILogger} logger The logger to use.
-     * @param {string} rawAccessToken the raw access token.
-     * @returns {jwt.JWT | null} A decoded token if the raw access token is well formed.
-     */
-    decodeToken(logger, rawAccessToken) {
-        try {
-            return jsonwebtoken_1.default.decode(rawAccessToken, { complete: true });
-        }
-        catch (error) {
-            logger.error(error);
-            return null;
-        }
-    }
-    /**
-     * Gets the public key from the key identifier in a token header
-     * @param {ILogger} logger The logger to use.
-     * @param {jwt.JwtHeader} header the token header
-     * @returns {Promise<string | undefined>} the public key corresponding to the header key identifier, if available
-     */
-    async getPublicKey(logger, header) {
-        try {
-            const signingKey = await this.keyClient.getSigningKey(header.kid);
-            return signingKey.getPublicKey() ?? null;
-        }
-        catch (error) {
-            logger.error(error);
-            return null;
-        }
-    }
-    /**
-     * Decodes the access token and verifies it against the public key
-     * @param {ILogger} logger The logger to use.
-     * @param {string} rawAccessToken the raw access token.
-     * @param {string} publicKey the public key to verify signature against.
-     * @returns {Promise<jwt.JWT | null>} A decoded token if the raw token is well formed and the signature is valid.
-     */
-    validateTokenSignature(logger, rawAccessToken, publicKey) {
-        try {
-            return jsonwebtoken_1.default.verify(rawAccessToken, publicKey, { complete: true });
-        }
-        catch (error) {
-            logger.error(error);
-            return null;
-        }
-    }
-}
-exports.EntraTokenValidator = EntraTokenValidator;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW50cmEtdG9rZW4tdmFsaWRhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21pZGRsZXdhcmUvZW50cmEtdG9rZW4tdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLGdFQUFvRDtBQUNwRCx3REFBa0Q7QUF5QjNDLE1BQU0sYUFBYSxHQUFHLENBQUMsT0FBMkIsRUFBYyxFQUFFLENBQUMsSUFBQSxrQkFBVSxFQUFDLE9BQU8sQ0FBQyxDQUFDO0FBQWpGLFFBQUEsYUFBYSxpQkFBb0U7QUFFOUY7O0dBRUc7QUFDSCxNQUFhLG1CQUFtQjtJQUNyQixRQUFRLENBQVM7SUFDakIsUUFBUSxDQUFTO0lBQ2pCLG9CQUFvQixDQUFXO0lBQ2hDLFNBQVMsQ0FBYTtJQUU5QixZQUFZLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQTZCO1FBQ3BFLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO1FBRXpCLDJFQUEyRTtRQUMzRSwwRUFBMEU7UUFDMUUsMkVBQTJFO1FBQzNFLE1BQU0sYUFBYSxHQUFHLENBQUMsUUFBUSxFQUFFLGVBQWUsRUFBRSxXQUFXLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLFFBQVEsS0FBSyxHQUFHLENBQUMsQ0FBQztRQUMvRixJQUFJLENBQUMsb0JBQW9CLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxPQUFPLEVBQUUsZ0JBQWdCLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUU5RixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUEscUJBQWEsRUFBQztZQUM3QixPQUFPLEVBQUUscUNBQXFDLFFBQVEsc0JBQXNCO1NBQzdFLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxLQUFL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

package/dist/middleware/with-client-auth.d.ts

@@ -1,13 +0,0 @@
-import express from 'express';
-import { Credentials } from '@microsoft/teams.api';
-import { ILogger } from '@microsoft/teams.common';
-import { IClientContext } from '../contexts';
-import { EntraTokenValidator } from './entra-token-validator';
-export type WithClientAuthParams = Partial<Credentials> & {
-    entraTokenValidator?: Pick<EntraTokenValidator, 'validateAccessToken' | 'getTokenPayload'>;
-    readonly logger: ILogger;
-};
-export type ClientAuthRequest = express.Request & {
-    context?: IClientContext;
-};
-export declare function withClientAuth(params: WithClientAuthParams): (req: ClientAuthRequest, res: express.Response, next: express.NextFunction) => Promise<void>;

package/dist/middleware/with-client-auth.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withClientAuth = withClientAuth;
-function withClientAuth(params) {
-    const entraTokenValidator = params.entraTokenValidator;
-    const log = params.logger;
-    return async (req, res, next) => {
-        const appSessionId = req.header('X-Teams-App-Session-Id');
-        const pageId = req.header('X-Teams-Page-Id');
-        const authorization = req.header('Authorization')?.split(' ');
-        const authToken = authorization?.length === 2 && authorization[0].toLowerCase() === 'bearer'
-            ? authorization[1]
-            : '';
-        const validatedToken = !entraTokenValidator
-            ? null
-            : await entraTokenValidator.validateAccessToken(log, authToken);
-        const tokenPayload = validatedToken && entraTokenValidator?.getTokenPayload(validatedToken);
-        if (!pageId ||
-            !appSessionId ||
-            !validatedToken ||
-            !entraTokenValidator ||
-            !tokenPayload) {
-            log.debug('unauthorized');
-            res.status(401).send('unauthorized');
-            return;
-        }
-        req.context = {
-            appId: tokenPayload?.['appId'],
-            appSessionId,
-            authToken,
-            channelId: req.header('X-Teams-Channel-Id'),
-            chatId: req.header('X-Teams-Chat-Id'),
-            meetingId: req.header('X-Teams-Meeting-Id'),
-            messageId: req.header('X-Teams-Message-Id'),
-            pageId,
-            subPageId: req.header('X-Teams-Sub-Page-Id'),
-            teamId: req.header('X-Teams-Team-Id'),
-            tenantId: tokenPayload['tid'],
-            userId: tokenPayload['oid'],
-            userName: tokenPayload['name'],
-        };
-        next();
-    };
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2l0aC1jbGllbnQtYXV0aC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9taWRkbGV3YXJlL3dpdGgtY2xpZW50LWF1dGgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFxQkEsd0NBcURDO0FBckRELFNBQWdCLGNBQWMsQ0FBQyxNQUE0QjtJQUN6RCxNQUFNLG1CQUFtQixHQUFHLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQztJQUN2RCxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO0lBRTFCLE9BQU8sS0FBSyxFQUNWLEdBQXNCLEVBQ3RCLEdBQXFCLEVBQ3JCLElBQTBCLEVBQzFCLEVBQUU7UUFDRixNQUFNLFlBQVksR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLHdCQUF3QixDQUFDLENBQUM7UUFDMUQsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBQzdDLE1BQU0sYUFBYSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsZUFBZSxDQUFDLEVBQUUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzlELE1BQU0sU0FBUyxHQUNiLGFBQWEsRUFBRSxNQUFNLEtBQUssQ0FBQyxJQUFJLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsS0FBSyxRQUFRO1lBQ3hFLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1lBQ2xCLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFFVCxNQUFNLGNBQWMsR0FBRyxDQUFDLG1CQUFtQjtZQUN6QyxDQUFDLENBQUMsSUFBSTtZQUNOLENBQUMsQ0FBQyxNQUFNLG1CQUFtQixDQUFDLG1CQUFtQixDQUFDLEdBQUcsRUFBRSxTQUFTLENBQUMsQ0FBQztRQUNsRSxNQUFNLFlBQVksR0FDaEIsY0FBYyxJQUFJLG1CQUFtQixFQUFFLGVBQWUsQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUV6RSxJQUNFLENBQUMsTUFBTTtZQUNQLENBQUMsWUFBWTtZQUNiLENBQUMsY0FBYztZQUNmLENBQUMsbUJBQW1CO1lBQ3BCLENBQUMsWUFBWSxFQUNiLENBQUM7WUFDRCxHQUFHLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxDQUFDO1lBQzFCLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1lBQ3JDLE9BQU87UUFDVCxDQUFDO1FBRUQsR0FBRyxDQUFDLE9BQU8sR0FBRztZQUNaLEtBQUssRUFBRSxZQUFZLEVBQUUsQ0FBQyxPQUFPLENBQUM7WUFDOUIsWUFBWTtZQUNaLFNBQVM7WUFDVCxTQUFTLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQztZQUMzQyxNQUFNLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQztZQUNyQyxTQUFTLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQztZQUMzQyxTQUFTLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQztZQUMzQyxNQUFNO1lBQ04sU0FBUyxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMscUJBQXFCLENBQUM7WUFDNUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsaUJBQWlCLENBQUM7WUFDckMsUUFBUSxFQUFFLFlBQVksQ0FBQyxLQUFLLENBQUM7WUFDN0IsTUFBTSxFQUFFLFlBQVksQ0FBQyxLQUFLLENBQUM7WUFDM0IsUUFBUSxFQUFFLFlBQVksQ0FBQyxNQUFNLENBQUM7U0FDL0IsQ0FBQztRQUVGLElBQUksRUFBRSxDQUFDO0lBQ1QsQ0FBQyxDQUFDO0FBQ0osQ0FBQyJ9

package/dist/router.d.ts

@@ -1,34 +0,0 @@
-import { Activity } from '@microsoft/teams.api';
-import { IActivityContext } from './contexts';
-import { IRoutes } from './routes';
-import { RouteHandler } from './types';
-type Route<Name extends keyof IRoutes = keyof IRoutes> = {
-    readonly name?: Name;
-    readonly select: (activity: Activity) => boolean;
-    readonly callback: IRoutes[Name];
-};
-export declare class Router {
-    protected readonly routes: Route[];
-    /**
-     * select routes that match the inbound activity
-     * @param activity the inbound activity
-     */
-    select(activity: Activity): RouteHandler<IActivityContext<Activity>, any>[];
-    /**
-     * register a new route
-     * @param route the route to register
-     */
-    register<Name extends keyof IRoutes>(route: Route<Name>): this;
-    /**
-     * register a middleware
-     * @param callback the callback to invoke
-     */
-    use(callback: RouteHandler<IActivityContext, any>): this;
-    /**
-     * register an activity route
-     * @param event event to subscribe to
-     * @param callback the callback to invoke
-     */
-    on<Name extends keyof IRoutes>(event: Name, callback: Exclude<IRoutes[Name], undefined>): this;
-}
-export {};

package/dist/router.js

@@ -1,91 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Router = void 0;
-const routes_1 = require("./routes");
-class Router {
-    routes = [];
-    /**
-     * select routes that match the inbound activity
-     * @param activity the inbound activity
-     */
-    select(activity) {
-        return this.routes
-            .filter((r) => r.select(activity))
-            .map((r) => r.callback);
-    }
-    /**
-     * register a new route
-     * @param route the route to register
-     */
-    register(route) {
-        this.routes.push(route);
-        return this;
-    }
-    /**
-     * register a middleware
-     * @param callback the callback to invoke
-     */
-    use(callback) {
-        this.register({
-            select: () => true,
-            callback,
-        });
-        return this;
-    }
-    /**
-     * register an activity route
-     * @param event event to subscribe to
-     * @param callback the callback to invoke
-     */
-    on(event, callback) {
-        this.register({
-            name: event,
-            select: (activity) => {
-                if (event === 'activity') {
-                    return true;
-                }
-                if (event === activity.type) {
-                    return true;
-                }
-                if (activity.type === 'conversationUpdate') {
-                    return event === activity.channelData?.eventType;
-                }
-                if (activity.type === 'installationUpdate') {
-                    return event === `install.${activity.action}`;
-                }
-                if (activity.type === 'messageDelete') {
-                    return event === activity.channelData?.eventType;
-                }
-                if (activity.type === 'messageUpdate') {
-                    return event === activity.channelData?.eventType;
-                }
-                if (activity.type === 'event') {
-                    return event === routes_1.EVENT_ALIASES[activity.name];
-                }
-                if (activity.type === 'invoke') {
-                    if (event === routes_1.INVOKE_ALIASES[activity.name]) {
-                        return true;
-                    }
-                    if (activity.name === 'fileConsent/invoke') {
-                        return event === `file.consent.${activity.value.action}`;
-                    }
-                    if (activity.name === 'composeExtension/submitAction') {
-                        return event === `message.ext.${activity.value.botMessagePreviewAction}`;
-                    }
-                    if (activity.name === 'message/submitAction') {
-                        return event === `message.submit.${activity.value.actionName}`;
-                    }
-                }
-                // custom routes
-                if (event === 'mention' && activity.entities?.some((e) => e.type === 'mention')) {
-                    return (activity.entities?.find((e) => e.type === 'mention' && e.mentioned.id === activity.recipient.id) !== undefined);
-                }
-                return false;
-            },
-            callback,
-        });
-        return this;
-    }
-}
-exports.Router = Router;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3JvdXRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFHQSxxQ0FBa0U7QUFTbEUsTUFBYSxNQUFNO0lBQ0UsTUFBTSxHQUFZLEVBQUUsQ0FBQztJQUV4Qzs7O09BR0c7SUFDSCxNQUFNLENBQUMsUUFBa0I7UUFDdkIsT0FBTyxJQUFJLENBQUMsTUFBTTthQUNmLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQzthQUNqQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxRQUErQyxDQUFDLENBQUM7SUFDbkUsQ0FBQztJQUVEOzs7T0FHRztJQUNILFFBQVEsQ0FBNkIsS0FBa0I7UUFDckQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDeEIsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsR0FBRyxDQUFDLFFBQTZDO1FBQy9DLElBQUksQ0FBQyxRQUFRLENBQUM7WUFDWixNQUFNLEVBQUUsR0FBRyxFQUFFLENBQUMsSUFBSTtZQUNsQixRQUFRO1NBQ1QsQ0FBQyxDQUFDO1FBRUgsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILEVBQUUsQ0FBNkIsS0FBVyxFQUFFLFFBQTJDO1FBQ3JGLElBQUksQ0FBQyxRQUFRLENBQUM7WUFDWixJQUFJLEVBQUUsS0FBSztZQUNYLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRSxFQUFFO2dCQUNuQixJQUFJLEtBQUssS0FBSyxVQUFVLEVBQUUsQ0FBQztvQkFDekIsT0FBTyxJQUFJLENBQUM7Z0JBQ2QsQ0FBQztnQkFFRCxJQUFJLEtBQUssS0FBSyxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUM7b0JBQzVCLE9BQU8sSUFBSSxDQUFD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