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

Merge branch 'master' into clostridium

Browse source 
* master:
  Refresh token
This commit is contained in:
Matthew Dillon 2015-09-17 15:58:25 -07:00
commit 418b294634
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/pods/login/controller.js
View file

@ -5,7 +5,7 @@ export default Ember.Controller.extend({
authenticate: function() { authenticate: function() {
let credentials = this.getProperties('identification', 'password'); let credentials = this.getProperties('identification', 'password');
let session = this.get('session'); let session = this.get('session');
let authenticator = 'simple-auth-authenticator:token'; let authenticator = 'simple-auth-authenticator:jwt';
// Manually clean up because there might not be a transition // Manually clean up because there might not be a transition
this.get('flashMessages').clearMessages(); this.get('flashMessages').clearMessages();

4
config/environment.js
View file

@ -27,6 +27,9 @@ module.exports = function(environment) {
tokenPropertyName: 'token', tokenPropertyName: 'token',
authorizationPrefix: 'Bearer ', authorizationPrefix: 'Bearer ',
authorizationHeaderName: 'Authorization', authorizationHeaderName: 'Authorization',
refreshAccessTokens: true,
timeFactor: 1000,
refreshLeeway: 300,
}, },
contentSecurityPolicy: { contentSecurityPolicy: {
'default-src': "'none'", 'default-src': "'none'",
@ -61,6 +64,7 @@ module.exports = function(environment) {
ENV['simple-auth']['crossOriginWhitelist'] = [apiURL]; ENV['simple-auth']['crossOriginWhitelist'] = [apiURL];
ENV['simple-auth-token']['serverTokenEndpoint'] = apiURL + '/api/authenticate'; ENV['simple-auth-token']['serverTokenEndpoint'] = apiURL + '/api/authenticate';
ENV['simple-auth-token']['serverTokenRefreshEndpoint'] = apiURL + '/api/refresh';
ENV.apiURL = apiURL; ENV.apiURL = apiURL;
ENV.contentSecurityPolicy['connect-src'] = "'self' " + apiURL; ENV.contentSecurityPolicy['connect-src'] = "'self' " + apiURL;