Merge pull request #1608 from OfficeDev/dev

chore: merge dev into main (samples)

Author: wh-alice

.config/samples-config-v3.json

@@ -735,27 +735,6 @@
                 "dir": "samples/msgext-link-unfurling-reddit/nodejs"
             }
         },
-        {
-            "id": "intelligent-data-chart-generator",
-            "shortId": "data-chart-generator",
-            "onboardDate": "2024-01-31",
-            "title": "Intelligent Data Chart Generator",
-            "shortDescription": "The Microsoft Teams Tab app, powered by Azure OpenAI, interprets user inputs to generate data charts from Azure SQL.",
-            "fullDescription": "This intelligent Microsoft Teams Tab app is powered by Azure OpenAI, which helps users generating data charts based on users' description of the data chart in human language. There is an input box where users tell the Tab app what data chart they want to generate, and the app interprets user's requirements then generate visual charts. The data is from Azure SQL. This sample demonstrates how to build a seamless and intuitive experience for accessing and interpreting data.",
-            "types": [
-              "Tab"
-            ],
-            "tags": [
-              "Tab",
-              "TS",
-              "Azure Functions"
-            ],
-            "time": "30 mins to run",
-            "configuration": "Manual configurations required",
-            "thumbnailPath": "assets/thumbnail.png",
-            "gifPath": "assets/sampleDemo.gif",
-            "suggested": false
-        },
         {
             "id": "bot-sso-docker",
             "shortId": "bot-sso-docker",

large-scale-notification/README.md

@@ -54,7 +54,7 @@ This sample demonstrates the architecture of a Teams notfication bot app created
 Since there are usually at most 25 users in Microsoft 365 E3/E5 subscription in a tenant, duplicate the installation data can be used to mock a large amount of users.
 
 1. Copy the value of `STORAGE_ACCOUNT_NAME` in `env/.env.dev` and paste it to variable `storageAccount` in `script/mockInstallationData.ts`.
-2. Please ensure you are logged into the Azure account used for deploying the app.
+2. Please ensure you are logged into the Azure account used for deploying the app and set environment variable `AZURE_TOKEN_CREDENTIALS` to `dev`.
 3. Run command in project root folder: `npx ts-node script/mockInstallationData.ts`.
 4. Update `storageTableName` in `src/internal/initialize.ts` to `installationMockTableName`.
 5. Deploy the code to Azure Function by selecting `Deploy` from the Microsoft 365 Agents Toolkit sidebar. Your app should now use the mock data.

large-scale-notification/package.json

@@ -25,7 +25,7 @@
   "dependencies": {
     "@azure/data-tables": "^13.2.2",
     "@azure/functions": "^4.6.0",
-    "@azure/identity": "^4.4.1",
+    "@azure/identity": "^4.13.0",
     "@azure/service-bus": "^7.9.0",
     "@microsoft/agents-activity": "^0.4.3",
     "@microsoft/agents-hosting": "^0.4.3",

large-scale-notification/script/mockInstallationData.ts

@@ -6,18 +6,20 @@ const storageTableName = "installation";
 const installationMockTableName = "installationmock";
 
 async function copy() {
-  const credential = new DefaultAzureCredential();
+  const credential = new DefaultAzureCredential({
+    requiredEnvVars: ["AZURE_TOKEN_CREDENTIALS"],
+  });
 
   const originInstallationTableClient = new TableClient(
     `https://${storageAccount}.table.core.windows.net`,
     `${storageTableName}`,
-    credential
+    credential,
   );
 
   const mockInstallationTableClient = new TableClient(
     `https://${storageAccount}.table.core.windows.net`,
     `${installationMockTableName}`,
-    credential
+    credential,
   );
 
   const pages = await originInstallationTableClient

large-scale-notification/src/functions/durableFunctionHttpTrigger.ts

@@ -1,13 +1,13 @@
-import * as df from "durable-functions";
-import { DefaultAzureCredential } from "@azure/identity";
-import {
+import {
   app,
   HttpHandler,
   HttpRequest,
   HttpResponse,
   InvocationContext,
 } from "@azure/functions";
+import { ManagedIdentityCredential } from "@azure/identity";
 import { ServiceBusAdministrationClient } from "@azure/service-bus";
+import * as df from "durable-functions";
 import {
   managedIdentityId,
   serviceBusMessageQueueName,
@@ -16,18 +16,18 @@ import {
 
 const durableHttpStart: HttpHandler = async (
   request: HttpRequest,
-  context: InvocationContext
+  context: InvocationContext,
 ): Promise<HttpResponse> => {
   const client = df.getClient(context);
-  const credential = new DefaultAzureCredential({
-    managedIdentityClientId: managedIdentityId,
+  const credential = new ManagedIdentityCredential({
+    clientId: managedIdentityId,
   });
   const sbAdminClient = new ServiceBusAdministrationClient(
     `${serviceBusNamespace}.servicebus.windows.net`,
-    credential
+    credential,
   );
   let queueRuntimeProperties = await sbAdminClient.getQueueRuntimeProperties(
-    serviceBusMessageQueueName
+    serviceBusMessageQueueName,
   );
   const instanceId = await client.startNew("sendNotifications", {
     instanceId: undefined,

large-scale-notification/src/functions/enqueueTasksForInstallationsActivity.ts

@@ -8,8 +8,8 @@ import { ActivityHandler } from "durable-functions";
 import { chunk } from "lodash";
 import { DateTime } from "luxon";
 
-import { DefaultAzureCredential } from "@azure/identity";
 import { InvocationContext } from "@azure/functions";
+import { ManagedIdentityCredential } from "@azure/identity";
 import {
   ServiceBusAdministrationClient,
   ServiceBusClient,
@@ -31,29 +31,28 @@ import { extractKeyDataFromConversationReference } from "../util";
 
 const enqueueTasksForInstallationsActivity: ActivityHandler = async (
   triggerInput: any,
-  context: InvocationContext
+  context: InvocationContext,
 ): Promise<{ sendStatus: SendStatus; continuationToken: string }> => {
   const input = triggerInput as {
     continuationToken: string;
     sendStatus: SendStatus;
   };
-  const credential = new DefaultAzureCredential({
-    managedIdentityClientId: managedIdentityId,
+  const credential = new ManagedIdentityCredential({
+    clientId: managedIdentityId,
   });
   let token = input.continuationToken;
   let installations: TeamsBotInstallation[] = [];
   let lastSendTime: Date = undefined;
   let newStatus = { ...input.sendStatus };
   for (let iter = 0; iter < iterateTime; iter++) {
     context.warn(
-      `${new Date().toISOString()} #${iter} [enqueueTasksForInstallationsActivity] continue ${token}`
+      `${new Date().toISOString()} #${iter} [enqueueTasksForInstallationsActivity] continue ${token}`,
+    );
+    const installationResult = await notificationApp.getPagedInstallations(
+      maxPageSize,
+      token,
+      false,
     );
-    const installationResult =
-      await notificationApp.getPagedInstallations(
-        maxPageSize,
-        token,
-        false
-      );
     installations = installationResult.data;
     token = installationResult.continuationToken;
 
@@ -64,13 +63,13 @@ const enqueueTasksForInstallationsActivity: ActivityHandler = async (
     context.warn(
       `${new Date().toISOString()} #${iter} [enqueueTasksForInstallationsActivity] found ${
         installations.length
-      } installations`
+      } installations`,
     );
     newStatus.totalMessageCount += installations.length;
 
     const sbClient = new ServiceBusClient(
       `${serviceBusNamespace}.servicebus.windows.net`,
-      credential
+      credential,
     );
     const sender = sbClient.createSender(serviceBusMessageQueueName);
     const chunks = chunk(installations, RPS * batchSendingInterval);
@@ -79,8 +78,8 @@ const enqueueTasksForInstallationsActivity: ActivityHandler = async (
       for (const conversation of chunk) {
         const messageBody = JSON.stringify(
           extractKeyDataFromConversationReference(
-            conversation.conversationReference
-          )
+            conversation.conversationReference,
+          ),
         );
         if (!batch.tryAddMessage({ body: messageBody })) {
           // if it can't be added to the batch, the message is probably too big to fit in a batch
@@ -95,12 +94,12 @@ const enqueueTasksForInstallationsActivity: ActivityHandler = async (
           .plus({ second: batchSendingInterval })
           .toJSDate();
         context.warn(
-          `[enqueueTasksForInstallationsActivity] ${new Date().toISOString()} next enqueue time ${nextEnqueueTime.toISOString()}`
+          `[enqueueTasksForInstallationsActivity] ${new Date().toISOString()} next enqueue time ${nextEnqueueTime.toISOString()}`,
         );
         if (nextEnqueueTime > new Date()) {
           const waitMs = nextEnqueueTime.getTime() - new Date().getTime();
           context.warn(
-            `[enqueueTasksForInstallationsActivity] wait to ${nextEnqueueTime.toISOString()}, ${waitMs} ms`
+            `[enqueueTasksForInstallationsActivity] wait to ${nextEnqueueTime.toISOString()}, ${waitMs} ms`,
           );
           await new Promise((r) => setTimeout(r, waitMs));
         }
@@ -110,13 +109,13 @@ const enqueueTasksForInstallationsActivity: ActivityHandler = async (
       context.warn(
         `[enqueueTasksForInstallationsActivity] ${lastSendTime.toISOString()} sending ${
           chunk[0].conversationReference.user.id
-        }`
+        }`,
       );
       await sender.sendMessages(batch);
       context.warn(
         `[enqueueTasksForInstallationsActivity] sent task to queue ${
           chunk[0].conversationReference.user.id
-        }, cost ${new Date().getTime() - lastSendTime.getTime()} ms}`
+        }, cost ${new Date().getTime() - lastSendTime.getTime()} ms}`,
       );
     }
 
@@ -127,13 +126,13 @@ const enqueueTasksForInstallationsActivity: ActivityHandler = async (
 
   const sbAdminClient = new ServiceBusAdministrationClient(
     `${serviceBusNamespace}.servicebus.windows.net`,
-    credential
+    credential,
   );
   const runtimeProperties = await sbAdminClient.getQueueRuntimeProperties(
-    serviceBusMessageQueueName
+    serviceBusMessageQueueName,
   );
   context.warn(
-    `[enqueueTasksForInstallationsActivity] active messages: ${runtimeProperties.activeMessageCount}`
+    `[enqueueTasksForInstallationsActivity] active messages: ${runtimeProperties.activeMessageCount}`,
   );
   newStatus.sentMessageCount =
     newStatus.totalMessageCount - runtimeProperties.activeMessageCount;

large-scale-notification/src/functions/waitSendingFinishActivity.ts

@@ -11,8 +11,8 @@
 import * as df from "durable-functions";
 import { ActivityHandler } from "durable-functions";
 
-import { DefaultAzureCredential } from "@azure/identity";
 import { InvocationContext } from "@azure/functions";
+import { ManagedIdentityCredential } from "@azure/identity";
 import { ServiceBusAdministrationClient } from "@azure/service-bus";
 
 import {
@@ -24,27 +24,27 @@ import { SendStatus } from "../types/sendStatus";
 
 const waitSendingFinishActivity: ActivityHandler = async (
   triggerInput: any,
-  context: InvocationContext
+  context: InvocationContext,
 ): Promise<SendStatus> => {
-  const credential = new DefaultAzureCredential({
-    managedIdentityClientId: managedIdentityId,
+  const credential = new ManagedIdentityCredential({
+    clientId: managedIdentityId,
   });
   const input = triggerInput as SendStatus;
   const sbAdminClient = new ServiceBusAdministrationClient(
     `${serviceBusNamespace}.servicebus.windows.net`,
-    credential
+    credential,
   );
   let runtimeProperties = await sbAdminClient.getQueueRuntimeProperties(
-    serviceBusMessageQueueName
+    serviceBusMessageQueueName,
   );
   context.warn(`[waitSendingFinishActivity] checking.`);
   while (runtimeProperties.activeMessageCount > 0) {
     context.warn(
-      `[waitSendingFinishActivity] active messages: ${runtimeProperties.activeMessageCount}`
+      `[waitSendingFinishActivity] active messages: ${runtimeProperties.activeMessageCount}`,
     );
     await new Promise((r) => setTimeout(r, 5000));
     runtimeProperties = await sbAdminClient.getQueueRuntimeProperties(
-      serviceBusMessageQueueName
+      serviceBusMessageQueueName,
     );
   }
   input.failedMessageCount =

large-scale-notification/src/internal/tableStore.ts

@@ -1,48 +1,57 @@
-import { ConversationReference } from "@microsoft/agents-activity";
-import { DefaultAzureCredential } from "@azure/identity";
 import { TableClient } from "@azure/data-tables";
+import { ManagedIdentityCredential } from "@azure/identity";
+import { ConversationReference } from "@microsoft/agents-activity";
 import { IStorage, PagedData } from "../notification/interface";
 
+import { InstallationReference } from "../types/installationReference";
 import {
   constructConversationReference,
   extractKeyDataFromConversationReference,
 } from "../util";
-import { InstallationReference } from "../types/installationReference";
 
 export class TableStore implements IStorage {
   private readonly client: TableClient;
 
   constructor(
     managedIdentityId: string,
     storageAccountURL: string,
-    storageTableName: string
+    storageTableName: string,
   ) {
-    const credential = new DefaultAzureCredential({
-      managedIdentityClientId: managedIdentityId,
+    const credential = new ManagedIdentityCredential({
+      clientId: managedIdentityId,
     });
 
     this.client = new TableClient(
       `${storageAccountURL}`,
       `${storageTableName}`,
       credential,
-      { allowInsecureConnection: true }
+      { allowInsecureConnection: true },
     );
   }
 
-  public async read(keys: string[]): Promise<{ [key: string]: Partial<ConversationReference> }> {
+  public async read(
+    keys: string[],
+  ): Promise<{ [key: string]: Partial<ConversationReference> }> {
     const results: { [key: string]: Partial<ConversationReference> } = {};
     try {
-      await Promise.all(keys.map(async (key) => {
-        const entity: InstallationReference = await this.client.getEntity(this.hash(key), key);
-        results[key] = constructConversationReference(entity);
-      }));
+      await Promise.all(
+        keys.map(async (key) => {
+          const entity: InstallationReference = await this.client.getEntity(
+            this.hash(key),
+            key,
+          );
+          results[key] = constructConversationReference(entity);
+        }),
+      );
     } catch (e: any) {
       // Optionally handle error
     }
     return results;
   }
 
-  public async write(changes: { [key: string]: Partial<ConversationReference> }): Promise<void> {
+  public async write(changes: {
+    [key: string]: Partial<ConversationReference>;
+  }): Promise<void> {
     /*
      * {
      *   "activityId":"f:4c06e7be-31d2-27d3-2c3f-e2c2ff775e0a",
@@ -79,15 +88,17 @@ export class TableStore implements IStorage {
 
   public async delete(keys: string[]): Promise<void> {
     try {
-      await Promise.all(keys.map(key => this.client.deleteEntity(this.hash(key), key)));
+      await Promise.all(
+        keys.map((key) => this.client.deleteEntity(this.hash(key), key)),
+      );
     } catch (e: unknown) {
       // Optionally handle error
     }
   }
 
   public async list(
     pageSize?: number,
-    continuationToken?: string
+    continuationToken?: string,
   ): Promise<PagedData<Partial<ConversationReference>>> {
     const entities = await this.client
       .listEntities()