Graph RSC C# Sample SDK Updates and Fixes

samples/graph-rsc/csharp/M365Agent/aad.manifest.json

@@ -27,6 +27,10 @@
         {
           "id": "TeamsAppInstallation.ReadForUser.All",
           "type": "Role"
+        },
+        {
+          "id": "TeamsActivity.Send",
+          "type": "Role"
         }
       ]
     }

samples/graph-rsc/csharp/M365Agent/build/aad.manifest.local.json

@@ -0,0 +1,121 @@
+{
+    "id": "72c97357-4670-4e63-a1a7-ed21a2dde867",
+    "appId": "e5aabd5f-b79b-4e60-8dc3-090af1fa3ad2",
+    "name": "graph-rsc-aad",
+    "accessTokenAcceptedVersion": 2,
+    "signInAudience": "AzureADMultipleOrgs",
+    "optionalClaims": {
+        "idToken": [],
+        "accessToken": [
+            {
+                "name": "idtyp",
+                "source": null,
+                "essential": false,
+                "additionalProperties": []
+            }
+        ],
+        "saml2Token": []
+    },
+    "requiredResourceAccess": [
+        {
+            "resourceAppId": "00000003-0000-0000-c000-000000000000",
+            "resourceAccess": [
+                {
+                    "id": "e1fe6dd8-ba31-4d61-89e7-88639da4683d",
+                    "type": "Scope"
+                },
+                {
+                    "id": "9ce09611-f4f7-4abd-a629-a05450422a97",
+                    "type": "Role"
+                },
+                {
+                    "id": "a267235f-af13-44dc-8385-c1dc93023186",
+                    "type": "Role"
+                }
+            ]
+        }
+    ],
+    "oauth2Permissions": [
+        {
+            "adminConsentDescription": "Allows Teams to call the app's web APIs as the current user.",
+            "adminConsentDisplayName": "Teams can access app's web APIs",
+            "id": "d51b26ab-b4af-4eb5-b868-4fc2de7c2785",
+            "isEnabled": true,
+            "type": "User",
+            "userConsentDescription": "Enable Teams to call this app's web APIs with the same rights that you have",
+            "userConsentDisplayName": "Teams can access app's web APIs and make requests on your behalf",
+            "value": "access_as_user"
+        }
+    ],
+    "preAuthorizedApplications": [
+        {
+            "appId": "1fec8e78-bce4-4aaf-ab1b-5451cc387264",
+            "permissionIds": [
+                "d51b26ab-b4af-4eb5-b868-4fc2de7c2785"
+            ]
+        },
+        {
+            "appId": "5e3ce6c0-2b1f-4285-8d4b-75ee78787346",
+            "permissionIds": [
+                "d51b26ab-b4af-4eb5-b868-4fc2de7c2785"
+            ]
+        },
+        {
+            "appId": "d3590ed6-52b3-4102-aeff-aad2292ab01c",
+            "permissionIds": [
+                "d51b26ab-b4af-4eb5-b868-4fc2de7c2785"
+            ]
+        },
+        {
+            "appId": "00000002-0000-0ff1-ce00-000000000000",
+            "permissionIds": [
+                "d51b26ab-b4af-4eb5-b868-4fc2de7c2785"
+            ]
+        },
+        {
+            "appId": "bc59ab01-8403-45c6-8796-ac3ef710b3e3",
+            "permissionIds": [
+                "d51b26ab-b4af-4eb5-b868-4fc2de7c2785"
+            ]
+        },
+        {
+            "appId": "0ec893e0-5785-4de6-99da-4ed124e5296c",
+            "permissionIds": [
+                "d51b26ab-b4af-4eb5-b868-4fc2de7c2785"
+            ]
+        },
+        {
+            "appId": "4765445b-32c6-49b0-83e6-1d93765276ca",
+            "permissionIds": [
+                "d51b26ab-b4af-4eb5-b868-4fc2de7c2785"
+            ]
+        },
+        {
+            "appId": "4345a7b9-9a63-4910-a426-35363201d503",
+            "permissionIds": [
+                "d51b26ab-b4af-4eb5-b868-4fc2de7c2785"
+            ]
+        }
+    ],
+    "identifierUris": [
+        "api://localhost:44302/e5aabd5f-b79b-4e60-8dc3-090af1fa3ad2"
+    ],
+    "replyUrlsWithType": [
+        {
+            "url": "https://localhost:44302/auth-end.html",
+            "type": "Web"
+        },
+        {
+            "url": "https://localhost:44302/auth-end.html?clientId=e5aabd5f-b79b-4e60-8dc3-090af1fa3ad2",
+            "type": "Spa"
+        },
+        {
+            "url": "https://localhost:44302/blank-auth-end.html",
+            "type": "Spa"
+        },
+        {
+            "url": "https://localhost:44302/Auth/End",
+            "type": "Spa"
+        }
+    ]
+}

