Graph Activity Feed- Build App Package Icons Fixes For TTK

samples/graph-activity-feed/csharp/ActivityFeedNotification/Controllers/HomeController.cs

@@ -87,20 +87,20 @@
                 Console.WriteLine(ex);
             }
 
             var installationId = "";
 
 
             if (taskDetails.taskInfoAction == "customTopic")
             {
                 ChatMessageHelper chatMessage = new ChatMessageHelper(_configuration);
-                var getChannelMessage = await chatMessage.CreateChatMessageForChannel(taskDetails, taskDetails.access_token);
+                //var getChannelMessage = await chatMessage.CreateChatMessageForChannel(taskDetails, taskDetails.access_token);
                 var requestBody = new Microsoft.Graph.Beta.Users.Item.Teamwork.SendActivityNotification.SendActivityNotificationPostRequestBody
                 {
                     Topic = new TeamworkActivityTopic
                     {
                         Source = TeamworkActivityTopicSource.Text,
                         Value = "Deployment Approvals Channel",
-                        WebUrl = getChannelMessage.WebUrl
+                        WebUrl = "https://teams.microsoft.com/l/entity/" + _configuration["AzureAd:MicrosoftAppId"]
                     },
                     ActivityType = "taskCreated",
                     PreviewText = new ItemBody
@@ -111,15 +111,15 @@
                     {
                         new Microsoft.Graph.Beta.Models.KeyValuePair
                         {
-                            Name = "taskId",
-                            Value = "12322",
+                            Name = "taskName",
+                            Value = taskDetails.taskName ?? "New Task",
                         },
                     },
                     IconId = "taskCreatedId"
                 };
                 try
                 {
-                    await graphClient.Users["{userId}"].Teamwork
+                    await graphClient.Users[_configuration["AzureAd:UserId"]].Teamwork
                         .SendActivityNotification.PostAsync(requestBody);
                 }
                 catch (Exception ex)
@@ -148,14 +148,14 @@
                         new KeyValuePair
                         {
                             Name = "taskName",
-                            Value = "12322",
+                            Value = taskDetails.taskName ?? "New Task",
                         },
                     },
                     IconId = "taskCreatedId"
                 };
                 try
                 {
-                    await graphClient.Users["{userId}"].Teamwork
+                    await graphClient.Users[_configuration["AzureAd:UserId"]].Teamwork
                         .SendActivityNotification.PostAsync(requestBody);
                 }
                 catch (Exception ex)
