Merge pull request #1805 from OfficeDev/v-mfurquan/Graph-activity-feed-manifest-icons-Fixes

Graph Activity Feed- Build App Package Icons Fixes For TTK

Author: Harikrishnan-MSFT

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

@@ -93,14 +93,14 @@ public async Task<ActionResult> SendNotificationToUser(TaskDetails taskDetails)
             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 @@ public async Task<ActionResult> SendNotificationToUser(TaskDetails taskDetails)
                     {
                         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 @@ await graphClient.Users["{userId}"].Teamwork
                         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 @@ public async Task<ActionResult> SendNotificationToGroupChat(TaskDetails taskDeta
                     Recipient = new AadUserNotificationRecipient
                     {
                         OdataType = "microsoft.graph.aadUserNotificationRecipient",
-                        UserId = "{userId}",
+                        UserId = _configuration["AzureAd:UserId"],
                     },
                     TemplateParameters = new List<KeyValuePair>
                     {
@@ -233,7 +233,7 @@ await graphClient.Chats[taskDetails.chatId]
                     Recipient = new AadUserNotificationRecipient
                     {
                         OdataType = "microsoft.graph.aadUserNotificationRecipient",
-                        UserId = "{userid}",
+                        UserId = _configuration["AzureAd:UserId"],
                     },
                     TemplateParameters = new List<KeyValuePair>
                     {
@@ -378,7 +378,7 @@ await graphClientApp.Teams[taskDetails.teamId]
                     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": {