Fix issues

Author: MarcialRosales

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

@@ -290,19 +290,24 @@ export function oauth_completeLogin() {
 
 export function oauth_initiateLogout() {
   if (oauth.sp_initiated) {
-    return mgr.getUser().then(User => {
-      mgr.metadataService.getEndSessionEndpoint().then(endpoint => {
-        if (endpoint == undefined) {
-          // Logout only from management UI
-          mgr.removeUser().then(res => {
-            clear_auth()
-            oauth_redirectToLogin()
-          })
-        }else {
-          // OpenId Connect RP-Initiated Logout
-          mgr.signoutRedirect()
-        }
-      })
+    return mgr.getUser().then(user => {
+      if (user != null) {
+        mgr.metadataService.getEndSessionEndpoint().then(endpoint => {
+          if (endpoint == undefined) {
+            // Logout only from management UI
+            mgr.removeUser().then(res => {
+              clear_auth()
+              oauth_redirectToLogin()
+            })
+          }else {
+            // OpenId Connect RP-Initiated Logout
+            mgr.signoutRedirect()
+          }
+        })
+      }else {
+        clear_auth()
+        go_to_home()
+      }
     })
 
   } else {

selenium/suites/authnz-mgt/oauth-and-basic-auth.sh

@@ -4,7 +4,7 @@ SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 TEST_CASES_PATH=/oauth/with-basic-auth
 TEST_CONFIG_PATH=/oauth
-PROFILES="keycloak jwks keycloak-oauth-provider enable-basic-auth tls"
+PROFILES="keycloak keycloak-oauth-provider keycloak-mgt-oauth-provider tls enable-basic-auth"
 
 source $SCRIPT/../../bin/suite_template $@
 runWith keycloak

selenium/test/oauth/with-basic-auth-idp-down/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, delay } = require('../../utils')
 
 const SSOHomePage = require('../../pageobjects/SSOHomePage')
 const OverviewPage = require('../../pageobjects/OverviewPage')
@@ -24,9 +24,8 @@ describe('When basic authentication is enabled but UAA is down', function () {
   it('can log in with Basic Auth', async function () {
     await homePage.toggleBasicAuthSection()
     await homePage.basicAuthLogin('guest', 'guest')
-    if (!await overview.isLoaded()) {
-      throw new Error('Failed to login')
-    }
+    await overview.isLoaded()
+    assert.equal(await overview.getUser(), 'User guest')
     await overview.logout()
   })