casdoor 1.0.2 → 1.1.0

package/.eslintrc.js

@@ -17,8 +17,14 @@ module.exports = {
     "space-in-parens": ["error", "never"],
     "object-curly-spacing": ["error", "never"],
     "array-bracket-spacing": ["error", "never"],
-    "comma-spacing": ["error", {before: false, after: true}],
-    "arrow-spacing": ["error", {before: true, after: true}],
+    "comma-spacing": ["error", {
+      before: false,
+      after: true
+    }],
+    "arrow-spacing": ["error", {
+      before: true,
+      after: true
+    }],
     "space-before-blocks": ["error", "always"],
     "spaced-comment": ["error", "always"],
     "block-spacing": ["error", "never"],
@@ -43,11 +49,21 @@ module.exports = {
     ],
     "no-multiple-empty-lines": [
       "error",
-      {max: 1, maxBOF: 0, maxEOF: 0},
+      {
+        max: 1,
+        maxBOF: 0,
+        maxEOF: 0
+      },
     ],
-    "space-unary-ops": ["error", {words: true, nonwords: false}],
+    "space-unary-ops": ["error", {
+      words: true,
+      nonwords: false
+    }],
     "space-infix-ops": "error",
-    "key-spacing": ["error", {beforeColon: false, afterColon: true}],
+    "key-spacing": ["error", {
+      beforeColon: false,
+      afterColon: true
+    }],
     "comma-style": ["error", "last"],
     "comma-dangle": [
       "error",

package/.releaserc.json

@@ -1,10 +1,10 @@
 {
-    "debug": true,
-    "branches": "master",
-    "plugins": [
-        "@semantic-release/commit-analyzer",
-        "@semantic-release/release-notes-generator",
-        "@semantic-release/npm",
-        "@semantic-release/github"
-    ]
-}
+  "debug": true,
+  "branches": "master",
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
+    "@semantic-release/npm",
+    "@semantic-release/github"
+  ]
+}

package/manifest.json

