From a9e56cb3154ea2a1e34834f83d45b3e5391c7357 Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Fri, 26 Jun 2020 22:50:53 +0200
Subject: [PATCH] Fix SSO login with subpaths (#4496)

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
---
 app/screens/sso/sso.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/screens/sso/sso.js b/app/screens/sso/sso.js
index 7f4c7ef5f..ee498a000 100644
--- a/app/screens/sso/sso.js
+++ b/app/screens/sso/sso.js
@@ -109,7 +109,15 @@ class SSO extends PureComponent {
     }
 
     extractCookie = (parsedUrl) => {
-        CookieManager.get(parsedUrl.origin, true).then((res) => {
+        const original = urlParse(this.props.serverUrl);
+
+        // Check whether we need to set a sub-path
+        parsedUrl.set('pathname', original.pathname || '');
+
+        parsedUrl.set('query', '');
+        Client4.setUrl(parsedUrl.href);
+
+        CookieManager.get(parsedUrl.href, true).then((res) => {
             const mmtoken = res.MMAUTHTOKEN;
             const token = typeof mmtoken === 'object' ? mmtoken.value : mmtoken;
 
@@ -121,13 +129,6 @@ class SSO extends PureComponent {
                 } = this.props.actions;
 
                 Client4.setToken(token);
-                if (this.props.serverUrl !== parsedUrl.origin) {
-                    const original = urlParse(this.props.serverUrl);
-
-                    // Check whether we need to set a sub-path
-                    parsedUrl.set('pathname', original.pathname || '');
-                    Client4.setUrl(parsedUrl.href);
-                }
                 ssoLogin(token).then((result) => {
                     if (result.error) {
                         this.onLoadEndError(result.error);