fix: accessKey not effective

DIYgod · Dec 15, 2023 · 393b003 · 393b003
1 parent 190aa14
commit 393b003
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/src/lib/config.ts b/src/lib/config.ts
@@ -7,9 +7,7 @@ const storage = new Storage()
 export const defaultConfig = {
     rsshubDomain: 'https://rsshub.app',
     rsshubAccessControl: {
-        enabled: false,
         accessKey: '',
-        useCode: true,
     },
     notice: {
         badge: true,
@@ -55,9 +53,6 @@ export async function setConfig(config: Partial<typeof defaultConfig>) {
         config.rsshubDomain = defaultConfig.rsshubDomain;
     }
     config.rsshubDomain = config.rsshubDomain.replace(/\/$/, '');
-    if (config.rsshubDomain === defaultConfig.rsshubDomain) {
-        config.rsshubAccessControl.enabled = defaultConfig.rsshubAccessControl.enabled;
-    }
     await storage.set("config", config)
     toast.success("Saved")
     return config;

diff --git a/src/options/routes/General.tsx b/src/options/routes/General.tsx
@@ -85,9 +85,7 @@ function General() {
                 id="accessKey"
                 value={config.rsshubAccessControl.accessKey} onChange={(e) => setConfig({
                   rsshubAccessControl: {
-                    enabled: !!e.target.value,
                     accessKey: e.target.value,
-                    useCode: true,
                   }
                 })}
                 placeholder={chrome.i18n.getMessage("configurationRequiredIfAccessKeysEnabled")}

diff --git a/src/popup/RSSItem.tsx b/src/popup/RSSItem.tsx
@@ -28,12 +28,8 @@ function RSSItem({
   }, [copied])
 
   let url = item.url.replace('{rsshubDomain}', config.rsshubDomain);
-  if (type === 'currentPageRSS' && config.rsshubAccessControl.enabled) {
-    if (config.rsshubAccessControl.useCode) {
-      url = `${url}?code=${new MD5().update(item.path + config.rsshubAccessControl.accessKey).digest('hex')}`
-    } else {
-      url = `${url}?key=${config.rsshubAccessControl.accessKey}`
-    }
+  if (type === 'currentPageRSSHub' && config.rsshubAccessControl.accessKey) {
+    url = `${url}?code=${new MD5().update(item.path + config.rsshubAccessControl.accessKey).digest('hex')}`
   }
   url = encodeURI(url);
   const encodedUrl = encodeURIComponent(url);