update resolver to query user by orcid or id

packages/openneuro-app/src/scripts/users/user-query.tsx

@@ -1,49 +1,20 @@
-// UserQuery.tsx
-
 import React from 'react';
 import { useParams } from 'react-router-dom';
 import { UserRoutes } from './user-routes';
 import FourOFourPage from '../errors/404page';
 import { isValidOrcid } from "../utils/validationUtils";
-
-
-
-// Dummy user data
-const dummyUsers: Record<string, User> = {
-  '0000-0001-6755-0259': {
-    id: '1',
-    name: 'Gregory Noack',
-    location: 'Stanford, CA',
-    github: 'thinknoack',
-    institution: 'Stanford University',
-    email: '[email protected]',
-    avatar: 'https://dummyimage.com/200x200/000/fff',
-    orcid: '0000-0001-6755-0259',
-    links: ['onelink.com', 'https://www.twolink.com'],
-  },
-  '0000-0002-1234-5678': {
-    id: '2',
-    name: 'Jane Doe',
-    location: 'Stanford, CA',
-    institution: 'Stanford University',
-    email: '[email protected]',
-    avatar: 'https://dummyimage.com/200x200/000/fff',
-    orcid: '0000-0002-1234-5678',
-    links: ['onelink.com', 'https://www.twolink.com'],
-  },
-  '0000-0003-2345-6789': {
-    id: '3',
-    name: 'John Smith',
-    location: 'Stanford, CA',
-    institution: 'Stanford University',
-    email: '[email protected]',
-    avatar: 'https://dummyimage.com/200x200/000/fff',
-    orcid: '0000-0003-2345-6789',
-    links: ['onelink.com', 'https://www.twolink.com'],
-  },
-};
-
-
+import { gql, useQuery } from "@apollo/client";
+
+// GraphQL query to fetch user by ORCID
+const GET_USER_BY_ORCID = gql`
+  query User($userId: ID!) {
+    user(id: $userId) {
+      id
+      name
+      orcid
+    }
+  }
+`;
 
 export interface User {
   id: string;
@@ -65,16 +36,20 @@
     return <FourOFourPage />;
   }
 
-  // Check if the user exists in the dummyUsers data
-  const user = dummyUsers[orcid];
+  // Fetch user data using GraphQL
+  const { data, loading, error } = useQuery(GET_USER_BY_ORCID, {
+    variables: { userId: orcid }
+  });
+
+  if (loading) return <div>Loading...</div>;
+  if (error) return <FourOFourPage />; // Handle error as 404 page
 
-  if (!user) {
-    // If user is not found, render 404 page
+  if (!data?.user) {
     return <FourOFourPage />;
   }
 
-  // Mocked for now
+  // Assuming hasEdit is a static boolean value for now need to check against logged in user
   const hasEdit = true;
 
-  return <UserRoutes user={user} hasEdit={hasEdit} />;
+  return <UserRoutes user={data.user} hasEdit={hasEdit} />;
 };

packages/openneuro-server/src/graphql/resolvers/__tests__/user.spec.ts

@@ -13,6 +13,15 @@ describe("user resolvers", () => {
           { userInfo: {} },
         ),
       ).rejects.toEqual(new Error("You must be a site admin to retrieve users"))
-    })
-  })
-})
+    });
+    it("throws an error for non-admins", () => {
+      expect(
+        users(
+          null,
+          { id: "0000-0000-0000-000X" },
+          { userInfo: {} },
+        ),
+      ).rejects.toEqual(new Error("You must be a site admin to retrieve users"))
+    });
+  });
+});

packages/openneuro-server/src/graphql/resolvers/user.ts

@@ -3,8 +3,20 @@
  */
 import User from "../../models/user"
 
+
+
 export const user = (obj, { id }) => {
-  return User.findOne({ id }).exec()
+
+  function isValidOrcid(orcid: string): boolean {
+    return /^[0-9]{4}-[0-9]{4}-[0-9]{4}-[0-9]{3}[0-9X]$/.test(orcid || '');
+  }
+
+  if (isValidOrcid(id)) {
+    return User.findOne({ "orchid": id }).exec()
+  } else {
+    return User.findOne({ 'id': id }).exec()
+  }
+
 }
 
 export const users = (obj, args, { userInfo }) => {