Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace _checkPanoptesSession with _getNewToken #86

Merged
merged 4 commits into from
Mar 6, 2018
Merged

Replace _checkPanoptesSession with _getNewToken #86

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f26d810
Replace _checkPanoptesSession with _getNewToken
eatyourgreens Feb 27, 2018
9e2f32b
Fix this._deleteBearerToken is undefined error
eatyourgreens Mar 2, 2018
1a2a80b
Better handling for token expiration
eatyourgreens Mar 5, 2018
8bc2017
Rename token check to _bearerTokenWillExpire
eatyourgreens Mar 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions lib/oauth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = new Model({

checkBearerToken: function() {
var awaitBearerToken;
if (this._bearerTokenIsExpired()) {
if (this._bearerTokenWillExpire()) {
awaitBearerToken = this._refreshBearerToken();
} else {
var tokenDetails = JSON.parse(SESSION_STORAGE.getItem(LOCAL_STORAGE_PREFIX + 'tokenDetails'));
Expand Down Expand Up @@ -165,7 +165,7 @@ module.exports = new Model({
].join('');
},

_bearerTokenIsExpired: function() {
_bearerTokenWillExpire: function() {
var tokenDetails = JSON.parse(SESSION_STORAGE.getItem(LOCAL_STORAGE_PREFIX + 'tokenDetails'));
if (tokenDetails) {
return Date.now() >= tokenDetails.expires_at - TOKEN_EXPIRATION_ALLOWANCE;
Expand All @@ -174,14 +174,10 @@ module.exports = new Model({
}
},

_checkForPanoptesSession: function() {
var sessionTokenDetails = JSON.parse(SESSION_STORAGE.getItem(LOCAL_STORAGE_PREFIX + 'tokenDetails'));
_getNewToken: function() {
var redirectUri = ls.get(LOCAL_STORAGE_PREFIX + 'redirectUri');
this.update({
_currentSessionCheckPromise: new Promise(function(resolve, reject) {
if (sessionTokenDetails) {
resolve(sessionTokenDetails);
}

if (!redirectUri) {
reject(Error('No redirect URI found'));
Expand Down Expand Up @@ -256,6 +252,18 @@ module.exports = new Model({
});
},

_handleExpiredToken: function() {
var tokenDetails = JSON.parse(SESSION_STORAGE.getItem(LOCAL_STORAGE_PREFIX + 'tokenDetails'));
var tokenHasExpired = false;
if (tokenDetails && tokenDetails.expires_at) {
tokenHasExpired = Date.now() > tokenDetails.expires_at;
}
if (tokenHasExpired) {
console.info('Panoptes session has expired');
this._deleteBearerToken();
}
},

_handleNewBearerToken: function(tokenDetails) {
if (tokenDetails && tokenDetails.access_token) {
console.log('Got new bearer token', tokenDetails.access_token.slice(-6));
Expand All @@ -272,16 +280,15 @@ module.exports = new Model({
},

_refreshBearerToken: function() {
return this._checkForPanoptesSession()
return this._getNewToken()
.then(function(tokenDetails) {
return this._handleNewBearerToken(tokenDetails);
}.bind(this))
.catch(function (error) {
console.info('Panoptes session has expired');
console.log(error);
this._deleteBearerToken();
this._handleExpiredToken();
return null;
});
}.bind(this));
},

_saveRedirectUri: function(redirectUri) {
Expand Down