@@ -1,40 +1,46 @@
 {
-    "name": "Casdoor",
-    "description": "The Casdoor extension can help browser users automatically log into applications protected by Casdoor single-sign-on (SSO) system.",
-    "version": "1.0.0",
-    "manifest_version": 3,
-    "permissions": ["storage", "identity"],
-    "action": {
-        "default_popup": "/src/popup.html",
-        "default_icon": {
-            "16": "/images/icon16.png",
-            "32": "/images/icon32.png",
-            "48": "/images/icon48.png",
-            "128": "/images/icon128.png"
-        }
-    },
-    "icons": {
-        "16": "/images/icon16.png",
-        "32": "/images/icon32.png",
-        "48": "/images/icon48.png",
-        "128": "/images/icon128.png"
-    },
-    "content_scripts": [
-        {
-            "matches": [
-                "https://*/*",
-                "http://*/*"
-            ],
-            "js": [
-                "/src/content-script.js",
-                "/src/sdk.js",
-                "/src/oauth.js",
-                "/src/config.js"
-            ]
-        }
-    ],
-    "host_permissions": [
+  "name": "Casdoor",
+  "description": "The Casdoor extension can help browser users automatically log into applications protected by Casdoor single-sign-on (SSO) system.",
+  "version": "1.0.0",
+  "manifest_version": 3,
+  "permissions": [
+    "storage",
+    "identity"
+  ],
+  "action": {
+    "default_popup": "/src/popup.html",
+    "default_icon": {
+      "16": "/images/icon16.png",
+      "32": "/images/icon32.png",
+      "48": "/images/icon48.png",
+      "128": "/images/icon128.png"
+    }
+  },
+  "icons": {
+    "16": "/images/icon16.png",
+    "32": "/images/icon32.png",
+    "48": "/images/icon48.png",
+    "128": "/images/icon128.png"
+  },
+  "content_scripts": [
+    {
+      "matches": [
         "https://*/*",
         "http://*/*"
-    ]
+      ],
+      "js": [
+        "/src/content-script.js",
+        "/src/sdk.js",
+        "/src/oauth.js",
+        "/src/config.js"
+      ]
+    }
+  ],
+    "background": {
+        "service_worker": "/src/background.js"
+      },
+  "host_permissions": [
+    "https://*/*",
+    "http://*/*"
+  ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "casdoor",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "The Casdoor extension can help browser users automatically log into applications protected by Casdoor single-sign-on (SSO) system.",
   "scripts": {
     "semantic-release": "semantic-release"

package/src/background.js

@@ -0,0 +1,45 @@
+// Copyright 2024 The Casdoor Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+let autoLoginTabs = new Set();
+
+chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {  
+  if (tab.url && tab.status === "complete" && !autoLoginTabs.has(tabId) ) {  
+    const url = tab.url;  
+  
+    chrome.tabs.sendMessage(tabId, {action: "setManagedAccounts"},  
+      function (managedAccounts) {
+        if (chrome.runtime.lastError) {
+          console.error("Error sending first message:", chrome.runtime.lastError);  
+        } else if (managedAccounts) {  
+            for (const managedAccount of managedAccounts) {  
+              if (managedAccount && url.includes(managedAccount.signinUrl)) {  
+                autoLoginTabs.add(tabId);
+                chrome.tabs.sendMessage(tabId, {  
+                  action: "autoLogin",  
+                  managedAccount: managedAccount,  
+                });  
+              }  
+            }  
+        }  
+      }  
+    );  
+  }  
+});
+
+function clearAutoLoginTabs() {
+  autoLoginTabs.clear();
+}
+
+setInterval(clearAutoLoginTabs, 10000);

package/src/config.js

@@ -15,8 +15,11 @@
 const UsernameXpaths = [
   "//input[contains(@id,'username')]",
   "//input[contains(@name,'username')]",
+  "//input[contains(@name,'account')]",
+  "//input[contains(@name,'login')]",
   "//input[contains(@placeholder,'username')]",
   "//input[contains(@placeholder,'用户名')]",
+  "//input[contains(@placeholder,'账号')]",
   "//input[contains(@id,'phone')]",
   "//input[contains(@name,'phone')]",
   "//input[contains(@placeholder,'phone')]",
@@ -37,6 +40,7 @@ const PasswordXpaths = [
 
 const SubmitXpaths = [
   "//button[@type='submit']",
+  "//input[contains(@name,'commit')]",
   "//button[contains(string(),'Login')]",
   "//button[contains(string(),'Sign in')]",
   "//button[contains(string(),'登录')]",

package/src/content-script.js

@@ -94,18 +94,27 @@ window.onload = () => {
       autoFillCasdoorConfig();
     }
   });
-
-  const url = window.location.href;
-  chrome.storage.sync.get("managedAccounts", ({managedAccounts}) => {
-    for (const managedAccount of managedAccounts) {
-      if (managedAccount.signinUrl === url) {
-        chrome.storage.sync.get("disableAutoLogin", ({disableAutoLogin}) => {
-          if (!disableAutoLogin) {
-            autoLogin(managedAccount.username, managedAccount.password);
-          }
-        });
-        break;
-      }
-    }
-  });
 };
+
+chrome.runtime.onMessage.addListener((message) => {
+  if (message.action === "autoLogin") {
+      chrome.storage.sync.get("disableAutoLogin", ({ disableAutoLogin }) => {
+        if (!disableAutoLogin) {
+          const managedAccount = message.managedAccount;
+          autoLogin(managedAccount.username, managedAccount.password);
+        }
+      });
+  }
+});
+
+chrome.runtime.onMessage.addListener(function(message, sender,sendResponse) {
+  if (message.action === "setManagedAccounts") {
+    chrome.storage.sync.get("accessToken", ({accessToken}) => {
+      sdk.getAccount(accessToken).then((account) => {
+        const managedAccounts = account.data.managedAccounts;
+        sendResponse(managedAccounts);  
+      });
+    });
+    return true;
+  }
+});

package/src/oauth.js

@@ -40,7 +40,7 @@ function login() {
           .getUserProfile(accessToken)
           .then((userProfile) => displayUserProfile(userProfile));
       });
-      setInputDisabledState(true, "endpoint", "applicationName")
+      setInputDisabledState(true, "endpoint", "applicationName");
     } else {
       alert("Login failed!");
     }
