thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated merge from master

Browse source
This commit is contained in:
Matthew Dillon 2015-07-07 14:41:40 -08:00
commit 8ab97c00e1
127 changed files with 578 additions and 1802 deletions
Download patch file Download diff file Expand all files Collapse all files

31
config/environment.js
View file

@ -16,8 +16,8 @@ module.exports = function(environment) {
},
podModulePrefix: 'clostridiumdotinfo/pods',
'simple-auth': {
session: 'session:custom',
authorizer: 'simple-auth-authorizer:token',
store: 'simple-auth-session-store:local-storage',
},
'simple-auth-token': {
identificationField: 'email',
@ -34,32 +34,33 @@ module.exports = function(environment) {
'style-src': "'self' 'unsafe-inline'",
'media-src': "'self'"
},
flashMessageDefaults: {
sticky: true,
type: 'error',
types: ['error', 'warning', 'success', 'information', 'tip', 'message'],
},
};
var apiURL;
if (environment === 'development') {
ENV['simple-auth']['crossOriginWhitelist'] = ['http://127.0.0.1:4200'];
ENV['simple-auth-token']['serverTokenEndpoint'] = '/api/authenticate';
ENV.apiURL = 'http://127.0.0.1:4200';
ENV.contentSecurityPolicy['connect-src'] = "'self' http://127.0.0.1:4200";
apiURL = 'http://127.0.0.1:8901';
}
if (environment === 'test') {
ENV['simple-auth']['crossOriginWhitelist'] = ['https://bactdb-test.herokuapp.com'];
ENV['simple-auth-token']['serverTokenEndpoint'] = 'https://bactdb-test.herokuapp.com/api/authenticate';
ENV.apiURL = 'https://bactdb-test.herokuapp.com';
ENV.contentSecurityPolicy['connect-src'] = "'self' https://bactdb-test.herokuapp.com";
// keep test console output quieter
apiURL = 'https://bactdb-test.herokuapp.com';
ENV.APP.LOG_ACTIVE_GENERATION = false;
ENV.APP.LOG_VIEW_LOOKUPS = false;
}
if (environment === 'production') {
ENV['simple-auth']['crossOriginWhitelist'] = ['https://bactdb.herokuapp.com'];
ENV['simple-auth-token']['serverTokenEndpoint'] = 'https://bactdb.herokuapp.com/api/authenticate';
ENV.apiURL = 'https://bactdb.herokuapp.com';
ENV.contentSecurityPolicy['connect-src'] = "'self' https://bactdb.herokuapp.com";
apiURL = 'https://bactdb.herokuapp.com';
}
ENV['simple-auth']['crossOriginWhitelist'] = [apiURL];
ENV['simple-auth-token']['serverTokenEndpoint'] = apiURL + '/api/authenticate';
ENV.apiURL = apiURL;
ENV.contentSecurityPolicy['connect-src'] = "'self' " + apiURL;
return ENV;
};