From 9f75b66d85776df513d0603668aa995426b83cee Mon Sep 17 00:00:00 2001
From: ddelpiano <dario@metacell.us>
Date: Thu, 10 Apr 2025 11:18:27 +0200
Subject: [PATCH] migrate to new scicrunch endpoint

---
 src/api/endpoints/index.ts       | 24 +++++++++++++++----
 src/components/Auth/Register.jsx | 40 --------------------------------
 src/components/Header/index.jsx  |  1 +
 src/config.js                    |  4 ++--
 vite.config.js                   |  4 ++--
 5 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/src/api/endpoints/index.ts b/src/api/endpoints/index.ts
index 649881c9..1fe20fb0 100644
--- a/src/api/endpoints/index.ts
+++ b/src/api/endpoints/index.ts
@@ -154,11 +154,25 @@ export const elasticSearch = async (query) => {
   const url = API_CONFIG.BASE_SCICRUNCH_URL + API_CONFIG.SCICRUNCH_KEY;
   try {
     const result = await fetchData(url, "POST", {
-      query: {
-        query_string: {
-          query: query,
-        },
-      },
+      "size": 20,
+      "from": 0,
+      "query": {
+        "bool": {
+            "must": [
+                {
+                    "query_string": {
+                        "fields": [
+                            "*"
+                        ],
+                        "query": query,
+                        "type": "cross_fields",
+                        "default_operator": "and",
+                        "lenient": "true"
+                    }
+                }
+            ]
+        }
+      }
     });
     return elasticSearhParser(result?.hits?.hits)
   } catch (error) {
diff --git a/src/components/Auth/Register.jsx b/src/components/Auth/Register.jsx
index e5068b38..d0d953d7 100644
--- a/src/components/Auth/Register.jsx
+++ b/src/components/Auth/Register.jsx
@@ -19,22 +19,16 @@ import { GlobalDataContext } from "../../contexts/DataContext";
 // import { register } from "../../api/endpoints/apiService";
 
 const schema = yup.object().shape({
-  firstName: yup.string().required("First name is a required field"),
-  lastName: yup.string().required("Last name is a required field"),
   email: yup.string().email().required(),
   username: yup.string().required().min(3),
   password: yup.string().required().min(10),
-  organization: yup.string().required()
 });
 
 const Register = () => {
   const [formData, setFormData] = React.useState({
-    firstName: "",
-    lastName: "",
     username: "",
     email: "",
     password: "",
-    organization: "",
   });
 
   const [errors, setErrors] = React.useState({});
@@ -137,28 +131,6 @@ const Register = () => {
 
           <form className="authForm">
             <Grid container spacing={2.5}>
-              <FormField
-                xs={6}
-                label="First name"
-                placeholder="Enter your name"
-                value={formData.firstName}
-                onChange={(e) =>
-                  setFormData({ ...formData, firstName: e.target.value })
-                }
-                errorMessage={errors.firstName}
-                helperText="Required"
-              />
-              <FormField
-                xs={6}
-                label="Last name"
-                placeholder="Enter your surname"
-                value={formData.lastName}
-                onChange={(e) =>
-                  setFormData({ ...formData, lastName: e.target.value })
-                }
-                errorMessage={errors.lastName}
-                helperText="Required"
-              />
               <FormField
                 label="Username"
                 placeholder="Enter your username"
@@ -189,18 +161,6 @@ const Register = () => {
                 errorMessage={errors.password}
                 helperText="Required"
               />
-              <Grid item xs={12}>
-                <FormField
-                  label="Organization"
-                  placeholder="Enter your organization"
-                  value={formData.organization}
-                  onChange={(e) =>
-                    setFormData({ ...formData, organization: e.target.value })
-                  }
-                  errorMessage={errors.organization}
-                  helperText="Required"
-                />
-              </Grid>
               <Grid item xs={12}>
                 <FormControl>
                   <Button variant="contained" color="primary" onClick={registerUser}>
diff --git a/src/components/Header/index.jsx b/src/components/Header/index.jsx
index 32745b90..edacc943 100644
--- a/src/components/Header/index.jsx
+++ b/src/components/Header/index.jsx
@@ -220,6 +220,7 @@ const Header = () => {
 
     const handleMenuClick = (e, menu) => {
         if (menu.label === 'Log out') {
+            window.cookieStore.delete({name: 'session', domain: 'https://uri.olympiangods.org'});
             setUserData(null, null);
             navigate('/');
         }
diff --git a/src/config.js b/src/config.js
index 3363167f..7329df86 100644
--- a/src/config.js
+++ b/src/config.js
@@ -24,12 +24,12 @@ export const API_CONFIG = {
         GET_ENDPOINTS_ILX: "/api/real/endpoints-ilx",
         PATCH_ENDPOINTS_ILX: "/api/real/patch-endpoints-ilx",
         SIGNIN: "/u/ops/user-login",
-        ORCID_SIGNIN: "/u/ops/orcid-new",
+        ORCID_SIGNIN: "/u/ops/orcid-login",
         NEWUSER_ILX: "/u/ops/user-new",
         NEWUSER_ORCID: "/u/ops/orcid-new",
     },
     OLYMPIAN_GODS : "https://uri.olympiangods.org",
-    BASE_SCICRUNCH_URL: "/api/elasticsearch?key=",
+    BASE_SCICRUNCH_URL: "/api/elasticsearch?apikey=",
     SCICRUNCH_KEY: import.meta.env.VITE_SCICRUNCH_API_KEY,
     BASE_URL: import.meta.env.MODE === "production" ? "https://uri.olympiangods.org" : window.location.origin,
 };
diff --git a/vite.config.js b/vite.config.js
index 56292794..aec029ff 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -6,11 +6,11 @@ export default defineConfig({
   server: {
     proxy: {
       "/api/elasticsearch": {
-        target: "https://scicrunch.org",
+        target: "https://api.scicrunch.io",
         changeOrigin: true,
         secure: true, // Ensure HTTPS requests work
         rewrite: (path) =>
-          path.replace(/^\/api\/elasticsearch/, "/api/1/elastic/Interlex_pr/_search"),
+          path.replace(/^\/api\/elasticsearch/, "/elastic/v1/Interlex_pr/_search"),
         headers: {
           // Forward headers correctly
           "Content-Type": "application/json",