chore: return projectId on magic link auth

digidem · Feb 11, 2025 · d2e429b · d2e429b
1 parent ded6093
commit d2e429b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/routes/magic-link.js b/src/routes/magic-link.js
@@ -98,6 +98,7 @@ export default async function magicLinkRoutes(fastify, { serverBearerToken }) {
         200: Type.Object({
           magicLinkToken: Type.String(),
           user: Type.Any(),
+          projectId: Type.String(),
         }),
         '4xx': schemas.errorResponse,
       },
@@ -140,7 +141,21 @@ export default async function magicLinkRoutes(fastify, { serverBearerToken }) {
         `Magic link token invalidated successfully: ${magicToken}`,
       )
 
-      return { magicLinkToken: magicToken, user: associatedUser }
+      const projects = await fastify.comapeo.listProjects()
+      const project = projects.find(
+        (p) => p.name === associatedUser.projectName,
+      )
+      if (!project) {
+        fastify.log.error(
+          `No project found for user with projectName: ${associatedUser.projectName}`,
+        )
+        throw errors.notFoundError(
+          `No project found for user with projectName: ${associatedUser.projectName}`,
+        )
+      }
+      const projectId = project.projectId
+
+      return { magicLinkToken: magicToken, user: associatedUser, projectId }
     },
   })
 }
diff --git a/src/routes/observations.js b/src/routes/observations.js
@@ -155,7 +155,9 @@ export default async function observationRoutes(
         category: Type.Optional(Type.String()),
         locale: Type.Optional(Type.String()),
       }),
-      body: Type.Union([schemas.observationToAdd, schemas.observationToUpdate]),
+      body: Type.Optional(
+        Type.Union([schemas.observationToAdd, schemas.observationToUpdate]),
+      ),
       response: {
         200: Type.Object({
           versionId: Type.String(),
@@ -208,8 +210,7 @@ export default async function observationRoutes(
 
       if (effectiveVersionId) {
         // Update existing observation
-        const body = /** @type {Record<string, any>} */ (req.body)
-
+        const body = /** @type {Record<string, any>} */ (req.body || {})
         // Explicitly reject lat/lon in updates
         if ('lat' in body || 'lon' in body) {
           throw errors.badRequestError(
@@ -244,8 +245,7 @@ export default async function observationRoutes(
       }
 
       // Create new observation
-      const body = /** @type {Record<string, any>} */ (req.body)
-
+      const body = /** @type {Record<string, any>} */ (req.body || {})
       if (typeof body.lat !== 'number' || typeof body.lon !== 'number') {
         throw errors.badRequestError(
           'lat and lon are required for new observations',

diff --git a/src/schemas.js b/src/schemas.js
@@ -102,6 +102,7 @@ export const observationToUpdate = Type.Object({
 })
 
 export const observationResult = Type.Object({
+  versionId: Type.String(),
   docId: Type.String(),
   createdAt: dateTimeString,
   updatedAt: dateTimeString,