+
-
+
-
+
diff --git a/www/src/app/pages/analyzers/analyzers.service.js b/www/src/app/pages/analyzers/analyzers.service.js
index b1061a4fe..25b091647 100644
--- a/www/src/app/pages/analyzers/analyzers.service.js
+++ b/www/src/app/pages/analyzers/analyzers.service.js
@@ -31,6 +31,21 @@ export default class AnalyzerService {
response => {
this.analyzerDefinitions = _.keyBy(response.data, 'id');
+ // Compute type (process/docker)
+ _.keys(this.analyzerDefinitions).forEach(key => {
+ let def = this.analyzerDefinitions[key];
+
+ def.runners = [];
+
+ if (def.command && def.command !== null) {
+ def.runners.push('Process');
+ }
+
+ if (def.dockerImage && def.dockerImage !== null) {
+ def.runners.push('Docker');
+ }
+ });
+
defered.resolve(this.analyzerDefinitions);
},
response => {
@@ -111,7 +126,23 @@ export default class AnalyzerService {
this.$http
.get(`./api/analyzerconfig/${name}`)
- .then(response => defer.resolve(response.data), err => defer.reject(err));
+ .then(response => {
+ let cfg = response.data;
+
+ if (name === 'global') {
+ // Prepare the default values of the global config
+ let globalWithDefaults = {};
+ _.each(cfg.configurationItems, item => {
+ globalWithDefaults[item.name] = item.defaultValue;
+ });
+
+ // Set the default value of the global config that are not set
+ _.defaults(cfg.config, globalWithDefaults);
+ }
+
+ defer.resolve(cfg);
+ })
+ .catch(err => defer.reject(err));
return defer.promise;
}
diff --git a/www/src/app/pages/jobs/components/jobs.list.html b/www/src/app/pages/jobs/components/jobs.list.html
index 1d836edc8..153807c2d 100644
--- a/www/src/app/pages/jobs/components/jobs.list.html
+++ b/www/src/app/pages/jobs/components/jobs.list.html
@@ -50,7 +50,8 @@
diff --git a/www/src/app/pages/login/login.controller.js b/www/src/app/pages/login/login.controller.js
index 6d6dcc3f6..dc51b9273 100644
--- a/www/src/app/pages/login/login.controller.js
+++ b/www/src/app/pages/login/login.controller.js
@@ -3,17 +3,23 @@ export default class LoginController {
$log,
$state,
$uibModalStack,
+ $location,
+ $stateParams,
AuthService,
NotificationService,
- Roles
+ Roles,
+ UrlParser
) {
'ngInject';
this.$log = $log;
this.$state = $state;
this.$uibModalStack = $uibModalStack;
+ this.$location = $location;
+ this.$stateParams = $stateParams;
this.AuthService = AuthService;
this.NotificationService = NotificationService;
this.Roles = Roles;
+ this.UrlParser = UrlParser;
this.params = {
bar: 'foo'
};
@@ -23,8 +29,29 @@ export default class LoginController {
this.params.username = angular.lowercase(this.params.username);
this.AuthService.login(this.params.username, this.params.password)
- .then(() => {
- this.$state.go('index');
+ .then(() => this.$state.go('index'))
+ .catch(err => {
+ if (err.status === 520) {
+ this.NotificationService.handleError(
+ 'LoginController',
+ err.data,
+ err.status
+ );
+ } else {
+ this.NotificationService.log(err.data.message, 'error');
+ }
+ });
+ }
+
+ ssoLogin(code) {
+ this.AuthService.ssoLogin(code)
+ .then(response => {
+ let redirectLocation = response.headers().location;
+ if (angular.isDefined(redirectLocation)) {
+ window.location = redirectLocation;
+ } else {
+ this.$state.go('index');
+ }
})
.catch(err => {
if (err.status === 520) {
@@ -35,11 +62,21 @@ export default class LoginController {
);
} else {
this.NotificationService.log(err.data.message, 'error');
+ this.$location.url(this.$location.path());
}
});
}
+ ssoEnabled() {
+ return this.config.config.authType.indexOf('oauth2') !== -1;
+ }
+
$onInit() {
this.$uibModalStack.dismissAll();
+
+ let code = (this.UrlParser('?') || {}).code;
+ if (angular.isDefined(code) || this.$stateParams.autoLogin) {
+ this.ssoLogin(code);
+ }
}
-}
+}
\ No newline at end of file
diff --git a/www/src/app/pages/login/login.module.js b/www/src/app/pages/login/login.module.js
index 212673120..5bb20baab 100644
--- a/www/src/app/pages/login/login.module.js
+++ b/www/src/app/pages/login/login.module.js
@@ -3,6 +3,8 @@
import LoginController from './login.controller';
import tpl from './login.page.html';
+import './login.page.scss';
+
const loginPageModule = angular
.module('login-module', ['ui.router'])
.config($stateProvider => {
@@ -10,12 +12,22 @@ const loginPageModule = angular
$stateProvider.state('login', {
url: '/login',
- component: 'loginPage'
+ component: 'loginPage',
+ resolve: {
+ config: ($q, VersionService) => VersionService.get()
+ .then(response => $q.resolve(response.data))
+ },
+ params: {
+ autoLogin: false
+ }
});
})
.component('loginPage', {
controller: LoginController,
- templateUrl: tpl
+ templateUrl: tpl,
+ bindings: {
+ config: '<'
+ }
});
-export default loginPageModule;
+export default loginPageModule;
\ No newline at end of file
diff --git a/www/src/app/pages/login/login.page.html b/www/src/app/pages/login/login.page.html
index 6d8424406..90a3af416 100644
--- a/www/src/app/pages/login/login.page.html
+++ b/www/src/app/pages/login/login.page.html
@@ -21,4 +21,11 @@