Pass authorization to mgt-api calls

Author: MarcialRosales

selenium/test/mgt-api.js

@@ -114,18 +114,17 @@ module.exports = {
       throw new Error(req.responseText)
     }
   },
-  createVhost: (url, name, description = "", tags = []) => {
+  createVhost: (url, authorization, name, description = "", tags = []) => {
     let vhost = {
       "description": description,
       "tags": tags
     }
     log("Create vhost " + JSON.stringify(vhost) 
       + " with name " + name + " on " + url)
     const req = new XMLHttpRequest()
-    let base64Credentials = btoa('administrator-only' + ":" + 'guest')
     let finalUrl = url + "/api/vhosts/" + encodeURIComponent(name)
     req.open('PUT', finalUrl, false)
-    req.setRequestHeader("Authorization", "Basic " + base64Credentials)
+    req.setRequestHeader("Authorization", authorization)
     req.setRequestHeader('Content-Type', 'application/json')
 
     req.send(JSON.stringify(vhost))
@@ -158,13 +157,12 @@ module.exports = {
       throw new Error(req.responseText)
     }
   },
-  deleteVhost: (url, vhost) => {
+  deleteVhost: (url, authorization, vhost) => {
     log("Deleting vhost " + vhost)
     const req = new XMLHttpRequest()
-    let base64Credentials = btoa('administrator-only' + ":" + 'guest')
     let finalUrl = url + "/api/vhosts/" + encodeURIComponent(vhost)
     req.open('DELETE', finalUrl, false)
-    req.setRequestHeader("Authorization", "Basic " + base64Credentials)
+    req.setRequestHeader("Authorization", authorization)
 
     req.send()
     if (req.status == 200 || req.status == 204) {
@@ -194,15 +192,14 @@ module.exports = {
       throw new Error(req.responseText)
     }
   },
-  createQueue: (url, name, vhost, queueType = "quorum") => {    
+  createQueue: (url, authorization, vhost, name, queueType = "quorum") => {    
     log("Create queue " + JSON.stringify(name) 
       + " in vhost " + vhost + " on " + url)
     const req = new XMLHttpRequest()
-    let base64Credentials = btoa('administrator-only' + ":" + 'guest')
     let finalUrl = url + "/api/queues/" + encodeURIComponent(vhost) + "/"
       + encodeURIComponent(name)
     req.open('PUT', finalUrl, false)
-    req.setRequestHeader("Authorization", "Basic " + base64Credentials)
+    req.setRequestHeader("Authorization", authorization)
     req.setRequestHeader('Content-Type', 'application/json')
     let payload = {
       "durable": true,
@@ -219,14 +216,13 @@ module.exports = {
       throw new Error(req.responseText)
     }
   },
-  deleteQueue: (url, name, vhost) => {
+  deleteQueue: (url, authorization, vhost, name) => {
     log("Deleting queue " + name + " on vhost " + vhost)
     const req = new XMLHttpRequest()
-    let base64Credentials = btoa('administrator-only' + ":" + 'guest')
     let finalUrl = url + "/api/queues/" + encodeURIComponent(vhost) + "/"
       + encodeURIComponent(name)
     req.open('DELETE', finalUrl, false)
-    req.setRequestHeader("Authorization", "Basic " + base64Credentials)
+    req.setRequestHeader("Authorization", authorization)
 
     req.send()
     if (req.status == 200 || req.status == 204) {

selenium/test/pageobjects/BasePage.js

@@ -34,6 +34,9 @@ module.exports = class BasePage {
     this.interactionDelay = parseInt(process.env.SELENIUM_INTERACTION_DELAY) || 0 // slow down interactions (when rabbit is behind a http proxy)
   }
 
+  async goTo(path) {
+    return driver.get(d.baseUrl + path)  
+  }
 
   async isLoaded () {
     return this.waitForDisplayed(MENU_TABS)

selenium/test/pageobjects/QueuePage.js

@@ -1,7 +1,6 @@
 const { By, Key, until, Builder } = require('selenium-webdriver')
 
 const BasePage = require('./BasePage')
-const { goTo } = require('../utils')
 
 
 const QUEUE_NAME = By.css('div#main h1 b')
@@ -16,9 +15,7 @@ module.exports = class QueuePage extends BasePage {
   async getName() {
     return this.getText(QUEUE_NAME)
   }
-  async goToQueue(vhost, queue) {
-    return goTo('#/queues/' + encodeURIComponent(vhost) + '/' + encodeURIComponent(queue))
-  }
+  
   async ensureDeleteQueueSectionIsVisible() {    
     await this.click(DELETE_SECTION)
     return this.driver.findElement(DELETE_SECTION).isDisplayed()

selenium/test/queuesAndStreams/view-qq-consumers.js

@@ -1,8 +1,8 @@
 const { By, Key, until, Builder } = require('selenium-webdriver')
 require('chromedriver')
 const assert = require('assert')
-const { buildDriver, goToHome, captureScreensFor, teardown, delay, goToExchanges } = require('../utils')
-const { createQueue, deleteQueue, getManagementUrl } = require('../mgt-api')
+const { buildDriver, goToHome, captureScreensFor, teardown, delay, goToQueue } = require('../utils')
+const { createQueue, deleteQueue, getManagementUrl, basicAuthorization } = require('../mgt-api')
 
 const LoginPage = require('../pageobjects/LoginPage')
 const OverviewPage = require('../pageobjects/OverviewPage')
@@ -37,19 +37,21 @@ describe('Given a quorum queue', function () {
     await overview.clickOnQueuesTab()
     queueName = "test_" + Math.floor(Math.random() * 1000)
 
-    createQueue(getManagementUrl(), queueName, "/", "quorum")
+    createQueue(getManagementUrl(), basicAuthorization("management", "guest"), 
+       "/", queueName, "quorum")
 
   })
 
   it('add quorum queue and view it', async function () {    
-    await queuePage.goToQueue("/", queueName)
+    await goToQueue(driver, "/", queueName)
     await queuePage.isLoaded()
     assert.equal(queueName, await queuePage.getName())
 
   })
 
   after(async function () {    
     await teardown(driver, this, captureScreen)
-    deleteQueue(getManagementUrl(), "/", queueName)
+    deleteQueue(getManagementUrl(), basicAuthorization("management", "guest"), 
+      "/", queueName)
   })
 })

selenium/test/utils.js

@@ -127,11 +127,11 @@ module.exports = {
   },
 
   goToExchanges: (d) => {
-    return this.goTo('#/exchanges')
+    return d.driver.get(d.baseUrl + '#/exchanges')
   },
 
-  goTo: (d, path) => {
-    return d.ddriver.get(d.baseUrl + path)
+  goToQueue(d, vhost, queue) {
+    return d.driver.get(d.baseUrl + '#/queues/' + encodeURIComponent(vhost) + '/' + encodeURIComponent(queue))
   },
 
   delay: async (msec, ref) => {

selenium/test/vhosts/admin-vhosts.js

@@ -2,7 +2,7 @@ const { By, Key, until, Builder } = require('selenium-webdriver')
 require('chromedriver')
 const assert = require('assert')
 const { buildDriver, goToHome, captureScreensFor, teardown, doWhile, log, delay } = require('../utils')
-const { getManagementUrl, createVhost, deleteVhost } = require('../mgt-api')
+const { getManagementUrl, basicAuthorization, createVhost, deleteVhost } = require('../mgt-api')
 
 const LoginPage = require('../pageobjects/LoginPage')
 const OverviewPage = require('../pageobjects/OverviewPage')
@@ -107,7 +107,8 @@ describe('Virtual Hosts in Admin tab', function () {
     let vhost = "test_" + Math.floor(Math.random() * 1000)
     before(async function() {
       log("Creating vhost")
-      createVhost(getManagementUrl(), vhost, "selenium", "selenium-tag")
+      createVhost(getManagementUrl(), basicAuthorization('administraotor', 'guest'), 
+        vhost, "selenium", "selenium-tag")
     //  await overview.clickOnOverviewTab()
       await overview.clickOnAdminTab()
       await adminTab.clickOnVhosts()
@@ -131,7 +132,8 @@ describe('Virtual Hosts in Admin tab', function () {
     })
     after(async function () {
       log("Deleting vhost")
-      deleteVhost(getManagementUrl(), vhost)
+      deleteVhost(getManagementUrl(), basicAuthorization("administrator", "guest"), 
+          vhost)
     })
 
   })