tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #22530 from abpframework/auto-merge/rel-9-1/3588 

Merge branch rel-9.2 with rel-9.1
pull/22531/head
maliming 2 years ago
committed by GitHub
parent
fc7fe298a1 36c0335a0b
commit
05ba01a3cf
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
3 changed files with 95 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj
  2. 39
      framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/oauth2-redirect.html
  3. 58
      framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js

2
framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj
View File

@ -30,6 +30,8 @@
<EmbeddedResource Include="wwwroot\swagger\ui\abp.swagger.js" /> <EmbeddedResource Include="wwwroot\swagger\ui\abp.swagger.js" />
<None Remove="wwwroot\swagger\ui\abp.js" /> <None Remove="wwwroot\swagger\ui\abp.js" />
<EmbeddedResource Include="wwwroot\swagger\ui\abp.js" /> <EmbeddedResource Include="wwwroot\swagger\ui\abp.js" />
<None Remove="wwwroot\swagger\oauth2-redirect.html" />
<EmbeddedResource Include="wwwroot\swagger\oauth2-redirect.html" />
</ItemGroup> </ItemGroup>
</Project> </Project>

39
framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/oauth2-redirect.html
View File

@ -0,0 +1,39 @@
<!doctype html>
<html lang="en-US">
<head>
<title>Swagger UI: OAuth2 Redirect</title>
</head>
<body>
<script>
'use strict';
function run () {
var qp, arr;
if (/code|token|error/.test(window.location.hash)) {
qp = window.location.hash.substring(1).replace('?', '&');
} else {
qp = location.search.substring(1);
}
arr = qp.split("&");
arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';});
qp = qp ? JSON.parse('{' + arr.join() + '}',
function (key, value) {
return key === "" ? value : decodeURIComponent(value);
}
) : {};
localStorage.setItem("abp_swagger_oauth2", JSON.stringify(qp));
window.close();
}
if (document.readyState !== 'loading') {
run();
} else {
document.addEventListener('DOMContentLoaded', function () {
run();
});
}
</script>
</body>
</html>

58
framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js
View File

@ -1,9 +1,9 @@
var abp = abp || {}; var abp = abp || {};
(function () { (function () {
var oldSwaggerUIBundle = SwaggerUIBundle; var oldSwaggerUIBundle = SwaggerUIBundle;
SwaggerUIBundle = function (configObject) { SwaggerUIBundle = function (configObject) {
var excludeUrl = ["swagger.json", "connect/token"] var excludeUrl = ["swagger.json", "connect/token"]
var firstRequest = true; var firstRequest = true;
@ -112,7 +112,57 @@ var abp = abp || {};
return oldSwaggerUIBundle(configObject); return oldSwaggerUIBundle(configObject);
} }
SwaggerUIBundle = Object.assign(SwaggerUIBundle, oldSwaggerUIBundle); SwaggerUIBundle = Object.assign(SwaggerUIBundle, oldSwaggerUIBundle);
window.addEventListener("storage", function (event) {
if (event.key !== "abp_swagger_oauth2" || !event.newValue) {
return;
}
var qp = JSON.parse(event.newValue || "{}");
localStorage.removeItem("abp_swagger_oauth2");
var oauth2 = window.swaggerUIRedirectOauth2;
var sentState = oauth2.state;
var redirectUrl = oauth2.redirectUrl;
var isValid = qp.state === sentState;
if ((
oauth2.auth.schema.get("flow") === "accessCode" ||
oauth2.auth.schema.get("flow") === "authorizationCode" ||
oauth2.auth.schema.get("flow") === "authorization_code"
) && !oauth2.auth.code) {
if (!isValid) {
oauth2.errCb({
authId: oauth2.auth.name,
source: "auth",
level: "warning",
message: "Authorization may be unsafe, passed state was changed in server. The passed state wasn't returned from auth server."
});
}
if (qp.code) {
delete oauth2.state;
oauth2.auth.code = qp.code;
oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
} else {
let oauthErrorMsg;
if (qp.error) {
oauthErrorMsg = "["+qp.error+"]: " +
(qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
(qp.error_uri ? "More info: "+qp.error_uri : "");
}
oauth2.errCb({
authId: oauth2.auth.name,
source: "auth",
level: "error",
message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
});
}
} else {
oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid, redirectUrl: redirectUrl});
}
});
})(); })();

Write Preview
Loading…
Cancel
Save