suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Log user out only if necessary on failed user data request

Browse Source
This commit is contained in:
Piotr Sarnacki 2016-03-08 13:34:00 +01:00
parent fa7c275eaa
commit c6ec02429d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/routes/application.js
View File

@ -9,8 +9,13 @@ export default TravisRoute.extend(BuildFaviconMixin, {
this._super.apply(this, arguments); this._super.apply(this, arguments);
return this.get('auth').refreshUserData().then( () => { return this.get('auth').refreshUserData().then( () => {
this.setupPendo(); this.setupPendo();
}, () => { }, (xhr) => {
return this.get('auth').signOut(); // if xhr is not defined it means that scopes are not correct,
// so log the user out. Also log the user out if the response is 401
// or 403
if(!xhr || (xhr.status === 401 || xhr.status === 403)) {
return this.get('auth').signOut();
}
}); });
}, },

2
app/services/auth.js
View File

@ -140,7 +140,7 @@ export default Ember.Service.extend({
data.user.token = user.token; data.user.token = user.token;
this.storeData(data, this.get('sessionStorage')); this.storeData(data, this.get('sessionStorage'));
this.storeData(data, this.get('storage')); this.storeData(data, this.get('storage'));
return Travis.trigger('user:refreshed', data.user); Travis.trigger('user:refreshed', data.user);
} }
} else { } else {
return Ember.RSVP.Promise.reject(); return Ember.RSVP.Promise.reject();