Merge branch 'master' of https://github.com/docusign/code-examples-csharp-private

Author: paigesrossi

ExamplesAPIType.cs

@@ -49,6 +49,12 @@ public enum ExamplesApiType
         /// </summary>
         [Description("web")]
         WebForms = 6,
+
+        /// <summary>
+        /// Notary API
+        /// </summary>
+        [Description("neg")]
+        Notary = 7
     }
 
     public static class ExamplesApiTypeExtensions

ExamplesApiTypeExtensions.cs

@@ -55,6 +55,12 @@ public enum ExamplesApiType
         /// </summary>
         [Description("mae")]
         Maestro = 7,
+
+        /// <summary>
+        /// Notary API
+        /// </summary>
+        [Description("neg")]
+        Notary = 8,
     }
 
     public static class ExamplesApiTypeExtensions

Quick_ACG/Program.cs

@@ -28,11 +28,11 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args)
                 {
                     path = Path.GetFullPath(@"..\\launcher-csharp\\appsettings.json");
                 }
-                 
+
 
                 config.AddJsonFile(path,
-                                   optional: false,
-                                   reloadOnChange: true);
+                    optional: false,
+                    reloadOnChange: true);
             });
             return builder;
         }

Quick_ACG/Quick_ACG.csproj

@@ -47,17 +47,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DocuSign.Admin" Version="2.0.0-rc4" />
-    <PackageReference Include="DocuSign.eSign.dll" Version="8.0.0-rc2" />
+    <PackageReference Include="DocuSign.Admin" Version="2.0.0" />
+    <PackageReference Include="DocuSign.eSign.dll" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Session" Version="2.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.18" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.29">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.6" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>

Quick_ACG/Startup.cs

@@ -12,6 +12,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json.Linq;
+
+using System.Threading.Tasks;
 using System;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -95,6 +97,12 @@ public void ConfigureServices(IServiceCollection services)
                 options.ClaimActions.MapJsonKey("expires_in", "expires_in");
                 options.Events = new OAuthEvents
                 {
+                    OnRedirectToAuthorizationEndpoint = redirectContext =>
+                    {
+                        redirectContext.Options.UsePkce = this.Configuration["PkceFailed"] == null;
+                        redirectContext.HttpContext.Response.Redirect(redirectContext.RedirectUri);
+                        return Task.FromResult(0);
+                    },
                     OnCreatingTicket = async context =>
                     {
                         var request = new HttpRequestMessage(HttpMethod.Get, context.Options.UserInformationEndpoint);
@@ -113,12 +121,27 @@ public void ConfigureServices(IServiceCollection services)
                         {
                             context.RunClaimActions(payload.RootElement);
                         }
-                    }
+                    },
+                    OnRemoteFailure = async context =>
+                    {
+                        var redirectContext = new RedirectContext<OAuthOptions>(
+                            context.HttpContext,
+                            context.Scheme,
+                            options,
+                            context.Properties,
+                            this.Configuration["RedirectUrl"]);
+
+                        this.Configuration["PkceFailed"] = "true";
+
+                        await options.Events.OnRedirectToAuthorizationEndpoint(redirectContext);
+
+                        context.HandleResponse();
+                    },
                 };
             });
         }
 
-        #nullable enable
+#nullable enable
         private string? ExtractDefaultAccountValue(JsonElement obj, string key)
         {
             if (!obj.TryGetProperty("accounts", out var accounts))
@@ -166,7 +189,7 @@ public void ConfigureServices(IServiceCollection services)
 
             return keyValue;
         }
-        #nullable disable
+#nullable disable
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

azure-pipelines.yml

@@ -107,7 +107,7 @@ steps:
     command: build
     repository: 'launcher-automation-csharp'
     dockerfile: '$(Build.SourcesDirectory)/code-examples-csharp-private/Dockerfile'
-    buildContext: '$(Build.SourcesDirectory)/code-examples-csharp-private '
+    buildContext: '$(Build.SourcesDirectory)/code-examples-csharp-private'
     tags: |
       latest
 

launcher-csharp/Common/RequestItemsService.cs

@@ -289,6 +289,10 @@ public string IdentifyApiOfCodeExample(string eg)
             {
                 currentApiType = ExamplesApiType.WebForms.ToString();
             }
+            else if (eg.Contains(ExamplesApiType.Notary.ToKeywordString()))
+            {
+                currentApiType = ExamplesApiType.Notary.ToString();
+            }
             else
             {
                 currentApiType = ExamplesApiType.ESignature.ToString();