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

bugfix: refresh session and assign sub from sub, acs.id, or axs[0].appScopedId

Browse Source
This commit is contained in:
AJ ONeal 2017-03-22 20:13:06 -04:00
parent 02bb01fdf4
commit abb788780d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oauth3.core.js
View File

@ -445,13 +445,19 @@
// info about the newly-discovered token // info about the newly-discovered token
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 && oldSession.token.acx.id)
|| (oldSession.token.axs && oldSession.token.axs[0] && oldSession.token.axs[0].appScopedId)
;
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 && oldSession.refresh.acx.id)
|| (oldSession.refresh.axs && oldSession.refresh.axs[0] && oldSession.refresh.axs[0].appScopedId)
;
oldSession.refresh.provider_uri = providerUri; oldSession.refresh.provider_uri = providerUri;
} }

2
oauth3.issuer.js
View File

@ -207,7 +207,7 @@ OAUTH3.urls.grants = function (directive, opts) {
var url = OAUTH3.url.resolve(directive.issuer, directive.grants.url) var url = OAUTH3.url.resolve(directive.issuer, directive.grants.url)
.replace(/(:azp|:client_id)/g, OAUTH3.uri.normalize(opts.client_id || opts.client_uri)) .replace(/(:azp|:client_id)/g, OAUTH3.uri.normalize(opts.client_id || opts.client_uri))
.replace(/(:sub|:account_id)/g, opts.session.token.sub) .replace(/(:sub|:account_id)/g, opts.session.token.sub || 'ISSUER:GRANT:TOKEN_SUB:UNDEFINED')
; ;
var data = { var data = {
client_id: opts.client_id client_id: opts.client_id