Modify fakeportal so that it can talk to spring too

Author: MarcialRosales

selenium/bin/components/fakeportal

@@ -32,6 +32,8 @@ init_fakeportal() {
   print "> CLIENT_ID: ${CLIENT_ID}"
   print "> CLIENT_SECRET: ${CLIENT_SECRET}"
   print "> RABBITMQ_URL: ${RABBITMQ_URL}"
+  print "> IDP_TOKEN_ENDPOINT: ${IDP_TOKEN_ENDPOINT}"
+  print "> IDP: ${IDP}"
 }
 start_fakeportal() {
   begin "Starting fakeportal ..."
@@ -48,11 +50,11 @@ start_fakeportal() {
     --env PORT=3000 \
     --env RABBITMQ_URL="${RABBITMQ_URL_FOR_FAKEPORTAL}" \
     --env PROXIED_RABBITMQ_URL="${RABBITMQ_URL}" \
-    --env UAA_URL="${UAA_URL_FOR_FAKEPORTAL}" \
+    --env IDP_TOKEN_ENDPOINT="${IDP_TOKEN_ENDPOINT}" \
     --env CLIENT_ID="${CLIENT_ID}" \
     --env CLIENT_SECRET="${CLIENT_SECRET}" \
-    --env NODE_EXTRA_CA_CERTS=/etc/uaa/ca_uaa_certificate.pem \
-    -v ${TEST_CONFIG_DIR}/uaa:/etc/uaa \
+    --env NODE_EXTRA_CA_CERTS=/etc/uaa/ca_${IDP}_certificate.pem \
+    -v ${TEST_CONFIG_DIR}/${IDP}:/etc/${IDP} \
     -v ${FAKEPORTAL_DIR}:/code/fakeportal \
     mocha-test:${mocha_test_tag} run fakeportal
 

selenium/fakeportal/app.js

@@ -28,7 +28,10 @@ app.get('/favicon.ico', (req, res) => res.status(204));
 
 
 app.listen(port);
-console.log('Express started on port ' + port);
+console.log('Express started on port ' + port + " using ") 
+console.log(" -  idp_token_endpoint: " + idp_token_endpoint)
+console.log(" -  rabbitmq_url: " + rabbitmq_url)
+console.log(" -  proxied_rabbitmq_url: " + proxied_rabbitmq_url)
 
 function default_if_blank(value, defaultValue) {
   if (typeof value === "undefined" || value === null || value == "") {
@@ -40,14 +43,14 @@ function default_if_blank(value, defaultValue) {
 
 function access_token(id, secret) {
   const req = new XMLHttpRequest();
-  const url = idp_token_endpoint; // uaa_url + '/oauth/token';
+  const url = idp_token_endpoint
   const params = 'client_id=' + id +
     '&client_secret=' + secret +
     '&grant_type=client_credentials' +
     '&token_format=jwt' +
     '&response_type=token';
 
-  console.debug("Sending " + url + " with params "+  params);
+  console.debug("Sending " + url + " with params " +  params);
 
   req.open('POST', url, false);
   req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');

selenium/test/oauth/env.docker.uaa

@@ -1,2 +1 @@
 export UAA_URL=https://uaa:8443
-export IDP_TOKEN_ENDPOINT=$UAA_URL/oauth/token

selenium/test/oauth/env.dockerr.fakeportal.uaa

@@ -0,0 +1 @@
+export IDP_TOKEN_ENDPOINT=https://uaa:8443/oauth/token

selenium/test/oauth/env.local.fakeportal.uaa

@@ -0,0 +1 @@
+export IDP_TOKEN_ENDPOINT=https://uaa:8443/oauth/token

selenium/test/oauth/env.local.uaa

@@ -1,2 +1 @@
 export UAA_URL=https://localhost:8443
-export IDP_TOKEN_ENDPOINT=$UAA_URL/oauth/token

selenium/test/oauth/env.spring

@@ -1,3 +1,4 @@
 export OAUTH_SERVER_CONFIG_DIR=${OAUTH_SERVER_CONFIG_BASEDIR}/oauth/spring
 export OAUTH_SCOPES="openid profile"
 export OAUTH_CLIENT_ID=rabbitmq_client_code
+export IDP=spring 

selenium/test/oauth/env.uaa

@@ -3,3 +3,4 @@ export OAUTH_SERVER_CONFIG_DIR=${OAUTH_SERVER_CONFIG_BASEDIR}/oauth/uaa
 export OAUTH_CLIENT_SECRET=rabbitmq_client_code
 export OAUTH_CLIENT_ID=rabbitmq_client_code
 export OAUTH_SCOPES="openid profile rabbitmq.*"
+export IDP=uaa