Created extension method to inject GraphServiceClient

Author: alrios-ms

Service/GroupMembershipManagement/Common.DependencyInjection/Common.DependencyInjection.csproj

@@ -7,6 +7,10 @@
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.11.0" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Graph" Version="5.24.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
   </ItemGroup>

Service/GroupMembershipManagement/Common.DependencyInjection/ServiceCollectionExtensions.cs

@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Microsoft.Graph;
+using System;
+
+namespace Common.DependencyInjection
+{
+    public static class ServiceCollectionExtensions
+    {
+        public static IServiceCollection AddGraphAPIClient(this IServiceCollection services)
+        {
+            services.AddSingleton((services) =>
+            {
+                var configuration = services.GetService<IConfiguration>();
+                var graphCredentials = services.GetService<IOptions<GraphCredentials>>().Value;
+                var authenticationType = MapStringToAuthenticationType(configuration["GraphAPI:AuthenticationType"]);
+                var credential = FunctionAppDI.CreateAuthenticationProvider(graphCredentials, authenticationType);
+                return new GraphServiceClient(credential);
+            });
+
+            return services;
+        }
+
+        public static AuthenticationType MapStringToAuthenticationType(string input)
+        {
+            if (Enum.TryParse(typeof(AuthenticationType), input, true, out object result))
+            {
+                return (AuthenticationType)result;
+            }
+            else
+            {
+                return AuthenticationType.Unknown;
+            }
+        }
+    }
+}
+

Service/GroupMembershipManagement/Hosts.FunctionBase/CommonStartup.cs

@@ -233,18 +233,5 @@ public string GetValueOrDefault(string key, [CallerFilePath] string callerFile =
         {
             return Environment.GetEnvironmentVariable(key, EnvironmentVariableTarget.Process) ?? string.Empty;
         }
-
-        public AuthenticationType MapStringToAuthenticationType(string input)
-        {
-            if (Enum.TryParse(typeof(AuthenticationType), input, true, out object result))
-            {
-                return (AuthenticationType)result;
-            }
-            else
-            {
-                return AuthenticationType.Unknown;
-            }
-        }
-
     }
 }

Service/GroupMembershipManagement/Hosts/JobTrigger/Function/Startup.cs

@@ -52,15 +52,8 @@ public override void Configure(IFunctionsHostBuilder builder)
                 return new KeyVaultSecret<IJobTriggerService, Guid>(Guid.Parse(configuration["teamsChannelServiceAccountObjectId"]));
             });
 
-            builder.Services.AddSingleton((services) =>
-            {
-                var configuration = services.GetService<IConfiguration>();
-                var graphCredentials = services.GetService<IOptions<GraphCredentials>>().Value;
-                var authenticationType = MapStringToAuthenticationType(configuration["GraphAPI:AuthenticationType"]);
-                var credential = FunctionAppDI.CreateAuthenticationProvider(graphCredentials, authenticationType);
-                return new GraphServiceClient(credential);
-            })
-            .AddScoped<IGraphGroupRepository, GraphGroupRepository>();
+            builder.Services.AddGraphAPIClient();
+            builder.Services.AddScoped<IGraphGroupRepository, GraphGroupRepository>();
 
             builder.Services.AddTransient<ITeamsChannelRepository, TeamsChannelRepository>((services) =>
             {