[Teacher][R-1.8.1] Siteadmin login fix (#132)

instructure · Jun 27, 2019 · e3ddf17 · e3ddf17
1 parent 4fb4d4d
commit e3ddf17
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...pi-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginSignInActivity.java b/...pi-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginSignInActivity.java
@@ -410,13 +410,17 @@ final protected void loadAuthenticationUrl(final String apiProtocol, final Strin
             mAuthenticationURL += "&canvas_login=1";
         } else if (mCanvasLogin == MASQUERADE_FLOW) {
             // canvas_sa_delegated=1    identifies that we want to masquerade
-            final String cookie = "canvas_sa_delegated=1;domain=.instructure.com;path=/;";
             CookieManager cookieManager = CookieManager.getInstance();
             if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 cookieManager.setAcceptThirdPartyCookies(mWebView, true);
             }
-            cookieManager.setCookie(apiProtocol + "://" + domain, cookie);
-            cookieManager.setCookie(".instructure.com", cookie);
+            if (domain.contains(".instructure.com")) {
+                String cookie = "canvas_sa_delegated=1;domain=.instructure.com;path=/;";
+                cookieManager.setCookie(apiProtocol + "://" + domain, cookie);
+                cookieManager.setCookie(".instructure.com", cookie);
+            } else {
+                cookieManager.setCookie(domain, "canvas_sa_delegated=1");
+            }
         }
         mWebView.loadUrl(mAuthenticationURL, getHeaders());