@lenne.tech/nest-server 11.43.3 → 12.1.0

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

@@ -10,16 +10,16 @@ import {
   ApiTags,
 } from '@nestjs/swagger';
 
-import { ApiCommonErrorResponses } from '../../../core/common/decorators/common-error.decorator';
-import { CurrentUser } from '../../../core/common/decorators/current-user.decorator';
-import { Roles } from '../../../core/common/decorators/roles.decorator';
-import { RoleEnum } from '../../../core/common/enums/role.enum';
-import { ServiceOptions } from '../../../core/common/interfaces/service-options.interface';
-import { UserCreateInput } from './inputs/user-create.input';
-import { UserInput } from './inputs/user.input';
-import { FindAndCountUsersResult } from './outputs/find-and-count-users-result.output';
-import { User } from './user.model';
-import { UserService } from './user.service';
+import { ApiCommonErrorResponses } from '../../../core/common/decorators/common-error.decorator.js';
+import { CurrentUser } from '../../../core/common/decorators/current-user.decorator.js';
+import { Roles } from '../../../core/common/decorators/roles.decorator.js';
+import { RoleEnum } from '../../../core/common/enums/role.enum.js';
+import { ServiceOptions } from '../../../core/common/interfaces/service-options.interface.js';
+import { UserCreateInput } from './inputs/user-create.input.js';
+import { UserInput } from './inputs/user.input.js';
+import { FindAndCountUsersResult } from './outputs/find-and-count-users-result.output.js';
+import { User } from './user.model.js';
+import { UserService } from './user.service.js';
 
 /**
  * Controller to handle user REST API endpoints

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

@@ -1,15 +1,20 @@
 import { ObjectType } from '@nestjs/graphql';
-import { Schema as MongooseSchema, Prop, SchemaFactory } from '@nestjs/mongoose';
+import {
+  objectIdType,
+  Prop,
+  Schema as MongooseSchema,
+  SchemaFactory,
+} from '../../../core/common/persistence/mongo/mongoose-compat.js';
 import { IsEmail } from 'class-validator';
-import { Document, Schema } from 'mongoose';
+import type { Document } from 'mongoose';
 
-import { Restricted } from '../../../core/common/decorators/restricted.decorator';
-import { Translatable } from '../../../core/common/decorators/translatable.decorator';
-import { UnifiedField } from '../../../core/common/decorators/unified-field.decorator';
-import { ProcessType } from '../../../core/common/enums/process-type.enum';
-import { RoleEnum } from '../../../core/common/enums/role.enum';
-import { CoreUserModel } from '../../../core/modules/user/core-user.model';
-import { PersistenceModel } from '../../common/models/persistence.model';
+import { Restricted } from '../../../core/common/decorators/restricted.decorator.js';
+import { Translatable } from '../../../core/common/decorators/translatable.decorator.js';
+import { UnifiedField } from '../../../core/common/decorators/unified-field.decorator.js';
+import { ProcessType } from '../../../core/common/enums/process-type.enum.js';
+import { RoleEnum } from '../../../core/common/enums/role.enum.js';
+import { CoreUserModel } from '../../../core/modules/user/core-user.model.js';
+import { PersistenceModel } from '../../common/models/persistence.model.js';
 
 export type UserDocument = Document & User;
 
@@ -48,7 +53,7 @@ export class User extends CoreUserModel implements PersistenceModel {
   @UnifiedField({
     description: 'ID of the user who created the object',
     isOptional: true,
-    mongoose: { ref: 'User', type: Schema.Types.ObjectId },
+    mongoose: { ref: 'User', type: objectIdType() },
     roles: RoleEnum.S_EVERYONE,
     type: () => String,
   })
@@ -96,13 +101,13 @@ export class User extends CoreUserModel implements PersistenceModel {
   @UnifiedField({
     description: 'ID of the user who last updated the object',
     isOptional: true,
-    mongoose: { ref: 'User', type: Schema.Types.ObjectId },
+    mongoose: { ref: 'User', type: objectIdType() },
     roles: RoleEnum.S_USER,
     type: () => String,
   })
   updatedBy: string = undefined;
 
-  @Prop({ default: {}, type: Schema.Types.Mixed })
+  @Prop({ default: {}, type: Object })
   @Restricted(RoleEnum.S_EVERYONE)
   _translations?: Record<string, Partial<User>> = undefined;
 

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

@@ -1,26 +1,32 @@
 import { forwardRef, Module } from '@nestjs/common';
-import { MongooseModule } from '@nestjs/mongoose';
 import { PubSub } from 'graphql-subscriptions';
 
-import { ConfigService } from '../../../core/common/services/config.service';
-import { CoreRedisPubSub } from '../../../core/common/services/core-redis-pubsub';
-import { CoreRedisService } from '../../../core/common/services/core-redis.service';
-import { FileModule } from '../file/file.module';
-import { AvatarController } from './avatar.controller';
-import { UserController } from './user.controller';
-import { User, UserSchema } from './user.model';
-import { UserResolver } from './user.resolver';
-import { UserService } from './user.service';
+import { CorePersistenceModule } from '../../../core/common/persistence/core-persistence.module.js';
+import { ConfigService } from '../../../core/common/services/config.service.js';
+import { CoreRedisPubSub } from '../../../core/common/services/core-redis-pubsub.js';
+import { CoreRedisService } from '../../../core/common/services/core-redis.service.js';
+import { FileModule } from '../file/file.module.js';
+import { AvatarController } from './avatar.controller.js';
+import { UserController } from './user.controller.js';
+import { User, UserSchema } from './user.model.js';
+import { UserResolver } from './user.resolver.js';
+import { UserService } from './user.service.js';
+
+/**
+ * The user model, registered database-neutrally: `@InjectModel()` keeps working, and `database` in the configuration
+ * decides whether users are stored in MongoDB or a SQL database (`CorePersistenceModule`)
+ */
+const UserPersistence = CorePersistenceModule.forFeature([{ model: User, name: User.name, schema: UserSchema }]);
 
 /**
  * User module
  */
 @Module({
   controllers: [AvatarController, UserController],
-  exports: [MongooseModule, UserResolver, UserService, 'USER_CLASS'],
+  exports: [UserPersistence, UserResolver, UserService, 'USER_CLASS'],
   // forwardRef: FileModule already imports UserModule, and the avatar upload now
   // needs FileService to reach the central storage — so the two reference each other.
-  imports: [MongooseModule.forFeature([{ name: User.name, schema: UserSchema }]), forwardRef(() => FileModule)],
+  imports: [UserPersistence, forwardRef(() => FileModule)],
   providers: [
     UserResolver,
     ConfigService,

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

@@ -2,16 +2,16 @@ import { Inject } from '@nestjs/common';
 import { Args, Mutation, Query, Resolver, Subscription } from '@nestjs/graphql';
 import { PubSub } from 'graphql-subscriptions';
 
-import { FilterArgs } from '../../../core/common/args/filter.args';
-import { GraphQLServiceOptions } from '../../../core/common/decorators/graphql-service-options.decorator';
-import { Roles } from '../../../core/common/decorators/roles.decorator';
-import { RoleEnum } from '../../../core/common/enums/role.enum';
-import { ServiceOptions } from '../../../core/common/interfaces/service-options.interface';
-import { UserCreateInput } from './inputs/user-create.input';
-import { UserInput } from './inputs/user.input';
-import { FindAndCountUsersResult } from './outputs/find-and-count-users-result.output';
-import { User } from './user.model';
-import { UserService } from './user.service';
+import { FilterArgs } from '../../../core/common/args/filter.args.js';
+import { GraphQLServiceOptions } from '../../../core/common/decorators/graphql-service-options.decorator.js';
+import { Roles } from '../../../core/common/decorators/roles.decorator.js';
+import { RoleEnum } from '../../../core/common/enums/role.enum.js';
+import type { ServiceOptions } from '../../../core/common/interfaces/service-options.interface.js';
+import { UserCreateInput } from './inputs/user-create.input.js';
+import { UserInput } from './inputs/user.input.js';
+import { FindAndCountUsersResult } from './outputs/find-and-count-users-result.output.js';
+import { User } from './user.model.js';
+import { UserService } from './user.service.js';
 
 /**
  * Resolver to process with user data
@@ -174,7 +174,7 @@ export class UserResolver {
     },
     resolve: (user) => user,
   })
-  async userCreated() {
+  async userCreated(): Promise<AsyncIterableIterator<unknown>> {
     return this.pubSub.asyncIterableIterator('userCreated');
   }
 }

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

@@ -1,18 +1,18 @@
 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 { getTranslatablePropertyKeys, updateLanguage } from '../../../core/common/decorators/translatable.decorator';
-import { ServiceOptions } from '../../../core/common/interfaces/service-options.interface';
-import { ConfigService } from '../../../core/common/services/config.service';
-import { EmailService } from '../../../core/common/services/email.service';
-import { CoreModelConstructor } from '../../../core/common/types/core-model-constructor.type';
-import { CoreBetterAuthUserMapper } from '../../../core/modules/better-auth/core-better-auth-user.mapper';
-import { CoreUserService } from '../../../core/modules/user/core-user.service';
-import { UserCreateInput } from './inputs/user-create.input';
-import { UserInput } from './inputs/user.input';
-import { User, UserDocument } from './user.model';
+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';
+import { ConfigService } from '../../../core/common/services/config.service.js';
+import { EmailService } from '../../../core/common/services/email.service.js';
+import type { CoreModelConstructor } from '../../../core/common/types/core-model-constructor.type.js';
+import { CoreBetterAuthUserMapper } from '../../../core/modules/better-auth/core-better-auth-user.mapper.js';
+import { CoreUserService } from '../../../core/modules/user/core-user.service.js';
+import { UserCreateInput } from './inputs/user-create.input.js';
+import { UserInput } from './inputs/user.input.js';
+import { User, UserDocument } from './user.model.js';
 
 /**
  * User service
@@ -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/server/server.controller.ts

@@ -1,6 +1,6 @@
 import { Controller, Get, Render } from '@nestjs/common';
 
-import { ConfigService, RoleEnum, Roles } from '..';
+import { ConfigService, RoleEnum, Roles } from '../index.js';
 
 @Controller()
 @Roles(RoleEnum.ADMIN)

package/src/server/server.module.ts

@@ -1,22 +1,22 @@
 import { Module } from '@nestjs/common';
 import { ScheduleModule } from '@nestjs/schedule';
 
-import envConfig from '../config.env';
-import { CoreModule } from '../core.module';
-import { Any } from '../core/common/scalars/any.scalar';
-import { DateScalar } from '../core/common/scalars/date.scalar';
-import { JSON } from '../core/common/scalars/json.scalar';
-import { CoreAuthService } from '../core/modules/auth/services/core-auth.service';
-import { TusModule } from '../core/modules/tus';
-import { CronJobs } from './common/services/cron-jobs.service';
-import { AiToolsModule } from './modules/ai/ai-tools.module';
-import { AuthController } from './modules/auth/auth.controller';
-import { AuthModule } from './modules/auth/auth.module';
-import { BetterAuthModule } from './modules/better-auth/better-auth.module';
-import { ErrorCodeController } from './modules/error-code/error-code.controller';
-import { ErrorCodeService } from './modules/error-code/error-code.service';
-import { FileModule } from './modules/file/file.module';
-import { ServerController } from './server.controller';
+import envConfig from '../config.env.js';
+import { CoreModule } from '../core.module.js';
+import { Any } from '../core/common/scalars/any.scalar.js';
+import { DateScalar } from '../core/common/scalars/date.scalar.js';
+import { JSON } from '../core/common/scalars/json.scalar.js';
+import { CoreAuthService } from '../core/modules/auth/services/core-auth.service.js';
+import { TusModule } from '../core/modules/tus/index.js';
+import { CronJobs } from './common/services/cron-jobs.service.js';
+import { AiToolsModule } from './modules/ai/ai-tools.module.js';
+import { AuthController } from './modules/auth/auth.controller.js';
+import { AuthModule } from './modules/auth/auth.module.js';
+import { BetterAuthModule } from './modules/better-auth/better-auth.module.js';
+import { ErrorCodeController } from './modules/error-code/error-code.controller.js';
+import { ErrorCodeService } from './modules/error-code/error-code.service.js';
+import { FileModule } from './modules/file/file.module.js';
+import { ServerController } from './server.controller.js';
 
 /**
  * Server module (dynamic)

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 = require('supertest');
-import util = require('util');
-import ws = require('ws');
+import supertest from 'supertest';
+import * as util from 'util';
+import ws from 'ws';
 
-import { getStringIds } from '../core/common/helpers/db.helper';
-import { resolveBetterAuthSessionCookieName } from '../core/modules/better-auth/better-auth-cookie-prefix.helper';
+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;
 }