Connect-SFApp: Corrected bug with SSO sign in parsing results

sfc-gh-klochen · Oct 12, 2021 · a484ce1 · a484ce1
1 parent aad07da
commit a484ce1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/Commands/Authentication/ConnectAppCommand.cs b/Commands/Authentication/ConnectAppCommand.cs
@@ -26,10 +26,10 @@
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Security.Authentication;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
 
-
 namespace Snowflake.Powershell
 {
     [Cmdlet
@@ -550,7 +550,7 @@ protected override void ProcessRecord()
                 // 	<script>
                 // 	var params = {"account":"sfpscogs_dodievich_sso","appServerUrl":"https://apps-api.c1.westus2.azure.app.snowflake.com",.... "username":"DODIEVICH_ALT"}}
                 // 	if (window.opener && params.isPopupAuth) {
-                string paramsCarryingPageResult = HttpUtility.HtmlDecode(JSONHelper.getStringValueFromJToken(authenticationTokenWebPageObject, "resultPage"));
+                string paramsCarryingPageResult = Encoding.UTF8.GetString(Convert.FromBase64String(JSONHelper.getStringValueFromJToken(authenticationTokenWebPageObject, "resultPage")));
                 Regex regexParameters = new Regex(@"(?i)var params = ({.*})", RegexOptions.IgnoreCase);
                 match = regexParameters.Match(paramsCarryingPageResult);
                 if (match != null)

diff --git a/Readme.md b/Readme.md
@@ -68,17 +68,17 @@ The output should look like this:
 ```
 CommandType     Name                                               Version     Source
 -----------     ----                                               -------     ------
-Cmdlet          Connect-SFApp                                      2021.10.7.0 SnowflakePS
-Cmdlet          Get-SFDashboards                                   2021.10.7.0 SnowflakePS
-Cmdlet          Get-SFFolders                                      2021.10.7.0 SnowflakePS
-Cmdlet          Get-SFQueryProfile                                 2021.10.7.0 SnowflakePS
-Cmdlet          Get-SFWorksheets                                   2021.10.7.0 SnowflakePS
-Cmdlet          Invoke-SFDashboard                                 2021.10.7.0 SnowflakePS
-Cmdlet          Invoke-SFWorksheet                                 2021.10.7.0 SnowflakePS
-Cmdlet          New-SFDashboard                                    2021.10.7.0 SnowflakePS
-Cmdlet          New-SFWorksheet                                    2021.10.7.0 SnowflakePS
-Cmdlet          Remove-SFDashboard                                 2021.10.7.0 SnowflakePS
-Cmdlet          Remove-SFWorksheet                                 2021.10.7.0 SnowflakePS
+Cmdlet          Connect-SFApp                                      2021.10.11.0 SnowflakePS
+Cmdlet          Get-SFDashboards                                   2021.10.11.0 SnowflakePS
+Cmdlet          Get-SFFolders                                      2021.10.11.0 SnowflakePS
+Cmdlet          Get-SFQueryProfile                                 2021.10.11.0 SnowflakePS
+Cmdlet          Get-SFWorksheets                                   2021.10.11.0 SnowflakePS
+Cmdlet          Invoke-SFDashboard                                 2021.10.11.0 SnowflakePS
+Cmdlet          Invoke-SFWorksheet                                 2021.10.11.0 SnowflakePS
+Cmdlet          New-SFDashboard                                    2021.10.11.0 SnowflakePS
+Cmdlet          New-SFWorksheet                                    2021.10.11.0 SnowflakePS
+Cmdlet          Remove-SFDashboard                                 2021.10.11.0 SnowflakePS
+Cmdlet          Remove-SFWorksheet                                 2021.10.11.0 SnowflakePS
 ```
 
 ## Connect-SFApp

diff --git a/SnowflakePS.csproj b/SnowflakePS.csproj
@@ -5,9 +5,9 @@
     <AssemblyName>SnowflakePS</AssemblyName>
     <RootNamespace>Snowflake.Powershell</RootNamespace>
 
-    <Version>2021.10.7.0</Version>
-    <FileVersion>2021.10.7.0</FileVersion>
-    <AssemblyVersion>2021.10.7.0</AssemblyVersion>
+    <Version>2021.10.11.0</Version>
+    <FileVersion>2021.10.11.0</FileVersion>
+    <AssemblyVersion>2021.10.11.0</AssemblyVersion>
     <Authors>Daniel Odievich (daniel.odievich@snowflake.com)</Authors>
     <Company>Snowflake Computing</Company>
     <Product>Snowflake Snowsight Extensions</Product>

diff --git a/SnowflakePS.psd1 b/SnowflakePS.psd1
@@ -27,7 +27,7 @@
 RootModule = 'SnowflakePS.dll'
 
 # Version number of this module.
-ModuleVersion = '2021.10.7.0'
+ModuleVersion = '2021.10.11.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()

diff --git a/UtilityDrivers/SnowflakeDriver.cs b/UtilityDrivers/SnowflakeDriver.cs
@@ -22,6 +22,7 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Reflection;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
 
@@ -743,7 +744,7 @@ private static string apiGET(string baseUrl, string restAPIUrl, string acceptHea
                                 {
                                     if (cookie.StartsWith("user-") == true)
                                     {
-                                        resultString = String.Format("{{\"authenticationCookie\": \"{0}\", \"resultPage\": \"{1}\"}}", cookie, HttpUtility.HtmlEncode(resultString));
+                                        resultString = String.Format("{{\"authenticationCookie\": \"{0}\", \"resultPage\": \"{1}\"}}", cookie, Convert.ToBase64String(Encoding.UTF8.GetBytes(resultString)));
                                     }
                                 }
                             }