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

Merge branch 'v1' into api-hostname

Browse Source
This commit is contained in:
AJ ONeal 2017-05-26 22:24:19 +00:00
commit fbd53e486f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oauth3.core.js
View File

@ -485,14 +485,18 @@
oldSession.token = OAUTH3.jwt.decode(oldSession.access_token).payload; oldSession.token = OAUTH3.jwt.decode(oldSession.access_token).payload;
oldSession.token.sub = oldSession.token.sub || (oldSession.token.acx||{}).id oldSession.token.sub = oldSession.token.sub || (oldSession.token.acx||{}).id
|| ((oldSession.token.axs||[])[0]||{}).id; || ((oldSession.token.axs||[])[0]||{}).appScopedId
|| ((oldSession.token.axs||[])[0]||{}).id
;
oldSession.token.client_uri = clientUri; oldSession.token.client_uri = clientUri;
oldSession.token.provider_uri = providerUri; oldSession.token.provider_uri = providerUri;
if (oldSession.refresh_token) { if (oldSession.refresh_token) {
oldSession.refresh = OAUTH3.jwt.decode(oldSession.refresh_token).payload; oldSession.refresh = OAUTH3.jwt.decode(oldSession.refresh_token).payload;
oldSession.refresh.sub = oldSession.refresh.sub || (oldSession.refresh.acx||{}).id oldSession.refresh.sub = oldSession.refresh.sub || (oldSession.refresh.acx||{}).id
|| ((oldSession.refresh.axs||[])[0]||{}).id; || ((oldSession.refresh.axs||[])[0]||{}).appScopedId
|| ((oldSession.refresh.axs||[])[0]||{}).id
;
oldSession.refresh.provider_uri = providerUri; oldSession.refresh.provider_uri = providerUri;
} }
@ -1144,7 +1148,6 @@
return OAUTH3.implicitGrant(me._providerDirectives, opts).then(function (session) { return OAUTH3.implicitGrant(me._providerDirectives, opts).then(function (session) {
me._session = true; me._session = true;
me.__session = session;
return session; return session;
}); });
} }
@ -1168,7 +1171,6 @@
return OAUTH3.request(preq, opts); return OAUTH3.request(preq, opts);
} }
, logout: function (opts) { , logout: function (opts) {
this.__session = false;
this._session = false; this._session = false;
opts = opts || {}; opts = opts || {};
opts.client_uri = this._clientUri; opts.client_uri = this._clientUri;
@ -1180,7 +1182,7 @@
, api: function (api, opts) { , api: function (api, opts) {
opts = opts || {}; opts = opts || {};
opts.api = api; opts.api = api;
opts.session = this.__session || OAUTH3.hooks.session._getCached(this._providerUri); opts.session = OAUTH3.hooks.session._getCached(this._providerUri);
return OAUTH3.api(this._providerUri, opts); return OAUTH3.api(this._providerUri, opts);
} }