Fixed a NPE

david-rocca · david-rocca · commit 95e57ae93041 · 2025-09-08T14:34:03.000-04:00
diff --git a/src/repositories/baseUserRepository.js b/src/repositories/baseUserRepository.js
@@ -86,7 +86,7 @@ class BaseUserRepository extends BaseRepository {
 
     const user = users.find(user => org.users.includes(user.UUID))
 
-    if (isLegacyObject) {
+    if (isLegacyObject && user) {
       return await legacyUserRepo.findOneByUUID(user.UUID) || null
     }
     return user || null
@@ -104,7 +104,7 @@ class BaseUserRepository extends BaseRepository {
     }
 
     const user = users.find(user => org.users.includes(user.UUID))
-    if (isLegacyObject) {
+    if (isLegacyObject && user) {
       return await legacyUserRepo.findOneByUUID(user.UUID) || null
     }
     return user || null

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ class BaseUserRepository extends BaseRepository {`
`86`	`86`
`87`	`87`	`const user = users.find(user => org.users.includes(user.UUID))`
`88`	`88`
`89`		`- if (isLegacyObject) {`
	`89`	`+ if (isLegacyObject && user) {`
`90`	`90`	`return await legacyUserRepo.findOneByUUID(user.UUID) \|\| null`
`91`	`91`	`}`
`92`	`92`	`return user \|\| null`
`@@ -104,7 +104,7 @@ class BaseUserRepository extends BaseRepository {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`const user = users.find(user => org.users.includes(user.UUID))`
`107`		`- if (isLegacyObject) {`
	`107`	`+ if (isLegacyObject && user) {`
`108`	`108`	`return await legacyUserRepo.findOneByUUID(user.UUID) \|\| null`
`109`	`109`	`}`
`110`	`110`	`return user \|\| null`