Make avatar static-resource resolvers try/catches

packages/server-core/src/user/avatar/avatar.hooks.ts

@@ -196,15 +196,14 @@ const updateUserAvatars = async (context: HookContext<AvatarService>) => {
 
 /**
  * Hook used to check if request has any public avatar in data.
- * @param context
  */
 const isPublicAvatar = () => {
   return (context: HookContext) => {
     const data: AvatarType[] = Array.isArray(context.data) ? context.data : [context.data]
 
     const hasPublic = data.find((item) => item.isPublic)
 
-    return hasPublic ? true : false
+    return !!hasPublic
   }
 }
 

packages/server-core/src/user/avatar/avatar.resolvers.ts

@@ -57,11 +57,19 @@ export const avatarExternalResolver = resolve<AvatarType, HookContext>({
   }),
   modelResource: virtual(async (avatar, context) => {
     if (context.event !== 'removed' && avatar.modelResourceId)
-      return context.app.service(staticResourcePath).get(avatar.modelResourceId)
+      try {
+        return await context.app.service(staticResourcePath).get(avatar.modelResourceId)
+      } catch (err) {
+        //Swallow missing resource errors, deal with them elsewhere
+      }
   }),
   thumbnailResource: virtual(async (avatar, context) => {
     if (context.event !== 'removed' && avatar.thumbnailResourceId)
-      return context.app.service(staticResourcePath).get(avatar.thumbnailResourceId)
+      try {
+        return await context.app.service(staticResourcePath).get(avatar.thumbnailResourceId)
+      } catch (err) {
+        //Swallow missing resource errors, deal with them elsewhere
+      }
   })
 })
 

packages/server-core/src/user/identity-provider/identity-provider.hooks.ts

@@ -147,14 +147,14 @@ async function addIdentityProviderType(context: HookContext<IdentityProviderServ
 
 async function createNewUser(context: HookContext<IdentityProviderService>) {
   const isGuest = (context.actualData as IdentityProviderType).type === 'guest'
-  const avatars = await context.app.service(avatarPath).find({ isInternal: true, query: { $limit: 1000 } })
+  const avatars = await context.app
+    .service(avatarPath)
+    .find({ isInternal: true, query: { isPublic: true, skipUser: true, $limit: 1000 } })
 
-  const newUser = await context.app.service(userPath).create({
+  context.existingUser = await context.app.service(userPath).create({
     isGuest,
     avatarId: avatars.data[random(avatars.data.length - 1)].id
   })
-
-  context.existingUser = newUser
 }
 
 /* (AFTER) CREATE HOOKS */