kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #435 from JoergAdler/master

Browse Source 
The list of scopes now RFC6749 Sec.3.3 compliant
This commit is contained in:
Tony Tam
2014-06-01 16:35:58 -07:00
parent 4b535adcb7 52db742a10
commit c2dd77ff3a
1 changed files with 54 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/swagger-oauth.js
View File

@@ -48,7 +48,7 @@ function handleLogin() {
str += '</label></li>'; str += '</label></li>';
popup.append(str); popup.append(str);
} }
}
var $win = $(window), var $win = $(window),
dw = $win.width(), dw = $win.width(),
@@ -73,8 +73,9 @@ function handleLogin() {
popupDialog.hide(); popupDialog.hide();
var authSchemes = window.swaggerUi.api.authSchemes; var authSchemes = window.swaggerUi.api.authSchemes;
var host = window.location; var location = window.location;
var redirectUrl = host.protocol + '//' + host.host + "/o2c.html"; var locationUrl = location.protocol + '//' + location.host + location.pathname;
var redirectUrl = locationUrl.replace("index.html","").concat("/o2c.html").replace("//o2c.html","/o2c.html");
var url = null; var url = null;
var p = window.swaggerUi.api.authSchemes; var p = window.swaggerUi.api.authSchemes;
@@ -90,23 +91,29 @@ function handleLogin() {
} }
} }
} }
var scopes = [] var scopes = [];
var scopeForUrl='';
var o = $('.api-popup-scopes').find('input:checked'); var o = $('.api-popup-scopes').find('input:checked');
for(k =0; k < o.length; k++) { for(var k =0; k < o.length; k++) {
scopes.push($(o[k]).attr("scope")); scopes.push($(o[k]).attr("scope"));
if(k > 0){
scopeForUrl+=' ';
}
scopeForUrl+=$(o[k]).attr("scope");
} }
window.enabledScopes=scopes; window.enabledScopes=scopes;
url += '&redirect_uri=' + encodeURIComponent(redirectUrl); url += '&redirect_uri=' + encodeURIComponent(redirectUrl);
url += '&realm=' + encodeURIComponent(realm); url += '&realm=' + encodeURIComponent(realm);
url += '&client_id=' + encodeURIComponent(clientId); url += '&client_id=' + encodeURIComponent(clientId);
url += '&scope=' + encodeURIComponent(scopes); url += '&scope=' + encodeURIComponent(scopeForUrl);
window.open(url); window.open(url);
}); });
}
popupMask.show(); popupMask.show();
popupDialog.show(); popupDialog.show();
return; return;