0) {
+ // we have a license object
+ if (!license.valid_key) {
+ // missing valid key
+ return true;
+ }
+ else if (license.free_instances <= 0) {
+ // host count exceeded
+ return true;
+ }
+ else if (this.getRemainingDays(license.time_remaining) < 15) {
+ // below 15 days remaining on license
+ return true;
+ }
+ return false;
+ } else {
+ // missing license object
+ return true;
+ }
+ },
+
+ isAdmin: function() {
+ return IsAdmin();
+ },
+ post: function(license, eula){
+ var defaultUrl = GetBasePath('config');
+ Rest.setUrl(defaultUrl);
+ var data = license;
+ data.eula_accepted = eula;
+ return Rest.post(JSON.stringify(data))
+ .success(function(res){
+ return res;
+ })
+ .error(function(res, status){
+ ProcessErrors($rootScope, res, status, null, {hdr: 'Error!',
+ msg: 'Call to '+ defaultUrl + ' failed. Return status: '+ status});
+ });
+ },
+ postLicense: function(license_key, in_scope) {
+ var url = GetBasePath('config'),
+ self = this,
+ json_data, scope;
+
+ scope = (in_scope) ? in_scope : self.scope;
+
+ json_data = ToJSON('json', license_key);
+ json_data.eula_accepted = scope.eula_agreement;
+ if (typeof json_data === 'object' && Object.keys(json_data).length > 0) {
+ Rest.setUrl(url);
+ Rest.post(json_data)
+ .success(function (response) {
+ response.license_info = response;
+ Alert('License Accepted', 'The Ansible Tower license was updated. To review or update the license, choose View License from the Setup menu.','alert-info');
+ $rootScope.features = undefined;
+
+ Authorization.getLicense()
+ .success(function (data) {
+ Authorization.setLicense(data);
+ pendoService.issuePendoIdentity();
+ Wait("stop");
+ $state.go('home');
+ })
+ .error(function () {
+ Wait('stop');
+ Alert('Error', 'Failed to access license information. GET returned status: ' + status, 'alert-danger',
+ $state.go('signOut'));
+ });
+
+
+
+
+ })
+ .catch(function (response) {
+ scope.license_json_api_error = "A valid license key in JSON format is required";
+ ProcessErrors(scope, response.data, response.status, null, { hdr: 'Error!',
+ msg: 'Failed to update license. POST returned: ' + response.status
+ });
+ });
+ } else {
+ scope.license_json_api_error = "A valid license key in JSON format is required";
+ }
+ },
+
+ test: function() {
+ var license = Store('license'),
+ self = this;
+ // scope;
+
+ var getLicense = function() {
+ var deferred = $q.defer();
+
+ if (license === null) {
+ Rest.setUrl(GetBasePath('config'));
+ return Rest.get()
+ .then(function (data) {
+ license = data.data.license_info;
+ deferred.resolve();
+ return deferred.promise;
+ }, function () {
+ deferred.resolve();
+ return deferred.promise;
+ });
+ } else {
+ deferred.resolve(license);
+ return deferred.promise;
+ }
+ };
+
+ var promise = getLicense();
+ promise.then(function() {
+ // self.scope = $rootScope.$new();
+ // scope = self.scope;
+
+ if (license && typeof license === 'object' && Object.keys(license).length > 0) {
+ // if (license.tested) {
+ // return true;
+ // }
+ license.tested = true;
+ Store('license',license); //update with tested flag
+ }
+
+ // Don't do anything when the license is valid
+ if (!self.shouldNotify(license)) {
+ $rootScope.licenseMissing = false;
+ return true; // if the license is valid it would exit 'test' here, otherwise it moves on to making the modal for the license
+ }
+ $rootScope.licenseMissing = true;
+ $state.go('license');
+ });
+ },
+ // Checks current license validity
+ // Intended to for runtime or pre-state checks
+ // Returns false if invalid
+ valid: function(license) {
+ if (!license.valid_key){
+ return false;
+ }
+ else if (license.free_instances <= 0){
+ return false;
+ }
+ // notify if less than 15 days remaining
+ else if (license.time_remaining / 1000 / 60 / 60 / 24 > 15){
+ return false;
+ }
+ return true;
+ },
+ GetLicense: function() {
+ // Retrieve license detail
+ var //self = this,
+ // scope = (inScope) ? inScope : self.scope,
+ url = GetBasePath('config');
+ Rest.setUrl(url);
+ return Rest.get()
+ .success(function(res){
+ $rootScope.license_tested = true;
+ return res;
+ })
+ .error(function (data, status) {
+ ProcessErrors($rootScope, data, status, null, { hdr: 'Error!',
+ msg: 'Failed to retrieve license. GET status: ' + status
+ });
+ });
+ }
+ };
+ }];
diff --git a/awx/ui/client/src/license/license.block.less b/awx/ui/client/src/license/license.block.less
index f76c1de0aa..90a8eb88af 100644
--- a/awx/ui/client/src/license/license.block.less
+++ b/awx/ui/client/src/license/license.block.less
@@ -6,7 +6,6 @@
@import "awx/ui/client/src/shared/branding/colors.default.less";
@import "awx/ui/client/src/shared/layouts/one-plus-two.less";
-
.License-container{
.OnePlusTwo-container;
}
diff --git a/awx/ui/client/src/license/license.controller.js b/awx/ui/client/src/license/license.controller.js
index ee9bee730d..b210bd5a0b 100644
--- a/awx/ui/client/src/license/license.controller.js
+++ b/awx/ui/client/src/license/license.controller.js
@@ -74,23 +74,22 @@ export default
var calcExpiresOn = function(days){
// calculate the expiration date of the license
- days = parseInt(days);
return moment().add(days, 'days').calendar();
};
var init = function(){
$scope.fileName = "No file selected.";
$scope.title = $rootScope.licenseMissing ? "Tower License" : "License Management";
Wait('start');
- CheckLicense.get()
- .then(function(res){
- $scope.license = res.data;
- $scope.license.version = res.data.version.split('-')[0];
+ var license = CheckLicense.get();
+ //.then(function(res){
+ $scope.license = license;
+ $scope.license.version = license.version.split('-')[0];
$scope.time = {};
$scope.time.remaining = calcDaysRemaining($scope.license.license_info.time_remaining);
$scope.time.expiresOn = calcExpiresOn($scope.time.remaining);
$scope.valid = CheckLicense.valid($scope.license.license_info);
Wait('stop');
- });
+ // });
};
var reset = function(){
document.getElementById('License-form').reset();
diff --git a/awx/ui/client/src/license/license.partial.html b/awx/ui/client/src/license/license.partial.html
index 24614bdc21..1c1c230bbc 100644
--- a/awx/ui/client/src/license/license.partial.html
+++ b/awx/ui/client/src/license/license.partial.html
@@ -1,6 +1,6 @@
-
+
Details
diff --git a/awx/ui/client/src/license/main.js b/awx/ui/client/src/license/main.js
index 6eeb8bf12e..90c5ff36f3 100644
--- a/awx/ui/client/src/license/main.js
+++ b/awx/ui/client/src/license/main.js
@@ -16,4 +16,4 @@ export default
.factory('CheckLicense', CheckLicense)
.run(['$stateExtender', function($stateExtender) {
$stateExtender.addState(route);
- }]);
\ No newline at end of file
+ }]);
diff --git a/awx/ui/client/src/login/authenticationServices/authentication.service.js b/awx/ui/client/src/login/authenticationServices/authentication.service.js
index 912ada41a8..68e912c1a3 100644
--- a/awx/ui/client/src/login/authenticationServices/authentication.service.js
+++ b/awx/ui/client/src/login/authenticationServices/authentication.service.js
@@ -98,6 +98,7 @@ export default
$rootScope.license_tested = undefined;
$rootScope.userLoggedIn = false;
$rootScope.sessionExpired = false;
+ $rootScope.licenseMissing = true;
$rootScope.token = null;
$rootScope.token_expires = null;
$rootScope.login_username = null;
@@ -127,7 +128,7 @@ export default
Store('license', license);
$rootScope.features = Store('license').features;
},
-
+
licenseTested: function () {
var license, result;
if ($rootScope.license_tested !== undefined) {
diff --git a/awx/ui/client/src/login/authenticationServices/pendo.service.js b/awx/ui/client/src/login/authenticationServices/pendo.service.js
index 82af8ade88..5e034eaa87 100644
--- a/awx/ui/client/src/login/authenticationServices/pendo.service.js
+++ b/awx/ui/client/src/login/authenticationServices/pendo.service.js
@@ -7,9 +7,9 @@
export default
[ '$rootScope', '$pendolytics', 'Rest', 'GetBasePath', 'ProcessErrors', '$q',
- 'Store', '$log',
+ 'ConfigService', '$log',
function ($rootScope, $pendolytics, Rest, GetBasePath, ProcessErrors, $q,
- Store, $log) {
+ ConfigService, $log) {
return {
setPendoOptions: function (config) {
var tower_version = config.version.split('-')[0],
@@ -93,7 +93,7 @@ export default
},
getConfig: function () {
- var config = Store('license'),
+ var config = ConfigService.get(),
deferred = $q.defer();
if(_.isEmpty(config)){
var url = GetBasePath('config');
diff --git a/awx/ui/client/src/main-menu/main-menu.partial.html b/awx/ui/client/src/main-menu/main-menu.partial.html
index b45d0eb382..ba4d8ad69c 100644
--- a/awx/ui/client/src/main-menu/main-menu.partial.html
+++ b/awx/ui/client/src/main-menu/main-menu.partial.html
@@ -2,8 +2,8 @@
![]()
@@ -86,10 +86,10 @@
-
PROJECTS
@@ -98,7 +98,7 @@
INVENTORIES
@@ -107,7 +107,7 @@
JOB TEMPLATES
@@ -116,7 +116,7 @@
JOBS
@@ -125,7 +125,7 @@
diff --git a/awx/ui/client/src/shared/config/config.service.js b/awx/ui/client/src/shared/config/config.service.js
new file mode 100644
index 0000000000..4df049068d
--- /dev/null
+++ b/awx/ui/client/src/shared/config/config.service.js
@@ -0,0 +1,52 @@
+/*************************************************
+* Copyright (c) 2016 Ansible, Inc.
+*
+* All Rights Reserved
+*************************************************/
+
+
+export default
+ [ '$rootScope', '$pendolytics', 'Rest', 'GetBasePath', 'ProcessErrors', '$q',
+ function ($rootScope, $pendolytics, Rest, GetBasePath, ProcessErrors, $q) {
+ return {
+ get: function(){
+ return this.config;
+ },
+
+ set: function(config){
+ this.config = config;
+ },
+
+ getConfig: function () {
+ var config = this.get(),
+ that = this,
+ deferred = $q.defer();
+ if(_.isEmpty(config)){
+ var url = GetBasePath('config');
+ Rest.setUrl(url);
+ var promise = Rest.get();
+ promise.then(function (response) {
+ var config = response.data;
+ that.set(config);
+ deferred.resolve(response.data);
+ });
+ promise.catch(function (response) {
+ ProcessErrors($rootScope, response.data, response.status, null, {
+ hdr: 'Error!',
+ msg: 'Failed to get inventory name. GET returned status: ' +
+ response.status });
+ deferred.reject('Could not resolve pendo config.');
+ });
+ }
+ else if(config){
+ this.set(config);
+ deferred.resolve(config);
+ }
+ else {
+ deferred.reject('Config not found.');
+ }
+ return deferred.promise;
+ }
+ };
+ }
+];
diff --git a/awx/ui/client/src/shared/config/main.js b/awx/ui/client/src/shared/config/main.js
new file mode 100644
index 0000000000..ad8d75b0e2
--- /dev/null
+++ b/awx/ui/client/src/shared/config/main.js
@@ -0,0 +1,11 @@
+/*************************************************
+ * Copyright (c) 2016 Ansible, Inc.
+ *
+ * All Rights Reserved
+ *************************************************/
+
+import ConfigService from './config.service';
+
+export default
+ angular.module('config', [])
+ .service('ConfigService', ConfigService);
diff --git a/awx/ui/client/src/shared/features/features.service.js b/awx/ui/client/src/shared/features/features.service.js
index ab44f354ba..00e1df3d09 100644
--- a/awx/ui/client/src/shared/features/features.service.js
+++ b/awx/ui/client/src/shared/features/features.service.js
@@ -4,26 +4,32 @@
* All Rights Reserved
*************************************************/
-export default ['$rootScope', 'Rest', 'GetBasePath', 'ProcessErrors', '$http', '$q',
-function ($rootScope, Rest, GetBasePath, ProcessErrors, $http, $q) {
+export default ['$rootScope', 'Rest', 'GetBasePath', 'ProcessErrors', '$http',
+ '$q', 'ConfigService',
+function ($rootScope, Rest, GetBasePath, ProcessErrors, $http, $q,
+ ConfigService) {
var license_info;
return {
getFeatures: function(){
- var promise;
- Rest.setUrl(GetBasePath('config'));
- promise = Rest.get();
- return promise.then(function (data) {
- license_info = data.data.license_info;
- $rootScope.features = data.data.license_info.features;
- return $rootScope.features;
- }).catch(function (response) {
- ProcessErrors($rootScope, response.data, response.status, null, {
- hdr: 'Error!',
- msg: 'Failed to get license info. GET returned status: ' +
- response.status
- });
- });
+ var config = ConfigService.get();
+ license_info = config.license_info;
+ $rootScope.features = config.license_info.features;
+ return $rootScope.features;
+ // var promise;
+ // Rest.setUrl(GetBasePath('config'));
+ // promise = Rest.get();
+ // return promise.then(function (data) {
+ // license_info = data.data.license_info;
+ // $rootScope.features = data.data.license_info.features;
+ // return $rootScope.features;
+ // }).catch(function (response) {
+ // ProcessErrors($rootScope, response.data, response.status, null, {
+ // hdr: 'Error!',
+ // msg: 'Failed to get license info. GET returned status: ' +
+ // response.status
+ // });
+ // });
},
get: function(){
if(_.isEmpty($rootScope.features)){
@@ -41,9 +47,6 @@ function ($rootScope, Rest, GetBasePath, ProcessErrors, $http, $q) {
else {
return false;
}
- },
- getLicenseInfo: function() {
- return license_info;
}
};
}];
diff --git a/awx/ui/client/src/shared/stateExtender.provider.js b/awx/ui/client/src/shared/stateExtender.provider.js
index 9f6f637838..d647e5caf7 100644
--- a/awx/ui/client/src/shared/stateExtender.provider.js
+++ b/awx/ui/client/src/shared/stateExtender.provider.js
@@ -11,10 +11,17 @@ export default function($stateProvider) {
resolve.features = ['FeaturesService', function(FeaturesService) {
return FeaturesService.get();
}];
+ // resolve.features = ['CheckLicense', 'Store', '$state',
+ // function(CheckLicense, Store, $state) {
+ // var license = Store('license');
+ // if(CheckLicense.valid(license)=== false){
+ // $state.go('license');
+ // }
+ // }];
return resolve;
}
},
-
+
addState: function(state) {
var route = state.route || state.url,
resolve = this.getResolves(state);