nicot-simple-user 1.0.1 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nicot-simple-user",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Simple user module based on NICOT",
   "author": "Nanahira <nanahira@momobako.com>",
   "license": "MIT",
@@ -41,7 +41,7 @@
     "@nestjs/typeorm": "^11.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.3",
-    "nicot": "^1.3.1",
+    "nicot": "^1.3.4",
     "typeorm": "^0.3.28"
   },
   "devDependencies": {
@@ -63,7 +63,7 @@
     "eslint-plugin-prettier": "^5.2.2",
     "globals": "^16.0.0",
     "jest": "^29.7.0",
-    "nesties": "^1.1.27",
+    "nesties": "^1.1.29",
     "pg": "^8.16.3",
     "prettier": "^3.4.2",
     "reflect-metadata": "^0.2.2",

package/test/app-e2e.spec.ts

@@ -2,27 +2,9 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { INestApplication } from '@nestjs/common';
 import request from 'supertest';
 import { AppModule } from './../src/app.module';
-
-type BlankReturnMessageDto = {
-  statusCode: number;
-  message: string;
-  success: boolean;
-  timestamp: string;
-};
-
-type ReturnMessage<T> = BlankReturnMessageDto & { data?: T };
-
-type LoginResponseDto = {
-  token: string;
-  tokenExpiresAt: string;
-  userId: number;
-};
-
-type SimpleUserResultDto = {
-  id: number;
-  email?: string;
-  passwordSet: boolean;
-};
+import { AppUser } from '../src/app-user.entity';
+import { GenericReturnMessageDto } from 'nicot';
+import { LoginResponseDto } from '../src/simple-user/simple-user/login.dto';
 
 describe('SimpleUserModule (e2e)', () => {
   let app: INestApplication;
@@ -45,6 +27,31 @@ describe('SimpleUserModule (e2e)', () => {
 
   let token: string | undefined;
 
+  type ArticleCreateResult = {
+    id: number;
+    title: string;
+    content: string;
+    userId: number;
+  };
+
+  type ArticleResult = ArticleCreateResult & {
+    user?: {
+      id: number;
+      email?: string;
+      passwordSet: boolean;
+      age: number;
+    };
+  };
+
+  let userId: number | undefined;
+  let currentEmail = email1;
+
+  let articleId: number | undefined;
+  const articleTitle1 = `Hello_${rand}`;
+  const articleTitle2 = `Hello2_${rand}`;
+  const articleContent1 = `Content_${rand}`;
+  const articleContent2 = `Content2_${rand}`;
+
   beforeAll(async () => {
     const moduleFixture: TestingModule = await Test.createTestingModule({
       imports: [AppModule],
@@ -114,13 +121,14 @@ describe('SimpleUserModule (e2e)', () => {
       .expect(200);
 
     expectOkEnvelope(res.body);
-    const data = (res.body as ReturnMessage<LoginResponseDto>).data;
+    const data = (res.body as GenericReturnMessageDto<LoginResponseDto>).data;
     expect(data).toBeDefined();
     expect(typeof data.userId).toBe('number');
     expect(typeof data.token).toBe('string');
     expect(data.token).toHaveLength(64);
 
     token = data.token;
+    userId = data.userId;
   });
 
   it('GET /user-center/me -> should return current user info', async () => {
@@ -131,12 +139,13 @@ describe('SimpleUserModule (e2e)', () => {
       .expect(200);
 
     expectOkEnvelope(res.body);
-    const data = (res.body as ReturnMessage<SimpleUserResultDto>).data;
+    const data = (res.body as GenericReturnMessageDto<AppUser>).data;
     expect(data).toBeDefined();
     expect(typeof data.id).toBe('number');
     // 刚用 email 登录，通常应该有 email
     expect(data.email).toBe(email1);
     expect(typeof data.passwordSet).toBe('boolean');
+    expect(data.age).toBe(18); // from AppUser default
   });
 
   it('POST /user-center/change-password -> set password (first time) and then login by password', async () => {
@@ -158,7 +167,8 @@ describe('SimpleUserModule (e2e)', () => {
       .expect(200);
 
     expectOkEnvelope(loginOk.body);
-    const data = (loginOk.body as ReturnMessage<LoginResponseDto>).data;
+    const data = (loginOk.body as GenericReturnMessageDto<LoginResponseDto>)
+      .data;
     expect(data.token).toHaveLength(64);
 
     // 用错密码应 403
@@ -181,6 +191,8 @@ describe('SimpleUserModule (e2e)', () => {
 
     expectOkEnvelope(send.body);
 
+    currentEmail = email2;
+
     // 提交换绑
     const change = await request(httpServer)
       .post('/user-center/change-email')
@@ -199,10 +211,131 @@ describe('SimpleUserModule (e2e)', () => {
       .expect(200);
 
     expectOkEnvelope(relogin.body);
-    const data = (relogin.body as ReturnMessage<LoginResponseDto>).data;
+    const data = (relogin.body as GenericReturnMessageDto<LoginResponseDto>)
+      .data;
     expect(data.token).toHaveLength(64);
   });
 
+  describe('Article (e2e)', () => {
+    it('POST /article -> should create article and auto-bind userId (ignore body.userId)', async () => {
+      expect(token).toBeDefined();
+      expect(userId).toBeDefined();
+
+      const res = await request(httpServer)
+        .post('/article')
+        .set('x-client-ssaid', ssaid)
+        .set('x-client-token', token)
+        .send({
+          title: articleTitle1,
+          content: articleContent1,
+          // 故意注入：如果 binding 正常，这个不该生效
+          userId: 999999999,
+        })
+        .expect(200);
+
+      expectOkEnvelope(res.body);
+
+      const data = (res.body as GenericReturnMessageDto<ArticleCreateResult>)
+        .data;
+      expect(data).toBeDefined();
+      expect(typeof data.id).toBe('number');
+      expect(data.title).toBe(articleTitle1);
+      expect(data.content).toBe(articleContent1);
+
+      // 核心：binding 自动绑定为当前登录用户
+      expect(data.userId).toBe(userId);
+
+      articleId = data.id;
+    });
+
+    it('GET /article/{id} -> should return article with user info and correct userId/email', async () => {
+      expect(articleId).toBeDefined();
+
+      const res = await request(httpServer)
+        .get(`/article/${articleId}`)
+        .set('x-client-ssaid', ssaid)
+        .set('x-client-token', token)
+        .expect(200);
+
+      expectOkEnvelope(res.body);
+      const data = (res.body as GenericReturnMessageDto<ArticleResult>).data;
+      expect(data).toBeDefined();
+      expect(data.id).toBe(articleId);
+      expect(data.userId).toBe(userId);
+
+      // 你的 schema 里 findOne 会带 user（ManyToOne + NotColumn），这里顺手断言一下
+      expect(data.user).toBeDefined();
+      expect(data.user.id).toBe(userId);
+      // email 可能是可选字段，但你这里应该有（我们已经换绑过）
+      expect(data.user.email).toBe(currentEmail);
+    });
+
+    it('GET /article -> should list articles and include the created one', async () => {
+      expect(articleId).toBeDefined();
+
+      const res = await request(httpServer)
+        .get('/article')
+        .set('x-client-ssaid', ssaid)
+        .set('x-client-token', token)
+        .query({ pageCount: 1, recordsPerPage: 10 })
+        .expect(200);
+
+      expectOkEnvelope(res.body);
+      expect(typeof res.body.total).toBe('number');
+      expect(Array.isArray(res.body.data)).toBe(true);
+
+      const found = (res.body.data as ArticleCreateResult[]).find(
+        (x) => x.id === articleId,
+      );
+      expect(found).toBeDefined();
+      expect(found.userId).toBe(userId);
+    });
+
+    it('PATCH /article/{id} -> should update title/content', async () => {
+      expect(articleId).toBeDefined();
+
+      const patch = await request(httpServer)
+        .patch(`/article/${articleId}`)
+        .set('x-client-ssaid', ssaid)
+        .set('x-client-token', token)
+        .send({ title: articleTitle2, content: articleContent2 })
+        .expect(200);
+
+      expectOkEnvelope(patch.body);
+
+      const after = await request(httpServer)
+        .get(`/article/${articleId}`)
+        .set('x-client-ssaid', ssaid)
+        .set('x-client-token', token)
+        .expect(200);
+
+      expectOkEnvelope(after.body);
+      const data = (after.body as GenericReturnMessageDto<ArticleResult>).data;
+      expect(data.title).toBe(articleTitle2);
+      expect(data.content).toBe(articleContent2);
+    });
+
+    it('DELETE /article/{id} -> should delete; then GET should 404', async () => {
+      expect(articleId).toBeDefined();
+
+      const del = await request(httpServer)
+        .delete(`/article/${articleId}`)
+        .set('x-client-ssaid', ssaid)
+        .set('x-client-token', token)
+        .expect(200);
+
+      expectOkEnvelope(del.body);
+
+      const gone = await request(httpServer)
+        .get(`/article/${articleId}`)
+        .set('x-client-ssaid', ssaid)
+        .set('x-client-token', token);
+
+      expect(gone.status).toBe(404);
+      expectOkEnvelope(gone.body);
+    });
+  });
+
   it('POST /send-code/send (ResetPassword) -> POST /login/reset-password -> login with new password', async () => {
     // 发 reset code（purpose 注意大小写：ResetPassword）
     const send = await request(httpServer)

package/Dockerfile.puppeteer

@@ -1,45 +0,0 @@
-FROM node:lts-trixie-slim as base
-LABEL Author="Nanahira <nanahira@momobako.com>"
-
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN set -eux; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends curl ca-certificates gnupg; \
-    install -d -m 0755 /etc/apt/keyrings; \
-    curl -fsSL https://dl.google.com/linux/linux_signing_key.pub \
-      | gpg --dearmor -o /etc/apt/keyrings/google-linux.gpg; \
-    chmod a+r /etc/apt/keyrings/google-linux.gpg; \
-    echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/google-linux.gpg] https://dl.google.com/linux/chrome/deb stable main" \
-      > /etc/apt/sources.list.d/google-chrome.list; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-      python3 build-essential git \
-      google-chrome-stable \
-      libnss3 libfreetype6-dev libharfbuzz-bin libharfbuzz-dev \
-      fonts-freefont-otf fonts-freefont-ttf \
-      fonts-noto-cjk fonts-noto-cjk-extra \
-      fonts-wqy-microhei fonts-wqy-zenhei \
-      xvfb libpq-dev; \
-    apt-get purge -y --auto-remove gnupg; \
-    apt-get clean; \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/*
-
-WORKDIR /usr/src/app
-COPY ./package*.json ./
-
-FROM base as builder
-RUN npm ci && npm cache clean --force
-COPY . ./
-RUN npm run build
-
-FROM base
-ENV NODE_ENV production
-RUN npm ci && npm i pg-native && npm cache clean --force
-COPY --from=builder /usr/src/app/dist ./dist
-COPY ./config.example.yaml ./config.yaml
-
-ENV NODE_PG_FORCE_NATIVE=true
-EXPOSE 3000
-CMD [ "npm", "run", "start:prod" ]

package/dist/app.module.d.ts

@@ -1,2 +0,0 @@
-export declare class AppModule {
-}

package/dist/app.module.js

@@ -1,53 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppModule = void 0;
-const common_1 = require("@nestjs/common");
-const config_1 = require("@nestjs/config");
-const load_config_1 = require("./utility/load-config");
-const typeorm_1 = require("@nestjs/typeorm");
-const simple_user_module_1 = require("./simple-user/simple-user.module");
-let AppModule = class AppModule {
-};
-exports.AppModule = AppModule;
-exports.AppModule = AppModule = __decorate([
-    (0, common_1.Module)({
-        imports: [
-            config_1.ConfigModule.forRoot({
-                load: [load_config_1.loadConfig],
-                isGlobal: true,
-                ignoreEnvVars: true,
-                ignoreEnvFile: true,
-            }),
-            typeorm_1.TypeOrmModule.forRootAsync({
-                inject: [config_1.ConfigService],
-                useFactory: async (config) => ({
-                    type: 'postgres',
-                    entities: [],
-                    autoLoadEntities: true,
-                    dropSchema: !!config.get('DB_DROP_SCHEMA'),
-                    synchronize: !config.get('DB_NO_INIT'),
-                    host: config.get('DB_HOST'),
-                    port: parseInt(config.get('DB_PORT')) || 5432,
-                    username: config.get('DB_USER'),
-                    password: config.get('DB_PASS'),
-                    database: config.get('DB_NAME'),
-                    supportBigNumbers: true,
-                    bigNumberStrings: false,
-                }),
-            }),
-            simple_user_module_1.SimpleUserModule.register({
-                sendCodeGenerator: (ctx) => {
-                    console.log(`Generating code for ${ctx.email} on ${ctx.codePurpose}`);
-                    return '123456';
-                },
-            }),
-        ],
-    })
-], AppModule);
-//# sourceMappingURL=app.module.js.map

package/dist/app.module.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA6D;AAC7D,uDAAmD;AACnD,6CAAgD;AAChD,yEAAoE;AAmC7D,IAAM,SAAS,GAAf,MAAM,SAAS;CAAG,CAAA;AAAZ,8BAAS;oBAAT,SAAS;IAjCrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,qBAAY,CAAC,OAAO,CAAC;gBACnB,IAAI,EAAE,CAAC,wBAAU,CAAC;gBAClB,QAAQ,EAAE,IAAI;gBACd,aAAa,EAAE,IAAI;gBACnB,aAAa,EAAE,IAAI;aACpB,CAAC;YACF,uBAAa,CAAC,YAAY,CAAC;gBACzB,MAAM,EAAE,CAAC,sBAAa,CAAC;gBACvB,UAAU,EAAE,KAAK,EAAE,MAAqB,EAAE,EAAE,CAAC,CAAC;oBAC5C,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE,EAAE;oBACZ,gBAAgB,EAAE,IAAI;oBACtB,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC;oBAC1C,WAAW,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;oBACtC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC;oBAC3B,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,IAAI;oBAC7C,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC;oBAC/B,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC;oBAC/B,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC;oBAC/B,iBAAiB,EAAE,IAAI;oBACvB,gBAAgB,EAAE,KAAK;iBACxB,CAAC;aACH,CAAC;YACF,qCAAgB,CAAC,QAAQ,CAAC;gBACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,EAAE;oBACzB,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,CAAC,KAAK,OAAO,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;oBACtE,OAAO,QAAQ,CAAC;gBAClB,CAAC;aACF,CAAC;SACH;KACF,CAAC;GACW,SAAS,CAAG"}

package/dist/main.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/main.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@nestjs/core");
-const swagger_1 = require("@nestjs/swagger");
-const app_module_1 = require("./app.module");
-const config_1 = require("@nestjs/config");
-async function bootstrap() {
-    const app = await core_1.NestFactory.create(app_module_1.AppModule);
-    app.setGlobalPrefix('api');
-    app.enableCors();
-    app.set('trust proxy', ['172.16.0.0/12', 'loopback']);
-    app.enableShutdownHooks();
-    const config = app.get(config_1.ConfigService);
-    if (!config.get('NO_OPENAPI')) {
-        const documentConfig = new swagger_1.DocumentBuilder()
-            .setTitle('app')
-            .setDescription('The app')
-            .setVersion('1.0')
-            .build();
-        const document = swagger_1.SwaggerModule.createDocument(app, documentConfig);
-        swagger_1.SwaggerModule.setup('docs', app, document);
-    }
-    await app.listen(config.get('port') || 3000, config.get('host') || '::');
-}
-bootstrap();
-//# sourceMappingURL=main.js.map

package/install-npm-typeorm.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-npm install --save typeorm @nestjs/typeorm pg nicot