samples/graph-rsc/csharp/M365Agent/env/.env.local

@@ -4,18 +4,3 @@
 TEAMSFX_ENV=local
 
 # Generated during provision, you can also add your own variables. 
-TEAMS_APP_ID=
-AAD_APP_CLIENT_ID=
-AAD_APP_OBJECT_ID=
-AAD_APP_OAUTH2_PERMISSION_ID=
-AAD_APP_TENANT_ID=
-AAD_APP_OAUTH_AUTHORITY_HOST=
-AAD_APP_OAUTH_AUTHORITY=
-TAB_ENDPOINT=
-
-TEAMSFX_M365_USER_NAME=
-
-APP_NAME_SUFFIX=
-TAB_DOMAIN=
-TEAMS_APP_TENANT_ID=
-AAD_APP_ACCESS_AS_USER_PERMISSION_ID=

samples/graph-rsc/csharp/M365Agent/m365agents.yml

@@ -6,4 +6,5 @@ version: v1.2
 additionalMetadata:
   sampleTag: Microsoft-Teams-Samples:graph-rsc-csharp
 
-environmentFolderPath: ./env
+environmentFolderPath: ./env
+projectId: 

samples/graph-rsc/csharp/README.md

@@ -78,7 +78,9 @@ The simplest way to run this sample in Teams is to use Teams Toolkit for Visual
 
 1) Register your app with Microsoft identity platform via the Microsoft Entra ID portal (Microsoft Entra ID app registration)
     - Your app must be registered in the Microsoft Entra ID portal to integrate with the Microsoft identity platform and call Microsoft Graph APIs. See [Register an application with the Microsoft identity platform](https://docs.microsoft.com/graph/auth-register-app-v2). 
-**Note** -  Make sure you have added `TeamsAppInstallation.ReadForUser.All` as Application level 
+**Note** -  Make sure you have added below permissions
+1. `TeamsAppInstallation.ReadForUser.All` as Application level 
+2. `TeamsActivity.Send` as Application level 
 
 2) Clone the repository
    ```bash

samples/graph-rsc/csharp/RSCDemo/Controllers/HomeController.cs

@@ -1,4 +1,10 @@
-using Microsoft.AspNetCore.Mvc;
+// <copyright file="HomeController.cs" company="Microsoft Corporation">
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+// </copyright>
+
+using Azure.Core;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Graph;
 using Microsoft.Identity.Client;
@@ -13,13 +19,13 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using static RSCDemo.Helper.GraphClient;
 
 namespace RSCWithGraphAPI.Controllers
 {
     public class HomeController : Controller
     {
         private readonly IConfiguration _configuration;
-
         public string appId;
 
         public HomeController(IConfiguration configuration)
@@ -79,9 +85,24 @@ private async Task<List<string>> GetPermissionGrants(GraphServiceClient graphCli
             return result.Value.Select(r => r.Permission).ToList();
         }
 
+        /// <summary>
+        /// Get Authenticated Graph Client (fixed for Graph SDK 5+)
+        /// </summary>
+        private async Task<GraphServiceClient> GetAuthenticatedClient()
+        {
+            var accessToken = await GetToken();
+
+            var accessTokenProvider = new SimpleAccessTokenProvider(accessToken);
+
+            var authProvider = new BaseBearerTokenAuthenticationProvider(accessTokenProvider);
+
+            var graphClient = new GraphServiceClient(authProvider);
+
+            return graphClient;
+        }
 
         /// <summary>
-        ///Get Authenticated Client
+        /// Simple Access Token Provider for Graph SDK
         /// </summary>
         public class SimpleAccessTokenProvider : IAccessTokenProvider
         {
@@ -92,21 +113,33 @@ public SimpleAccessTokenProvider(string accessToken)
                 _accessToken = accessToken;
             }
 
-            public Task<string> GetAuthorizationTokenAsync(Uri uri, Dictionary<string, object> context = null, CancellationToken cancellationToken = default)
+            public AllowedHostsValidator AllowedHostsValidator { get; }
+
+            public async Task<string> GetAuthorizationTokenAsync(Uri uri, Dictionary<string, object> additionalAuthenticationContext = null, CancellationToken cancellationToken = default)
             {
-                return Task.FromResult(_accessToken);
+                return _accessToken;
             }
-
-            public AllowedHostsValidator AllowedHostsValidator => new AllowedHostsValidator();
         }
 
-        private async Task<GraphServiceClient> GetAuthenticatedClient()
+        // New helper class to return AccessToken
+        private class SimpleAccessTokenCredential : TokenCredential
         {
-            var accessToken = await GetToken();
-            var tokenProvider = new SimpleAccessTokenProvider(accessToken);
-            var authProvider = new BaseBearerTokenAuthenticationProvider(tokenProvider);
+            private readonly string _accessToken;
+
+            public SimpleAccessTokenCredential(string accessToken)
+            {
+                _accessToken = accessToken;
+            }
+
+            public override AccessToken GetToken(TokenRequestContext requestContext, CancellationToken cancellationToken)
+            {
+                return new AccessToken(_accessToken, DateTimeOffset.UtcNow.AddHours(1));
+            }
 
-            return new GraphServiceClient(authProvider);
+            public override ValueTask<AccessToken> GetTokenAsync(TokenRequestContext requestContext, CancellationToken cancellationToken)
+            {
+                return new ValueTask<AccessToken>(new AccessToken(_accessToken, DateTimeOffset.UtcNow.AddHours(1)));
+            }
         }
 
         /// <summary>
@@ -142,19 +175,18 @@ public async Task<JsonResult> GetInstalledAppList(string reciepientUserId)
                     {
                         // Read and display the response content
                         string responseBody = await response.Content.ReadAsStringAsync();
-
                         var responseData = JsonConvert.DeserializeObject<ResponseData>(responseBody);
                         var installedAppList = responseData.Value;
 
-                        foreach(AppData element in installedAppList)
+                        foreach (AppData element in installedAppList)
                         {
                             if (element.TeamsAppDefinition.DisplayName == "RSC-GraphAPI ")
                             {
                                 appId = element.Id;
                             }
-                        };
+                        }
 
-                        if(appId != null)
+                        if (appId != null)
                         {
                             await SendNotification(reciepientUserId, appId);
                             return Json("Message sent successfully");
@@ -167,13 +199,13 @@ public async Task<JsonResult> GetInstalledAppList(string reciepientUserId)
                     else
                     {
                         Console.WriteLine($"Error: {response.StatusCode}");
-                        return Json("Error occured");
+                        return Json("Error occurred");
                     }
                 }
                 catch (Exception ex)
-                {          
+                {
                     Console.WriteLine($"Error: {ex.Message}");
-                    return Json("Error occured"+ ex.Message);
+                    return Json("Error occurred: " + ex.Message);
                 }
             }
         }
@@ -230,7 +262,7 @@ public async Task<string> SendNotification(string reciepientUserId, string appId
                     else
                     {
                         Console.WriteLine($"Error: {response.StatusCode}");
-                        return "Notification sent";
+                        return "Notification failed";
                     }
                 }
                 catch (Exception ex)

samples/graph-rsc/csharp/RSCDemo/Helper/GraphClient.cs

@@ -0,0 +1,44 @@
+// <copyright file="GraphClient.cs" company="Microsoft Corporation">
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+// </copyright>
+
+using Microsoft.Graph;
+using Microsoft.Kiota.Abstractions.Authentication;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Threading;
+using System;
+
+namespace RSCDemo.Helper
+{
+    public class GraphClient
+    {
+
+        public class SimpleAccessTokenProvider : IAccessTokenProvider
+        {
+            private readonly string _accessToken;
+
+            public SimpleAccessTokenProvider(string accessToken)
+            {
+                _accessToken = accessToken;
+            }
+
+            public Task<string> GetAuthorizationTokenAsync(Uri uri, Dictionary<string, object> context = null, CancellationToken cancellationToken = default)
+            {
+                return Task.FromResult(_accessToken);
+            }
+
+            public AllowedHostsValidator AllowedHostsValidator => new AllowedHostsValidator();
+        }
+
+        public static GraphServiceClient GetGraphClient(string accessToken)
+        {
+            var tokenProvider = new SimpleAccessTokenProvider(accessToken);
+            var authProvider = new BaseBearerTokenAuthenticationProvider(tokenProvider);
+
+            return new GraphServiceClient(authProvider);
+        }
+
+    }
+}

samples/graph-rsc/csharp/RSCDemo/Models/DemoViewModel.cs

@@ -1,8 +1,9 @@
-using Microsoft.Graph;
-using System;
+// <copyright file="DemoViewModel.cs" company="Microsoft Corporation">
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+// </copyright>
+
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace RSCWithGraphAPI.Models
 {

samples/graph-rsc/csharp/RSCDemo/Models/ErrorViewModel.cs

@@ -1,4 +1,7 @@
-using System;
+// <copyright file="ErrorViewModel.cs" company="Microsoft Corporation">
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+// </copyright>
 
 namespace RSCWithGraphAPI.Models
 {

samples/graph-rsc/csharp/RSCDemo/Models/ResponseData.cs

@@ -1,4 +1,9 @@
-using System.Collections.Generic;
+// <copyright file="ResponseData.cs" company="Microsoft Corporation">
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+// </copyright>
+
+using System.Collections.Generic;
 
 namespace RSCWithGraphAPI.Models
 {