Fix issue with oauth2+basic_auth where

the user logged in via basic auth and on
page reload, the credentials were deleted.

Author: MarcialRosales

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

@@ -99,7 +99,7 @@ function get_oauth_settings() {
 
 export function oauth_initialize_if_required(state = "index") {
   let oauth = oauth_initialize(get_oauth_settings())
-  if (!oauth.enabled) return oauth;
+  if (!oauth.enabled || has_auth_credentials()) return oauth;
   switch (state) {
     case 'login-callback':
       oauth_completeLogin(); break;

selenium/test/oauth/with-basic-auth/happy-login.js

@@ -1,7 +1,7 @@
 const { By, Key, until, Builder } = require('selenium-webdriver')
 require('chromedriver')
 const assert = require('assert')
-const { buildDriver, goToHome, captureScreensFor, teardown, idpLoginPage } = require('../../utils')
+const { buildDriver, goToHome, captureScreensFor, teardown, idpLoginPage, log } = require('../../utils')
 
 const SSOHomePage = require('../../pageobjects/SSOHomePage')
 const OverviewPage = require('../../pageobjects/OverviewPage')
@@ -40,6 +40,46 @@ describe('An user with administrator tag', function () {
     await overview.logout()
   })
 
+  describe("And logged in via OAuth 2.0", async function() {
+    before(async function() {
+      await homePage.clickToLogin()
+      await idpLogin.login('rabbit_admin', 'rabbit_admin')
+      if (!await overview.isLoaded()) {
+        throw new Error('Failed to login via OAuth 2.0')
+      }
+    })
+    it ('can reload page without being logged out', async function() {
+      log("About to refresh page")
+      overview.refresh()      
+      if (!await overview.isLoaded()) {
+        throw new Error('Failed to keep session opened')
+      }
+    })
+    after(async function () {
+       await overview.logout()
+    })
+  })
+
+  describe("An logged in via Basic Auth", async function() {
+    before(async function() {
+      await homePage.toggleBasicAuthSection()
+      await homePage.basicAuthLogin('guest', 'guest')
+      if (!await overview.isLoaded()) {
+        throw new Error('Failed to login')
+      }
+    })
+    it ('can reload page without being logged out', async function() {
+      log("About to refresh page")
+      overview.refresh()      
+      if (!await overview.isLoaded()) {
+        throw new Error('Failed to keep session opened')
+      }
+    })
+    after(async function () {
+       await overview.logout()
+    })
+  })
+
   after(async function () {
     await teardown(driver, this, captureScreen)
   })

selenium/test/oauth/with-basic-auth/unauthorized.js

@@ -40,20 +40,6 @@ describe('An user without management tag', function () {
     assert.ok(!await homePage.isOAuth2SectionVisible())
   })
 
-  describe("After clicking on logout button", function() {
-
-      before(async function () {
-          await homePage.clickToLogout()
-      })
-
-      it('should get redirected to home page again without error message', async function(){
-        const visible = await homePage.isWarningVisible()
-        assert.ok(!visible)
-      })
-
-  })
-
-
   after(async function () {
     await teardown(driver, this, captureScreen)
   })