Add environment login.

Update changelog.

Author: calebkiage

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- Add Environment login. Client secret login and certificate file login are now possible with this new strategy.
+
+### Changed
+- Update login command help text.
+- Fix a bug where the CLI didn't send the Content-Type header when sending requests with bodies.
+
 ## [0.2.0-preview.1] - 2023-02-27
 
 ### Added

src/Program.cs

@@ -41,12 +41,7 @@ class Program
     {
         static async Task<int> Main(string[] args)
         {
-            var customCommands = new List<Command>();
-            customCommands.Add(new LoginCommand().Build());
-            customCommands.Add(new LogoutCommand().Build());
-
-
-            var builder = BuildCommandLine(customCommands)
+            var builder = BuildCommandLine()
                 .UseDefaults()
                 .UseHost(a =>
                 {
@@ -75,7 +70,7 @@ static async Task<int> Main(string[] args)
             {
                 var host = ic.GetHost();
 
-                ic.BindingContext.AddService(_ => host.Services.GetRequiredService<IAuthenticationCacheUtility>());
+                ic.BindingContext.AddService(_ => host.Services.GetRequiredService<IAuthenticationCacheManager>());
                 ic.BindingContext.AddService(_ => host.Services.GetRequiredService<AuthenticationServiceFactory>());
                 // Needed by LogoutCommand
                 ic.BindingContext.AddService(_ => host.Services.GetRequiredService<LogoutService>());
@@ -115,7 +110,7 @@ static async Task<int> Main(string[] args)
             return await parser.InvokeAsync(args);
         }
 
-        static CommandLineBuilder BuildCommandLine(IEnumerable<Command> commands)
+        static CommandLineBuilder BuildCommandLine()
         {
             var rootCommand = new GraphClient().BuildRootCommand();
             rootCommand.Description = "Microsoft Graph CLI";
@@ -125,12 +120,11 @@ static CommandLineBuilder BuildCommandLine(IEnumerable<Command> commands)
             // --debug for configs.
             rootCommand.TreatUnmatchedTokensAsErrors = false;
 
-            foreach (var command in commands)
-            {
-                rootCommand.AddCommand(command);
-            }
+            var builder = new CommandLineBuilder(rootCommand);
+            rootCommand.AddCommand(new LoginCommand(builder));
+            rootCommand.AddCommand(new LogoutCommand());
 
-            return new CommandLineBuilder(rootCommand);
+            return builder;
         }
 
         static IHostBuilder CreateHostBuilder(string[] args) =>
@@ -188,13 +182,13 @@ static IHostBuilder CreateHostBuilder(string[] args) =>
                     return new HttpClientRequestAdapter(authProvider, httpClient: client);
                 });
                 services.AddSingleton<IPathUtility, PathUtility>();
-                services.AddSingleton<IAuthenticationCacheUtility, AuthenticationCacheUtility>();
+                services.AddSingleton<IAuthenticationCacheManager, AuthenticationCacheManager>();
                 services.AddSingleton<LogoutService>();
                 services.AddSingleton<AuthenticationServiceFactory>(p =>
                 {
                     var authSettings = p.GetRequiredService<IOptions<AuthenticationOptions>>()?.Value;
                     var pathUtil = p.GetRequiredService<IPathUtility>();
-                    var cacheUtil = p.GetRequiredService<IAuthenticationCacheUtility>();
+                    var cacheUtil = p.GetRequiredService<IAuthenticationCacheManager>();
                     return new AuthenticationServiceFactory(pathUtil, cacheUtil, authSettings);
                 });
             }).ConfigureLogging((ctx, logBuilder) =>
@@ -214,7 +208,7 @@ static void ConfigureAppConfiguration(IConfigurationBuilder builder, string[] ar
             builder.Sources.Clear();
             builder.AddJsonFile(Path.Combine(System.AppContext.BaseDirectory, "app-settings.json"), optional: true);
             var pathUtil = new PathUtility();
-            var authCache = new AuthenticationCacheUtility(pathUtil);
+            var authCache = new AuthenticationCacheManager(pathUtil);
             var dataDir = pathUtil.GetApplicationDataDirectory();
             var userConfigPath = Path.Combine(dataDir, "settings.json");
             builder.AddJsonFile(userConfigPath, optional: true);

src/msgraph-cli.csproj

@@ -7,7 +7,7 @@
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AssemblyName>mgc</AssemblyName>
-    <Version>0.2.0-preview.1</Version>
+    <Version>0.3.0-preview.1</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Graph.Cli.Core" Version="0.1.8-preview.1" />
+    <PackageReference Include="Microsoft.Graph.Cli.Core" Version="0.2.0-preview.1" />
     <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
   </ItemGroup>
 </Project>