opendev/storyboard-webclient
Code Issues Proposed changes

Simplify API-base configuration.

Browse Source 
With the ability to customize the application using config.json, the
complex config discovery used for storyboardApiBase is no longer
necessary. This removes it.

Change-Id: Ie6d0390e30c24b2ca22bd389a817c40823ab80b1
This commit is contained in:
Michael Krotscheck 2014-09-25 15:43:10 -07:00
parent 941b12aec2
commit 0de4a51783
2 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/app/services/provider/storyboard_api_base.js
View File

@ -15,38 +15,10 @@
*/ */
/** /**
* This provider attempts to discover the API URI base for storyboard, by * This provider injects a sane default for the storyboardApiBase property. It
* checking various expected configuration parameters. * may be overridden simply by injecting a constant of the same name in any
* module which lists sb.services as a dependency.
* *
* @author Michael Krotscheck * @author Michael Krotscheck
*/ */
angular.module('sb.services') angular.module('sb.services').constant('storyboardApiBase', '/api/v1');
.config(function ($provide, $injector) {
'use strict';
var propertyName = 'storyboardApiBase';
// First to see whether something's already been injected.
if ($injector.has(propertyName)) {
// We've already got one, exit.
return;
}
// Do we have a global ENV property with something we can use?
if (window.hasOwnProperty('ENV')) {
var ENV = window.ENV;
if (ENV !== null && ENV.hasOwnProperty(propertyName)) {
$provide.constant(propertyName, ENV[propertyName]);
return;
}
}
// If there is a <base> tag, then we can use that.
if (document.getElementsByTagName('base').length > 0) {
$provide.constant(propertyName, '');
return;
}
// Neither of those work, so default to something sane on the current
// domain
$provide.constant(propertyName, '/api/v1');
});

14
test/unit/services/provider/storyboard_api_base_test.js
View File

@ -29,20 +29,6 @@ describe('storyboardApiBase', function () {
}); });
}); });
it('should detect a value in window.ENV', function () {
window.ENV = {
storyboardApiBase: 'https://localhost:8080/api/v1'
};
module('sb.services');
inject(function (storyboardApiBase) {
expect(storyboardApiBase).toEqual('https://localhost:8080/api/v1');
});
delete window.ENV;
});
it('should defer to properties injected at the parent level.', function () { it('should defer to properties injected at the parent level.', function () {
angular.module('testModule', ['sb.services']) angular.module('testModule', ['sb.services'])
.config(function ($provide) { .config(function ($provide) {