updated readme file and resolve issue #2

Author: kdcllc

README.md

@@ -1,34 +1,78 @@
 # CometD .NET Core implementation of Salesforce Platform events
 [![Build status](https://ci.appveyor.com/api/projects/status/baalfhs6vvc38icc?svg=true)](https://ci.appveyor.com/project/kdcllc/cometd-netcore-salesforce)
 
-This repo contains the CometD .NET Core implementation for Salesforce Platform events. 
-These events can be subscribed to and listened to by your custom `Event Listener`.
+This repo contains the CometD .NET Core implementation for Salesforce Platform events.
+ 
+These events can be subscribed to and listened to by your custom `Event Listener`. The sample application of this library can be found [here](https://github.com/kdcllc/Bet.BuildingBlocks.SalesforceEventBus).
 
-1. `CometD.NetCore2.Salesforce`
-     - Salesforce Platform Events as Event Bus [eShopOnContainers](https://github.com/dotnet-architecture/eShopOnContainers).
+The solution contains the following:
+
+1. `CometD.NetCore2.Salesforce` Project
+     - A Salesforce Platform Events implementation based [Even Bus idea of eShopOnContainers](https://github.com/dotnet-architecture/eShopOnContainers).
      - [Reusable Building Blocks and sample application that listens to Salesforce push events](https://github.com/kdcllc/Bet.BuildingBlocks.SalesforceEventBus).
-2. DotNet Cli tool `AuthApp`
-   - This dotnet cli tool allows for retrieval of `Access Token` and `Refresh Token` to be used by any other application. Please refer to [How Are Apps Authenticated with the Web Server OAuth Authentication Flow](https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/intro_understanding_web_server_oauth_flow.htm)
 
+2. DotNet Cli tool `salesforce` Project
+   - This dotnet cli tool allows for retrieval of `Access Token` and `Refresh Token` to be used by any other application. Please refer to [How Are Apps Authenticated with the Web Server OAuth Authentication Flow](https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/intro_understanding_web_server_oauth_flow.htm)
 
 ## Installation
 
 - To include this library inside of your project run nuget package installation
-> Install-Package CometD.NetCore2.Salesforce
+
+```cmd
+    PM> Install-Package CometD.NetCore2.Salesforce
+```
+
 Or
-> dotnet add package CometD.NetCore.Salesforce
-- To Inatall Salesforce Cli tool globally
 
-> dotnet tool install salesforce -g
+```cmd
+ dotnet add package CometD.NetCore.Salesforce
+```
+
+- To Install Salesforce Cli tool globally run the following command:
+
+```cmd
+ dotnet tool install salesforce -g
+
+```
+
+To verify the installation run:
+
+```cmd
+ dotnet tool list -g
+```
+
+## 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:
+
+```json
+  "Salesforce": {
+    "ClientId": "",
+    "ClientSecret": ""
+  }
+````
+
+Or you can specify Azure Key Vault Url:
+
+```json
+    "AzureVault": {
+     "BaseUrl": "https://{name}.vault.azure.net/"
+    },
+```
+
+Then run:
+
+```cmd
+    salesforce get-tokens
+```
 
-Then to see if it was installed correctly:
+Or specify url within the dotnet cli tool like so:
 
-> dotnet tool list -g
+```cmd
+    salesforce get-tokens --azure https://{name}.vault.azure.net/"
+```
 
-## Salesforce DotNet Cli usage
-Run this in the project directory that contains appsettings.json with your setttings:
-> salesforce refresh-token
-It will open web browser and log in with your credentials.
+This tool will open web browser and will require you to log in with your credentials to Salesforce portal in order to retrieve the tokens.
 
 ## Saleforce Setup
 [Video](https://www.youtube.com/watch?v=L6OWyCfQD6U)

build/settings.props

@@ -10,12 +10,12 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Nuget Package Settings">
-	<Description>Event Bus for Salesforce Platform events.</Description>
-	<PackageProjectUrl>https://github.com/kdcllc/CometD.NetCore.Salesforce</PackageProjectUrl>
-	<RepositoryUrl>https://github.com/kdcllc/CometD.NetCore.Salesforce.git</RepositoryUrl>
+    <Description>Event Bus for Salesforce Platform events.</Description>
+    <PackageProjectUrl>https://github.com/kdcllc/CometD.NetCore.Salesforce</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/kdcllc/CometD.NetCore.Salesforce.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-	<PackageLicense>https://github.com/kdcllc/CometD.NetCore.Salesforce/blob/master/LICENSE</PackageLicense>
-	<PackageIconUrl>https://raw.githubusercontent.com/kdcllc/CometD.NetCore.Salesforce/master/img/logo64x64.png</PackageIconUrl>
+    <PackageLicense>https://github.com/kdcllc/CometD.NetCore.Salesforce/blob/master/LICENSE</PackageLicense>
+    <PackageIconUrl>https://raw.githubusercontent.com/kdcllc/CometD.NetCore.Salesforce/master/img/logo64x64.png</PackageIconUrl>
     <PackageTags>aspnetcore,dottet,salesforce, cometd, bayeux</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>

src/AuthApp/AuthApp.csproj

@@ -5,7 +5,7 @@
     <TargetFrameworks>netcoreapp2.2;</TargetFrameworks>
     <ToolCommandName>salesforce</ToolCommandName>
     <PackageId>salesforce</PackageId>
-    <Description>A command-line tool that enables Salesforce Refresh Token Generation.</Description>
+    <Description>A command-line tool that enables Salesforce Access and Refresh Tokens Generation.</Description>
     <PackAsTool>True</PackAsTool>
   </PropertyGroup>
 

src/AuthApp/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "AuthApp": {
       "commandName": "Project",
-      "commandLineArgs": "refresh-token --azure https://kdcllc.vault.azure.net/ --configfile D:\\Dev\\GitHub\\kdcllc\\CometD.NetCore.Salesforce\\src\\TestApp\\appsettings.json --verbose"
+      "commandLineArgs": "refresh-token --azure https://{name}.vault.azure.net/"
     }
   }
 }

src/AuthApp/TokenGeneratorCommand.cs

@@ -1,12 +1,14 @@
 using AuthApp.Host;
+using Bet.AspNetCore.Options;
 using McMaster.Extensions.CommandLineUtils;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using System;
 using System.Threading.Tasks;
 namespace AuthApp
 {
-    [Command("refresh-token",
-        Description ="Generates Salesforce Refresh Token",
+    [Command("get-tokens",
+        Description = "Generates Salesforce Access and Refresh Tokens",
         ThrowOnUnexpectedArgument = false)]
     internal class TokenGeneratorCommand
     {
@@ -41,15 +43,23 @@ private async Task<int> OnExecuteAsync()
                 HostingEnviroment = !string.IsNullOrWhiteSpace(HostingEnviroment) ? HostingEnviroment : "Development"
             };
 
-            var builder = HostBuilderExtensions.CreateDefaultBuilder(builderConfig)
-                .ConfigureServices((hostingContext,services) =>
-                {
-                    services.ConfigureWithDataAnnotationsValidation<SfConfig>("Salesforce");
-                    services.AddHostedService<HttpServer>();
-                });
+            try
+            {
+                var builder = HostBuilderExtensions.CreateDefaultBuilder(builderConfig)
+                                .ConfigureServices((hostingContext, services) =>
+                                {
+                                    services.ConfigureWithDataAnnotationsValidation<SfConfig>("Salesforce");
+                                    services.AddHostedService<HttpServer>();
+                                });
+
+                await builder.RunConsoleAsync();
+                return 0;
+            }
+            catch (Exception)
+            {
+                throw;
+            }
 
-            await builder.RunConsoleAsync();
-            return 0;
         }
     }
 }