Merge pull request #9820 from dukex/improve-login-exp

Redirect user back to landing page

Author: michaelklishin

deps/rabbitmq_management/priv/www/js/main.js

@@ -19,6 +19,8 @@ function startWithLoginPage() {
   start_app_login();
 }
 function startWithOAuthLogin () {
+  store_pref("oauth-return-to", window.location.hash);
+
   if (!oauth.logged_in) {
     if (oauth.sp_initiated) {
       get(oauth.readiness_url, 'application/json', function (req) {

deps/rabbitmq_management/priv/www/js/oidc-oauth/helper.js

@@ -148,10 +148,13 @@ function oauth_initiateLogin() {
 function oauth_redirectToHome(oauth) {
   console.log("oauth_redirectToHome set_token_auth")
   set_token_auth(oauth.access_token)
-  go_to_home()
+
+  path = get_pref("oauth-return-to");
+  clear_pref("oauth-return-to")
+  go_to(path)
 }
-function go_to_home() {
-  location.href = rabbit_path_prefix() + "/"
+function go_to(path) {
+  location.href = rabbit_path_prefix() + "/" + path
 }
 function go_to_authority() {
   location.href = oauth.authority

deps/rabbitmq_management/priv/www/js/prefs.js

@@ -185,6 +185,7 @@ function default_pref(k) {
     if (k.substring(0, 11) == 'chart-line-')  return 'true';
     if (k == 'truncate')                      return '100';
     if (k == 'chart-range')                   return '60|5';
+    if (k == 'oauth-return-to')               return '';
     if (k.substring(0,  7) == 'column-')
         return default_column_pref(k.substring(7));
     return null;

deps/rabbitmq_management/selenium/test/oauth/with-sp-initiated/redirection-after-login.js

@@ -0,0 +1,43 @@
+const { By, Key, until, Builder } = require('selenium-webdriver')
+require('chromedriver')
+const assert = require('assert')
+const { buildDriver, goToExchanges, captureScreensFor, teardown, goToHome } = require('../../utils')
+
+const SSOHomePage = require('../../pageobjects/SSOHomePage')
+const UAALoginPage = require('../../pageobjects/UAALoginPage')
+const ExchangesPage = require('../../pageobjects/ExchangesPage')
+
+describe('A user which accesses a protected URL without a session', function () {
+  let homePage
+  let uaaLogin
+  let exchanges
+  let captureScreen
+
+  before(async function () {
+    driver = buildDriver()
+    homePage = new SSOHomePage(driver)
+    uaaLogin = new UAALoginPage(driver)
+    exchanges = new ExchangesPage(driver)
+
+    await goToExchanges(driver)
+
+    captureScreen = captureScreensFor(driver, __filename)
+  })
+
+  it('redirect to previous accessed page after login ', async function () {
+    await homePage.clickToLogin()
+
+    await uaaLogin.login('rabbit_admin', 'rabbit_admin')
+
+    if (!await exchanges.isLoaded()) {
+      throw new Error('Failed to login')
+    }
+
+    assert.equal("All exchanges (8)", await exchanges.getPagingSectionHeaderText())
+  })
+
+
+  after(async function () {
+    await teardown(driver, this, captureScreen)
+  })
+})

deps/rabbitmq_management/selenium/test/utils.js

@@ -6,7 +6,7 @@ const { By, Key, until, Builder, logging } = require('selenium-webdriver')
 require('chromedriver')
 
 const uaaUrl = process.env.UAA_URL || 'http://localhost:8080'
-const baseUrl = process.env.RABBITMQ_URL || 'http://localhost:15672'
+const baseUrl = process.env.RABBITMQ_URL || 'http://localhost:15672/'
 const hostname = process.env.RABBITMQ_HOSTNAME || 'localhost'
 const runLocal = String(process.env.RUN_LOCAL).toLowerCase() != 'false'
 const seleniumUrl = process.env.SELENIUM_URL || 'http://selenium:4444'
@@ -59,7 +59,11 @@ module.exports = {
   },
 
   goToLogin: (driver, token) => {
-    return driver.get(baseUrl + '/#/login?access_token=' + token)
+    return driver.get(baseUrl + '#/login?access_token=' + token)
+  },
+
+  goToExchanges: (driver) => {
+    return driver.get(baseUrl + '#/exchanges')
   },
 
   goTo: (driver, address) => {