Fixed Connect-SFApp command to log in users with LOGIN_NAME different…

… from USERNAME property
sfc-gh-klochen · Oct 7, 2021 · aad07da · aad07da
1 parent 0eb635c
commit aad07da
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 19 deletions.
diff --git a/Commands/Authentication/ConnectAppCommand.cs b/Commands/Authentication/ConnectAppCommand.cs
@@ -172,7 +172,7 @@ protected override void ProcessRecord()
                         throw new ArgumentException(String.Format("Unknown parameter set {0}", this.ParameterSetName));
                 }
                 appUserContext.UserName = this.UserName;
-                logger.Info("Username={0}", appUserContext.UserName);
+                logger.Info("LoginName={0}", appUserContext.UserName);
 
                 #endregion
 
@@ -529,14 +529,50 @@ protected override void ProcessRecord()
                 loggerConsole.Info("Converting redirect token to authentication token for user {0} in account {1}", appUserContext.UserName, appUserContext.AccountName);
 
                 // Authenticate Step 3, Converting OAuth redirect into authentication cookie
-                appUserContext.AuthTokenSnowsight = SnowflakeDriver.GetAuthenticationTokenFromOAuthRedirectToken(appUserContext.AppServerUrl, appUserContext.AccountUrl, oAuthRedirectCode);
-                if (appUserContext.AuthTokenSnowsight.Length == 0)
+                string authenticationTokenWebPageResult = SnowflakeDriver.GetAuthenticationTokenFromOAuthRedirectToken(appUserContext.AppServerUrl, appUserContext.AccountUrl, oAuthRedirectCode);
+                if (authenticationTokenWebPageResult.Length == 0)
                 {
                     throw new InvalidCredentialException(String.Format("Invalid response from completing redirect OAuth Token for user {0}@{1}", appUserContext.UserName, appUserContext.AccountName));
                 }
 
+                JObject authenticationTokenWebPageObject = JObject.Parse(authenticationTokenWebPageResult);
+                if (authenticationTokenWebPageObject == null)
+                {
+                    throw new InvalidCredentialException(String.Format("Invalid result from completing redirect OAuth Token for user {0}@{1}", appUserContext.UserName, appUserContext.AccountName));
+                }
+                appUserContext.AuthTokenSnowsight = JSONHelper.getStringValueFromJToken(authenticationTokenWebPageObject, "authenticationCookie");
+
                 logger.Info("SnowsightAuthToken={0}", appUserContext.AuthTokenSnowsight);
 
+                // For users where their USERNAME is not the same as LOGIN_NAME, the future authentication needs USERNAME property. It is specified in var params = {...} block in HTML returned from the call
+                // <html>
+                // <head>
+                // 	<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"));
+                Regex regexParameters = new Regex(@"(?i)var params = ({.*})", RegexOptions.IgnoreCase);
+                match = regexParameters.Match(paramsCarryingPageResult);
+                if (match != null)
+                {
+                    if (match.Groups.Count > 1)
+                    {
+                        string userAccountParams = match.Groups[1].Value;
+
+                        JObject userAccountParamsObject = JObject.Parse(userAccountParams);
+                        if (userAccountParamsObject != null)
+                        {
+                            string userName = JSONHelper.getStringValueFromJToken(userAccountParamsObject["user"], "username");
+                            logger.Info("UserName={0}", userName);
+                            // Only set the Username if it is indeed different from LoginName
+                            if (String.Compare(userName, appUserContext.UserName, true) != 0)
+                            {
+                                appUserContext.UserName = userName;
+                            }
+                        }
+                    }
+                }
+
                 #endregion
 
                 #region Organization and User ID context

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.6.0 SnowflakePS
-Cmdlet          Get-SFDashboards                                   2021.10.6.0 SnowflakePS
-Cmdlet          Get-SFFolders                                      2021.10.6.0 SnowflakePS
-Cmdlet          Get-SFQueryProfile                                 2021.10.6.0 SnowflakePS
-Cmdlet          Get-SFWorksheets                                   2021.10.6.0 SnowflakePS
-Cmdlet          Invoke-SFDashboard                                 2021.10.6.0 SnowflakePS
-Cmdlet          Invoke-SFWorksheet                                 2021.10.6.0 SnowflakePS
-Cmdlet          New-SFDashboard                                    2021.10.6.0 SnowflakePS
-Cmdlet          New-SFWorksheet                                    2021.10.6.0 SnowflakePS
-Cmdlet          Remove-SFDashboard                                 2021.10.6.0 SnowflakePS
-Cmdlet          Remove-SFWorksheet                                 2021.10.6.0 SnowflakePS
+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
 ```
 
 ## Connect-SFApp

diff --git a/SnowflakePS.csproj b/SnowflakePS.csproj
@@ -5,9 +5,9 @@
     <AssemblyName>SnowflakePS</AssemblyName>
     <RootNamespace>Snowflake.Powershell</RootNamespace>
 
-    <Version>2021.10.6.0</Version>
-    <FileVersion>2021.10.6.0</FileVersion>
-    <AssemblyVersion>2021.10.6.0</AssemblyVersion>
+    <Version>2021.10.7.0</Version>
+    <FileVersion>2021.10.7.0</FileVersion>
+    <AssemblyVersion>2021.10.7.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.6.0'
+ModuleVersion = '2021.10.7.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()

diff --git a/UtilityDrivers/SnowflakeDriver.cs b/UtilityDrivers/SnowflakeDriver.cs
@@ -743,7 +743,7 @@ private static string apiGET(string baseUrl, string restAPIUrl, string acceptHea
                                 {
                                     if (cookie.StartsWith("user-") == true)
                                     {
-                                        resultString = cookie;
+                                        resultString = String.Format("{{\"authenticationCookie\": \"{0}\", \"resultPage\": \"{1}\"}}", cookie, HttpUtility.HtmlEncode(resultString));
                                     }
                                 }
                             }