CORE: restrict url (#359)

oacore · Nov 14, 2024 · 0f3f570 · 0f3f570
1 parent 5c4772d
commit 0f3f570
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 16 deletions.
diff --git a/api/data-provider.js b/api/data-provider.js
@@ -11,7 +11,7 @@ const fetchMetadata = async (id, search_id) => {
   const isUndefined = split?.some((item) => item === undefined)
   const { data } = await requestV3(
     // eslint-disable-next-line camelcase
-    `/data-providers/${id}${!isUndefined ? `?t=${search_id}` : ''}`
+    `/data-providers/${id}${!isUndefined || search_id ? `?t=${search_id}` : ''}`
   )
   return data
 }

diff --git a/api/search.js b/api/search.js
@@ -9,7 +9,7 @@ export const fetchWorks = async (body) => {
   const isUndefined = split?.some((item) => item === undefined)
   const url = new URL(
     // eslint-disable-next-line camelcase
-    `/v3/search/works${!isUndefined ? `?t=${search_id}` : ''}`,
+    `/v3/search/works${!isUndefined || search_id ? `?t=${search_id}` : ''}`,
     process.env.API_URL
   ).href
   const { data: dataWorks } = await apiRequest(url, {

diff --git a/api/works.js b/api/works.js
@@ -6,7 +6,7 @@ const fetchWork = async (id, search_id) => {
   const isUndefined = split?.some((item) => item === undefined)
   const url = new URL(
     // eslint-disable-next-line camelcase
-    `/v3/works/${id}${!isUndefined ? `?t=${search_id}` : ''}`,
+    `/v3/works/${id}${!isUndefined || search_id ? `?t=${search_id}` : ''}`,
     process.env.API_URL
   ).href
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/templates/search/results.jsx b/templates/search/results.jsx
@@ -70,6 +70,7 @@ const Results = ({ works, searchId }) =>
         if (innerDownloadLink) return innerDownloadLink
         return innerFullTextLink
       }
+
       return (
         <SearchResult
           id={`search-output-${id}`}
@@ -89,13 +90,17 @@ const Results = ({ works, searchId }) =>
             metadataLink:
               generateMetadataLink(metadataLink, searchId, id) ||
               generateMetadataLink(displayLink, searchId, id),
-            fullTextLink: renderFullTextLink({
-              fullTextLink,
-              downloadLink,
-              modifiedReaderLink,
-              searchId,
-              id,
-            }),
+            fullTextLink:
+              !window.location.search.includes('author') &&
+              !window.location.pathname.includes('data-providers')
+                ? renderFullTextLink({
+                    fullTextLink,
+                    downloadLink,
+                    modifiedReaderLink,
+                    searchId,
+                    id,
+                  })
+                : fullTextLink || readerLink || downloadLink,
             dataProviders: dataProviders || [],
             isRecommended: memberType?.billing_type === 'sustaining',
           }}