@lenne.tech/nest-server 12.0.0 → 12.1.0

package/src/server/modules/user/user.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable, Optional, UnauthorizedException, UnprocessableEntityException } from '@nestjs/common';
-import { InjectModel } from '@nestjs/mongoose';
+import { InjectModel } from '../../../core/common/persistence/mongo/mongoose-compat.js';
 import { PubSub } from 'graphql-subscriptions';
-import { Model } from 'mongoose';
+import type { Model } from 'mongoose';
 
 import { getTranslatablePropertyKeys, updateLanguage } from '../../../core/common/decorators/translatable.decorator.js';
 import { ServiceOptions } from '../../../core/common/interfaces/service-options.interface.js';
@@ -51,7 +51,8 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
     // Add the createdBy information in an extra step if it was not set by the system because the user created himself
     // and could not exist as currentUser before
     if (!user.createdBy) {
-      await this.mainDbModel.findByIdAndUpdate(user.id, { createdBy: user.id });
+      // Through the data store, not the Mongoose model: it serves the user on whichever database the model is routed to
+      await this.dataStore.updateById(user.id, { createdBy: user.id });
       user = await this.get(user.id, { ...serviceOptions, currentUser: serviceOptions?.currentUser || user });
     }
 
@@ -149,11 +150,10 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
    * @returns the PREVIOUS avatar id, so the caller can delete the orphaned file
    */
   async setAvatar(avatarId: string, user: User): Promise<string> {
-    // `findById`, not `findOne({ id })`: `id` is a Mongoose virtual, so it exists on the
-    // document but not in MongoDB — a filter on it matches nothing and every call ended in
-    // "session user no longer exists". Broken since the Mongoose migration and never noticed,
-    // because no test covers the avatar endpoint.
-    const dbUser = await this.mainDbModel.findById(user.id).exec();
+    // Through the data store, which serves the user on whichever database the model is routed to and addresses
+    // the id the same way on each. (A Mongoose `findOne({ id })` matched nothing — `id` is a virtual there — and
+    // every call ended in "session user no longer exists" until this used `findById`.)
+    const dbUser = await this.dataStore.findById(user.id);
     // Check user: the token is valid but the account no longer exists, so the session really is
     // invalid — 401 is right here. (A permission error would have to be 403, see accessDeniedException.)
     if (!dbUser) {
@@ -168,9 +168,7 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
     const previousAvatar = dbUser.avatar;
 
     // The avatar is referenced by file id and served via GET /files/id/:id
-    dbUser.avatar = avatarId;
-
-    await dbUser.save();
+    await this.dataStore.updateById(user.id, { avatar: avatarId });
 
     return previousAvatar;
   }

package/src/test/test.helper.ts

@@ -2,13 +2,13 @@ import { INestApplication } from '@nestjs/common';
 import { Blob } from 'buffer';
 import { createClient } from 'graphql-ws';
 import { jsonToGraphQLQuery } from 'json-to-graphql-query';
-import { Types } from 'mongoose';
 import supertest from 'supertest';
 import * as util from 'util';
 import ws from 'ws';
 
 import { getStringIds } from '../core/common/helpers/db.helper.js';
 import { resolveBetterAuthSessionCookieName } from '../core/modules/better-auth/better-auth-cookie-prefix.helper.js';
+import { isObjectIdLike } from '../core/common/helpers/id.helper.js';
 
 /**
  * GraphQL request type
@@ -801,7 +801,7 @@ export class TestHelper {
     if (args instanceof Date) {
       return args.toISOString();
     }
-    if (args instanceof Types.ObjectId) {
+    if (isObjectIdLike(args)) {
       return getStringIds(args);
     }
     if (!objects) {

package/src/types/graphql-upload.d.ts

@@ -1,9 +1,14 @@
 /**
  * Type definitions for graphql-upload
- * graphql-upload uses deep imports, so we declare types for the specific modules
+ * graphql-upload uses deep imports, so we declare types for the specific modules.
+ *
+ * Since graphql-upload 16 the package is ESM: its `exports` map lists only the `.mjs` deep paths, each
+ * with a default export, and it ships no declaration files (its types are JSDoc inside the `.mjs`
+ * sources, which TypeScript does not read from `node_modules`). Both names below are the ones the
+ * framework imports.
  */
 
-declare module 'graphql-upload/graphqlUploadExpress.js' {
+declare module 'graphql-upload/graphqlUploadExpress.mjs' {
   import { RequestHandler } from 'express';
 
   interface GraphQLUploadOptions {
@@ -11,15 +16,13 @@ declare module 'graphql-upload/graphqlUploadExpress.js' {
     maxFileSize?: number;
   }
 
-  function graphqlUploadExpress(options?: GraphQLUploadOptions): RequestHandler;
-
-  export = graphqlUploadExpress;
+  export default function graphqlUploadExpress(options?: GraphQLUploadOptions): RequestHandler;
 }
 
-declare module 'graphql-upload/GraphQLUpload.js' {
+declare module 'graphql-upload/GraphQLUpload.mjs' {
   import { GraphQLScalarType } from 'graphql';
 
   const GraphQLUpload: GraphQLScalarType;
 
-  export = GraphQLUpload;
+  export default GraphQLUpload;
 }