@@ -194,7 +194,7 @@
                     Recipient = new AadUserNotificationRecipient
                     {
                         OdataType = "microsoft.graph.aadUserNotificationRecipient",
-                        UserId = "{userId}",
+                        UserId = _configuration["AzureAd:UserId"],
                     },
                     TemplateParameters = new List<KeyValuePair>
                     {
@@ -233,7 +233,7 @@
                     Recipient = new AadUserNotificationRecipient
                     {
                         OdataType = "microsoft.graph.aadUserNotificationRecipient",
-                        UserId = "{userid}",
+                        UserId = _configuration["AzureAd:UserId"],
                     },
                     TemplateParameters = new List<KeyValuePair>
                     {
@@ -378,7 +378,7 @@
                     Recipient = new AadUserNotificationRecipient
                     {
                         OdataType = "microsoft.graph.aadUserNotificationRecipient",
-                        UserId = "{userId}",
+                        UserId = _configuration["AzureAd:UserId"],
                     },
                     TemplateParameters = new List<KeyValuePair>
                     {

samples/graph-activity-feed/csharp/ActivityFeedNotification/appsettings.json

@@ -1,12 +1,13 @@
 {
   "AzureAd": {
     "Instance": "https://login.microsoftonline.com/",
-    "TenantId": "common",
+    "TenantId": "{TENANT_ID}",
     "MicrosoftAppId": "",
     "MicrosoftAppPassword": "",
     "ApplicationIdURI": "api://{Base_URL}/{MicrosoftAppId}",
     "AuthUrl": "/oauth2/v2.0/token",
-    "ValidIssuers": "https://login.microsoftonline.com/TENANT_ID/v2.0,https://sts.windows.net/TENANT_ID/"
+    "ValidIssuers": "https://login.microsoftonline.com/TENANT_ID/v2.0,https://sts.windows.net/TENANT_ID/",
+    "UserId": ""
   },
   "Logging": {
     "LogLevel": {

samples/graph-activity-feed/csharp/README.md

@@ -192,11 +192,19 @@ Teams Activity feed notification API uses activity to which user want a notifica
 
 ## Running the sample
 
-![image](Images/TeamsNotification.png)
+![image](Images/1.PersonalNotfication.png)
+
+![image](Images/2.ActivityNotificationForUser.png)
+
+![image](Images/3.GroupChatCustom.png)
+
+![image](Images/4.NotificationInGroupChat.png)
+
+![image](Images/5.TeamsNotification.png)
 
 - Notification triggred by Tab App will appear in Teams Activity Feed
 
-![image](Images/ActivityFeedNotification.png)
+![image](Images/6.ActivityFeedNotification.png)
 
 
 **Custom Activity Icons**

samples/graph-activity-feed/nodejs/.env

@@ -1,4 +1,7 @@
-ClientId = 
-ClientSecret = 
-TenantId = 
-AllowedHosts = *
+ClientId=
+ClientSecret=
+TenantId=
+AllowedHosts=*
+applicationIdUri=
+UserId=
+TeamsAppId=

samples/graph-activity-feed/nodejs/aad.manifest.json

@@ -51,6 +51,10 @@
                 {
                     "id": "TeamsTab.Read.All",
                     "type": "Scope"
+                },
+                {
+                    "id": "Directory.Read.All",
+                    "type": "Role"
                 }
             ]
         }
@@ -130,7 +134,15 @@
             "type": "Spa"
         },
         {
-            "url": "${{TAB_ENDPOINT}}/auth-end",
+            "url": "${{TAB_ENDPOINT}}/UserNotification",
+            "type": "Spa"
+        },
+        {
+            "url": "${{TAB_ENDPOINT}}/GroupChatNotification",
+            "type": "Spa"
+        },
+        {
+            "url": "${{TAB_ENDPOINT}}/TeamNotification",
             "type": "Spa"
         }
     ]

samples/graph-activity-feed/nodejs/appManifest/manifest.json

@@ -68,7 +68,10 @@
       {
         "type": "deploymentApprovalRequired",
         "description": "New deployment requires your approval",
-        "templateText": "New deployment requires your approval with {deploymentId}"
+        "templateText": "New deployment requires your approval with {deploymentId}",
+        "allowedIconIds": [
+          "deploymentApprovalRequiredId"
+        ]
       },
       {
         "type": "approvalRequired",
@@ -100,6 +103,10 @@
         "id": "taskCreatedId",
         "iconFile": "exclaim.png"
       },
+      {
+        "id": "deploymentApprovalRequiredId",
+        "iconFile": "deploymentApprovalRequired.png"
+      },
       {
         "id": "approvalRequiredId",
         "iconFile": "approvalRequired.png"

samples/graph-activity-feed/nodejs/build-app-package.js

@@ -0,0 +1,61 @@
+const fs = require('fs');
+const path = require('path');
+const archiver = require('archiver');
+
+// Create build directory if it doesn't exist
+const buildDir = path.join(__dirname, 'appManifest', 'build');
+if (!fs.existsSync(buildDir)) {
+    fs.mkdirSync(buildDir, { recursive: true });
+}
+
+// Read the manifest file
+const manifestPath = path.join(__dirname, 'appManifest', 'manifest.json');
+const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
+
+// Replace environment variables in manifest
+const envReplacements = {
+    '{{TEAMS_APP_ID}}': process.env.TEAMS_APP_ID || 'placeholder-teams-app-id',
+    '{{TAB_DOMAIN}}': process.env.TAB_DOMAIN || 'placeholder-domain',
+    '{{AAD_APP_CLIENT_ID}}': process.env.AAD_APP_CLIENT_ID || 'placeholder-client-id',
+    '{{TEAMSFX_ENV}}': process.env.TEAMSFX_ENV || 'local'
+};
+
+let manifestString = JSON.stringify(manifest, null, 2);
+Object.entries(envReplacements).forEach(([placeholder, value]) => {
+    manifestString = manifestString.replace(new RegExp(`\\$\\{\\{${placeholder.slice(2, -2)}\\}\\}`, 'g'), value);
+});
+
+// Write the processed manifest
+const outputManifestPath = path.join(buildDir, `manifest.${process.env.TEAMSFX_ENV || 'local'}.json`);
+fs.writeFileSync(outputManifestPath, manifestString);
+
+// Create the zip file
+const outputZipPath = path.join(buildDir, `appManifest.${process.env.TEAMSFX_ENV || 'local'}.zip`);
+const output = fs.createWriteStream(outputZipPath);
+const archive = archiver('zip', { zlib: { level: 9 } });
+
+output.on('close', () => {
+    console.log(`App package created: ${outputZipPath} (${archive.pointer()} total bytes)`);
+});
+
+archive.on('error', (err) => {
+    throw err;
+});
+
+archive.pipe(output);
+
+// Add manifest file
+archive.file(outputManifestPath, { name: 'manifest.json' });
+
+// Add all PNG files from appManifest directory
+const appManifestDir = path.join(__dirname, 'appManifest');
+const files = fs.readdirSync(appManifestDir);
+files.forEach(file => {
+    if (file.endsWith('.png')) {
+        const filePath = path.join(appManifestDir, file);
+        archive.file(filePath, { name: file });
+        console.log(`Added icon: ${file}`);
+    }
+});
+
+archive.finalize();

samples/graph-activity-feed/nodejs/m365agents.local.yml

@@ -59,13 +59,11 @@ provision:
       # Path to manifest template
       manifestPath: ./appManifest/manifest.json
 
-  # Build Teams app package with latest env value
-  - uses: teamsApp/zipAppPackage
+  # Build Teams app package manually to ensure all icons are included
+  - uses: cli/runNpmCommand
     with:
-      # Path to manifest template
-      manifestPath: ./appManifest/manifest.json
-      outputZipPath: ./appManifest/build/appManifest.${{TEAMSFX_ENV}}.zip
-      outputJsonPath: ./appManifest/build/manifest.${{TEAMSFX_ENV}}.json
+      workingDirectory: .
+      args: run build:app-package
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with: