From c97e090a3c26363f750903edb86e422c43b95233 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Fri, 11 Aug 2017 10:05:19 -0400 Subject: [PATCH] 12033: Fix logging in from location with non-empty query string. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- apps/workbench/app/assets/javascripts/models/session_db.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/workbench/app/assets/javascripts/models/session_db.js b/apps/workbench/app/assets/javascripts/models/session_db.js index fde02f637a..13d3eaffee 100644 --- a/apps/workbench/app/assets/javascripts/models/session_db.js +++ b/apps/workbench/app/assets/javascripts/models/session_db.js @@ -47,7 +47,7 @@ window.models.SessionDB = function() { baseURL = 'https://' + baseURL if (!baseURL.endsWith('/')) baseURL = baseURL + '/' - document.location = baseURL + 'login?return_to=' + encodeURIComponent(document.location.href+'?baseURL='+encodeURIComponent(baseURL)) + document.location = baseURL + 'login?return_to=' + encodeURIComponent(document.location.href.replace(/\?.*/, '')+'?baseURL='+encodeURIComponent(baseURL)) return false }, checkForNewToken: function() { -- 2.30.2