|
@@ -11,13 +11,17 @@
|
|
|
</head>
|
|
</head>
|
|
|
<body>
|
|
<body>
|
|
|
<script type="text/javascript">
|
|
<script type="text/javascript">
|
|
|
- function proxyLogout(askUrl, retUrl) {
|
|
|
|
|
|
|
+ function proxyLogout(askUrl, retUrl, logoutUrl) {
|
|
|
$.getJSON(askUrl + "?callback=?", function(d){
|
|
$.getJSON(askUrl + "?callback=?", function(d){
|
|
|
- window.location.href = retUrl;
|
|
|
|
|
|
|
+ if (d.error) {
|
|
|
|
|
+ window.location.href = logoutUrl
|
|
|
|
|
+ } else {
|
|
|
|
|
+ window.location.href = retUrl && retUrl !== 'null' ? retUrl : '/'
|
|
|
|
|
+ }
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
$.getJSON('logout/crossBefore', function(data){
|
|
$.getJSON('logout/crossBefore', function(data){
|
|
|
- proxyLogout(data.askUrl, data.returnUrl);
|
|
|
|
|
|
|
+ proxyLogout(data.askUrl, data.returnUrl ,data.logoutUrl);
|
|
|
});
|
|
});
|
|
|
</script>
|
|
</script>
|
|
|
<div align="center" style="margin-top: 180px;">
|
|
<div align="center" style="margin-top: 180px;">
|