@@ -50,7 +50,7 @@ function login() {
 // eslint-disable-next-line no-unused-vars
 function logout() {
   chrome.storage.sync.set({accessToken: ""}, () => clearUserProfile());
-  setInputDisabledState(false, "endpoint", "applicationName")
+  setInputDisabledState(false, "endpoint", "applicationName");
 }
 
 function displayUserProfile(userProfile) {
@@ -66,13 +66,13 @@ function clearUserProfile() {
   document.getElementById("loginOrLogout").innerText = "Login";
 }
 
-function setInputDisabledState(disabledState, ...elementIds) {  
-  elementIds.forEach(elementId => {  
-    const inputElement = document.getElementById(elementId);  
-    if (inputElement) {  
-      inputElement.disabled = disabledState;  
-    } else {  
-      console.warn(`No element found with ID: ${elementId}`);  
-    }  
-  });  
+function setInputDisabledState(disabledState, ...elementIds) {
+  elementIds.forEach(elementId => {
+    const inputElement = document.getElementById(elementId);
+    if (inputElement) {
+      inputElement.disabled = disabledState;
+    } else {
+      console.warn(`No element found with ID: ${elementId}`);
+    }
+  });
 }

package/src/popup.html

@@ -1,34 +1,34 @@
 <!DOCTYPE html>
 <html>
-  <head>
+<head>
     <link rel="stylesheet" href="popup.css">
-  </head>
-  <body>
-    <div class="background">
-        <h1 class="title" id="title">Casdoor</h1>
-        <div id="user"></div>
-        <div class="item">
-          endpoint: 
-          <input class="input" id="endpoint" name="endpoint" placeholder="your casdoor server url"/>
-        </div>
-        <div class="item">
-          applicationName: 
-          <input class="input" id="applicationName" name="applicationName" placeholder="your application name"/>
-        </div>
-        <div class="item">
-            Enable auto login: 
-            <label class="switch">
-                <input type="checkbox" id="enableAutoLogin">
-                <span class="slider"></span>
-            </label>
-        </div>
-        <div class="control">
-            <button class="primary" id="loginOrLogout">Login</button>
-        </div>
+</head>
+<body>
+<div class="background">
+    <h1 class="title" id="title">Casdoor</h1>
+    <div id="user"></div>
+    <div class="item">
+        endpoint:
+        <input class="input" id="endpoint" name="endpoint" placeholder="your casdoor server url"/>
     </div>
-    <script src="config.js"></script>
-    <script src="sdk.js"></script>
-    <script src="oauth.js"></script>
-    <script src="popup.js"></script>
-  </body>
+    <div class="item">
+        applicationName:
+        <input class="input" id="applicationName" name="applicationName" placeholder="your application name"/>
+    </div>
+    <div class="item">
+        Enable auto login:
+        <label class="switch">
+            <input type="checkbox" id="enableAutoLogin">
+            <span class="slider"></span>
+        </label>
+    </div>
+    <div class="control">
+        <button class="primary" id="loginOrLogout">Login</button>
+    </div>
+</div>
+<script src="config.js"></script>
+<script src="sdk.js"></script>
+<script src="oauth.js"></script>
+<script src="popup.js"></script>
+</body>
 </html>

package/src/popup.js

@@ -36,10 +36,6 @@ document.addEventListener("DOMContentLoaded", function() {
       sdk
         .getUserProfile(accessToken)
         .then((userProfile) => displayUserProfile(userProfile));
-      sdk.getAccount(accessToken).then((account) => {
-        const managedAccounts = account.data.managedAccounts;
-        chrome.storage.sync.set({managedAccounts});
-      });
       setInputDisabledState(true, "endpoint", "applicationName")
     } else {
       clearUserProfile();

package/src/sdk.js

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 /* eslint-disable no-undef */
+
 // eslint-disable-next-line no-unused-vars
 class Sdk {
   constructor(config) {
@@ -38,8 +39,8 @@ class Sdk {
 
   getAccessTokenFromRedirectUrl(redirectUrl) {
     if (redirectUrl) {
-      const accessTokenMatch  = redirectUrl.match(/#access_token=([^&]*)/);
-      const accessToken = accessTokenMatch ? accessTokenMatch[1] : "";  
+      const accessTokenMatch = redirectUrl.match(/#access_token=([^&]*)/);
+      const accessToken = accessTokenMatch ? accessTokenMatch[1] : "";
       return accessToken;
     }
     return "";
@@ -90,7 +91,7 @@ class Sdk {
 
   getAccountUrl() {
     const endpoint = this.config.endpoint;
-    return `${endpoint}/api/get-account?managedAccounts=1`;
+    return `${endpoint}/api/get-account`;
   }
 
   getAccount(accessToken) {