Allow setting auth strategy in login command

Author: calebkiage

src/Commands/Authentication/LoginCommand.cs

@@ -1,26 +1,32 @@
 using Microsoft.Graph.Cli.Authentication;
+using Microsoft.Graph.Cli.Utils;
 using System.CommandLine;
 using System.CommandLine.Invocation;
 
 namespace Microsoft.Graph.Cli.Commands.Authentication;
 
 class LoginCommand
 {
-    private IAuthenticationService authenticationService;
+    private AuthenticationServiceFactory authenticationServiceFactory;
 
-    public LoginCommand(IAuthenticationService authenticationService) {
-        this.authenticationService = authenticationService;
+    public LoginCommand(AuthenticationServiceFactory authenticationServiceFactory) {
+        this.authenticationServiceFactory = authenticationServiceFactory;
     }
 
-    public Command Build() {
+    public Command Build(bool persistToken = false) {
         var loginCommand = new Command("login", "Login and store the session for use in subsequent commands");
         var scopes = new Option<string>("--scopes", "The login scopes e.g. User.Read");
         scopes.IsRequired = true;
         scopes.Arity = ArgumentArity.OneOrMore;
         loginCommand.AddOption(scopes);
-        loginCommand.Handler = CommandHandler.Create<string[]>(async (scopes) =>
+
+        var strategy = new Option<AuthenticationStrategy>("--strategy", () => Constants.defaultAuthStrategy, "The authentication strategy to use.");
+        loginCommand.AddOption(strategy);
+
+        loginCommand.Handler = CommandHandler.Create<string[], AuthenticationStrategy>(async (scopes, strategy) =>
         {
-            await this.authenticationService.LoginAsync(scopes);
+            var authService = await this.authenticationServiceFactory.GetAuthenticationServiceAsync(strategy, persistToken);
+            await authService.LoginAsync(scopes);
         });
 
         return loginCommand;

src/Program.cs

@@ -24,9 +24,8 @@ static async Task<int> Main(string[] args) {
             var rootCommand = client.BuildCommand();
             rootCommand.Description = "Microsoft Graph CLI";
 
-            var authenticationService = await authServiceFactory.GetAuthenticationServiceAsync(authStrategy, persistToken);
-            var loginCommand = new LoginCommand(authenticationService);
-            rootCommand.AddCommand(loginCommand.Build());
+            var loginCommand = new LoginCommand(authServiceFactory);
+            rootCommand.AddCommand(loginCommand.Build(persistToken));
             return await rootCommand.InvokeAsync(args);
         }
     }

src/utils/Constants.cs

@@ -1,3 +1,5 @@
+using Microsoft.Graph.Cli.Authentication;
+
 namespace Microsoft.Graph.Cli.Utils
 {
     class Constants
@@ -6,6 +8,8 @@ class Constants
 
         public const string TokenCacheName = "MicrosoftGraph";
 
+        public const AuthenticationStrategy defaultAuthStrategy = AuthenticationStrategy.DeviceCode;
+
         public const string ClientId = "f645f5f8-2332-496d-9d85-e714b1192f0c";
 
         public const string TenantId = "39aafea4-2975-4790-9c07-e616c1c35d99";