Fix compatibility with new ngx-oauth proxy

cvut · May 12, 2021 · 746d856 · 746d856
1 parent a1e587a
commit 746d856
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/script/pre-deploy b/script/pre-deploy
@@ -19,5 +19,5 @@ mv new/fittable.css new/fittable-$md5css.css
 sed -i "s|fittable.js|fittable-$md5js.js|" new/index.html
 sed -i "s|fittable.css|fittable-$md5css.css|" new/*.html
 sed -i "s|fittable.css|new/fittable-$md5css.css|" index.html
-sed -i 's|"_oauth/login"|"/_oauth/login"|' new/landing.html
+sed -i 's|"_oauth/login"|"/_oauth/login?original_uri=/new/"|' new/landing.html
 sed -i 's|</head>|    <script>window.OAUTH_PROXY_PATH = "/../_oauth";</script>\n    </head>|g' new/index.html
diff --git a/src/callbacks/sirius.js b/src/callbacks/sirius.js
@@ -332,7 +332,7 @@ function fetchUserCallback (cb) {
 function logoutUserCallback (cb) {
   ajaxPost(`${oauthAPIUrl}/logout`, (request) => {
     if (request.readyState === XMLHttpRequest.DONE) {
-      if (request.status === 204) {
+      if (request.status < 400) {
         cb(null)
       } else {
         cb(generateError(request.status, 'Logout failed'))