casdoor 1.0.0 → 1.0.1

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.1",
+  "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/sdk.js

@@ -31,33 +31,26 @@ class Sdk {
   getSignInUrl(clientId) {
     const endpoint = this.config.endpoint;
     const redirectUri = this.getRedirectUri();
-    const scope = "profile";
+    const scope = "openid";
     const state = this.config.applicationName;
     return `${endpoint}/login/oauth/authorize?client_id=${clientId}&response_type=token&redirect_uri=${redirectUri}&scope=${scope}&state=${state}`;
   }
 
   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) => {