For new and portable installations, make user config optional

Author: calebkiage

msgraph-cli-core

@@ -36,11 +36,11 @@ static async Task<int> Main(string[] args)
             ConfigureAppConfiguration(configBuilder);
             var config = configBuilder.Build();
 
-            var authSettings = config.GetRequiredSection(Constants.AuthenticationSection).Get<AuthenticationOptions>();
-            var authServiceFactory = new AuthenticationServiceFactory();
+            var authSettings = config.GetSection(Constants.AuthenticationSection).Get<AuthenticationOptions>();
+            var authServiceFactory = new AuthenticationServiceFactory(new PathUtility());
             var authStrategy = AuthenticationStrategy.DeviceCode;
 
-            var credential = await authServiceFactory.GetTokenCredentialAsync(authStrategy, authSettings.TenantId, authSettings.ClientId);
+            var credential = await authServiceFactory.GetTokenCredentialAsync(authStrategy, authSettings?.TenantId, authSettings?.ClientId);
             var authProvider = new AzureIdentityAuthenticationProvider(credential);
             var defaultHandlers = KiotaClientFactory.CreateDefaultHandlers();
 
@@ -90,9 +90,7 @@ static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder().ConfigureHostConfiguration((configHost) => {
                 configHost.SetBasePath(Directory.GetCurrentDirectory());
             }).ConfigureAppConfiguration((ctx, config) => {
-                var env = ctx.HostingEnvironment;
                 ConfigureAppConfiguration(config);
-                config.AddJsonFile($"app-settings.{env.EnvironmentName}.json", optional: true, true);
             }).ConfigureServices((ctx, services) => {
                 var authSection = ctx.Configuration.GetSection(Constants.AuthenticationSection);
                 services.Configure<AuthenticationOptions>(authSection);
@@ -101,10 +99,10 @@ static IHostBuilder CreateHostBuilder(string[] args) =>
 
         static void ConfigureAppConfiguration(IConfigurationBuilder builder) {
             builder.Sources.Clear();
-            builder.AddJsonFile("app-settings.json", optional: true);
-            var home = new PathUtility().GetUserHomeDirectory();
-            var userConfigPath = Path.Combine(home, Constants.ApplicationDataDirectory, "settings.json");
-            builder.AddJsonFile(userConfigPath);
+            builder.AddJsonFile("app-settings.json", optional: false);
+            var dataDir = new PathUtility().GetApplicationDataDirectory();
+            var userConfigPath = Path.Combine(dataDir, "settings.json");
+            builder.AddJsonFile(userConfigPath, optional: true);
             builder.AddEnvironmentVariables(prefix: "MGC_");
         }
     }

src/Program.cs

@@ -1,4 +1,8 @@
 {
+    "Authentication": {
+        "ClientId": "f645f5f8-2332-496d-9d85-e714b1192f0c",
+        "TenantId": "39aafea4-2975-4790-9c07-e616c1c35d99"
+    },
     "Logging": {
         "LogLevel": {
             "Default": "Warning"