resolves issue #4

Author: kdcllc

README.md

@@ -43,17 +43,32 @@ To verify the installation run:
 
 ## Usage of Salesforce dotnet cli tool
 
-The regular usage of this tool is within the Salesforce project that utilizes this library and contains configuration settings with the minimum of:
+There are several ways to run this cli tool.
+
+1. From any location with Consumer Key and Secret provided
+
+```bash
+    salesforce get-tokens --key:{key} --secret:{secret} --login:https://login.salesforce.com --verbose:information
+```
+
+2. Running the tool in the directory that contains `appsettings.json` file
+
+```bash
+    salesforce get-tokens --section Salesforce
+```
+Note: required configurations are as follows:
 
 ```json
   "Salesforce": {
     "ClientId": "",
-    "ClientSecret": ""
+    "ClientSecret": "",
+    "LoginUrl": ""
   }
 ````
 
-Or you can specify Azure Key Vault Url:
+3. Running with Azure Vault
 
+`appsettings.json
 ```json
     "AzureVault": {
      "BaseUrl": "https://{name}.vault.azure.net/"

src/AuthApp/Host/HttpServer.cs

@@ -94,7 +94,7 @@ await auth.WebServerAsync(
                         _config.ClientSecret,
                         redirectURI,
                         code,
-                        $"{_config.LoginUrl}{_config.OAuthTokenUri}");
+                        $"{_config.LoginUrl}{_config.OAuthUri}");
 
                     Console.WriteLineFormatted("Access_token = {0}",Color.Green, Color.Yellow, auth.AccessInfo.AccessToken);
                     Console.WriteLineFormatted("Refresh_token = {0}", Color.Green, Color.Yellow, auth.AccessInfo.RefreshToken);
@@ -122,7 +122,7 @@ private int GetRandomUnusedPort()
 
         private string GetAuthorizationUrl(string redirectURI)
         {
-            var authEndpoint = $"{_config.LoginUrl}{_config.OAuthUri}";
+            var authEndpoint = $"{_config.LoginUrl}{_config.OAuthorizeUri}";
             var url = $"{authEndpoint}?response_type=code&access_type=offline&scope=openid%20profile%20api%20refresh_token%20offline_access&redirect_uri={Uri.EscapeDataString(redirectURI)}&client_id={_config.ClientId}";
             return url;
         }

src/AuthApp/Host/SfConfig.cs

@@ -26,8 +26,8 @@ public class SfConfig
         /// <summary>
         /// Default set to /services/oauth2/token.
         /// </summary>
-        public string OAuthTokenUri { get; set; } = "/services/oauth2/token";
+        public string OAuthUri { get; set; } = "/services/oauth2/token";
 
-        public string OAuthUri { get; set; } = "/services/oauth2/authorize";
+        public string OAuthorizeUri { get; set; } = "/services/oauth2/authorize";
     }
 }

src/AuthApp/HostBuilderExtensions.cs

@@ -69,6 +69,21 @@ internal static IHostBuilder CreateDefaultBuilder(HostBuilderOptions options)
                         config.AddAzureKeyVault(hostingEnviromentName:options.HostingEnviroment, options.UseAzureKeyPrefix);
                     }
 
+                    if(!string.IsNullOrWhiteSpace(options.Settings.ClientId)
+                        && !string.IsNullOrWhiteSpace(options.Settings.ClientSecret))
+                    {
+                        var inputValues = new Dictionary<string, string>
+                            {
+                                {$"{options.SectionName}:ClientId", options.Settings.ClientId },
+                                {$"{options.SectionName}:ClientSecret", options.Settings.ClientSecret },
+                                {$"{options.SectionName}:LoginUrl", options.Settings.LoginUrl },
+                                {$"{options.SectionName}:OAuthUri", options.Settings.OAuthUri },
+                                {$"{options.SectionName}:OAuthorizeUri", options.Settings.OAuthorizeUri },
+                            };
+
+                        config.AddInMemoryCollection(inputValues);
+                    }
+
                     if (options.Verbose && options.Level == LogLevel.Debug
                     || options.Level == LogLevel.Trace)
                     {

src/AuthApp/HostBuilderOptions.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Logging;
+using AuthApp.Host;
+using Microsoft.Extensions.Logging;
 
 namespace AuthApp
 {
@@ -38,5 +39,15 @@ internal class HostBuilderOptions
         /// Pass Hosting environment for the context of the application.
         /// </summary>
         public string HostingEnviroment { get; set; }
+
+        /// <summary>
+        /// Salesforce options.
+        /// </summary>
+        public SfConfig Settings { get; set; }
+
+        /// <summary>
+        /// The name of the configuration section for the options.
+        /// </summary>
+        public string SectionName { get; set; }
     }
 }

src/AuthApp/Properties/launchSettings.json

@@ -3,8 +3,9 @@
     "AuthApp": {
       "commandName": "Project",
       //"commandLineArgs": "get-tokens --azure https://{name}.vault.azure.net/"
-      "commandLineArgs": "get-tokens --verbose:information --section:sfconfig"
+      //"commandLineArgs": "get-tokens --verbose:information --section:sfconfig"
 
+      "commandLineArgs": "get-tokens --key: --secret: --verbose:information --section:Salesforce"
     }
   }
 }

src/AuthApp/TokenGeneratorCommand.cs

@@ -15,6 +15,15 @@ namespace AuthApp
         ThrowOnUnexpectedArgument = false)]
     internal class TokenGeneratorCommand
     {
+        [Option("--key", Description = "The Salesforce Consumer Key.")]
+        public string ClientId { get; set; }
+
+        [Option("--secret", Description = "The Salesforce Consumer Secret.")]
+        public string ClientSecret { get; set; }
+
+        [Option("--login", Description = "The Salesforce login url. The default value is https://login.salesforce.com.")]
+        public string LoginUrl { get; set; }
+
         [Option("--azure",
             Description = "Allows to specify Azure Vault Url. It overrides url specified in the appsetting.json file or any other configuration provider.")]
         public string AzureVault { get; set; }
@@ -57,25 +66,30 @@ private async Task<int> OnExecuteAsync()
                 Verbose = Verbose.HasValue,
                 Level = Verbose.level,
                 UserSecrets = UserSecrets,
-                HostingEnviroment = !string.IsNullOrWhiteSpace(HostingEnviroment) ? HostingEnviroment : "Development"
+                HostingEnviroment = !string.IsNullOrWhiteSpace(HostingEnviroment) ? HostingEnviroment : "Development",
+                Settings = new SfConfig
+                {
+                    ClientId = ClientId,
+                    ClientSecret = ClientSecret,
+                    LoginUrl = !string.IsNullOrWhiteSpace(LoginUrl) ? LoginUrl :  "https://login.salesforce.com"
+                },
+                SectionName = string.IsNullOrWhiteSpace(SectionName) ? "Salesforce" : SectionName,
             };
 
             try
             {
                 var builder = HostBuilderExtensions.CreateDefaultBuilder(builderConfig)
                                 .ConfigureServices((hostingContext, services) =>
                                 {
-                                    var configSection = string.IsNullOrWhiteSpace(SectionName) ? "Salesforce" : SectionName;
-
-                                    services.ConfigureWithDataAnnotationsValidation<SfConfig>(hostingContext.Configuration, configSection);
+                                    services.ConfigureWithDataAnnotationsValidation<SfConfig>(hostingContext.Configuration, builderConfig.SectionName);
                                     services.AddHostedService<HttpServer>();
                                 });
 
                 await builder.RunConsoleAsync();
 
                 return 0;
             }
-            catch(Microsoft.Extensions.Options.OptionsValidationException)
+            catch(Microsoft.Extensions.Options.OptionsValidationException exv)
             {
                 Console.WriteLine("Not all of the required configurations has been provided.", Color.Red);
             }