Merge branch 'staging' into production

1 files changed, 4 insertions, 8 deletions

diff --git a/inject/disable-password-login.js b/inject/disable-password-login.js
index d939e0c..fd66b74 100644
--- a/inject/disable-password-login.js
+++ b/inject/disable-password-login.js
@@ -1,17 +1,13 @@
 export function disablePasswordLogin() {
-  const queryString = new URLSearchParams();
-  if (queryString.get("all") == null) {
+  const queryString = new URLSearchParams(window.location.search);
+  if (queryString.get("pwauth") == null) {
     document.addEventListener("DOMContentLoaded", function () {
       const sso = document.querySelector(".o_auth_oauth_providers");
       if (sso) {
         const link = sso.getElementsByTagName("a")[0];
-        if (link.innerText.search("Authentik") > 0) {
+        if (link.innerText.search("Authentik") + link.innerText.search("TONI SSO") > 0) {
           console.info("Redirecting to SSO login:", link.href);
-          // Disable for now while we don't have a way to prevent redirection
-          // for e.g. admin login. One way would be to scan for presence of a
-          // query string parameter such as `pwauth`, but I could not get
-          // URLSearchParams to help me.
-          //window.location.replace(link.href);
+          window.location.replace(link.href);
         }
       }
     });