Fixing some issues related to running on MacOS

docusign · Dec 20, 2023 · f7c3a58 · f7c3a58
1 parent 17a99a9
commit f7c3a58
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 6 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -346,7 +346,7 @@ dotnet_diagnostic.SA1651.severity = error
 dotnet_diagnostic.SA1648.severity = error
 
 # SA1649: File name should match first type name
-dotnet_diagnostic.SA1649.severity = error
+dotnet_diagnostic.SA1649.severity = suggestion
 
 # SA1640: File header should have valid company text
 dotnet_diagnostic.SA1640.severity = error

diff --git a/ExamplesAPIType.cs b/ExamplesAPIType.cs
@@ -37,6 +37,12 @@ public enum ExamplesApiType
         /// </summary>
         [Description("aeg")]
         Admin = 4,
+
+        /// <summary>
+        /// Connect API
+        /// </summary>
+        [Description("con")]
+        Connect = 5,
     }
 
     public static class ExamplesApiTypeExtensions

diff --git a/JWT-Console/App.config.Example b/JWT-Console/App.config.Example
@@ -4,6 +4,6 @@
 	<add key="ClientId" value="{INTEGRATION_KEY_JWT}"/>
 	<add key="AuthServer" value="account-d.docusign.com"/>
 	<add key="ImpersonatedUserID" value="{IMPERSONATED_USER_ID}"/>
-	<add key="PrivateKeyFile" value="..\..\..\private.key"/>
+	<add key="PrivateKeyFile" value="../../../private.key"/>
 </appSettings>
 </configuration>
diff --git a/JWT-Console/JWT-Console.csproj b/JWT-Console/JWT-Console.csproj
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\ExamplesApiTypeExtensions.cs" Link="ExamplesApiTypeExtensions.cs" />
     <Compile Include="..\DSHelper.cs" Link="DSHelper.cs" />
+    <Compile Include="..\ExamplesAPIType.cs" Link="ExamplesAPIType.cs" />
     <Compile Include="..\JWTAuth.cs" Link="JWTAuth.cs" />
     <Compile Include="..\launcher-csharp\eSignature\Examples\SigningViaEmail.cs" Link="SigningViaEmail.cs" />
   </ItemGroup>

diff --git a/JWT-Console/Program.cs b/JWT-Console/Program.cs
@@ -42,7 +42,14 @@ static void Main(string[] args)
                     // build a URL to provide consent for this Integration Key and this userId
                     string url = "https://" + ConfigurationManager.AppSettings["AuthServer"] + "/oauth/auth?response_type=code" + caret + "&scope=impersonation%20signature" + caret +
                         "&client_id=" + ConfigurationManager.AppSettings["ClientId"] + caret + "&redirect_uri=" + DevCenterPage;
-                    Console.WriteLine($"Consent is required - launching browser (URL is {url.Replace(caret, "")})");
+
+                    string consentRequiredMessage = $"Consent is required - launching browser (URL is {url})";
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                    {
+                        consentRequiredMessage = consentRequiredMessage.Replace(caret, "");
+                    }
+
+                    Console.WriteLine(consentRequiredMessage);
 
                     // Start new browser window for login and consent to this app by DocuSign user
                     if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))

diff --git a/Quick_ACG/Quick_ACG.csproj b/Quick_ACG/Quick_ACG.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\ExamplesApiTypeExtensions.cs" Link="ExamplesApiTypeExtensions.cs" />
+    <Compile Include="..\ExamplesAPIType.cs" Link="ExamplesAPIType.cs" />
     <Compile Include="..\launcher-csharp\Common\SetViewBagAttribute.cs" Link="Common\SetViewBagAttribute.cs" />
     <Compile Include="..\launcher-csharp\EmbeddedSigningCeremony.cs" Link="EmbeddedSigningCeremony.cs" />
     <Compile Include="..\launcher-csharp\eSignature\Controllers\EmbeddedSigningCeremony.cs" Link="eSignature\Controllers\EmbeddedSigningCeremony.cs" />

diff --git a/launcher-csharp/eSignature/Controllers/HomeController.cs b/launcher-csharp/eSignature/Controllers/HomeController.cs
@@ -88,6 +88,7 @@ public IActionResult Index(string egName)
 
             if (egName == "home")
             {
+                this.RequestItemsService.EgName = null;
                 this.CheckIfThisIsCfr11Account();
                 return this.View();
             }

diff --git a/launcher-csharp/launcher-csharp - VS2019.csproj b/launcher-csharp/launcher-csharp - VS2019.csproj
@@ -36,7 +36,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DocuSign.Admin" Version="1.3.0" />
+    <PackageReference Include="DocuSign.Admin" Version="1.4.0" />
     <PackageReference Include="DocuSign.Click" Version="1.3.1" />
     <PackageReference Include="DocuSign.eSign.dll" Version="6.5.0" />
     <PackageReference Include="DocuSign.Monitor" Version="1.1.1" />