Merge branch 'rpc' into v1.2-next

This commit is contained in:
AJ ONeal 2017-11-25 08:59:15 +00:00
commit 2bfc752ea1
1 changed files with 5 additions and 2 deletions

View File

@ -104,12 +104,15 @@
oldRpc = true; oldRpc = true;
} }
var loco = window.location.href.replace(/\/\.well-known.*/, '');
//var loco = 'sso.hellabit.com';
var resp;
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') resp = subData || localStorage.getItem('oauth3.org:issuer') || loco;
|| window.location.href.replace(/\/\.well-known.*/, ''), subData && true); onSuccess(resp, subData && true);
return; return;
} }