@hed-hog/core 0.0.96 → 0.0.98
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/auth/auth.controller.d.ts +24 -11
- package/dist/auth/auth.controller.d.ts.map +1 -1
- package/dist/auth/auth.controller.js +43 -9
- package/dist/auth/auth.controller.js.map +1 -1
- package/dist/auth/auth.service.d.ts +34 -22
- package/dist/auth/auth.service.d.ts.map +1 -1
- package/dist/auth/auth.service.js +256 -13
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/auth/dto/login-email-verification-resend.dto.d.ts +4 -0
- package/dist/auth/dto/login-email-verification-resend.dto.d.ts.map +1 -0
- package/dist/auth/dto/login-email-verification-resend.dto.js +22 -0
- package/dist/auth/dto/login-email-verification-resend.dto.js.map +1 -0
- package/dist/auth/dto/login-email-verification.dto.d.ts +5 -0
- package/dist/auth/dto/login-email-verification.dto.d.ts.map +1 -0
- package/dist/auth/dto/login-email-verification.dto.js +28 -0
- package/dist/auth/dto/login-email-verification.dto.js.map +1 -0
- package/dist/challenge/challenge.service.d.ts.map +1 -1
- package/dist/challenge/challenge.service.js +1 -0
- package/dist/challenge/challenge.service.js.map +1 -1
- package/dist/dashboard/dashboard-core/dashboard-core.controller.d.ts +2 -2
- package/dist/dashboard/dashboard-core/dashboard-core.service.d.ts +2 -2
- package/dist/dashboard/dashboard-user/dashboard-user.controller.d.ts +3 -3
- package/dist/dashboard/dashboard-user/dashboard-user.service.d.ts +3 -3
- package/dist/mail/mail.controller.d.ts +2 -2
- package/dist/mail/mail.service.d.ts +2 -2
- package/dist/menu/menu.controller.d.ts +6 -6
- package/dist/menu/menu.service.d.ts +6 -6
- package/dist/profile/dto/email-verification-confirm.dto.d.ts +1 -0
- package/dist/profile/dto/email-verification-confirm.dto.d.ts.map +1 -1
- package/dist/profile/dto/email-verification-confirm.dto.js +7 -0
- package/dist/profile/dto/email-verification-confirm.dto.js.map +1 -1
- package/dist/profile/profile.controller.d.ts +2 -4
- package/dist/profile/profile.controller.d.ts.map +1 -1
- package/dist/profile/profile.controller.js +1 -0
- package/dist/profile/profile.controller.js.map +1 -1
- package/dist/profile/profile.service.d.ts +3 -5
- package/dist/profile/profile.service.d.ts.map +1 -1
- package/dist/profile/profile.service.js +54 -7
- package/dist/profile/profile.service.js.map +1 -1
- package/dist/role/role.controller.d.ts +3 -3
- package/dist/role/role.service.d.ts +3 -3
- package/dist/screen/screen.controller.d.ts +3 -3
- package/dist/screen/screen.service.d.ts +3 -3
- package/dist/security/security.service.d.ts +1 -0
- package/dist/security/security.service.d.ts.map +1 -1
- package/dist/security/security.service.js +5 -0
- package/dist/security/security.service.js.map +1 -1
- package/dist/setting/setting.controller.d.ts +4 -4
- package/dist/setting/setting.service.d.ts +4 -4
- package/dist/token/token.service.d.ts +1 -0
- package/dist/token/token.service.d.ts.map +1 -1
- package/dist/token/token.service.js +15 -1
- package/dist/token/token.service.js.map +1 -1
- package/dist/user/user.controller.d.ts +1 -1
- package/dist/user/user.service.d.ts +46 -4
- package/dist/user/user.service.d.ts.map +1 -1
- package/dist/user/user.service.js +11 -3
- package/dist/user/user.service.js.map +1 -1
- package/hedhog/data/mail.yaml +19 -0
- package/package.json +2 -2
- package/src/auth/auth.controller.ts +30 -10
- package/src/auth/auth.service.ts +329 -21
- package/src/auth/dto/login-email-verification-resend.dto.ts +7 -0
- package/src/auth/dto/login-email-verification.dto.ts +12 -0
- package/src/challenge/challenge.service.ts +4 -0
- package/src/mail/mail.controller.ts +13 -13
- package/src/profile/dto/email-verification-confirm.dto.ts +7 -1
- package/src/profile/profile.controller.ts +1 -0
- package/src/profile/profile.service.ts +63 -6
- package/src/security/security.service.ts +8 -0
- package/src/token/token.service.ts +17 -1
- package/src/user/user.service.ts +13 -5
|
@@ -62,9 +62,9 @@ export declare class SettingService {
|
|
|
62
62
|
value: string | null;
|
|
63
63
|
type: import("@prisma/client").$Enums.setting_type_enum;
|
|
64
64
|
id: number;
|
|
65
|
+
slug: string;
|
|
65
66
|
created_at: Date;
|
|
66
67
|
updated_at: Date;
|
|
67
|
-
slug: string;
|
|
68
68
|
group_id: number;
|
|
69
69
|
component: import("@prisma/client").$Enums.setting_component_enum;
|
|
70
70
|
user_override: boolean;
|
|
@@ -73,9 +73,9 @@ export declare class SettingService {
|
|
|
73
73
|
value: string | null;
|
|
74
74
|
type: import("@prisma/client").$Enums.setting_type_enum;
|
|
75
75
|
id: number;
|
|
76
|
+
slug: string;
|
|
76
77
|
created_at: Date;
|
|
77
78
|
updated_at: Date;
|
|
78
|
-
slug: string;
|
|
79
79
|
group_id: number;
|
|
80
80
|
component: import("@prisma/client").$Enums.setting_component_enum;
|
|
81
81
|
user_override: boolean;
|
|
@@ -87,9 +87,9 @@ export declare class SettingService {
|
|
|
87
87
|
value: string | null;
|
|
88
88
|
type: import("@prisma/client").$Enums.setting_type_enum;
|
|
89
89
|
id: number;
|
|
90
|
+
slug: string;
|
|
90
91
|
created_at: Date;
|
|
91
92
|
updated_at: Date;
|
|
92
|
-
slug: string;
|
|
93
93
|
group_id: number;
|
|
94
94
|
component: import("@prisma/client").$Enums.setting_component_enum;
|
|
95
95
|
user_override: boolean;
|
|
@@ -98,9 +98,9 @@ export declare class SettingService {
|
|
|
98
98
|
value: string | null;
|
|
99
99
|
type: import("@prisma/client").$Enums.setting_type_enum;
|
|
100
100
|
id: number;
|
|
101
|
+
slug: string;
|
|
101
102
|
created_at: Date;
|
|
102
103
|
updated_at: Date;
|
|
103
|
-
slug: string;
|
|
104
104
|
group_id: number;
|
|
105
105
|
component: import("@prisma/client").$Enums.setting_component_enum;
|
|
106
106
|
user_override: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.service.d.ts","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,qBACa,YAAY;IAIrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAEpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAJP,GAAG,EAAE,UAAU,EAEf,QAAQ,EAAE,eAAe,EAEzB,OAAO,EAAE,cAAc;IAGpC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"token.service.d.ts","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,qBACa,YAAY;IAIrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAEpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAJP,GAAG,EAAE,UAAU,EAEf,QAAQ,EAAE,eAAe,EAEzB,OAAO,EAAE,cAAc;IAGpC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAgBpC,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAM9C,iBAAiB,CAAC,IAAI,SAAK;YAInB,eAAe;IAgBvB,wBAAwB,CAAC,GAAG,KAAA,GAAG,OAAO,CAAC,IAAI,CAAC;IAe5C,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAA,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB1F,uBAAuB,CAAC,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAOxG,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAgBxH,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;CAUtD"}
|
|
@@ -26,9 +26,12 @@ let TokenService = class TokenService {
|
|
|
26
26
|
}
|
|
27
27
|
async verify(locale, token) {
|
|
28
28
|
try {
|
|
29
|
-
return this.jwt.verifyAsync(token, {
|
|
29
|
+
return this.jwt.verifyAsync(token, {
|
|
30
|
+
secret: this.security.getJwtSecret(),
|
|
31
|
+
});
|
|
30
32
|
}
|
|
31
33
|
catch (error) {
|
|
34
|
+
console.log('JWT ERROR', error);
|
|
32
35
|
// Return 401 for JWT errors (expired, invalid, etc.)
|
|
33
36
|
throw new common_1.UnauthorizedException(error.message || (0, api_locale_1.getLocaleText)('accessDenied', locale, 'Access denied.'));
|
|
34
37
|
}
|
|
@@ -105,6 +108,17 @@ let TokenService = class TokenService {
|
|
|
105
108
|
throw new common_1.ForbiddenException('Invalid or expired MFA token');
|
|
106
109
|
}
|
|
107
110
|
}
|
|
111
|
+
async decodeExpiredToken(token) {
|
|
112
|
+
try {
|
|
113
|
+
return await this.jwt.verifyAsync(token, {
|
|
114
|
+
secret: this.security.getJwtSecret(),
|
|
115
|
+
ignoreExpiration: true,
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
catch (error) {
|
|
119
|
+
throw new common_1.UnauthorizedException('Invalid token');
|
|
120
|
+
}
|
|
121
|
+
}
|
|
108
122
|
};
|
|
109
123
|
exports.TokenService = TokenService;
|
|
110
124
|
exports.TokenService = TokenService = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.service.js","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAoD;AACpD,2CAA2G;AAC3G,qCAAyC;AACzC,mEAA+D;AAC/D,gEAA4D;AAGrD,IAAM,YAAY,GAAlB,MAAM,YAAY;IAEvB,YAEmB,GAAe,EAEf,QAAyB,EAEzB,OAAuB;QAJvB,QAAG,GAAH,GAAG,CAAY;QAEf,aAAQ,GAAR,QAAQ,CAAiB;QAEzB,YAAO,GAAP,OAAO,CAAgB;IACtC,CAAC;IAEL,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,KAAa;QACxC,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"token.service.js","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,9 +25,9 @@ export declare class UserController {
|
|
|
25
25
|
provider: import("@prisma/client").$Enums.user_account_provider_enum;
|
|
26
26
|
created_at: Date;
|
|
27
27
|
updated_at: Date;
|
|
28
|
-
email: string | null;
|
|
29
28
|
user_id: number;
|
|
30
29
|
provider_user_id: string;
|
|
30
|
+
email: string | null;
|
|
31
31
|
scopes: string | null;
|
|
32
32
|
refresh_token: import("@prisma/client/runtime/library").Bytes | null;
|
|
33
33
|
token_expires_at: Date | null;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PaginationService } from '@hed-hog/api-pagination';
|
|
2
|
-
import { PrismaService
|
|
2
|
+
import { PrismaService } from '@hed-hog/api-prisma';
|
|
3
3
|
import { ChallengeService } from '../challenge/challenge.service';
|
|
4
4
|
import { DeleteDTO } from '../dto/delete.dto';
|
|
5
5
|
import { FileService } from '../file/file.service';
|
|
@@ -40,9 +40,9 @@ export declare class UserService {
|
|
|
40
40
|
provider: import("@prisma/client").$Enums.user_account_provider_enum;
|
|
41
41
|
created_at: Date;
|
|
42
42
|
updated_at: Date;
|
|
43
|
-
email: string | null;
|
|
44
43
|
user_id: number;
|
|
45
44
|
provider_user_id: string;
|
|
45
|
+
email: string | null;
|
|
46
46
|
scopes: string | null;
|
|
47
47
|
refresh_token: import("@prisma/client/runtime/library").Bytes | null;
|
|
48
48
|
token_expires_at: Date | null;
|
|
@@ -135,9 +135,9 @@ export declare class UserService {
|
|
|
135
135
|
provider: import("@prisma/client").$Enums.user_account_provider_enum;
|
|
136
136
|
created_at: Date;
|
|
137
137
|
updated_at: Date;
|
|
138
|
-
email: string | null;
|
|
139
138
|
user_id: number;
|
|
140
139
|
provider_user_id: string;
|
|
140
|
+
email: string | null;
|
|
141
141
|
scopes: string | null;
|
|
142
142
|
refresh_token: import("@prisma/client/runtime/library").Bytes | null;
|
|
143
143
|
token_expires_at: Date | null;
|
|
@@ -191,7 +191,49 @@ export declare class UserService {
|
|
|
191
191
|
suspended_reason: string | null;
|
|
192
192
|
deactivated_at: Date | null;
|
|
193
193
|
}>;
|
|
194
|
-
findUserByEmail(
|
|
194
|
+
findUserByEmail(_locale: string, email: string): Promise<{
|
|
195
|
+
user_credential: {
|
|
196
|
+
type: import("@prisma/client").$Enums.user_credential_type_enum;
|
|
197
|
+
id: number;
|
|
198
|
+
hash: string;
|
|
199
|
+
created_at: Date;
|
|
200
|
+
updated_at: Date;
|
|
201
|
+
user_id: number;
|
|
202
|
+
revoked_at: Date | null;
|
|
203
|
+
expires_at: Date | null;
|
|
204
|
+
requires_reset: boolean;
|
|
205
|
+
}[];
|
|
206
|
+
user_identifier: {
|
|
207
|
+
value: string;
|
|
208
|
+
type: import("@prisma/client").$Enums.user_identifier_type_enum;
|
|
209
|
+
id: number;
|
|
210
|
+
created_at: Date;
|
|
211
|
+
updated_at: Date;
|
|
212
|
+
user_id: number;
|
|
213
|
+
enabled: boolean;
|
|
214
|
+
verified_at: Date | null;
|
|
215
|
+
}[];
|
|
216
|
+
user_session: {
|
|
217
|
+
id: number;
|
|
218
|
+
hash: string;
|
|
219
|
+
created_at: Date;
|
|
220
|
+
updated_at: Date;
|
|
221
|
+
user_id: number;
|
|
222
|
+
revoked_at: Date | null;
|
|
223
|
+
expires_at: Date;
|
|
224
|
+
ip_address: string;
|
|
225
|
+
user_agent: string;
|
|
226
|
+
}[];
|
|
227
|
+
} & {
|
|
228
|
+
name: string;
|
|
229
|
+
id: number;
|
|
230
|
+
created_at: Date;
|
|
231
|
+
updated_at: Date;
|
|
232
|
+
photo_id: number | null;
|
|
233
|
+
suspended_until: Date | null;
|
|
234
|
+
suspended_reason: string | null;
|
|
235
|
+
deactivated_at: Date | null;
|
|
236
|
+
}>;
|
|
195
237
|
registerUserActivity(userId: number, action: string): Promise<{
|
|
196
238
|
id: number;
|
|
197
239
|
action: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.d.ts","sourceRoot":"","sources":["../../src/user/user.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"user.service.d.ts","sourceRoot":"","sources":["../../src/user/user.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAQpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AACzF,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,qBACa,WAAW;IAGpB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAE9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAElC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAE1B,OAAO,CAAC,QAAQ,CAAC,IAAI;gBARJ,aAAa,EAAE,aAAa,EAE5B,iBAAiB,EAAE,iBAAiB,EAEpC,QAAQ,EAAE,eAAe,EAEzB,SAAS,EAAE,gBAAgB,EAE3B,IAAI,EAAE,WAAW;IAG9B,gBAAgB,CACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM;;;;;;;;;;IAiBhB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,EAAC,GAAG,EAAC,EAAE,SAAS;IAYvC,MAAM,CACV,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,EAAC,IAAI,EAAC,EAAE,SAAS;;;;;;;;;;IAeb,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIlC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU;;;;IAsC/D,IAAI,CAAC,gBAAgB,KAAA;;;;;;;;;;;;;;IAyErB,0BAA0B,CAC5B,MAAM,EAAE,MAAM,EACd,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,6BAA6B;;;;;;;;;;;;;;;IAuCtD,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmBvC,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAyB9C,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;;;;IASnD,YAAY,CAAC,MAAM,EAAE,MAAM;;;;;;;IA2C3B,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;;;;IAoB/C,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;CAkBxD"}
|
|
@@ -115,8 +115,16 @@ let UserService = class UserService {
|
|
|
115
115
|
searchFields, include: {
|
|
116
116
|
user_account: true,
|
|
117
117
|
user_credential: true,
|
|
118
|
-
user_identifier:
|
|
119
|
-
|
|
118
|
+
user_identifier: {
|
|
119
|
+
where: {
|
|
120
|
+
enabled: true,
|
|
121
|
+
}
|
|
122
|
+
},
|
|
123
|
+
user_mfa: {
|
|
124
|
+
where: {
|
|
125
|
+
verified_at: { not: null },
|
|
126
|
+
}
|
|
127
|
+
},
|
|
120
128
|
user_activity: {
|
|
121
129
|
orderBy: {
|
|
122
130
|
created_at: 'desc',
|
|
@@ -201,7 +209,7 @@ let UserService = class UserService {
|
|
|
201
209
|
}
|
|
202
210
|
return user;
|
|
203
211
|
}
|
|
204
|
-
async findUserByEmail(
|
|
212
|
+
async findUserByEmail(_locale, email) {
|
|
205
213
|
const user = await this.prismaService.user.findFirst({
|
|
206
214
|
where: {
|
|
207
215
|
user_identifier: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/user/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAoD;AACpD,4DAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/user/user.service.ts"],"names":[],"mappings":"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"}
|
package/hedhog/data/mail.yaml
CHANGED
|
@@ -142,4 +142,23 @@
|
|
|
142
142
|
- name: ipAddress
|
|
143
143
|
- name: location
|
|
144
144
|
- name: name
|
|
145
|
+
- slug: auth-mfa-code
|
|
146
|
+
subject:
|
|
147
|
+
en: Your HedHog MFA Code
|
|
148
|
+
pt: Seu Código MFA do HedHog
|
|
149
|
+
body:
|
|
150
|
+
en: |
|
|
151
|
+
Hello {{name}},<br>
|
|
152
|
+
Your MFA code is: {{code}}<br>
|
|
153
|
+
Best regards,<br>
|
|
154
|
+
The HedHog Team
|
|
155
|
+
pt: |
|
|
156
|
+
Olá {{name}},<br>
|
|
157
|
+
Seu código MFA é: {{code}}<br>
|
|
158
|
+
Atenciosamente,<br>
|
|
159
|
+
A equipe HedHog
|
|
160
|
+
relations:
|
|
161
|
+
mail_var:
|
|
162
|
+
- name: code
|
|
163
|
+
- name: name
|
|
145
164
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hed-hog/core",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.98",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"dependencies": {
|
|
@@ -31,8 +31,8 @@
|
|
|
31
31
|
"uuid": "^11.1.0",
|
|
32
32
|
"@hed-hog/types": "0.0.1",
|
|
33
33
|
"@hed-hog/api-pagination": "0.0.4",
|
|
34
|
-
"@hed-hog/api": "0.0.3",
|
|
35
34
|
"@hed-hog/api-prisma": "0.0.4",
|
|
35
|
+
"@hed-hog/api": "0.0.3",
|
|
36
36
|
"@hed-hog/api-mail": "0.0.7",
|
|
37
37
|
"@hed-hog/api-locale": "0.0.10"
|
|
38
38
|
},
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Public, Role, User } from '@hed-hog/api';
|
|
1
|
+
import { Public, Role, User, UserOptional } from '@hed-hog/api';
|
|
2
2
|
import { Locale } from '@hed-hog/api-locale';
|
|
3
3
|
import {
|
|
4
4
|
BadRequestException,
|
|
@@ -18,6 +18,8 @@ import { CreateWithEmailAndPasswordDTO } from '../user/dto/create-with-email-and
|
|
|
18
18
|
import { UserService } from '../user/user.service';
|
|
19
19
|
import { AuthService } from './auth.service';
|
|
20
20
|
import { ForgetDTO } from './dto/forget.dto';
|
|
21
|
+
import { LoginEmailVerificationResendDTO } from './dto/login-email-verification-resend.dto';
|
|
22
|
+
import { LoginEmailVerificationDTO } from './dto/login-email-verification.dto';
|
|
21
23
|
import { LoginWithCodeDTO } from './dto/login-with-code.dto';
|
|
22
24
|
import { LoginWithRecoveryCodeDTO } from './dto/login-with-recovery-code';
|
|
23
25
|
import { LoginDTO } from './dto/login.dto';
|
|
@@ -40,6 +42,13 @@ export class AuthController {
|
|
|
40
42
|
return this.service.verifyUser(locale, id);
|
|
41
43
|
}
|
|
42
44
|
|
|
45
|
+
@Public()
|
|
46
|
+
@Get('roles')
|
|
47
|
+
async roles(@UserOptional() user, @Locale() locale: string) {
|
|
48
|
+
const roles = !user || !user.id ? [] : await this.service.verifyRoles(locale, user.id);
|
|
49
|
+
return { roles };
|
|
50
|
+
}
|
|
51
|
+
|
|
43
52
|
@Public()
|
|
44
53
|
@Post('refresh')
|
|
45
54
|
async refresh(
|
|
@@ -72,17 +81,28 @@ export class AuthController {
|
|
|
72
81
|
@Headers('user-agent') userAgent: string,
|
|
73
82
|
@Res({ passthrough: true }) res,
|
|
74
83
|
) {
|
|
75
|
-
|
|
84
|
+
return this.service.loginWithEmailAndPassword(res, locale, ipAddress, userAgent, data);
|
|
85
|
+
}
|
|
76
86
|
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
87
|
+
@Public()
|
|
88
|
+
@Post('login-email-verification')
|
|
89
|
+
async emailVerificationLogin(
|
|
90
|
+
@Locale() locale: string,
|
|
91
|
+
@Body() {token, code}: LoginEmailVerificationDTO,
|
|
92
|
+
@Ip() ipAddress: string,
|
|
93
|
+
@Headers('user-agent') userAgent: string,
|
|
94
|
+
@Res({ passthrough: true }) res,
|
|
95
|
+
) {
|
|
96
|
+
return this.service.emailVerificationLogin(locale, token, code, ipAddress, userAgent, res);
|
|
97
|
+
}
|
|
80
98
|
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
99
|
+
@Public()
|
|
100
|
+
@Post('login-email-verification-resend')
|
|
101
|
+
async emailVerificationLoginResend(
|
|
102
|
+
@Locale() locale: string,
|
|
103
|
+
@Body() {token}: LoginEmailVerificationResendDTO,
|
|
104
|
+
) {
|
|
105
|
+
return this.service.emailVerificationLoginResend(locale, token);
|
|
86
106
|
}
|
|
87
107
|
|
|
88
108
|
@Public()
|