Merge pull request #363 from Yooooomi/hotfix/import-missing-tokens

fixed import missing user tokens
Yooooomi · Mar 8, 2024 · ef46ab5 · ef46ab5
2 parents bba31e0 + b10c95c
commit ef46ab5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/apps/server/src/routes/importer.ts b/apps/server/src/routes/importer.ts
@@ -47,7 +47,7 @@ router.post(
       runImporter(
         null,
         ImporterStateTypes.privacy,
-        user,
+        user._id.toString(),
         (files as Express.Multer.File[]).map(f => f.path),
         success => {
           if (success) {
@@ -87,7 +87,7 @@ router.post(
       runImporter(
         null,
         ImporterStateTypes.fullPrivacy,
-        user,
+        user._id.toString(),
         (files as Express.Multer.File[]).map(f => f.path),
         success => {
           if (success) {
@@ -134,7 +134,7 @@ router.post(
       runImporter(
         importState._id.toString(),
         importState.type,
-        user,
+        user._id.toString(),
         importState.metadata,
         success => {
           if (success) {

diff --git a/apps/server/src/tools/importers/importer.ts b/apps/server/src/tools/importers/importer.ts
@@ -1,3 +1,4 @@
+import { Types } from "mongoose";
 import { getUserFromField } from "../../database";
 import {
   createImporterState,
@@ -58,11 +59,15 @@ export async function cleanupImport(existingStateId: string) {
 export async function runImporter<T extends ImporterStateTypes>(
   existingStateId: string | null,
   name: T,
-  user: User,
+  userId: string,
   requiredInitData: ImporterStateFromType<T>["metadata"],
   initDone: (success: boolean) => void,
 ) {
-  const userId = user._id.toString();
+  const user = await getUserFromField("_id", new Types.ObjectId(userId), true);
+  if (!user) {
+    logger.error(`User with id ${userId} was not found`);
+    return initDone(false);
+  }
   const importerClass = importers[name];
   if (!importerClass) {
     logger.error(`${name} importer was not found`);