git subrepo commit (merge) mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "32243e56"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "e2b4b6f6"
git-subrepo: version: "0.4.3"
origin: "???"
commit: "???"
Change-Id: I51e2016ef5ab88a8b0bdc08551b18f48ceef0aa5
diff --git a/mailcow/src/mailcow-dockerized/data/web/api/oauth2-redirect.html b/mailcow/src/mailcow-dockerized/data/web/api/oauth2-redirect.html
index a013fc8..64b171f 100644
--- a/mailcow/src/mailcow-dockerized/data/web/api/oauth2-redirect.html
+++ b/mailcow/src/mailcow-dockerized/data/web/api/oauth2-redirect.html
@@ -1,9 +1,9 @@
<!doctype html>
<html lang="en-US">
-<title>Swagger UI: OAuth2 Redirect</title>
-<body onload="run()">
-</body>
-</html>
+<head>
+ <title>Swagger UI: OAuth2 Redirect</title>
+</head>
+<body>
<script>
'use strict';
function run () {
@@ -18,19 +18,20 @@
qp = location.search.substring(1);
}
- arr = qp.split("&")
- arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';})
+ 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)
+ return key === "" ? value : decodeURIComponent(value);
}
- ) : {}
+ ) : {};
- isValid = qp.state === sentState
+ isValid = qp.state === sentState;
if ((
- oauth2.auth.schema.get("flow") === "accessCode"||
- oauth2.auth.schema.get("flow") === "authorizationCode"
+ 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({
@@ -46,7 +47,7 @@
oauth2.auth.code = qp.code;
oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
} else {
- let oauthErrorMsg
+ let oauthErrorMsg;
if (qp.error) {
oauthErrorMsg = "["+qp.error+"]: " +
(qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
@@ -65,4 +66,10 @@
}
window.close();
}
+
+ window.addEventListener('DOMContentLoaded', function () {
+ run();
+ });
</script>
+</body>
+</html>