Merge branch 'rpc' into v1.2-next

This commit is contained in:
AJ ONeal 2017-11-25 08:28:46 +00:00
commit d84b7bd6ea
1 changed files with 2 additions and 3 deletions

View File

@ -107,10 +107,9 @@
if (/localstorage/i.test(params._scheme)) { if (/localstorage/i.test(params._scheme)) {
if (sub) { if (sub) {
subData = localStorage.getItem(sub + '@oauth3.org:issuer'); subData = localStorage.getItem(sub + '@oauth3.org:issuer');
onSuccess(subData || localStorage.getItem('oauth3.org:issuer'), subData && true);
return;
} }
onSuccess(localStorage.getItem('oauth3.org:issuer')); onSuccess(subData || localStorage.getItem('oauth3.org:issuer')
|| window.location.href.replace(/\/\.well-known.*/, ''), subData && true);
return; return;
} }