Merge branch 'master' into improved-polling

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 **Highlight**
 - Add `stopped` field to executor data. In database, REST API and nFlow Explorer. Requires database migration.
+- Support Azure AD authentication in Explorer (see `nflow-explorer/src/config.js` for configuration options)
 
 **Details**
 - Travis CI no longer runs tests with Oracle JDK 10. Only oraclejdk8 and openjdk11 are currently running Travis CI tests.

nflow-explorer/src/app/app.js

@@ -4,6 +4,7 @@
   var m = angular.module('nflowExplorer', [
     'nflowExplorer.about',
     'nflowExplorer.config',
+    'nflowExplorer.config.adal',
     'nflowExplorer.components',
     'nflowExplorer.frontPage',
     'nflowExplorer.layout',
@@ -20,7 +21,8 @@
     'ngSanitize',
     'ngTouch',
     'ui.bootstrap',
-    'chart.js'
+    'chart.js',
+    'AdalAngular'
   ]);
 
   m.run(function (EndpointService, ExecutorService) {

nflow-explorer/src/app/config/adal.js

@@ -0,0 +1,9 @@
+(function () {
+    'use strict';
+    var m = angular.module('nflowExplorer.config.adal', ['nflowExplorer.config', 'AdalAngular']);
+    m.config(function(config, $httpProvider, adalAuthenticationServiceProvider) {
+        if (config.adal && config.adal.requireADLogin) {
+            adalAuthenticationServiceProvider.init(config.adal, $httpProvider);
+        }
+    });
+})();

nflow-explorer/src/config.js

@@ -20,6 +20,16 @@ var Config = function() {
     },
   ];
 
+  // see: https://github.com/AzureAD/azure-activedirectory-library-for-js/wiki/Config-authentication-context#configurable-options
+  this.adal = {
+    // undocumented adal-option that controls authentication on globally
+    requireADLogin: false,
+    instance: 'https://login.microsoftonline.com/',
+    tenant: 'Enter_your_tenant_name_here_e.g._contoso.onmicrosoft.com',
+    clientId: 'Enter_your_client_ID_here_e.g._e9a5a8b6-8af7-4719-9821-0deef255f68e',
+    popUp: false
+  };
+
   this.radiator = {
     // poll period in seconds
     pollPeriod: 15,

nflow-explorer/src/index.html

@@ -63,6 +63,13 @@
     <!-- endbower -->
     <!-- endbuild -->
 
+    <!--
+      Adal-angular is not managed using Bower purely because JS uglification fails because the
+      library declares strict mode but is not compliant with it, which makes the build to fail.
+      https://github.com/AzureAD/azure-activedirectory-library-for-js/pull/820/files
+    -->
+    <script src="external/adal-angular/adal-1.0.17.min.js"></script>
+    <script src="external/adal-angular/adal-angular-1.0.17.min.js"></script>
     <script src="external/angular-ui-bootstrap/ui-bootstrap-custom-tpls-0.10.0.min.js"></script>
 
     <script src="config.js"></script>
@@ -75,6 +82,7 @@
     <script src="app/config/index.js"></script>
     <script src="app/config/console.js"></script>
     <script src="app/config/routes.js"></script>
+    <script src="app/config/adal.js"></script>
 
     <script src="app/components/index.js"></script>
     <script src="app/components/constants.js"></script>

nflow-explorer/test/karma.conf.js

@@ -31,10 +31,11 @@ module.exports = function(config) {
       'bower_components/momentjs/moment.js',
       'bower_components/lodash/lodash.js',
       'bower_components/bootstrap-sass/assets/javascripts/bootstrap.js',
+      'bower_components/d3/d3.js',
 
-      'src/external/dagre-d3/js/dagre-d3.min.js',
+      'src/external/adal-angular/adal-1.0.17.min.js',
+      'src/external/adal-angular/adal-angular-1.0.17.min.js',
       'src/external/angular-ui-bootstrap/ui-bootstrap-custom-tpls-0.10.0.min.js',
-      'bower_components/d3/d3.js',
       'src/config.js',
       'src/app/**/*.js',
       'test/mock/**/*.js',