nicot-simple-user 1.0.6 → 1.0.7
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/simple-user/login/login.controller.d.ts +2 -1
- package/dist/simple-user/login/login.controller.js +17 -0
- package/dist/simple-user/login/login.controller.js.map +1 -1
- package/dist/simple-user/options.d.ts +3 -0
- package/dist/simple-user/send-code/send-code.dto.d.ts +2 -1
- package/dist/simple-user/send-code/send-code.dto.js +1 -0
- package/dist/simple-user/send-code/send-code.dto.js.map +1 -1
- package/dist/simple-user/simple-user/simple-user.service.d.ts +6 -0
- package/dist/simple-user/simple-user/simple-user.service.js +73 -13
- package/dist/simple-user/simple-user/simple-user.service.js.map +1 -1
- package/dist/simple-user/simple-user.entity.d.ts +1 -0
- package/dist/simple-user/simple-user.entity.js +9 -1
- package/dist/simple-user/simple-user.entity.js.map +1 -1
- package/dist/simple-user/user-center/user-center.controller.d.ts +1 -0
- package/dist/simple-user/user-center/user-center.controller.js +15 -0
- package/dist/simple-user/user-center/user-center.controller.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/test/app-e2e.spec.ts +46 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SimpleUserService } from '../simple-user/simple-user.service';
|
|
2
|
-
import { EmailDto } from '../simple-user/email.dto';
|
|
2
|
+
import { EmailAndCodeDto, EmailDto } from '../simple-user/email.dto';
|
|
3
3
|
import { LoginDto, LoginResponseDto } from '../simple-user/login.dto';
|
|
4
4
|
import { UserRiskControlContext } from '../resolver';
|
|
5
5
|
import { ResetPasswordDto } from '../simple-user/reset-password.dto';
|
|
@@ -11,4 +11,5 @@ export declare class LoginController {
|
|
|
11
11
|
}>>;
|
|
12
12
|
login(dto: LoginDto, rcContext: UserRiskControlContext): Promise<import("nicot").GenericReturnMessageDto<LoginResponseDto>>;
|
|
13
13
|
resetPassword(dto: ResetPasswordDto): Promise<import("nicot").BlankReturnMessageDto>;
|
|
14
|
+
unregisterWithCode(dto: EmailAndCodeDto): Promise<import("nicot").BlankReturnMessageDto>;
|
|
14
15
|
}
|
|
@@ -37,6 +37,9 @@ let LoginController = class LoginController {
|
|
|
37
37
|
async resetPassword(dto) {
|
|
38
38
|
return this.userService.resetPassword(dto);
|
|
39
39
|
}
|
|
40
|
+
async unregisterWithCode(dto) {
|
|
41
|
+
return this.userService.unregisterWithEmail(dto);
|
|
42
|
+
}
|
|
40
43
|
};
|
|
41
44
|
exports.LoginController = LoginController;
|
|
42
45
|
__decorate([
|
|
@@ -82,6 +85,20 @@ __decorate([
|
|
|
82
85
|
__metadata("design:paramtypes", [reset_password_dto_1.ResetPasswordDto]),
|
|
83
86
|
__metadata("design:returntype", Promise)
|
|
84
87
|
], LoginController.prototype, "resetPassword", null);
|
|
88
|
+
__decorate([
|
|
89
|
+
(0, common_1.Post)('unregister-with-code'),
|
|
90
|
+
(0, common_1.HttpCode)(200),
|
|
91
|
+
(0, swagger_1.ApiOperation)({
|
|
92
|
+
summary: 'Unregister user using email code.',
|
|
93
|
+
}),
|
|
94
|
+
(0, nicot_1.ApiBlankResponse)(),
|
|
95
|
+
(0, decorators_1.ApiInvalidCode)(),
|
|
96
|
+
openapi.ApiResponse({ status: 200 }),
|
|
97
|
+
__param(0, (0, nicot_1.DataBody)()),
|
|
98
|
+
__metadata("design:type", Function),
|
|
99
|
+
__metadata("design:paramtypes", [email_dto_1.EmailAndCodeDto]),
|
|
100
|
+
__metadata("design:returntype", Promise)
|
|
101
|
+
], LoginController.prototype, "unregisterWithCode", null);
|
|
85
102
|
exports.LoginController = LoginController = __decorate([
|
|
86
103
|
(0, common_1.Controller)('login'),
|
|
87
104
|
(0, swagger_1.ApiTags)('login'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../src/simple-user/login/login.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,6CAAwD;AACxD,4EAAuE;AACvE,iCAMe;AACf,oEAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../src/simple-user/login/login.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,6CAAwD;AACxD,4EAAuE;AACvE,iCAMe;AACf,oEAA+D;AAC/D,wDAAqE;AACrE,wDAAsE;AACtE,0CAIqB;AACrB,wDAAyD;AACzD,0EAAqE;AAI9D,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAAoB,WAA8B;QAA9B,gBAAW,GAAX,WAAW,CAAmB;IAAG,CAAC;IAOhD,AAAN,KAAK,CAAC,eAAe,CAAc,GAAa;QAC9C,OAAO,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACrD,CAAC;IAYK,AAAN,KAAK,CAAC,KAAK,CACG,GAAa,EACA,SAAiC;QAE1D,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAChD,CAAC;IASK,AAAN,KAAK,CAAC,aAAa,CAAa,GAAqB;QACnD,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC;IASK,AAAN,KAAK,CAAC,kBAAkB,CAAa,GAAoB;QACvD,OAAO,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACnD,CAAC;CACF,CAAA;AAlDY,0CAAe;AAQpB;IALL,IAAA,YAAG,EAAC,aAAa,CAAC;IAClB,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,iCAAiC;KAC3C,CAAC;IACD,IAAA,uBAAe,EAAC,+BAAa,CAAC;;IACR,WAAA,IAAA,iBAAS,GAAE,CAAA;;qCAAM,oBAAQ;;sDAE/C;AAYK;IAVL,IAAA,aAAI,GAAE;IACN,IAAA,iBAAQ,EAAC,GAAG,CAAC;IACb,IAAA,sBAAY,EAAC;QACZ,OAAO,EACL,yEAAyE;KAC5E,CAAC;IACD,IAAA,uBAAe,EAAC,4BAAgB,CAAC;IACjC,IAAA,gCAAqB,GAAE;IACvB,IAAA,2BAAc,GAAE;IAChB,IAAA,gBAAQ,EAAC,GAAG,EAAE,+CAA+C,CAAC;kCARrD,GAAG;IAUV,WAAA,IAAA,gBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,gCAAqB,GAAE,CAAA;;qCADP,oBAAQ;;4CAI1B;AASK;IAPL,IAAA,aAAI,EAAC,gBAAgB,CAAC;IACtB,IAAA,iBAAQ,EAAC,GAAG,CAAC;IACb,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,uCAAuC;KACjD,CAAC;IACD,IAAA,wBAAgB,GAAE;IAClB,IAAA,2BAAc,GAAE;kCALP,GAAG;IAMQ,WAAA,IAAA,gBAAQ,GAAE,CAAA;;qCAAM,qCAAgB;;oDAEpD;AASK;IAPL,IAAA,aAAI,EAAC,sBAAsB,CAAC;IAC5B,IAAA,iBAAQ,EAAC,GAAG,CAAC;IACb,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,mCAAmC;KAC7C,CAAC;IACD,IAAA,wBAAgB,GAAE;IAClB,IAAA,2BAAc,GAAE;kCALP,GAAG;IAMa,WAAA,IAAA,gBAAQ,GAAE,CAAA;;qCAAM,2BAAe;;yDAExD;0BAjDU,eAAe;IAF3B,IAAA,mBAAU,EAAC,OAAO,CAAC;IACnB,IAAA,iBAAO,EAAC,OAAO,CAAC;qCAEkB,uCAAiB;GADvC,eAAe,CAkD3B"}
|
|
@@ -3,6 +3,7 @@ import { ClassType } from 'nicot';
|
|
|
3
3
|
import { SimpleUser } from './simple-user.entity';
|
|
4
4
|
import { CrudOptions } from 'nicot';
|
|
5
5
|
import { SendCodeDto } from './send-code/send-code.dto';
|
|
6
|
+
import { EntityManager } from 'typeorm';
|
|
6
7
|
export interface SimpleUserExtraOptions {
|
|
7
8
|
userClass?: ClassType<SimpleUser>;
|
|
8
9
|
userServiceCrudExtras?: CrudOptions<SimpleUser>;
|
|
@@ -25,4 +26,6 @@ export interface SimpleUserOptions {
|
|
|
25
26
|
passwordMaxAttempts?: number;
|
|
26
27
|
passwordBlockTimeMs?: number;
|
|
27
28
|
onMigrateUser?: (oldUser: SimpleUser, newUser: SimpleUser) => Awaitable<void>;
|
|
29
|
+
unregisterWaitTimeMs?: number;
|
|
30
|
+
onUnregisterUser?: (user: SimpleUser, tdb: EntityManager) => Awaitable<void>;
|
|
28
31
|
}
|
|
@@ -2,7 +2,8 @@ import { EmailDto } from '../simple-user/email.dto';
|
|
|
2
2
|
export declare enum CodePurpose {
|
|
3
3
|
Login = "Login",
|
|
4
4
|
ResetPassword = "ResetPassword",
|
|
5
|
-
ChangeEmail = "ChangeEmail"
|
|
5
|
+
ChangeEmail = "ChangeEmail",
|
|
6
|
+
Unregister = "Unregister"
|
|
6
7
|
}
|
|
7
8
|
export declare class SendCodeDto extends EmailDto {
|
|
8
9
|
codePurpose: CodePurpose;
|
|
@@ -19,6 +19,7 @@ var CodePurpose;
|
|
|
19
19
|
CodePurpose["Login"] = "Login";
|
|
20
20
|
CodePurpose["ResetPassword"] = "ResetPassword";
|
|
21
21
|
CodePurpose["ChangeEmail"] = "ChangeEmail";
|
|
22
|
+
CodePurpose["Unregister"] = "Unregister";
|
|
22
23
|
})(CodePurpose || (exports.CodePurpose = CodePurpose = {}));
|
|
23
24
|
class SendCodeDto extends email_dto_1.EmailDto {
|
|
24
25
|
static _OPENAPI_METADATA_FACTORY() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-code.dto.js","sourceRoot":"","sources":["../../../src/simple-user/send-code/send-code.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qDAA+D;AAC/D,6CAA8C;AAC9C,wDAAoD;AAEpD,IAAY,
|
|
1
|
+
{"version":3,"file":"send-code.dto.js","sourceRoot":"","sources":["../../../src/simple-user/send-code/send-code.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qDAA+D;AAC/D,6CAA8C;AAC9C,wDAAoD;AAEpD,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,8BAAe,CAAA;IACf,8CAA+B,CAAA;IAC/B,0CAA2B,CAAA;IAC3B,wCAAyB,CAAA;AAC3B,CAAC,EALW,WAAW,2BAAX,WAAW,QAKtB;AAED,MAAa,WAAY,SAAQ,oBAAQ;;;;CASxC;AATD,kCASC;AADC;IAPC,IAAA,wBAAM,EAAC,WAAW,CAAC;IACnB,IAAA,qBAAW,EAAC;QACX,WAAW,EAAE,oCAAoC;QACjD,OAAO,EAAE,WAAW,CAAC,KAAK;QAC1B,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE,IAAI;KACf,CAAC;;gDACuB;AAG3B,MAAa,aAAc,SAAQ,WAAW;;;;CAS7C;AATD,sCASC;AADC;IAPC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAW,EAAC;QACX,WAAW,EAAE,0CAA0C;QACvD,OAAO,EAAE,QAAQ;QACjB,QAAQ,EAAE,IAAI;KACf,CAAC;;2CACW"}
|
|
@@ -9,6 +9,7 @@ import { SendCodeService } from '../send-code/send-code.service';
|
|
|
9
9
|
import { ChangeEmailDto } from './change-email.dto';
|
|
10
10
|
import { ChangePasswordDto } from './change-password.dto';
|
|
11
11
|
import { ResetPasswordDto } from './reset-password.dto';
|
|
12
|
+
import { EmailAndCodeDto } from './email.dto';
|
|
12
13
|
export declare class SimpleUserService<U extends SimpleUser = SimpleUser> extends CrudBase<U> {
|
|
13
14
|
private options;
|
|
14
15
|
private optionsEx;
|
|
@@ -25,9 +26,14 @@ export declare class SimpleUserService<U extends SimpleUser = SimpleUser> extend
|
|
|
25
26
|
private passwordBlockTimeMs;
|
|
26
27
|
private checkPasswordRiskControl;
|
|
27
28
|
private recordPasswordFailAttempt;
|
|
29
|
+
private unregisterWaitTimeMs;
|
|
30
|
+
private getUnregisterTimeCondition;
|
|
31
|
+
private isUserExpired;
|
|
28
32
|
login(dto: LoginDto, ctx: UserRiskControlContext): Promise<GenericReturnMessageDto<LoginResponseDto>>;
|
|
29
33
|
changeEmail(user: U, dto: ChangeEmailDto): Promise<BlankReturnMessageDto>;
|
|
30
34
|
kickUserEmail(email: string): Promise<void>;
|
|
31
35
|
changePassword(user: U, dto: ChangePasswordDto, ctx: UserRiskControlContext): Promise<BlankReturnMessageDto>;
|
|
32
36
|
resetPassword(dto: ResetPasswordDto): Promise<BlankReturnMessageDto>;
|
|
37
|
+
unregister(user: U, tdb?: import("typeorm").EntityManager): Promise<BlankReturnMessageDto>;
|
|
38
|
+
unregisterWithEmail(dto: EmailAndCodeDto): Promise<BlankReturnMessageDto>;
|
|
33
39
|
}
|
|
@@ -56,6 +56,7 @@ let SimpleUserService = class SimpleUserService extends nicot_1.CrudBase {
|
|
|
56
56
|
this.sendCodeService = sendCodeService;
|
|
57
57
|
this.passwordMaxAttempts = this.options.passwordMaxAttempts || 5;
|
|
58
58
|
this.passwordBlockTimeMs = this.options.passwordBlockTimeMs || 15 * 60 * 1000;
|
|
59
|
+
this.unregisterWaitTimeMs = this.options.unregisterWaitTimeMs || 30 * 24 * 60 * 60 * 1000;
|
|
59
60
|
}
|
|
60
61
|
getFindOptions() {
|
|
61
62
|
return {};
|
|
@@ -69,6 +70,7 @@ let SimpleUserService = class SimpleUserService extends nicot_1.CrudBase {
|
|
|
69
70
|
}, {
|
|
70
71
|
lastActiveIpAddress: user.lastActiveIpAddress,
|
|
71
72
|
lastActiveTime: user.lastActiveTime,
|
|
73
|
+
unregisterTime: null,
|
|
72
74
|
});
|
|
73
75
|
const fn = this.options.afterPutUser || ((u) => u);
|
|
74
76
|
const res = await fn(user);
|
|
@@ -87,7 +89,7 @@ let SimpleUserService = class SimpleUserService extends nicot_1.CrudBase {
|
|
|
87
89
|
...findOptions,
|
|
88
90
|
where: { id: session.userId },
|
|
89
91
|
});
|
|
90
|
-
if (!user) {
|
|
92
|
+
if (!user || this.isUserExpired(user)) {
|
|
91
93
|
throw401();
|
|
92
94
|
}
|
|
93
95
|
return after(user);
|
|
@@ -123,7 +125,7 @@ let SimpleUserService = class SimpleUserService extends nicot_1.CrudBase {
|
|
|
123
125
|
...findOptions,
|
|
124
126
|
where: { id },
|
|
125
127
|
});
|
|
126
|
-
if (!user) {
|
|
128
|
+
if (!user || this.isUserExpired(user)) {
|
|
127
129
|
throw new nicot_1.BlankReturnMessageDto(404, 'User not found.').toException();
|
|
128
130
|
}
|
|
129
131
|
return user;
|
|
@@ -177,14 +179,26 @@ let SimpleUserService = class SimpleUserService extends nicot_1.CrudBase {
|
|
|
177
179
|
})));
|
|
178
180
|
}
|
|
179
181
|
}
|
|
182
|
+
getUnregisterTimeCondition() {
|
|
183
|
+
return {
|
|
184
|
+
unregisterTime: (0, typeorm_1.LessThanOrEqual)(new Date(Date.now() - this.unregisterWaitTimeMs)),
|
|
185
|
+
};
|
|
186
|
+
}
|
|
187
|
+
isUserExpired(user) {
|
|
188
|
+
return (user?.unregisterTime &&
|
|
189
|
+
user.unregisterTime.getTime() + this.unregisterWaitTimeMs < Date.now());
|
|
190
|
+
}
|
|
180
191
|
async login(dto, ctx) {
|
|
181
192
|
if (!dto.code && !dto.password) {
|
|
182
193
|
throw new nicot_1.BlankReturnMessageDto(400, 'Please provide code or password to login.').toException();
|
|
183
194
|
}
|
|
184
|
-
|
|
195
|
+
let user = await this.repo.findOne({
|
|
185
196
|
...this.getFindOptions(),
|
|
186
197
|
where: { email: dto.email },
|
|
187
198
|
});
|
|
199
|
+
if (this.isUserExpired(user)) {
|
|
200
|
+
user = undefined;
|
|
201
|
+
}
|
|
188
202
|
const anonymousUser = await this.findOrCreateUser({
|
|
189
203
|
ssaid: ctx.ssaid,
|
|
190
204
|
ip: ctx.ip,
|
|
@@ -241,6 +255,13 @@ let SimpleUserService = class SimpleUserService extends nicot_1.CrudBase {
|
|
|
241
255
|
else {
|
|
242
256
|
throw new nicot_1.BlankReturnMessageDto(400, 'Please provide code or password to login.').toException();
|
|
243
257
|
}
|
|
258
|
+
if (user.unregisterTime) {
|
|
259
|
+
await this.repo.update({
|
|
260
|
+
id: user.id,
|
|
261
|
+
}, {
|
|
262
|
+
unregisterTime: null,
|
|
263
|
+
});
|
|
264
|
+
}
|
|
244
265
|
await this.options.onMigrateUser?.(anonymousUser, user);
|
|
245
266
|
return issueTokenForUser(user);
|
|
246
267
|
}
|
|
@@ -252,16 +273,23 @@ let SimpleUserService = class SimpleUserService extends nicot_1.CrudBase {
|
|
|
252
273
|
if (dto.setPassword) {
|
|
253
274
|
await anonymousUser.setPassword(dto.setPassword);
|
|
254
275
|
}
|
|
255
|
-
await this.repo
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
:
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
276
|
+
await this._mayBeTransaction(async (db, repo) => {
|
|
277
|
+
await repo.delete({
|
|
278
|
+
email: dto.email,
|
|
279
|
+
unregisterTime: (0, typeorm_1.LessThanOrEqual)(new Date(Date.now() - this.unregisterWaitTimeMs)),
|
|
280
|
+
});
|
|
281
|
+
await repo.update({
|
|
282
|
+
id: anonymousUser.id,
|
|
283
|
+
}, {
|
|
284
|
+
email: dto.email,
|
|
285
|
+
...(dto.setPassword
|
|
286
|
+
? { passwordHash: anonymousUser.passwordHash }
|
|
287
|
+
: {}),
|
|
288
|
+
ssaid: null,
|
|
289
|
+
registerIpAddress: ctx.ip,
|
|
290
|
+
registerTime: new Date(),
|
|
291
|
+
unregisterTime: null,
|
|
292
|
+
});
|
|
265
293
|
});
|
|
266
294
|
return issueTokenForUser(anonymousUser);
|
|
267
295
|
}
|
|
@@ -324,6 +352,38 @@ let SimpleUserService = class SimpleUserService extends nicot_1.CrudBase {
|
|
|
324
352
|
await this.kickUserEmail(dto.email);
|
|
325
353
|
return new nicot_1.BlankReturnMessageDto(200, 'success');
|
|
326
354
|
}
|
|
355
|
+
async unregister(user, tdb = this.repo.manager) {
|
|
356
|
+
return this._mayBeTransaction(async (db, repo) => {
|
|
357
|
+
user.unregisterTime = new Date();
|
|
358
|
+
await repo.update({
|
|
359
|
+
id: user.id,
|
|
360
|
+
}, {
|
|
361
|
+
unregisterTime: user.unregisterTime,
|
|
362
|
+
});
|
|
363
|
+
await this.kickUserEmail(user.email);
|
|
364
|
+
await this.options.onUnregisterUser?.(user, tdb);
|
|
365
|
+
return new nicot_1.BlankReturnMessageDto(200, 'success');
|
|
366
|
+
}, tdb);
|
|
367
|
+
}
|
|
368
|
+
async unregisterWithEmail(dto) {
|
|
369
|
+
await this.sendCodeService.verifyCode({
|
|
370
|
+
email: dto.email,
|
|
371
|
+
code: dto.code,
|
|
372
|
+
codePurpose: send_code_dto_1.CodePurpose.Unregister,
|
|
373
|
+
});
|
|
374
|
+
return this._mayBeTransaction(async (db, repo) => {
|
|
375
|
+
const user = await repo.findOne({
|
|
376
|
+
where: {
|
|
377
|
+
email: dto.email,
|
|
378
|
+
unregisterTime: (0, typeorm_1.IsNull)(),
|
|
379
|
+
},
|
|
380
|
+
});
|
|
381
|
+
if (!user) {
|
|
382
|
+
return new nicot_1.BlankReturnMessageDto(200, 'success');
|
|
383
|
+
}
|
|
384
|
+
return this.unregister(user, db);
|
|
385
|
+
});
|
|
386
|
+
}
|
|
327
387
|
};
|
|
328
388
|
exports.SimpleUserService = SimpleUserService;
|
|
329
389
|
exports.SimpleUserService = SimpleUserService = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simple-user.service.js","sourceRoot":"","sources":["../../../src/simple-user/simple-user/simple-user.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"simple-user.service.js","sourceRoot":"","sources":["../../../src/simple-user/simple-user/simple-user.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ let SimpleUser = class SimpleUser extends (0, nicot_1.IdBase)() {
|
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
static _OPENAPI_METADATA_FACTORY() {
|
|
40
|
-
return { email: { required: true, type: () => String }, ssaid: { required: true, type: () => String }, passwordHash: { required: true, type: () => String }, passwordSet: { required: true, type: () => Boolean }, loginIpAddress: { required: true, type: () => String }, loginTime: { required: true, type: () => Date }, registerIpAddress: { required: true, type: () => String }, registerTime: { required: true, type: () => Date }, lastActiveIpAddress: { required: true, type: () => String }, lastActiveTime: { required: true, type: () => Date } };
|
|
40
|
+
return { email: { required: true, type: () => String }, ssaid: { required: true, type: () => String }, passwordHash: { required: true, type: () => String }, passwordSet: { required: true, type: () => Boolean }, loginIpAddress: { required: true, type: () => String }, loginTime: { required: true, type: () => Date }, registerIpAddress: { required: true, type: () => String }, registerTime: { required: true, type: () => Date }, lastActiveIpAddress: { required: true, type: () => String }, lastActiveTime: { required: true, type: () => Date }, unregisterTime: { required: true, type: () => Date } };
|
|
41
41
|
}
|
|
42
42
|
};
|
|
43
43
|
exports.SimpleUser = SimpleUser;
|
|
@@ -113,6 +113,14 @@ __decorate([
|
|
|
113
113
|
}),
|
|
114
114
|
__metadata("design:type", Date)
|
|
115
115
|
], SimpleUser.prototype, "lastActiveTime", void 0);
|
|
116
|
+
__decorate([
|
|
117
|
+
(0, nicot_1.InternalColumn)(),
|
|
118
|
+
(0, typeorm_1.Index)(),
|
|
119
|
+
(0, nicot_1.DateColumn)({
|
|
120
|
+
description: 'Time when the user was unregistered',
|
|
121
|
+
}),
|
|
122
|
+
__metadata("design:type", Date)
|
|
123
|
+
], SimpleUser.prototype, "unregisterTime", void 0);
|
|
116
124
|
exports.SimpleUser = SimpleUser = __decorate([
|
|
117
125
|
(0, typeorm_1.Entity)()
|
|
118
126
|
], SimpleUser);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simple-user.entity.js","sourceRoot":"","sources":["../../src/simple-user/simple-user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iCAOe;AACf,qCAAwC;AACxC,oDAA4B;AAGrB,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,IAAA,cAAM,GAAE;IA6BtC,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;IACzC,CAAC;IAMD,KAAK,CAAC,WAAW,CAAC,QAAgB;QAChC,IAAI,CAAC,YAAY,GAAG,MAAM,gBAAM,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC9C,IAAI,EAAE,gBAAM,CAAC,QAAQ;SACtB,CAAC,CAAC;IACL,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,QAAgB;QAClC,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,QAAQ;YAAE,OAAO,KAAK,CAAC;QAElD,IAAI,CAAC;YACH,OAAO,MAAM,gBAAM,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC1D,CAAC;QAAC,MAAM,CAAC;YAEP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;;;;
|
|
1
|
+
{"version":3,"file":"simple-user.entity.js","sourceRoot":"","sources":["../../src/simple-user/simple-user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iCAOe;AACf,qCAAwC;AACxC,oDAA4B;AAGrB,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,IAAA,cAAM,GAAE;IA6BtC,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;IACzC,CAAC;IAMD,KAAK,CAAC,WAAW,CAAC,QAAgB;QAChC,IAAI,CAAC,YAAY,GAAG,MAAM,gBAAM,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC9C,IAAI,EAAE,gBAAM,CAAC,QAAQ;SACtB,CAAC,CAAC;IACL,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,QAAgB;QAClC,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,QAAQ;YAAE,OAAO,KAAK,CAAC;QAElD,IAAI,CAAC;YACH,OAAO,MAAM,gBAAM,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC1D,CAAC;QAAC,MAAM,CAAC;YAEP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;;;;CA4CF,CAAA;AAnGY,gCAAU;AAOrB;IANC,IAAA,eAAK,GAAE;IACP,IAAA,mBAAW,GAAE;IACb,IAAA,oBAAY,EAAC,GAAG,EAAE;QACjB,WAAW,EACT,gEAAgE;KACnE,CAAC;;yCACY;AAOd;IALC,IAAA,eAAK,GAAE;IACP,IAAA,sBAAc,GAAE;IAChB,IAAA,oBAAY,EAAC,GAAG,EAAE;QACjB,WAAW,EAAE,uDAAuD;KACrE,CAAC;;yCACY;AAOd;IALC,IAAA,sBAAc,GAAE;IAChB,IAAA,oBAAY,EAAC,GAAG,EAAE;QACjB,WAAW,EACT,kEAAkE;KACrE,CAAC;;gDACmB;AAMrB;IAJC,IAAA,iBAAS,EAAC;QACT,WAAW,EAAE,+CAA+C;QAC5D,QAAQ,EAAE,IAAI;KACf,CAAC;;+CACmB;AAkCrB;IAJC,IAAA,sBAAc,GAAE;IAChB,IAAA,oBAAY,EAAC,EAAE,EAAE;QAChB,WAAW,EAAE,mCAAmC;KACjD,CAAC;;kDACqB;AAMvB;IAJC,IAAA,sBAAc,GAAE;IAChB,IAAA,kBAAU,EAAC;QACV,WAAW,EAAE,6BAA6B;KAC3C,CAAC;8BACS,IAAI;6CAAC;AAMhB;IAJC,IAAA,sBAAc,GAAE;IAChB,IAAA,oBAAY,EAAC,EAAE,EAAE;QAChB,WAAW,EAAE,qCAAqC;KACnD,CAAC;;qDACwB;AAM1B;IAJC,IAAA,sBAAc,GAAE;IAChB,IAAA,kBAAU,EAAC;QACV,WAAW,EAAE,+BAA+B;KAC7C,CAAC;8BACY,IAAI;gDAAC;AAMnB;IAJC,IAAA,sBAAc,GAAE;IAChB,IAAA,oBAAY,EAAC,EAAE,EAAE;QAChB,WAAW,EAAE,oCAAoC;KAClD,CAAC;;uDAC0B;AAM5B;IAJC,IAAA,sBAAc,GAAE;IAChB,IAAA,kBAAU,EAAC;QACV,WAAW,EAAE,8BAA8B;KAC5C,CAAC;8BACc,IAAI;kDAAC;AAOrB;IALC,IAAA,sBAAc,GAAE;IAChB,IAAA,eAAK,GAAE;IACP,IAAA,kBAAU,EAAC;QACV,WAAW,EAAE,qCAAqC;KACnD,CAAC;8BACc,IAAI;kDAAC;qBAlGV,UAAU;IADtB,IAAA,gBAAM,GAAE;GACI,UAAU,CAmGtB"}
|
|
@@ -10,4 +10,5 @@ export declare class UserCenterController {
|
|
|
10
10
|
getCurrentUser(): Promise<import("nicot").GenericReturnMessageDto<SimpleUser>>;
|
|
11
11
|
changePassword(dto: ChangePasswordDto, ctx: UserRiskControlContext): Promise<import("nicot").BlankReturnMessageDto>;
|
|
12
12
|
changeEmail(dto: ChangeEmailDto): Promise<import("nicot").BlankReturnMessageDto>;
|
|
13
|
+
unregister(): Promise<import("nicot").BlankReturnMessageDto>;
|
|
13
14
|
}
|
|
@@ -37,6 +37,9 @@ let UserCenterController = class UserCenterController {
|
|
|
37
37
|
async changeEmail(dto) {
|
|
38
38
|
return this.userService.changeEmail(this.currentUser, dto);
|
|
39
39
|
}
|
|
40
|
+
async unregister() {
|
|
41
|
+
return this.userService.unregister(this.currentUser);
|
|
42
|
+
}
|
|
40
43
|
};
|
|
41
44
|
exports.UserCenterController = UserCenterController;
|
|
42
45
|
__decorate([
|
|
@@ -78,6 +81,18 @@ __decorate([
|
|
|
78
81
|
__metadata("design:paramtypes", [change_email_dto_1.ChangeEmailDto]),
|
|
79
82
|
__metadata("design:returntype", Promise)
|
|
80
83
|
], UserCenterController.prototype, "changeEmail", null);
|
|
84
|
+
__decorate([
|
|
85
|
+
(0, common_1.Post)('unregister'),
|
|
86
|
+
(0, common_1.HttpCode)(200),
|
|
87
|
+
(0, swagger_1.ApiOperation)({
|
|
88
|
+
summary: 'Unregister current user',
|
|
89
|
+
}),
|
|
90
|
+
(0, nicot_1.ApiBlankResponse)(),
|
|
91
|
+
openapi.ApiResponse({ status: 200 }),
|
|
92
|
+
__metadata("design:type", Function),
|
|
93
|
+
__metadata("design:paramtypes", []),
|
|
94
|
+
__metadata("design:returntype", Promise)
|
|
95
|
+
], UserCenterController.prototype, "unregister", null);
|
|
81
96
|
exports.UserCenterController = UserCenterController = __decorate([
|
|
82
97
|
(0, common_1.Controller)('user-center'),
|
|
83
98
|
(0, swagger_1.ApiTags)('user-center'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-center.controller.js","sourceRoot":"","sources":["../../../src/simple-user/user-center/user-center.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,6CAAwD;AACxD,4EAAuE;AACvE,8DAAmD;AACnD,0CAKqB;AACrB,iCAA6D;AAC7D,4EAAuE;AACvE,wDAAyD;AACzD,sEAAiE;AAI1D,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YACU,WAA8B,EAE9B,WAAuB;QAFvB,gBAAW,GAAX,WAAW,CAAmB;QAE9B,gBAAW,GAAX,WAAW,CAAY;IAC9B,CAAC;IAWE,AAAN,KAAK,CAAC,cAAc;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACvD,CAAC;IAUK,AAAN,KAAK,CAAC,cAAc,CACN,GAAsB,EACT,GAA2B;QAEpD,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACrE,CAAC;IASK,AAAN,KAAK,CAAC,WAAW,CAAa,GAAmB;QAC/C,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAC7D,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"user-center.controller.js","sourceRoot":"","sources":["../../../src/simple-user/user-center/user-center.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,6CAAwD;AACxD,4EAAuE;AACvE,8DAAmD;AACnD,0CAKqB;AACrB,iCAA6D;AAC7D,4EAAuE;AACvE,wDAAyD;AACzD,sEAAiE;AAI1D,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YACU,WAA8B,EAE9B,WAAuB;QAFvB,gBAAW,GAAX,WAAW,CAAmB;QAE9B,gBAAW,GAAX,WAAW,CAAY;IAC9B,CAAC;IAWE,AAAN,KAAK,CAAC,cAAc;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACvD,CAAC;IAUK,AAAN,KAAK,CAAC,cAAc,CACN,GAAsB,EACT,GAA2B;QAEpD,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACrE,CAAC;IASK,AAAN,KAAK,CAAC,WAAW,CAAa,GAAmB;QAC/C,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAC7D,CAAC;IAQK,AAAN,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;CACF,CAAA;AAvDY,oDAAoB;AAgBzB;IATL,IAAA,YAAG,EAAC,IAAI,CAAC;IACT,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,8BAA8B;KACxC,CAAC;;;;;0DAQD;AAUK;IARL,IAAA,aAAI,EAAC,iBAAiB,CAAC;IACvB,IAAA,iBAAQ,EAAC,GAAG,CAAC;IACb,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,8BAA8B;KACxC,CAAC;IAED,IAAA,wBAAgB,GAAE;IAClB,IAAA,gBAAQ,EAAC,GAAG,EAAE,4BAA4B,CAAC;kCANlC,GAAG;IAQV,WAAA,IAAA,gBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,gCAAqB,GAAE,CAAA;;qCADP,uCAAiB;;0DAInC;AASK;IAPL,IAAA,aAAI,EAAC,cAAc,CAAC;IACpB,IAAA,iBAAQ,EAAC,GAAG,CAAC;IACb,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,2BAA2B;KACrC,CAAC;IACD,IAAA,2BAAc,GAAE;IAChB,IAAA,wBAAgB,GAAE;kCALT,GAAG;IAMM,WAAA,IAAA,gBAAQ,GAAE,CAAA;;qCAAM,iCAAc;;uDAEhD;AAQK;IANL,IAAA,aAAI,EAAC,YAAY,CAAC;IAClB,IAAA,iBAAQ,EAAC,GAAG,CAAC;IACb,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,yBAAyB;KACnC,CAAC;IACD,IAAA,wBAAgB,GAAE;kCAJT,GAAG;;;;sDAOZ;+BAtDU,oBAAoB;IAFhC,IAAA,mBAAU,EAAC,aAAa,CAAC;IACzB,IAAA,iBAAO,EAAC,aAAa,CAAC;IAIlB,WAAA,IAAA,4BAAiB,GAAE,CAAA;qCADC,uCAAiB;QAEjB,+BAAU;GAJtB,oBAAoB,CAuDhC"}
|