casdoor 1.0.0 → 1.0.2

package/README.md

@@ -1,8 +1,8 @@
 # casdoor-chrome-extension
 
-Casdoor chrome extension can help the user to auto login with the casdoor application or login this extension through casdoor.
+The Casdoor extension can help browser users automatically log into applications protected by [Casdoor](https://casdoor.org). The extension's code is open-sourced at: https://github.com/casdoor/casdoor-chrome-extension
 
-Casdoor chrome extension is very simple to use. We will show you the steps below.
+This extension is very simple to use. We will show you the steps below.
 
 ## Usage
 

package/manifest.json

@@ -1,6 +1,6 @@
 {
     "name": "Casdoor",
-    "description": "Casdoor Chrome Extension",
+    "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"],
@@ -37,4 +37,4 @@
         "https://*/*",
         "http://*/*"
     ]
-}
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "casdoor",
-  "version": "1.0.0",
-  "description": "Casdoor Chrome Extension",
+  "version": "1.0.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/oauth.js

@@ -40,6 +40,7 @@ function login() {
           .getUserProfile(accessToken)
           .then((userProfile) => displayUserProfile(userProfile));
       });
+      setInputDisabledState(true, "endpoint", "applicationName")
     } else {
       alert("Login failed!");
     }
@@ -49,6 +50,7 @@ function login() {
 // eslint-disable-next-line no-unused-vars
 function logout() {
   chrome.storage.sync.set({accessToken: ""}, () => clearUserProfile());
+  setInputDisabledState(false, "endpoint", "applicationName")
 }
 
 function displayUserProfile(userProfile) {
@@ -63,3 +65,14 @@ function clearUserProfile() {
   document.getElementById("user").innerHTML = "";
   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}`);  
+    }  
+  });  
+}

package/src/popup.js

@@ -40,6 +40,7 @@ document.addEventListener("DOMContentLoaded", function() {
         const managedAccounts = account.data.managedAccounts;
         chrome.storage.sync.set({managedAccounts});
       });
+      setInputDisabledState(true, "endpoint", "applicationName")
     } else {
       clearUserProfile();
     }

package/src/sdk.js

@@ -38,26 +38,19 @@ class Sdk {
 
   getAccessTokenFromRedirectUrl(redirectUrl) {
     if (redirectUrl) {
-      const hashTagIndex = redirectUrl.indexOf("#");
-      const questionMaskIndex = redirectUrl.indexOf("?");
-      if (
-        hashTagIndex > 0 &&
-        questionMaskIndex > 0 &&
-        hashTagIndex < questionMaskIndex
-      ) {
-        // e.g. "https://${extensionId}.chromiumapp.org#token=${accessToken}?state=${state}&token_type=bearer"
-        return redirectUrl.substring(hashTagIndex + 7, questionMaskIndex);
-      }
+      const accessTokenMatch  = redirectUrl.match(/#access_token=([^&]*)/);
+      const accessToken = accessTokenMatch ? accessTokenMatch[1] : "";  
+      return accessToken;
     }
     return "";
   }
 
   login(func) {
-    this.getApplication().then(application => {
+    this.getApplication().then((res) => {
       // refer: https://developer.chrome.com/docs/extensions/reference/identity/#method-launchWebAuthFlow
       chrome.identity.launchWebAuthFlow(
         {
-          url: this.getSignInUrl(application.clientId),
+          url: this.getSignInUrl(res.data.clientId),
           interactive: true,
         },
         (redirectUrl) => {