coolaj86/oauth3.js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

assign token AFTER refresh :)

Browse Source
This commit is contained in:
AJ ONeal 2017-02-08 14:28:56 -05:00
parent dfeff76876
commit 8a00e9c0cd
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oauth3.core.js
View File

@ -200,7 +200,7 @@
, getFreshness: function (meta, staletime, now) { , getFreshness: function (meta, staletime, now) {
staletime = staletime || (15 * 60); staletime = staletime || (15 * 60);
now = now || Date.now(); now = now || Date.now();
var fresh = ((parseInt(meta.exp, 10) || 0) - (now / 1000)); var fresh = ((parseInt(meta.exp, 10) || 0) - Math.round(now / 1000));
if (fresh >= staletime) { if (fresh >= staletime) {
return 'fresh'; return 'fresh';

7
oauth3.js
View File

@ -141,6 +141,9 @@
function lintAndRequest(preq) { function lintAndRequest(preq) {
function goGetHer() { function goGetHer() {
preq.headers = preq.headers || {};
preq.headers.Authorization = 'Bearer ' + (preq.session.access_token || preq.session.accessToken);
if (!oauth3._lintRequest) { if (!oauth3._lintRequest) {
return rawRequest(preq); return rawRequest(preq);
} }
@ -153,12 +156,8 @@
return goGetHer(); return goGetHer();
} }
preq.headers = preq.headers || {};
preq.headers.Authorization = 'Bearer ' + (preq.session.access_token || preq.session.accessToken);
console.warn('lintAndRequest checkSession', preq); console.warn('lintAndRequest checkSession', preq);
return oauth3.hooks.checkSession(preq, opts).then(goGetHer); return oauth3.hooks.checkSession(preq, opts).then(goGetHer);
} }
if (opts.rawCase) { if (opts.rawCase) {