casdoor 1.3.0 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "casdoor",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "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

@@ -58,17 +58,32 @@ function getManagedAccounts(tabId) {
   });
 }
 
+function testUrlWithRegex(url, regexPattern) {
+  try {
+    const regex = new RegExp(regexPattern);
+    const isMatched = regex.test(url);
+    console.log(`testUrlWithRegex(), url = ${url}, regexPattern = ${regexPattern}, isMatched = ${isMatched}`);
+    return isMatched;
+  } catch (error) {
+    alert(`testUrlWithRegex() error, the regex pattern: "${regexPattern}" is invalid`);
+    return false;
+  }
+}
+
 async function autoLogin(tabId, url) {
   const managedAccounts = await getManagedAccounts(tabId);
   if (managedAccounts) {
     for (const managedAccount of managedAccounts) {
-      if (managedAccount && url.includes(managedAccount.signinUrl)) {
-        autoLoginTabs.add(tabId);
-        chrome.tabs.sendMessage(tabId, {
-          action: "autoLogin",
-          managedAccount: managedAccount,
-        });
-        break;
+      if (managedAccount && managedAccount.signinUrl && url) {
+        const isMatched = testUrlWithRegex(url, managedAccount.signinUrl);
+        if (isMatched) {
+          autoLoginTabs.add(tabId);
+          chrome.tabs.sendMessage(tabId, {
+            action: "autoLogin",
+            managedAccount: managedAccount,
+          });
+          break;
+        }
       }
     }
   }

package/src/oauth.js

@@ -119,9 +119,11 @@ let accessToken;
 let applicationName;
 
 function getDomAccessToken() {
-  if(window.location.pathname != "/src/popup.html"){
-    accessToken = document.getElementById("CasdoorAccessToken").getAttribute("value");
-    applicationName = document.getElementById("CasdoorApplicationName").getAttribute("value");
+  const accessTokenDom = document.getElementById("CasdoorAccessToken")
+  const applicationNameDom = document.getElementById("CasdoorApplicationName")
+  if(window.location.pathname != "/src/popup.html" && accessTokenDom && applicationNameDom){
+    accessToken = accessTokenDom.getAttribute("value");
+    applicationName = applicationNameDom.getAttribute("value");
     if (accessToken && applicationName) {
       sdk.getUserProfile(accessToken).then((userProfile) => {
         userProfile.applicationName = applicationName;

package/src/sdk.js

@@ -89,13 +89,18 @@ class Sdk {
       .catch((error) => console.error(error));
   }
 
-  getAccountUrl() {
-    const endpoint = this.config.endpoint;
-    return `${endpoint}/api/get-account`;
+  async getAccountUrl() {  
+    try {  
+      const endpointData = await getStorageData("endpoint");  
+      const endpoint = endpointData.endpoint;  
+      return `${endpoint}/api/get-account`;  
+    } catch (error) {  
+      console.error('Error fetching endpoint:', error);  
+    }  
   }
 
-  getAccount(accessToken) {
-    const accountUrl = this.getAccountUrl();
+  async getAccount(accessToken) {
+    const accountUrl = await this.getAccountUrl();
     const requestConfig = {
       method: "GET",
       async: true,