@qq33357486/oh-my-task 1.4.1 → 1.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/__tests__/auth-register.test.js +8 -45
- package/dist/__tests__/auth-register.test.js.map +1 -1
- package/dist/__tests__/fix-hcaptcha-dev-bypass.test.js +1 -186
- package/dist/__tests__/fix-hcaptcha-dev-bypass.test.js.map +1 -1
- package/dist/api/routes/auth.d.ts.map +1 -1
- package/dist/api/routes/auth.js +42 -7
- package/dist/api/routes/auth.js.map +1 -1
- package/dist/db/connection.d.ts.map +1 -1
- package/dist/db/connection.js +13 -0
- package/dist/db/connection.js.map +1 -1
- package/dist/services/user.service.d.ts +11 -2
- package/dist/services/user.service.d.ts.map +1 -1
- package/dist/services/user.service.js +43 -5
- package/dist/services/user.service.js.map +1 -1
- package/dist/utils/email.d.ts +6 -0
- package/dist/utils/email.d.ts.map +1 -0
- package/dist/utils/email.js +28 -0
- package/dist/utils/email.js.map +1 -0
- package/package.json +3 -1
|
@@ -48,7 +48,7 @@ describe('POST /api/auth/register', () => {
|
|
|
48
48
|
expect(res.body.success).toBe(true);
|
|
49
49
|
expect(res.body.data.user.role).toBe('admin');
|
|
50
50
|
expect(res.body.data.user.email).toBe('admin@test.com');
|
|
51
|
-
expect(res.body.data.user.name).toBe('
|
|
51
|
+
expect(res.body.data.user.name).toBe('admin');
|
|
52
52
|
// 确保返回的是公开用户信息(不包含密码等)
|
|
53
53
|
expect(res.body.data.user).not.toHaveProperty('password_hash');
|
|
54
54
|
expect(res.body.data.user).not.toHaveProperty('reset_token');
|
|
@@ -123,23 +123,11 @@ describe('POST /api/auth/register', () => {
|
|
|
123
123
|
expect(res4.body.success).toBe(false);
|
|
124
124
|
expect(res4.body.error).toMatch(/密码/);
|
|
125
125
|
});
|
|
126
|
-
it('VAL-AUTH-005:
|
|
127
|
-
// 空用户名
|
|
128
|
-
const res1 = await request(app)
|
|
129
|
-
.post('/api/auth/register')
|
|
130
|
-
.send({
|
|
131
|
-
name: '',
|
|
132
|
-
email: 'emptyname@test.com',
|
|
133
|
-
password: 'TestPass123'
|
|
134
|
-
});
|
|
135
|
-
expect(res1.status).toBe(400);
|
|
136
|
-
expect(res1.body.success).toBe(false);
|
|
137
|
-
expect(res1.body.error).toMatch(/必填|缺少/);
|
|
126
|
+
it('VAL-AUTH-005: 提交空邮箱、空密码时返回 400 错误', async () => {
|
|
138
127
|
// 空邮箱
|
|
139
128
|
const res2 = await request(app)
|
|
140
129
|
.post('/api/auth/register')
|
|
141
130
|
.send({
|
|
142
|
-
name: 'TestUser',
|
|
143
131
|
email: '',
|
|
144
132
|
password: 'TestPass123'
|
|
145
133
|
});
|
|
@@ -150,7 +138,6 @@ describe('POST /api/auth/register', () => {
|
|
|
150
138
|
const res3 = await request(app)
|
|
151
139
|
.post('/api/auth/register')
|
|
152
140
|
.send({
|
|
153
|
-
name: 'TestUser',
|
|
154
141
|
email: 'emptypass@test.com',
|
|
155
142
|
password: ''
|
|
156
143
|
});
|
|
@@ -161,7 +148,6 @@ describe('POST /api/auth/register', () => {
|
|
|
161
148
|
const res = await request(app)
|
|
162
149
|
.post('/api/auth/register')
|
|
163
150
|
.send({
|
|
164
|
-
name: 'BadEmail',
|
|
165
151
|
email: 'notanemail',
|
|
166
152
|
password: 'TestPass123'
|
|
167
153
|
});
|
|
@@ -264,30 +250,16 @@ describe('GET /api/auth/registration-status', () => {
|
|
|
264
250
|
});
|
|
265
251
|
});
|
|
266
252
|
describe('POST /api/auth/register — hCaptcha 验证', () => {
|
|
267
|
-
it('VAL-AUTH-029: hCaptcha
|
|
268
|
-
// 通过 getDb 单例设置数据库配置(模拟管理员开启 hCaptcha)
|
|
269
|
-
const { getDb } = await import('../db/connection.js');
|
|
270
|
-
getDb().prepare(`
|
|
271
|
-
INSERT OR REPLACE INTO system_config (key, value, updated_at)
|
|
272
|
-
VALUES ('hcaptcha_secret_key', 'test-secret-key', CURRENT_TIMESTAMP)
|
|
273
|
-
`).run();
|
|
253
|
+
it('VAL-AUTH-029: hCaptcha 已移除,注册不再需要 captcha token', async () => {
|
|
274
254
|
const res = await request(app)
|
|
275
255
|
.post('/api/auth/register')
|
|
276
256
|
.send({
|
|
277
|
-
name: 'CaptchaTest',
|
|
278
257
|
email: 'captcha@test.com',
|
|
279
258
|
password: 'CaptchaPass123'
|
|
280
|
-
// 不提供 captcha_token
|
|
259
|
+
// 不提供 captcha_token,应正常注册成功
|
|
281
260
|
});
|
|
282
|
-
//
|
|
283
|
-
expect(res.status)
|
|
284
|
-
expect(res.body.success).toBe(false);
|
|
285
|
-
expect(res.body.error).toMatch(/验证码/);
|
|
286
|
-
// 恢复数据库配置
|
|
287
|
-
getDb().prepare(`
|
|
288
|
-
INSERT OR REPLACE INTO system_config (key, value, updated_at)
|
|
289
|
-
VALUES ('hcaptcha_secret_key', '', CURRENT_TIMESTAMP)
|
|
290
|
-
`).run();
|
|
261
|
+
// hCaptcha 已移除,非 production 环境应直接注册成功
|
|
262
|
+
expect([200, 409]).toContain(res.status);
|
|
291
263
|
});
|
|
292
264
|
});
|
|
293
265
|
describe('POST /api/auth/register — 边界情况', () => {
|
|
@@ -300,7 +272,6 @@ describe('POST /api/auth/register — 边界情况', () => {
|
|
|
300
272
|
const res = await request(app)
|
|
301
273
|
.post('/api/auth/register')
|
|
302
274
|
.send({
|
|
303
|
-
name: 'UpperCase',
|
|
304
275
|
email: 'ADMIN@TEST.COM', // 大写版本的已注册邮箱
|
|
305
276
|
password: 'UpperPass123'
|
|
306
277
|
});
|
|
@@ -310,7 +281,7 @@ describe('POST /api/auth/register — 边界情况', () => {
|
|
|
310
281
|
process.env.NODE_ENV = originalNodeEnv;
|
|
311
282
|
process.env.HCAPTCHA_SECRET = originalSecret;
|
|
312
283
|
});
|
|
313
|
-
it('
|
|
284
|
+
it('用户名自动取邮箱前缀', async () => {
|
|
314
285
|
const originalNodeEnv = process.env.NODE_ENV;
|
|
315
286
|
const originalSecret = process.env.HCAPTCHA_SECRET;
|
|
316
287
|
delete process.env.HCAPTCHA_SECRET;
|
|
@@ -318,17 +289,11 @@ describe('POST /api/auth/register — 边界情况', () => {
|
|
|
318
289
|
const res = await request(app)
|
|
319
290
|
.post('/api/auth/register')
|
|
320
291
|
.send({
|
|
321
|
-
name: ' TrimUser ',
|
|
322
292
|
email: 'trim@test.com',
|
|
323
293
|
password: 'TrimPass123'
|
|
324
294
|
});
|
|
325
|
-
// 成功或失败都检查
|
|
326
295
|
if (res.status === 200) {
|
|
327
|
-
expect(res.body.data.user.name).toBe('
|
|
328
|
-
}
|
|
329
|
-
else {
|
|
330
|
-
// 如果失败,确保不是因为名称验证
|
|
331
|
-
expect(res.body.success).toBe(false);
|
|
296
|
+
expect(res.body.data.user.name).toBe('trim');
|
|
332
297
|
}
|
|
333
298
|
process.env.NODE_ENV = originalNodeEnv;
|
|
334
299
|
process.env.HCAPTCHA_SECRET = originalSecret;
|
|
@@ -341,7 +306,6 @@ describe('POST /api/auth/register — 边界情况', () => {
|
|
|
341
306
|
const res = await request(app)
|
|
342
307
|
.post('/api/auth/register')
|
|
343
308
|
.send({
|
|
344
|
-
name: 'ValidUser',
|
|
345
309
|
email: 'valid@test.com',
|
|
346
310
|
password: 'ValidPass123'
|
|
347
311
|
});
|
|
@@ -362,7 +326,6 @@ describe('POST /api/auth/register — 边界情况', () => {
|
|
|
362
326
|
const res = await request(app)
|
|
363
327
|
.post('/api/auth/register')
|
|
364
328
|
.send({
|
|
365
|
-
name: 'AnotherValidUser',
|
|
366
329
|
email: 'anothervalid@test.com',
|
|
367
330
|
password: 'AnotherPass123'
|
|
368
331
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-register.test.js","sourceRoot":"","sources":["../../src/__tests__/auth-register.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth-register.test.js","sourceRoot":"","sources":["../../src/__tests__/auth-register.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAc,MAAM,QAAQ,CAAC;AAC/E,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAE5B,wBAAwB;AACxB,IAAI,QAAgB,CAAC;AACrB,IAAI,YAAoB,CAAC;AACzB,IAAI,GAA8B,CAAC;AAEnC,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,0BAA0B,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAClE,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAEjD,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvD,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,YAAY,CAAC;IAEnC,SAAS;IACT,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAC;IACtC,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAChC,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAE/B,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC;IACxF,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACnB,EAAE,CAAC,KAAK,EAAE,CAAC;IAEX,uBAAuB;IACvB,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACtD,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,GAAG,EAAE;IACZ,IAAI,CAAC;QACH,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,wBAAwB;IAC1B,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,gBAAgB;YACvB,QAAQ,EAAE,cAAc;SACzB,CAAC,CAAC;QAEL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACxD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9C,uBAAuB;QACvB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;QAC/D,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,iBAAiB;YACxB,QAAQ,EAAE,eAAe;SAC1B,CAAC,CAAC;QAEL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,gBAAgB,EAAE,SAAS;YAClC,QAAQ,EAAE,kBAAkB;SAC7B,CAAC,CAAC;QAEL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,SAAS;QACT,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC5B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,gBAAgB;YACvB,QAAQ,EAAE,KAAK,CAAC,KAAK;SACtB,CAAC,CAAC;QAEL,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEtC,WAAW;QACX,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC5B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,gBAAgB;YACvB,QAAQ,EAAE,WAAW;SACtB,CAAC,CAAC;QAEL,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEtC,WAAW;QACX,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC5B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,gBAAgB;YACvB,QAAQ,EAAE,WAAW;SACtB,CAAC,CAAC;QAEL,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEtC,SAAS;QACT,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC5B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,gBAAgB;YACvB,QAAQ,EAAE,UAAU;SACrB,CAAC,CAAC;QAEL,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACjD,MAAM;QACN,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC5B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,KAAK,EAAE,EAAE;YACT,QAAQ,EAAE,aAAa;SACxB,CAAC,CAAC;QAEL,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEzC,MAAM;QACN,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC5B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,KAAK,EAAE,oBAAoB;YAC3B,QAAQ,EAAE,EAAE;SACb,CAAC,CAAC;QAEL,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACjD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,KAAK,EAAE,YAAY;YACnB,QAAQ,EAAE,aAAa;SACxB,CAAC,CAAC;QAEL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC9C,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,kBAAkB;QAClB,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,mBAAmB,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACtE,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAChE,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE5D,cAAc;QACd,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAC1C,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAChC,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAC/B,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC;QACxF,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEnB,OAAO;QACP,EAAE,CAAC,OAAO,CAAC,yEAAyE,CAAC,CAAC,GAAG,EAAE,CAAC;QAE5F,uBAAuB;QACvB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;QAC3D,EAAE,CAAC,OAAO,CAAC;;;KAGV,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,eAAe,EAAE,kBAAkB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACrE,EAAE,CAAC,KAAK,EAAE,CAAC;QAEX,eAAe;QACf,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,gBAAgB,CAAC;QAEvC,iBAAiB;QACjB,4CAA4C;QAC5C,2BAA2B;QAE3B,aAAa;QACb,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,cAAc,CAAC;QAErC,gBAAgB;QAChB,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACtD,8BAA8B;QAC9B,sCAAsC;QACtC,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC7C,SAAS,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QACvC,SAAS,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAEtC,OAAO;QACP,SAAS,CAAC,OAAO,CAAC,yEAAyE,CAAC,CAAC,GAAG,EAAE,CAAC;QACnG,SAAS,CAAC,KAAK,EAAE,CAAC;QAElB,kCAAkC;QAClC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,kBAAkB;YACzB,QAAQ,EAAE,gBAAgB;SAC3B,CAAC,CAAC;QAEL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEtC,SAAS;QACT,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC7C,SAAS,CAAC,OAAO,CAAC,yEAAyE,CAAC,CAAC,GAAG,EAAE,CAAC;QACnG,SAAS,CAAC,KAAK,EAAE,CAAC;QAElB,SAAS;QACT,IAAI,CAAC;YACH,IAAI,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC9B,MAAM,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;IACjD,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAEpE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;QACtC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAEpE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,OAAO;QACP,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAC;QACtC,EAAE,CAAC,OAAO,CAAC,yEAAyE,CAAC,CAAC,GAAG,EAAE,CAAC;QAC5F,EAAE,CAAC,KAAK,EAAE,CAAC;QAEX,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAEpE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE1C,KAAK;QACL,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC7C,SAAS,CAAC,OAAO,CAAC,yEAAyE,CAAC,CAAC,GAAG,EAAE,CAAC;QACnG,SAAS,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,uCAAuC,EAAE,GAAG,EAAE;IACrD,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;QAC/D,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,KAAK,EAAE,kBAAkB;YACzB,QAAQ,EAAE,gBAAgB;YAC1B,4BAA4B;SAC7B,CAAC,CAAC;QAEL,sCAAsC;QACtC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC9C,EAAE,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;QACtC,6BAA6B;QAC7B,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC7C,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACnD,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACnC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,aAAa,CAAC;QAErC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,KAAK,EAAE,gBAAgB,EAAE,aAAa;YACtC,QAAQ,EAAE,cAAc;SACzB,CAAC,CAAC;QAEL,8BAA8B;QAC9B,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAErC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,eAAe,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAC1B,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC7C,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACnD,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACnC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,aAAa,CAAC;QAErC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,KAAK,EAAE,eAAe;YACtB,QAAQ,EAAE,aAAa;SACxB,CAAC,CAAC;QAEL,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,eAAe,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE;QAC7B,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC7C,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACnD,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACnC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,aAAa,CAAC;QAErC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,KAAK,EAAE,gBAAgB;YACvB,QAAQ,EAAE,cAAc;SACzB,CAAC,CAAC;QAEL,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE/C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,eAAe,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE;QACnC,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC7C,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACnD,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACnC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,aAAa,CAAC;QAErC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC;YACJ,KAAK,EAAE,uBAAuB;YAC9B,QAAQ,EAAE,gBAAgB;SAC3B,CAAC,CAAC;QAEL,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE/C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,eAAe,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -4,30 +4,19 @@ import { mkdirSync, rmSync, existsSync, readFileSync } from 'fs';
|
|
|
4
4
|
import { join } from 'path';
|
|
5
5
|
import { tmpdir } from 'os';
|
|
6
6
|
import request from 'supertest';
|
|
7
|
-
// 每个测试用唯一的临时目录
|
|
8
7
|
let TEST_DIR;
|
|
9
8
|
let TEST_DB_PATH;
|
|
10
9
|
let app;
|
|
11
|
-
// 辅助函数:通过 getDb 设置系统配置(确保单例连接能看到)
|
|
12
|
-
async function setConfigViaGetDb(key, value) {
|
|
13
|
-
const { getDb } = await import('../db/connection.js');
|
|
14
|
-
getDb().prepare(`
|
|
15
|
-
INSERT OR REPLACE INTO system_config (key, value, updated_at)
|
|
16
|
-
VALUES (?, ?, CURRENT_TIMESTAMP)
|
|
17
|
-
`).run(key, value);
|
|
18
|
-
}
|
|
19
10
|
beforeAll(async () => {
|
|
20
11
|
TEST_DIR = join(tmpdir(), `omt-hcaptcha-fix-test-${Date.now()}`);
|
|
21
12
|
TEST_DB_PATH = join(TEST_DIR, 'data', 'data.db');
|
|
22
13
|
mkdirSync(join(TEST_DIR, 'data'), { recursive: true });
|
|
23
14
|
process.env.DB_PATH = TEST_DB_PATH;
|
|
24
|
-
// 初始化数据库
|
|
25
15
|
const db = new Database(TEST_DB_PATH);
|
|
26
16
|
db.pragma('journal_mode = WAL');
|
|
27
17
|
db.pragma('foreign_keys = ON');
|
|
28
18
|
const schemaSql = readFileSync(join(process.cwd(), 'src', 'db', 'schema.sql'), 'utf-8');
|
|
29
19
|
db.exec(schemaSql);
|
|
30
|
-
// 插入一个 admin 用户以允许注册其他用户
|
|
31
20
|
const bcrypt = await import('bcrypt');
|
|
32
21
|
const hash = await bcrypt.default.hash('AdminPass123', 12);
|
|
33
22
|
db.prepare(`
|
|
@@ -35,7 +24,6 @@ beforeAll(async () => {
|
|
|
35
24
|
VALUES (?, ?, ?, ?, ?)
|
|
36
25
|
`).run('admin-1', 'Admin', 'admin@test.com', hash, 'admin');
|
|
37
26
|
db.close();
|
|
38
|
-
// 动态导入 app
|
|
39
27
|
const serverModule = await import('../api/server.js');
|
|
40
28
|
app = serverModule.default;
|
|
41
29
|
});
|
|
@@ -46,178 +34,15 @@ afterAll(() => {
|
|
|
46
34
|
}
|
|
47
35
|
}
|
|
48
36
|
catch {
|
|
49
|
-
//
|
|
37
|
+
// ignore
|
|
50
38
|
}
|
|
51
39
|
delete process.env.DB_PATH;
|
|
52
40
|
});
|
|
53
|
-
describe('hCaptcha dev-mode bypass fix', () => {
|
|
54
|
-
describe('VAL-AUTH-029: 数据库配置 hcaptcha_secret_key 开启时,开发环境也要求 captcha token', () => {
|
|
55
|
-
it('hcaptcha_secret_key 有值时,无 captcha token 的注册返回 400', async () => {
|
|
56
|
-
// 通过 getDb 设置配置(确保单例连接能看到)
|
|
57
|
-
await setConfigViaGetDb('hcaptcha_secret_key', 'test-secret-key');
|
|
58
|
-
await setConfigViaGetDb('hcaptcha_site_key', 'test-site-key');
|
|
59
|
-
// 确保 HCAPTCHA_SECRET 环境变量没有设置(开发环境)
|
|
60
|
-
const originalSecret = process.env.HCAPTCHA_SECRET;
|
|
61
|
-
const originalNodeEnv = process.env.NODE_ENV;
|
|
62
|
-
delete process.env.HCAPTCHA_SECRET;
|
|
63
|
-
process.env.NODE_ENV = 'development';
|
|
64
|
-
const res = await request(app)
|
|
65
|
-
.post('/api/auth/register')
|
|
66
|
-
.send({
|
|
67
|
-
name: 'CaptchaUser',
|
|
68
|
-
email: 'captchauser@test.com',
|
|
69
|
-
password: 'CaptchaPass123'
|
|
70
|
-
// 不提供 captcha_token
|
|
71
|
-
});
|
|
72
|
-
expect(res.status).toBe(400);
|
|
73
|
-
expect(res.body.success).toBe(false);
|
|
74
|
-
expect(res.body.error).toMatch(/验证码/);
|
|
75
|
-
// 恢复
|
|
76
|
-
process.env.HCAPTCHA_SECRET = originalSecret;
|
|
77
|
-
process.env.NODE_ENV = originalNodeEnv;
|
|
78
|
-
// 清理数据库配置
|
|
79
|
-
await setConfigViaGetDb('hcaptcha_secret_key', '');
|
|
80
|
-
await setConfigViaGetDb('hcaptcha_site_key', '');
|
|
81
|
-
});
|
|
82
|
-
it('hcaptcha_secret_key 有值时,无 captcha token 的登录返回 400', async () => {
|
|
83
|
-
await setConfigViaGetDb('hcaptcha_secret_key', 'test-secret-key');
|
|
84
|
-
await setConfigViaGetDb('hcaptcha_site_key', 'test-site-key');
|
|
85
|
-
const originalSecret = process.env.HCAPTCHA_SECRET;
|
|
86
|
-
const originalNodeEnv = process.env.NODE_ENV;
|
|
87
|
-
delete process.env.HCAPTCHA_SECRET;
|
|
88
|
-
process.env.NODE_ENV = 'development';
|
|
89
|
-
const res = await request(app)
|
|
90
|
-
.post('/api/auth/login')
|
|
91
|
-
.send({
|
|
92
|
-
email: 'admin@test.com',
|
|
93
|
-
password: 'AdminPass123'
|
|
94
|
-
// 不提供 captcha_token
|
|
95
|
-
});
|
|
96
|
-
expect(res.status).toBe(400);
|
|
97
|
-
expect(res.body.success).toBe(false);
|
|
98
|
-
expect(res.body.error).toMatch(/验证码/);
|
|
99
|
-
process.env.HCAPTCHA_SECRET = originalSecret;
|
|
100
|
-
process.env.NODE_ENV = originalNodeEnv;
|
|
101
|
-
await setConfigViaGetDb('hcaptcha_secret_key', '');
|
|
102
|
-
await setConfigViaGetDb('hcaptcha_site_key', '');
|
|
103
|
-
});
|
|
104
|
-
});
|
|
105
|
-
describe('hcaptcha_secret_key 为空时,跳过 captcha 验证', () => {
|
|
106
|
-
it('hcaptcha_secret_key 为空时,开发环境注册不需要 captcha token', async () => {
|
|
107
|
-
await setConfigViaGetDb('hcaptcha_secret_key', '');
|
|
108
|
-
const originalSecret = process.env.HCAPTCHA_SECRET;
|
|
109
|
-
delete process.env.HCAPTCHA_SECRET;
|
|
110
|
-
const res = await request(app)
|
|
111
|
-
.post('/api/auth/register')
|
|
112
|
-
.send({
|
|
113
|
-
name: 'NoCaptchaUser',
|
|
114
|
-
email: `nocaptcha-${Date.now()}@test.com`,
|
|
115
|
-
password: 'NoCaptchaPass123'
|
|
116
|
-
});
|
|
117
|
-
expect(res.status).toBe(200);
|
|
118
|
-
expect(res.body.success).toBe(true);
|
|
119
|
-
process.env.HCAPTCHA_SECRET = originalSecret;
|
|
120
|
-
});
|
|
121
|
-
it('hcaptcha_secret_key 为空时,开发环境登录不需要 captcha token', async () => {
|
|
122
|
-
await setConfigViaGetDb('hcaptcha_secret_key', '');
|
|
123
|
-
const originalSecret = process.env.HCAPTCHA_SECRET;
|
|
124
|
-
delete process.env.HCAPTCHA_SECRET;
|
|
125
|
-
const res = await request(app)
|
|
126
|
-
.post('/api/auth/login')
|
|
127
|
-
.send({
|
|
128
|
-
email: 'admin@test.com',
|
|
129
|
-
password: 'AdminPass123'
|
|
130
|
-
});
|
|
131
|
-
expect(res.status).toBe(200);
|
|
132
|
-
expect(res.body.success).toBe(true);
|
|
133
|
-
process.env.HCAPTCHA_SECRET = originalSecret;
|
|
134
|
-
});
|
|
135
|
-
});
|
|
136
|
-
describe('环境变量 HCAPTCHA_SECRET 优先级', () => {
|
|
137
|
-
it('HCAPTCHA_SECRET 环境变量设置时,即使数据库无配置也要求 captcha', async () => {
|
|
138
|
-
await setConfigViaGetDb('hcaptcha_secret_key', '');
|
|
139
|
-
const originalSecret = process.env.HCAPTCHA_SECRET;
|
|
140
|
-
process.env.HCAPTCHA_SECRET = 'env-secret-key';
|
|
141
|
-
const res = await request(app)
|
|
142
|
-
.post('/api/auth/register')
|
|
143
|
-
.send({
|
|
144
|
-
name: 'EnvCaptchaUser',
|
|
145
|
-
email: `envcaptcha-${Date.now()}@test.com`,
|
|
146
|
-
password: 'EnvCaptchaPass123'
|
|
147
|
-
});
|
|
148
|
-
expect(res.status).toBe(400);
|
|
149
|
-
expect(res.body.success).toBe(false);
|
|
150
|
-
expect(res.body.error).toMatch(/验证码/);
|
|
151
|
-
process.env.HCAPTCHA_SECRET = originalSecret;
|
|
152
|
-
});
|
|
153
|
-
});
|
|
154
|
-
describe('生产环境行为', () => {
|
|
155
|
-
it('生产环境 + HCAPTCHA_SECRET 环境变量时要求 captcha', async () => {
|
|
156
|
-
const originalSecret = process.env.HCAPTCHA_SECRET;
|
|
157
|
-
const originalNodeEnv = process.env.NODE_ENV;
|
|
158
|
-
process.env.HCAPTCHA_SECRET = 'prod-secret';
|
|
159
|
-
process.env.NODE_ENV = 'production';
|
|
160
|
-
const res = await request(app)
|
|
161
|
-
.post('/api/auth/register')
|
|
162
|
-
.send({
|
|
163
|
-
name: 'ProdCaptchaUser',
|
|
164
|
-
email: `prodcaptcha-${Date.now()}@test.com`,
|
|
165
|
-
password: 'ProdCaptchaPass123'
|
|
166
|
-
});
|
|
167
|
-
expect(res.status).toBe(400);
|
|
168
|
-
expect(res.body.success).toBe(false);
|
|
169
|
-
expect(res.body.error).toMatch(/验证码/);
|
|
170
|
-
process.env.HCAPTCHA_SECRET = originalSecret;
|
|
171
|
-
process.env.NODE_ENV = originalNodeEnv;
|
|
172
|
-
});
|
|
173
|
-
it('生产环境 + 数据库 hcaptcha_secret_key 配置时要求 captcha', async () => {
|
|
174
|
-
await setConfigViaGetDb('hcaptcha_secret_key', 'db-secret-key');
|
|
175
|
-
const originalSecret = process.env.HCAPTCHA_SECRET;
|
|
176
|
-
const originalNodeEnv = process.env.NODE_ENV;
|
|
177
|
-
delete process.env.HCAPTCHA_SECRET;
|
|
178
|
-
process.env.NODE_ENV = 'production';
|
|
179
|
-
const res = await request(app)
|
|
180
|
-
.post('/api/auth/register')
|
|
181
|
-
.send({
|
|
182
|
-
name: 'ProdDbCaptchaUser',
|
|
183
|
-
email: `proddbcaptcha-${Date.now()}@test.com`,
|
|
184
|
-
password: 'ProdDbCaptchaPass123'
|
|
185
|
-
});
|
|
186
|
-
expect(res.status).toBe(400);
|
|
187
|
-
expect(res.body.success).toBe(false);
|
|
188
|
-
expect(res.body.error).toMatch(/验证码/);
|
|
189
|
-
process.env.HCAPTCHA_SECRET = originalSecret;
|
|
190
|
-
process.env.NODE_ENV = originalNodeEnv;
|
|
191
|
-
await setConfigViaGetDb('hcaptcha_secret_key', '');
|
|
192
|
-
});
|
|
193
|
-
it('生产环境无任何 captcha 配置时跳过验证', async () => {
|
|
194
|
-
await setConfigViaGetDb('hcaptcha_secret_key', '');
|
|
195
|
-
const originalSecret = process.env.HCAPTCHA_SECRET;
|
|
196
|
-
const originalNodeEnv = process.env.NODE_ENV;
|
|
197
|
-
delete process.env.HCAPTCHA_SECRET;
|
|
198
|
-
process.env.NODE_ENV = 'production';
|
|
199
|
-
const res = await request(app)
|
|
200
|
-
.post('/api/auth/register')
|
|
201
|
-
.send({
|
|
202
|
-
name: 'ProdNoCaptchaUser',
|
|
203
|
-
email: `prodnocaptcha-${Date.now()}@test.com`,
|
|
204
|
-
password: 'ProdNoCaptchaPass123'
|
|
205
|
-
});
|
|
206
|
-
// 无 captcha 配置时,无论环境都应该跳过验证
|
|
207
|
-
// 注册应该成功(除非邮箱已存在)
|
|
208
|
-
expect([200, 409]).toContain(res.status);
|
|
209
|
-
process.env.HCAPTCHA_SECRET = originalSecret;
|
|
210
|
-
process.env.NODE_ENV = originalNodeEnv;
|
|
211
|
-
});
|
|
212
|
-
});
|
|
213
|
-
});
|
|
214
41
|
describe('Token masking 格式修复', () => {
|
|
215
42
|
it('maskToken 返回 omt_***abc 格式(前4位 + *** + 后3位)', async () => {
|
|
216
43
|
const { maskToken } = await import('../services/token.service.js');
|
|
217
|
-
// 正常长度的 token
|
|
218
44
|
const token = 'omt_a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6';
|
|
219
45
|
const masked = maskToken(token);
|
|
220
|
-
// 格式应为 omt_***5d6 (前4位 omt_ + *** + 后3位 5d6)
|
|
221
46
|
expect(masked).toMatch(/^omt_\*{3}[a-f0-9]{3}$/);
|
|
222
47
|
expect(masked).toBe('omt_***5d6');
|
|
223
48
|
});
|
|
@@ -228,11 +53,6 @@ describe('Token masking 格式修复', () => {
|
|
|
228
53
|
expect(maskToken('omt_ab')).toBe('****');
|
|
229
54
|
});
|
|
230
55
|
it('GET /api/tokens 返回的 token 格式为 omt_***abc', async () => {
|
|
231
|
-
// 确保 captcha 关闭以便登录
|
|
232
|
-
await setConfigViaGetDb('hcaptcha_secret_key', '');
|
|
233
|
-
const originalSecret = process.env.HCAPTCHA_SECRET;
|
|
234
|
-
delete process.env.HCAPTCHA_SECRET;
|
|
235
|
-
// 登录获取 session
|
|
236
56
|
const loginRes = await request(app)
|
|
237
57
|
.post('/api/auth/login')
|
|
238
58
|
.send({ email: 'admin@test.com', password: 'AdminPass123' });
|
|
@@ -246,25 +66,20 @@ describe('Token masking 格式修复', () => {
|
|
|
246
66
|
cookie = setCookie.split(';')[0];
|
|
247
67
|
}
|
|
248
68
|
else {
|
|
249
|
-
process.env.HCAPTCHA_SECRET = originalSecret;
|
|
250
69
|
throw new Error('No set-cookie header in login response');
|
|
251
70
|
}
|
|
252
|
-
// 创建 token
|
|
253
71
|
const createRes = await request(app)
|
|
254
72
|
.post('/api/tokens')
|
|
255
73
|
.set('Cookie', cookie)
|
|
256
74
|
.send({ name: 'mask-test' });
|
|
257
75
|
expect(createRes.status).toBe(201);
|
|
258
|
-
// 列出 token
|
|
259
76
|
const listRes = await request(app)
|
|
260
77
|
.get('/api/tokens')
|
|
261
78
|
.set('Cookie', cookie);
|
|
262
79
|
expect(listRes.status).toBe(200);
|
|
263
80
|
const tokenItem = listRes.body.data.tokens.find((t) => t.name === 'mask-test');
|
|
264
81
|
expect(tokenItem).toBeDefined();
|
|
265
|
-
// 新格式:omt_***abc
|
|
266
82
|
expect(tokenItem.token).toMatch(/^omt_\*{3}[a-f0-9]{3}$/);
|
|
267
|
-
process.env.HCAPTCHA_SECRET = originalSecret;
|
|
268
83
|
});
|
|
269
84
|
});
|
|
270
85
|
//# sourceMappingURL=fix-hcaptcha-dev-bypass.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-hcaptcha-dev-bypass.test.js","sourceRoot":"","sources":["../../src/__tests__/fix-hcaptcha-dev-bypass.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACnE,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,OAAO,MAAM,WAAW,CAAC;AAEhC,eAAe;AACf,IAAI,QAAgB,CAAC;AACrB,IAAI,YAAoB,CAAC;AACzB,IAAI,GAA8B,CAAC;AAEnC,kCAAkC;AAClC,KAAK,UAAU,iBAAiB,CAAC,GAAW,EAAE,KAAa;IACzD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACtD,KAAK,EAAE,CAAC,OAAO,CAAC;;;GAGf,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AACrB,CAAC;AAED,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,yBAAyB,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACjE,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAEjD,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvD,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,YAAY,CAAC;IAEnC,SAAS;IACT,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAC;IACtC,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAChC,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAE/B,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC;IACxF,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAEnB,yBAAyB;IACzB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IAC3D,EAAE,CAAC,OAAO,CAAC;;;GAGV,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5D,EAAE,CAAC,KAAK,EAAE,CAAC;IAEX,WAAW;IACX,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACtD,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,GAAG,EAAE;IACZ,IAAI,CAAC;QACH,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,qCAAqC;IACvC,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;IAC5C,QAAQ,CAAC,mEAAmE,EAAE,GAAG,EAAE;QACjF,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;YACjE,2BAA2B;YAC3B,MAAM,iBAAiB,CAAC,qBAAqB,EAAE,iBAAiB,CAAC,CAAC;YAClE,MAAM,iBAAiB,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;YAE9D,oCAAoC;YACpC,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACnD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC7C,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,aAAa,CAAC;YAErC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;iBAC3B,IAAI,CAAC,oBAAoB,CAAC;iBAC1B,IAAI,CAAC;gBACJ,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,sBAAsB;gBAC7B,QAAQ,EAAE,gBAAgB;gBAC1B,oBAAoB;aACrB,CAAC,CAAC;YAEL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAEtC,KAAK;YACL,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,eAAe,CAAC;YAEvC,UAAU;YACV,MAAM,iBAAiB,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;YACnD,MAAM,iBAAiB,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;YACjE,MAAM,iBAAiB,CAAC,qBAAqB,EAAE,iBAAiB,CAAC,CAAC;YAClE,MAAM,iBAAiB,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;YAE9D,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACnD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC7C,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,aAAa,CAAC;YAErC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;iBAC3B,IAAI,CAAC,iBAAiB,CAAC;iBACvB,IAAI,CAAC;gBACJ,KAAK,EAAE,gBAAgB;gBACvB,QAAQ,EAAE,cAAc;gBACxB,oBAAoB;aACrB,CAAC,CAAC;YAEL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAEtC,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,eAAe,CAAC;YAEvC,MAAM,iBAAiB,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;YACnD,MAAM,iBAAiB,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,uCAAuC,EAAE,GAAG,EAAE;QACrD,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,MAAM,iBAAiB,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;YAEnD,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACnD,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YAEnC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;iBAC3B,IAAI,CAAC,oBAAoB,CAAC;iBAC1B,IAAI,CAAC;gBACJ,IAAI,EAAE,eAAe;gBACrB,KAAK,EAAE,aAAa,IAAI,CAAC,GAAG,EAAE,WAAW;gBACzC,QAAQ,EAAE,kBAAkB;aAC7B,CAAC,CAAC;YAEL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEpC,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,MAAM,iBAAiB,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;YAEnD,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACnD,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YAEnC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;iBAC3B,IAAI,CAAC,iBAAiB,CAAC;iBACvB,IAAI,CAAC;gBACJ,KAAK,EAAE,gBAAgB;gBACvB,QAAQ,EAAE,cAAc;aACzB,CAAC,CAAC;YAEL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEpC,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC;QAC/C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;QACxC,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YAC3D,MAAM,iBAAiB,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;YAEnD,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACnD,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,gBAAgB,CAAC;YAE/C,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;iBAC3B,IAAI,CAAC,oBAAoB,CAAC;iBAC1B,IAAI,CAAC;gBACJ,IAAI,EAAE,gBAAgB;gBACtB,KAAK,EAAE,cAAc,IAAI,CAAC,GAAG,EAAE,WAAW;gBAC1C,QAAQ,EAAE,mBAAmB;aAC9B,CAAC,CAAC;YAEL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAEtC,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC;QAC/C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;YACtD,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACnD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,aAAa,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,YAAY,CAAC;YAEpC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;iBAC3B,IAAI,CAAC,oBAAoB,CAAC;iBAC1B,IAAI,CAAC;gBACJ,IAAI,EAAE,iBAAiB;gBACvB,KAAK,EAAE,eAAe,IAAI,CAAC,GAAG,EAAE,WAAW;gBAC3C,QAAQ,EAAE,oBAAoB;aAC/B,CAAC,CAAC;YAEL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAEtC,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,eAAe,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC5D,MAAM,iBAAiB,CAAC,qBAAqB,EAAE,eAAe,CAAC,CAAC;YAEhE,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACnD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC7C,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,YAAY,CAAC;YAEpC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;iBAC3B,IAAI,CAAC,oBAAoB,CAAC;iBAC1B,IAAI,CAAC;gBACJ,IAAI,EAAE,mBAAmB;gBACzB,KAAK,EAAE,iBAAiB,IAAI,CAAC,GAAG,EAAE,WAAW;gBAC7C,QAAQ,EAAE,sBAAsB;aACjC,CAAC,CAAC;YAEL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAEtC,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,eAAe,CAAC;YAEvC,MAAM,iBAAiB,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,iBAAiB,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;YAEnD,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACnD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC7C,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,YAAY,CAAC;YAEpC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;iBAC3B,IAAI,CAAC,oBAAoB,CAAC;iBAC1B,IAAI,CAAC;gBACJ,IAAI,EAAE,mBAAmB;gBACzB,KAAK,EAAE,iBAAiB,IAAI,CAAC,GAAG,EAAE,WAAW;gBAC7C,QAAQ,EAAE,sBAAsB;aACjC,CAAC,CAAC;YAEL,4BAA4B;YAC5B,kBAAkB;YAClB,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAEzC,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,eAAe,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,8BAA8B,CAAC,CAAC;QAEnE,cAAc;QACd,MAAM,KAAK,GAAG,sCAAsC,CAAC;QACrD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAEhC,6CAA6C;QAC7C,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;QACjD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAC1C,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,8BAA8B,CAAC,CAAC;QAEnE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,oBAAoB;QACpB,MAAM,iBAAiB,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;QACnD,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACnD,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QAEnC,eAAe;QACf,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAChC,IAAI,CAAC,iBAAiB,CAAC;aACvB,IAAI,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;QAE/D,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAElC,IAAI,MAAc,CAAC;QACnB,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACjD,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,SAAS,EAAE,CAAC;YACrB,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC5D,CAAC;QAED,WAAW;QACX,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aACjC,IAAI,CAAC,aAAa,CAAC;aACnB,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC;aACrB,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QAE/B,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnC,WAAW;QACX,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC/B,GAAG,CAAC,aAAa,CAAC;aAClB,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAEzB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;QACjG,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC;QAChC,iBAAiB;QACjB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;QAE1D,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"fix-hcaptcha-dev-bypass.test.js","sourceRoot":"","sources":["../../src/__tests__/fix-hcaptcha-dev-bypass.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/api/routes/auth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/api/routes/auth.ts"],"names":[],"mappings":"AAKA,QAAA,MAAM,MAAM,4CAAW,CAAC;AAExB,OAAO,QAAQ,iBAAiB,CAAC;IAC/B,UAAU,WAAW;QACnB,MAAM,EAAE,MAAM,CAAC;KAChB;CACF;AAuPD,eAAe,MAAM,CAAC"}
|
package/dist/api/routes/auth.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { Router } from 'express';
|
|
2
|
-
import { createUser, loginUser, getUserById, toPublicUser, changePassword, generateResetToken, resetPassword } from '../../services/user.service.js';
|
|
2
|
+
import { createUser, loginUser, getUserById, toPublicUser, changePassword, generateResetToken, resetPassword, sendEmailCode, verifyEmailCode } from '../../services/user.service.js';
|
|
3
3
|
import { isRegistrationEnabled } from '../../services/config.service.js';
|
|
4
4
|
import { getDb } from '../../db/connection.js';
|
|
5
|
-
import { verifyHCaptcha } from '../middleware/captcha.js';
|
|
6
5
|
const router = Router();
|
|
7
6
|
/**
|
|
8
7
|
* 从请求中获取认证用户(Session Cookie 或 Bearer Token)
|
|
@@ -40,10 +39,35 @@ function getAuthenticatedUser(req) {
|
|
|
40
39
|
}
|
|
41
40
|
return null;
|
|
42
41
|
}
|
|
43
|
-
|
|
42
|
+
// 发送注册验证码
|
|
43
|
+
router.post('/send-code', async (req, res) => {
|
|
44
44
|
try {
|
|
45
|
-
const {
|
|
46
|
-
if (!
|
|
45
|
+
const { email } = req.body;
|
|
46
|
+
if (!email) {
|
|
47
|
+
res.status(400).json({ success: false, error: '请输入邮箱' });
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
// 检查注册是否开启
|
|
51
|
+
if (!isRegistrationEnabled()) {
|
|
52
|
+
const db = getDb();
|
|
53
|
+
const userCount = db.prepare('SELECT COUNT(*) as count FROM users').get();
|
|
54
|
+
if (userCount.count > 0) {
|
|
55
|
+
res.status(403).json({ success: false, error: '注册功能已关闭' });
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
await sendEmailCode(email);
|
|
60
|
+
res.json({ success: true, message: '验证码已发送,请查收邮件' });
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
const message = error instanceof Error ? error.message : '发送失败';
|
|
64
|
+
res.status(400).json({ success: false, error: message });
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
router.post('/register', async (req, res) => {
|
|
68
|
+
try {
|
|
69
|
+
const { email, password, code } = req.body;
|
|
70
|
+
if (!email || !password) {
|
|
47
71
|
res.status(400).json({ success: false, error: '缺少必填字段' });
|
|
48
72
|
return;
|
|
49
73
|
}
|
|
@@ -56,7 +80,18 @@ router.post('/register', verifyHCaptcha, async (req, res) => {
|
|
|
56
80
|
return;
|
|
57
81
|
}
|
|
58
82
|
}
|
|
59
|
-
|
|
83
|
+
// 生产环境必须校验验证码;非生产环境 code 缺失则跳过
|
|
84
|
+
if (process.env.NODE_ENV === 'production') {
|
|
85
|
+
if (!code) {
|
|
86
|
+
res.status(400).json({ success: false, error: '缺少必填字段' });
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
verifyEmailCode(email, code);
|
|
90
|
+
}
|
|
91
|
+
else if (code) {
|
|
92
|
+
verifyEmailCode(email, code);
|
|
93
|
+
}
|
|
94
|
+
const user = await createUser({ email, password, code: code || '' });
|
|
60
95
|
req.session.userId = user.id;
|
|
61
96
|
res.json({
|
|
62
97
|
success: true,
|
|
@@ -72,7 +107,7 @@ router.post('/register', verifyHCaptcha, async (req, res) => {
|
|
|
72
107
|
res.status(400).json({ success: false, error: message });
|
|
73
108
|
}
|
|
74
109
|
});
|
|
75
|
-
router.post('/login',
|
|
110
|
+
router.post('/login', async (req, res) => {
|
|
76
111
|
try {
|
|
77
112
|
const { email, password } = req.body;
|
|
78
113
|
if (!email || !password) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/api/routes/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqB,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/api/routes/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqB,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,aAAa,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACrL,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC;AAQxB;;GAEG;AACH,SAAS,oBAAoB,CAAC,GAAY;IACxC,iBAAiB;IACjB,IAAI,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,YAAY,CAAC,IAAI,CAA8D,CAAC;QACzF,CAAC;IACH,CAAC;IAED,mBAAmB;IACnB,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;IAC7C,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;YAChD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACvB,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;YAEnB,MAAM,WAAW,GAAG,EAAE,CAAC,OAAO,CAAC;;;;;OAK9B,CAAC,CAAC,GAAG,CAAC,KAAK,CAAoC,CAAC;YAEjD,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,IAAI,GAAG,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;gBAC9C,IAAI,IAAI,EAAE,CAAC;oBACT,WAAW;oBACX,EAAE,CAAC,OAAO,CAAC,yEAAyE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;oBACjG,OAAO,YAAY,CAAC,IAAI,CAA8D,CAAC;gBACzF,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,UAAU;AACV,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IAC9D,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAC3B,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YACzD,OAAO;QACT,CAAC;QAED,WAAW;QACX,IAAI,CAAC,qBAAqB,EAAE,EAAE,CAAC;YAC7B,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;YACnB,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,CAAC,qCAAqC,CAAC,CAAC,GAAG,EAAuB,CAAC;YAC/F,IAAI,SAAS,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;gBACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;gBAC3D,OAAO;YACT,CAAC;QACH,CAAC;QAED,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;QAC3B,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAChE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IAC7D,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAE3C,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;YACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC1D,OAAO;QACT,CAAC;QAED,sCAAsC;QACtC,IAAI,CAAC,qBAAqB,EAAE,EAAE,CAAC;YAC7B,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;YACnB,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,CAAC,qCAAqC,CAAC,CAAC,GAAG,EAAuB,CAAC;YAC/F,IAAI,SAAS,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;gBACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;gBAC3D,OAAO;YACT,CAAC;QACH,CAAC;QAED,+BAA+B;QAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;YAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAC1D,OAAO;YACT,CAAC;YACD,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC/B,CAAC;aAAM,IAAI,IAAI,EAAE,CAAC;YAChB,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC/B,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;QAErE,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QAE7B,GAAG,CAAC,IAAI,CAAC;YACP,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,EAAE;SACnC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAChE,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YACzD,OAAO;QACT,CAAC;QACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IAC1D,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAErC,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;YACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QAElD,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QAE7B,GAAG,CAAC,IAAI,CAAC;YACP,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACJ,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC;aACzB;SACF,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAChE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;IACrD,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC1B,IAAI,GAAG,EAAE,CAAC;YACR,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;YACxD,OAAO;QACT,CAAC;QACD,GAAG,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAClC,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;IAChD,MAAM,IAAI,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAEvC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QACvD,OAAO;IACT,CAAC;IAED,GAAG,CAAC,IAAI,CAAC;QACP,OAAO,EAAE,IAAI;QACb,IAAI,EAAE;YACJ,IAAI;SACL;KACF,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACpE,IAAI,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YACvD,OAAO;QACT,CAAC;QAED,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAChD,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,EAAE,CAAC;YACnC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC1D,OAAO;QACT,CAAC;QAED,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YACzD,OAAO;QACT,CAAC;QAED,MAAM,cAAc,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;QAEhG,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IACjD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;QAClE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACpE,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAC3B,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAE7C,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,8BAA8B,KAAK,KAAK,UAAU,EAAE,CAAC,CAAC;QACpE,CAAC;QAED,GAAG,CAAC,IAAI,CAAC;YACP,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,qBAAqB;SAC/B,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAChE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACnE,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACzC,IAAI,CAAC,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;YAC5B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC1D,OAAO;QACT,CAAC;QAED,MAAM,aAAa,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;QAE1D,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC1D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;QAClE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,sBAAsB;AACtB,MAAM,CAAC,GAAG,CAAC,sBAAsB,EAAE,CAAC,IAAa,EAAE,GAAa,EAAE,EAAE;IAClE,GAAG,CAAC,IAAI,CAAC;QACP,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,EAAE,OAAO,EAAE,qBAAqB,EAAE,EAAE;KAC3C,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,eAAe,MAAM,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/db/connection.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/db/connection.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAoBtC;;GAEG;AACH,wBAAgB,KAAK,IAAI,QAAQ,CAAC,QAAQ,CAYzC;AAED;;GAEG;AACH,wBAAgB,MAAM,IAAI,IAAI,CA8C7B;AAED;;GAEG;AACH,wBAAgB,OAAO,IAAI,IAAI,CAM9B;AAED,eAAe,KAAK,CAAC"}
|
package/dist/db/connection.js
CHANGED
|
@@ -3,6 +3,8 @@ import { fileURLToPath } from 'url';
|
|
|
3
3
|
import { dirname, join } from 'path';
|
|
4
4
|
import { readFileSync } from 'fs';
|
|
5
5
|
import { mkdirSync } from 'fs';
|
|
6
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
7
|
+
import bcrypt from 'bcrypt';
|
|
6
8
|
const __filename = fileURLToPath(import.meta.url);
|
|
7
9
|
const __dirname = dirname(__filename);
|
|
8
10
|
// 数据库文件路径
|
|
@@ -65,6 +67,17 @@ export function initDb() {
|
|
|
65
67
|
// sessions 表不存在,忽略
|
|
66
68
|
}
|
|
67
69
|
console.log('Database initialized successfully');
|
|
70
|
+
// 默认管理员账号(仅在 users 表为空时初始化)
|
|
71
|
+
const userCount = database.prepare('SELECT COUNT(*) as count FROM users').get();
|
|
72
|
+
if (userCount.count === 0) {
|
|
73
|
+
const passwordHash = bcrypt.hashSync('admin', 10);
|
|
74
|
+
const id = uuidv4();
|
|
75
|
+
database.prepare(`
|
|
76
|
+
INSERT INTO users (id, name, email, password_hash, role)
|
|
77
|
+
VALUES (?, ?, ?, ?, ?)
|
|
78
|
+
`).run(id, 'admin', 'admin@admin.com', passwordHash, 'admin');
|
|
79
|
+
console.log('Default admin user created: admin@admin.com / admin');
|
|
80
|
+
}
|
|
68
81
|
}
|
|
69
82
|
/**
|
|
70
83
|
* 关闭数据库连接
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/db/connection.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/db/connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,18 @@
|
|
|
1
1
|
import type { User } from '../types/index.js';
|
|
2
2
|
export interface CreateUserParams {
|
|
3
|
-
name: string;
|
|
4
3
|
email: string;
|
|
5
4
|
password: string;
|
|
5
|
+
code: string;
|
|
6
6
|
}
|
|
7
|
+
/**
|
|
8
|
+
* 发送邮箱注册验证码
|
|
9
|
+
*/
|
|
10
|
+
export declare function sendEmailCode(email: string): Promise<void>;
|
|
11
|
+
/**
|
|
12
|
+
* 校验邮箱验证码(通过后从 store 中删除)
|
|
13
|
+
*/
|
|
14
|
+
export declare function verifyEmailCode(email: string, code: string): void;
|
|
15
|
+
export declare function _setEmailCodeForTest(email: string, code: string): void;
|
|
7
16
|
export interface LoginParams {
|
|
8
17
|
email: string;
|
|
9
18
|
password: string;
|
|
@@ -18,7 +27,7 @@ export interface ResetPasswordParams {
|
|
|
18
27
|
newPassword: string;
|
|
19
28
|
}
|
|
20
29
|
/**
|
|
21
|
-
*
|
|
30
|
+
* 创建用户(邮箱+验证码+密码,name 自动取邮箱前缀)
|
|
22
31
|
*/
|
|
23
32
|
export declare function createUser(params: CreateUserParams): Promise<User>;
|
|
24
33
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.d.ts","sourceRoot":"","sources":["../../src/services/user.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user.service.d.ts","sourceRoot":"","sources":["../../src/services/user.service.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAKD;;GAEG;AACH,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAahE;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAcjE;AAGD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAEtE;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAID;;GAEG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwCxE;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBlE;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAInD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAIzD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,eAAe,GAAG,aAAa,GAAG,qBAAqB,CAAC,CAS5G;AAID;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,GAAE,MAAU,EAAE,QAAQ,GAAE,MAAW,GAAG;IAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAWrG;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,CA0BnF;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAiB/D;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CA6BjF;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAI9C"}
|
|
@@ -2,12 +2,49 @@ import { v4 as uuidv4 } from 'uuid';
|
|
|
2
2
|
import { getDb } from '../db/connection.js';
|
|
3
3
|
import { hashPassword, verifyPassword, validatePasswordStrength } from '../utils/password.js';
|
|
4
4
|
import { validateEmail, normalizeEmail } from '../utils/validation.js';
|
|
5
|
+
import { sendEmail } from '../utils/email.js';
|
|
6
|
+
// 内存验证码存储:email -> { code, expiresAt }
|
|
7
|
+
const emailCodeStore = new Map();
|
|
8
|
+
/**
|
|
9
|
+
* 发送邮箱注册验证码
|
|
10
|
+
*/
|
|
11
|
+
export async function sendEmailCode(email) {
|
|
12
|
+
if (!validateEmail(email)) {
|
|
13
|
+
throw new Error('邮箱格式无效');
|
|
14
|
+
}
|
|
15
|
+
const code = String(Math.floor(100000 + Math.random() * 900000));
|
|
16
|
+
const expiresAt = Date.now() + 5 * 60 * 1000; // 5分钟
|
|
17
|
+
emailCodeStore.set(normalizeEmail(email), { code, expiresAt });
|
|
18
|
+
await sendEmail(email, '注册验证码 - oh-my-task', `您的注册验证码是:${code}\n验证码 5 分钟内有效,请勿泄露给他人。`);
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* 校验邮箱验证码(通过后从 store 中删除)
|
|
22
|
+
*/
|
|
23
|
+
export function verifyEmailCode(email, code) {
|
|
24
|
+
const normalized = normalizeEmail(email);
|
|
25
|
+
const entry = emailCodeStore.get(normalized);
|
|
26
|
+
if (!entry) {
|
|
27
|
+
throw new Error('验证码不存在或已过期,请重新发送');
|
|
28
|
+
}
|
|
29
|
+
if (Date.now() > entry.expiresAt) {
|
|
30
|
+
emailCodeStore.delete(normalized);
|
|
31
|
+
throw new Error('验证码已过期,请重新发送');
|
|
32
|
+
}
|
|
33
|
+
if (entry.code !== code) {
|
|
34
|
+
throw new Error('验证码错误');
|
|
35
|
+
}
|
|
36
|
+
emailCodeStore.delete(normalized);
|
|
37
|
+
}
|
|
38
|
+
// 供测试直接写入验证码
|
|
39
|
+
export function _setEmailCodeForTest(email, code) {
|
|
40
|
+
emailCodeStore.set(normalizeEmail(email), { code, expiresAt: Date.now() + 5 * 60 * 1000 });
|
|
41
|
+
}
|
|
5
42
|
// ========== 认证相关 ==========
|
|
6
43
|
/**
|
|
7
|
-
*
|
|
44
|
+
* 创建用户(邮箱+验证码+密码,name 自动取邮箱前缀)
|
|
8
45
|
*/
|
|
9
46
|
export async function createUser(params) {
|
|
10
|
-
const {
|
|
47
|
+
const { email, password } = params;
|
|
11
48
|
// 验证邮箱
|
|
12
49
|
if (!validateEmail(email)) {
|
|
13
50
|
throw new Error('邮箱格式无效');
|
|
@@ -26,15 +63,16 @@ export async function createUser(params) {
|
|
|
26
63
|
}
|
|
27
64
|
// 哈希密码
|
|
28
65
|
const passwordHash = await hashPassword(password);
|
|
29
|
-
//
|
|
66
|
+
// name 取邮箱前缀
|
|
67
|
+
const name = normalizedEmail.split('@')[0];
|
|
68
|
+
// 创建用户(第一个注册的普通用户自动成为 admin)
|
|
30
69
|
const id = uuidv4();
|
|
31
|
-
// 第一个注册的用户自动成为 admin
|
|
32
70
|
const userCount = db.prepare('SELECT COUNT(*) as count FROM users').get();
|
|
33
71
|
const role = userCount.count === 0 ? 'admin' : 'member';
|
|
34
72
|
db.prepare(`
|
|
35
73
|
INSERT INTO users (id, name, email, password_hash, role)
|
|
36
74
|
VALUES (?, ?, ?, ?, ?)
|
|
37
|
-
`).run(id, name
|
|
75
|
+
`).run(id, name, normalizedEmail, passwordHash, role);
|
|
38
76
|
return getUserById(id);
|
|
39
77
|
}
|
|
40
78
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/services/user.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/services/user.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../../src/utils/email.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAsB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBxF"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import nodemailer from 'nodemailer';
|
|
2
|
+
import { getConfig } from '../services/config.service.js';
|
|
3
|
+
/**
|
|
4
|
+
* 发送邮件
|
|
5
|
+
* SMTP 未配置时,将验证码打印到日志
|
|
6
|
+
*/
|
|
7
|
+
export async function sendEmail(to, subject, text) {
|
|
8
|
+
const host = getConfig('smtp_host');
|
|
9
|
+
const port = getConfig('smtp_port');
|
|
10
|
+
const user = getConfig('smtp_user');
|
|
11
|
+
const pass = getConfig('smtp_pass');
|
|
12
|
+
const from = getConfig('smtp_from') || user || '';
|
|
13
|
+
if (!host || !user || !pass) {
|
|
14
|
+
console.log(`[Email] SMTP 未配置,邮件内容输出到日志:`);
|
|
15
|
+
console.log(`[Email] To: ${to}`);
|
|
16
|
+
console.log(`[Email] Subject: ${subject}`);
|
|
17
|
+
console.log(`[Email] ${text}`);
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
const transporter = nodemailer.createTransport({
|
|
21
|
+
host,
|
|
22
|
+
port: parseInt(port || '587', 10),
|
|
23
|
+
secure: parseInt(port || '587', 10) === 465,
|
|
24
|
+
auth: { user, pass },
|
|
25
|
+
});
|
|
26
|
+
await transporter.sendMail({ from, to, subject, text });
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=email.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"email.js","sourceRoot":"","sources":["../../src/utils/email.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,EAAU,EAAE,OAAe,EAAE,IAAY;IACvE,MAAM,IAAI,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;IAElD,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,oBAAoB,OAAO,EAAE,CAAC,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QAC/B,OAAO;IACT,CAAC;IAED,MAAM,WAAW,GAAG,UAAU,CAAC,eAAe,CAAC;QAC7C,IAAI;QACJ,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;QACjC,MAAM,EAAE,QAAQ,CAAC,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG;QAC3C,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;KACrB,CAAC,CAAC;IAEH,MAAM,WAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AAC1D,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@qq33357486/oh-my-task",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.2",
|
|
4
4
|
"description": "文档驱动的 AI 编程协作系统 - 通过 MCP 工具管理任务",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -31,12 +31,14 @@
|
|
|
31
31
|
"license": "MIT",
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@modelcontextprotocol/sdk": "^1.0.0",
|
|
34
|
+
"@types/nodemailer": "^8.0.0",
|
|
34
35
|
"bcrypt": "^6.0.0",
|
|
35
36
|
"better-sqlite3": "^11.0.0",
|
|
36
37
|
"better-sqlite3-session-store": "^0.1.0",
|
|
37
38
|
"cors": "^2.8.5",
|
|
38
39
|
"express": "^4.18.2",
|
|
39
40
|
"express-session": "^1.19.0",
|
|
41
|
+
"nodemailer": "^8.0.5",
|
|
40
42
|
"uuid": "^9.0.0"
|
|
41
43
|
},
|
|
42
44
|
"devDependencies": {
|