Check version also when the index.html is loaded

This is to prevent some side-effects issues of the
page refresh after a successful login during a
selenium test

Author: MarcialRosales

deps/rabbitmq_management/priv/www/index.html

@@ -21,7 +21,8 @@
     <link href="css/main.css" rel="stylesheet" type="text/css"/>
     <link href="favicon.ico" rel="shortcut icon" type="image/x-icon"/>    
 
-    <script type="module">      
+    <script type="module">   
+      check_version()   
       window.oauth = oauth_initialize_if_required()      
     </script>
 

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

@@ -119,10 +119,8 @@ function check_login () {
   if (user == false || user.error) {
     clear_auth();
     if (oauth.enabled) {
-      //hide_popup_warn();
       renderWarningMessageInLoginStatus(oauth, 'Not authorized');
     } else {
-      //hide_popup_warn();
       replace_content('login-status', '<p>Login failed</p>');
     }
     return false;
@@ -1865,7 +1863,7 @@ function get_chart_range_type(arg) {
 
 function check_version() {
     let curVersion = sync_get('/version')
-    let storedVersion = get_pref('version')    
+    let storedVersion = get_pref('version')
     if (!storedVersion || storedVersion != curVersion) {
         store_pref('version', curVersion)
         location.reload()

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

@@ -378,8 +378,7 @@ export function hasAnyResourceServerReady(oauth, onReadyCallback) {
           return group;
         }, {})
         let warnings = []
-        for(var url in groupByProviderURL){
-          console.log(url + ': ' + groupByProviderURL[url]);
+        for(var url in groupByProviderURL){          
           const notReadyResources = groupByProviderURL[url].filter((oauthserver) => notReadyServers.includes(oauthserver.oauth_provider_url))
           const notCompliantResources = groupByProviderURL[url].filter((oauthserver) => notCompliantServers.includes(oauthserver.oauth_provider_url))
           if (notReadyResources.length == 1) {
@@ -393,7 +392,6 @@ export function hasAnyResourceServerReady(oauth, onReadyCallback) {
             warnings.push(warningMessageOAuthResources(url, notCompliantResources, " not compliant"))
           }
         }
-        console.log("warnings:" + warnings)
         oauth.declared_resource_servers_count = oauth.resource_servers.length
         oauth.resource_servers = oauth.resource_servers.filter((resource) =>
           !notReadyServers.includes(resource.oauth_provider_url) && !notCompliantServers.includes(resource.oauth_provider_url))

selenium/bin/suite_template

@@ -626,7 +626,7 @@ start_components() {
 teardown_components() {
   skip_rabbitmq=${1:-false}
 
-  begin "Tear down ... $skip_rabbitmq"
+  begin "Tear down ... "
   for i in "${REQUIRED_COMPONENTS[@]}"
   do
     if [[ $i != "rabbitmq" || ($i == "rabbitmq" && $skip_rabbitmq == false) ]] 

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

@@ -1,28 +1,27 @@
 const { By, Key, until, Builder } = require('selenium-webdriver')
 require('chromedriver')
 const assert = require('assert')
-const { buildDriver, goToHome, captureScreensFor, teardown, idpLoginPage, delay } = require('../../utils')
+const { buildDriver, goToHome, captureScreensFor, teardown, delay } = require('../../utils')
 
 const SSOHomePage = require('../../pageobjects/SSOHomePage')
 const OverviewPage = require('../../pageobjects/OverviewPage')
 
 describe('When basic authentication is enabled but UAA is down', function () {
   let homePage
-  let idpLogin
   let overview
   let captureScreen
 
   before(async function () {
     driver = buildDriver()
     await goToHome(driver)
-    homePage = new SSOHomePage(driver)
-    idpLogin = idpLoginPage(driver)
+    homePage = new SSOHomePage(driver)    
     overview = new OverviewPage(driver)
     captureScreen = captureScreensFor(driver, __filename)
   })
 
   it('can log in with Basic Auth', async function () {
     await homePage.toggleBasicAuthSection()
+    assert.ok(await homePage.isLoginButtonVisible)
     await homePage.basicAuthLogin('guest', 'guest')
     await overview.isLoaded()
     assert.equal(await overview.getUser(), 'User guest')

selenium/test/pageobjects/SSOHomePage.js

@@ -87,8 +87,11 @@ module.exports = class SSOHomePage extends BasePage {
 
   async basicAuthLogin (username, password) {
     await this.isLoaded()
+    await this.waitForDisplayed(BASIC_AUTH_LOGIN_USERNAME)
     await this.sendKeys(BASIC_AUTH_LOGIN_USERNAME, username)
+    await this.waitForDisplayed(BASIC_AUTH_LOGIN_PASSWORD)
     await this.sendKeys(BASIC_AUTH_LOGIN_PASSWORD, password)
+    await this.waitForDisplayed(BASIC_AUTH_LOGIN_FORM)
     return this.submit(BASIC_AUTH_LOGIN_FORM)
   }