Merge pull request #110 from jason-fox/feature/dependencies

Feature/dependencies

Author: apozohue10

Dockerfile-sample

@@ -7,7 +7,6 @@ const fs = require('fs');
 const https = require('https');
 const Root = require('../controllers/root').Root;
 const IDM = require('../lib/idm.js').IDM;
-const async = require('async');
 const errorhandler = require('errorhandler');
 
 config.azf = config.azf || {};
@@ -77,54 +76,20 @@ for (const p in config.public_paths) {
 
 app.all('/*', Root.pep);
 
-let retries = 0;
-let idmConnected = false;
-
-function retryCheck() {
-  return !idmConnected && retries < 10;
-}
 
 function connectIDM(callback) {
   IDM.authenticate(
     function(token) {
       log.info('Success authenticating PEP proxy. Proxy Auth-token: ', token);
-      idmConnected = true;
       callback();
     },
     function(status, e) {
       log.error('Error in IDM communication', e);
-      callback();
+      callback(e);
     }
   );
 }
 
-function tryCreateConnection(callback) {
-  const seconds = 5;
-
-  retries++;
-
-  if (retries === 1) {
-    log.info('Starting PEP proxy in port ' + port + '. IdM authentication ...');
-    connectIDM(callback);
-  } else {
-    log.info('Waiting %d seconds before attempting again.', seconds);
-    setTimeout(() => {
-      connectIDM(callback);
-    }, seconds * 1000);
-  }
-}
-
-function createConnectionHandler(error) {
-  if (idmConnected) {
-    log.info('Success authenticating PEP proxy.');
-  } else {
-    log.error('Error found after [%d] attempts: %s', retries, error);
-    process.exit(1);
-  }
-}
-
-async.whilst(retryCheck, tryCreateConnection, createConnectionHandler);
-
 if (config.https.enabled === true) {
   const options = {
     key: fs.readFileSync(config.https.key_file),
@@ -139,3 +104,28 @@ if (config.https.enabled === true) {
 } else {
   app.listen(app.get('port'));
 }
+
+let retry = 20;
+function connect() {
+  const connect_with_retry = () => {
+    connectIDM((err) => {
+      if (err) {
+        retry--;
+        if (retry === 0) {
+          log.error('Error found after [%d] attempts: %s', 20, error);
+          process.exit(1);
+        } else {
+          console.log('retry after 5 seconds.');
+          //eslint-disable-next-line snakecase/snakecase
+          setTimeout(connect_with_retry, 5000);
+        }
+      } else {
+        log.info('Success authenticating PEP proxy.');
+      }
+    });
+  };
+  connect_with_retry();
+}
+
+log.info('Starting PEP proxy in port ' + port + '. IdM authentication ...');
+connect();

bin/www

@@ -210,7 +210,9 @@ const Root = (function() {
   };
 
   const redirRequest = ('auth_for_nginx' in config && config.auth_for_nginx)
-    ? function(req, res, userInfo) {
+    ? 
+      // eslint-disable-next-line no-unused-vars
+      function(req, res, userInfo) {
         log.info('Access-token OK. Response 204');
         res.sendStatus(204);
       }

controllers/root.js

@@ -171,10 +171,10 @@ server {
 
 The auth_request directive in the `location /` block specifies the location for checking a token and permissions.
 Proxying to a backend-app happens only if the auth_request response is successful (HTTP status 2xx). The proxy_pass
-directive is a url of a backend-app.
+directive is a URL of a backend-app.
 
 To call a PEP Proxy, the various values of a request are defined in the `/_check_oauth2_token` block. The proxy_pass
-directive is a url of a PEP Proxy.
+directive is a URL of a PEP Proxy.
 
 Update the values of the two proxy_pass directives to suit your system environment.
 

doc/admin_guide.md

@@ -1,23 +1,22 @@
 const log = require('../lib/logger').logger.getLogger('Server');
 const path = require('path');
+const fs   = require('fs');
 
 let config = {};
-
-const fs   = require('fs');
-const path = require('path');
 const SECRETS_DIR =  process.env.SECRETS_DIR || '/run/secrets';
 const secrets = {};
 
 if (fs.existsSync(SECRETS_DIR)) {
   const files = fs.readdirSync(SECRETS_DIR);
+  // eslint-disable-next-line no-unused-vars
   files.forEach(function(file, index) {
     const fullPath = path.join(SECRETS_DIR, file);
     const key = file;
     try {
         const data = fs.readFileSync(fullPath, 'utf8').toString().trim();
         secrets[key] = data;
     } catch (e) {
-        logger.error(e.message);
+        log.error(e.message);
     }
   });
 }

lib/config_service.js

@@ -5,7 +5,6 @@
   "description": "PEP oauth2 authentication proxy for FIWARE GE services",
   "author": "GING DIT UPM",
   "dependencies": {
-    "async": "3.2.0",
     "errorhandler": "1.x",
     "escape-html": "1.0.3",
     "express": "4.x",