@hed-hog/core 0.0.7 → 0.0.10
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.service.d.ts +1 -4
- package/dist/auth/auth.service.d.ts.map +1 -1
- package/dist/auth/auth.service.js +9 -19
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/challenge/challenge.service.d.ts +1 -4
- package/dist/challenge/challenge.service.d.ts.map +1 -1
- package/dist/challenge/challenge.service.js +26 -16
- package/dist/challenge/challenge.service.js.map +1 -1
- package/dist/file/file.service.d.ts +2 -5
- package/dist/file/file.service.d.ts.map +1 -1
- package/dist/file/file.service.js +40 -16
- package/dist/file/file.service.js.map +1 -1
- package/dist/mail/mail.service.d.ts +1 -4
- package/dist/mail/mail.service.d.ts.map +1 -1
- package/dist/mail/mail.service.js +10 -9
- package/dist/mail/mail.service.js.map +1 -1
- package/dist/oauth/interfaces/OAuthProvider.d.ts +1 -1
- package/dist/oauth/interfaces/OAuthProvider.d.ts.map +1 -1
- package/dist/oauth/oauth.service.d.ts +2 -5
- package/dist/oauth/oauth.service.d.ts.map +1 -1
- package/dist/oauth/oauth.service.js +12 -15
- package/dist/oauth/oauth.service.js.map +1 -1
- package/dist/oauth/providers/abstract.provider.d.ts +1 -1
- package/dist/oauth/providers/abstract.provider.d.ts.map +1 -1
- package/dist/oauth/providers/facebook.provider.d.ts +2 -5
- package/dist/oauth/providers/facebook.provider.d.ts.map +1 -1
- package/dist/oauth/providers/facebook.provider.js +18 -15
- package/dist/oauth/providers/facebook.provider.js.map +1 -1
- package/dist/oauth/providers/github.provider.d.ts +2 -5
- package/dist/oauth/providers/github.provider.d.ts.map +1 -1
- package/dist/oauth/providers/github.provider.js +17 -14
- package/dist/oauth/providers/github.provider.js.map +1 -1
- package/dist/oauth/providers/google.provider.d.ts +2 -5
- package/dist/oauth/providers/google.provider.d.ts.map +1 -1
- package/dist/oauth/providers/google.provider.js +18 -15
- package/dist/oauth/providers/google.provider.js.map +1 -1
- package/dist/oauth/providers/microsoft.provider.d.ts +2 -5
- package/dist/oauth/providers/microsoft.provider.d.ts.map +1 -1
- package/dist/oauth/providers/microsoft.provider.js +17 -14
- package/dist/oauth/providers/microsoft.provider.js.map +1 -1
- package/dist/profile/profile.service.d.ts +0 -2
- package/dist/profile/profile.service.d.ts.map +1 -1
- package/dist/profile/profile.service.js +41 -20
- package/dist/profile/profile.service.js.map +1 -1
- package/dist/session/session.service.d.ts +1 -4
- package/dist/session/session.service.d.ts.map +1 -1
- package/dist/session/session.service.js +4 -7
- package/dist/session/session.service.js.map +1 -1
- package/dist/setting/setting.controller.d.ts +3 -4
- package/dist/setting/setting.controller.d.ts.map +1 -1
- package/dist/setting/setting.controller.js +7 -3
- package/dist/setting/setting.controller.js.map +1 -1
- package/dist/setting/setting.service.d.ts +2 -4
- package/dist/setting/setting.service.d.ts.map +1 -1
- package/dist/setting/setting.service.js +45 -5
- package/dist/setting/setting.service.js.map +1 -1
- package/dist/token/token.service.d.ts +1 -4
- package/dist/token/token.service.d.ts.map +1 -1
- package/dist/token/token.service.js +8 -11
- package/dist/token/token.service.js.map +1 -1
- package/hedhog/data/setting_group.yaml +11 -20
- package/package.json +7 -5
- package/src/auth/auth.service.ts +11 -22
- package/src/challenge/challenge.service.ts +35 -19
- package/src/file/file.service.ts +45 -20
- package/src/mail/mail.service.ts +16 -12
- package/src/oauth/interfaces/OAuthProvider.ts +1 -1
- package/src/oauth/oauth.service.ts +16 -19
- package/src/oauth/providers/abstract.provider.ts +1 -1
- package/src/oauth/providers/facebook.provider.ts +22 -18
- package/src/oauth/providers/github.provider.ts +22 -18
- package/src/oauth/providers/google.provider.ts +23 -17
- package/src/oauth/providers/microsoft.provider.ts +23 -18
- package/src/profile/profile.service.ts +52 -27
- package/src/session/session.service.ts +6 -11
- package/src/setting/setting.controller.ts +9 -3
- package/src/setting/setting.service.ts +18 -9
- package/src/token/token.service.ts +12 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setting.service.d.ts","sourceRoot":"","sources":["../../src/setting/setting.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAqB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"setting.service.d.ts","sourceRoot":"","sources":["../../src/setting/setting.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAqB,MAAM,qBAAqB,CAAC;AAQvE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,qBACa,cAAc;IAMvB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAE9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAElC,OAAO,CAAC,QAAQ,CAAC,aAAa;IARhC,OAAO,CAAC,cAAc,CAA2B;gBAI9B,aAAa,EAAE,aAAa,EAE5B,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa;IAGzC,cAAc,CAAC,cAAc,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAqBvD,cAAc,CAAC,IAAI,EAAE,UAAU;;;;;;;IA0C/B,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;;;;IA2C9D,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC;IA6BjC,eAAe,CAAC,IAAI,EAAE,UAAU;;;IAqBhC,mBAAmB,CACvB,MAAM,EAAE,GAAG,EACX,gBAAgB,EAAE,GAAG,EACrB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM;;;;;;;;;IAqFV,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,aAAa;;;;;;;;;IAwCjE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,aAAa;;;;;;;;;IA0D5D,GAAG,CAAC,SAAS,EAAE,MAAM;;;;;;;;;;;IAMrB,MAAM,CAAC,IAAI,EAAE,SAAS;;;;;;;;;;;IAiBtB,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,SAAS,CAAA;KAAE;;;;;;;;;;;IAkCpD,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS;;;;;;;;;;;IAwBlD,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAchD,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAkB1C,MAAM,CAAC,EAAE,GAAG,EAAE,EAAE,SAAS;IAiBzB,mBAAmB,CAAC,MAAM,EAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;;IAmD/E,gBAAgB,CACpB,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAwF/B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAOnC,UAAU;IAIJ,eAAe,CAAC,OAAO,EAAE,MAAM;;;;;;;;;;;;IAe/B,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAW3C"}
|
|
@@ -1,10 +1,43 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
2
18
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
19
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
20
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
21
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
22
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
23
|
};
|
|
24
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
25
|
+
var ownKeys = function(o) {
|
|
26
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
27
|
+
var ar = [];
|
|
28
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
29
|
+
return ar;
|
|
30
|
+
};
|
|
31
|
+
return ownKeys(o);
|
|
32
|
+
};
|
|
33
|
+
return function (mod) {
|
|
34
|
+
if (mod && mod.__esModule) return mod;
|
|
35
|
+
var result = {};
|
|
36
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
37
|
+
__setModuleDefault(result, mod);
|
|
38
|
+
return result;
|
|
39
|
+
};
|
|
40
|
+
})();
|
|
8
41
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
42
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
43
|
};
|
|
@@ -18,6 +51,7 @@ const api_locale_1 = require("@hed-hog/api-locale");
|
|
|
18
51
|
const api_pagination_1 = require("@hed-hog/api-pagination");
|
|
19
52
|
const api_prisma_1 = require("@hed-hog/api-prisma");
|
|
20
53
|
const common_1 = require("@nestjs/common");
|
|
54
|
+
const pako = __importStar(require("pako"));
|
|
21
55
|
let SettingService = class SettingService {
|
|
22
56
|
constructor(prismaService, paginationService, localeService) {
|
|
23
57
|
this.prismaService = prismaService;
|
|
@@ -37,17 +71,20 @@ let SettingService = class SettingService {
|
|
|
37
71
|
value: true,
|
|
38
72
|
}
|
|
39
73
|
});
|
|
40
|
-
|
|
74
|
+
// Converte para JSON e compacta com gzip
|
|
75
|
+
const jsonString = JSON.stringify(settings);
|
|
76
|
+
const compressed = pako.gzip(jsonString);
|
|
77
|
+
return Buffer.from(compressed);
|
|
41
78
|
}
|
|
42
79
|
async importSettings(file) {
|
|
43
|
-
var _a;
|
|
44
|
-
const content = ((_a = file.buffer) === null || _a === void 0 ? void 0 : _a.toString('utf-8')) || '';
|
|
45
80
|
let json;
|
|
46
81
|
try {
|
|
47
|
-
|
|
82
|
+
// Descompacta o arquivo .hedhog
|
|
83
|
+
const decompressed = pako.ungzip(file.buffer, { to: 'string' });
|
|
84
|
+
json = JSON.parse(decompressed);
|
|
48
85
|
}
|
|
49
86
|
catch (err) {
|
|
50
|
-
throw new common_1.BadRequestException((0, api_locale_1.getLocaleText)('
|
|
87
|
+
throw new common_1.BadRequestException((0, api_locale_1.getLocaleText)('invalidCompressedFile', 'en', 'File is not a valid .hedhog file or is corrupted.'));
|
|
51
88
|
}
|
|
52
89
|
if (!Array.isArray(json)) {
|
|
53
90
|
throw new common_1.BadRequestException((0, api_locale_1.getLocaleText)('invalidJsonArray', 'en', 'The JSON file must contain an array of settings.'));
|
|
@@ -66,11 +103,14 @@ let SettingService = class SettingService {
|
|
|
66
103
|
const existingSlugs = existingSettings.map((s) => s.slug);
|
|
67
104
|
const validSlugs = slugsFromFile.filter((slug) => existingSlugs.includes(slug));
|
|
68
105
|
const invalidSlugs = slugsFromFile.filter((slug) => !existingSlugs.includes(slug));
|
|
106
|
+
// Filtra apenas os dados válidos para retornar
|
|
107
|
+
const validData = json.filter((item) => validSlugs.includes(item.slug));
|
|
69
108
|
return {
|
|
70
109
|
totalSettings: slugsFromFile.length,
|
|
71
110
|
validSettings: validSlugs.length,
|
|
72
111
|
invalidSlugs,
|
|
73
112
|
validSlugs,
|
|
113
|
+
fileData: validData,
|
|
74
114
|
};
|
|
75
115
|
}
|
|
76
116
|
async confirmImport(settings) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setting.service.js","sourceRoot":"","sources":["../../src/setting/setting.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"setting.service.js","sourceRoot":"","sources":["../../src/setting/setting.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,11 @@
|
|
|
1
|
-
import { OnModuleInit } from "@nestjs/common";
|
|
2
1
|
import { JwtService } from "@nestjs/jwt";
|
|
3
2
|
import { SecurityService } from "../security/security.service";
|
|
4
3
|
import { SettingService } from "../setting/setting.service";
|
|
5
|
-
export declare class TokenService
|
|
4
|
+
export declare class TokenService {
|
|
6
5
|
private readonly jwt;
|
|
7
6
|
private readonly security;
|
|
8
7
|
private readonly setting;
|
|
9
|
-
settings: Record<string, any>;
|
|
10
8
|
constructor(jwt: JwtService, security: SecurityService, setting: SettingService);
|
|
11
|
-
onModuleInit(): Promise<void>;
|
|
12
9
|
verify(locale: string, token: string): Promise<any>;
|
|
13
10
|
createAccessToken(payload: Record<string, any>): Promise<string>;
|
|
14
11
|
createOpaqueToken(size?: number): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.service.d.ts","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":"
|
|
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;IAQpC,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;CAe/H"}
|
|
@@ -23,12 +23,6 @@ let TokenService = class TokenService {
|
|
|
23
23
|
this.jwt = jwt;
|
|
24
24
|
this.security = security;
|
|
25
25
|
this.setting = setting;
|
|
26
|
-
this.settings = {};
|
|
27
|
-
}
|
|
28
|
-
async onModuleInit() {
|
|
29
|
-
this.settings = await this.setting.getSettingValues([
|
|
30
|
-
'url'
|
|
31
|
-
]);
|
|
32
26
|
}
|
|
33
27
|
async verify(locale, token) {
|
|
34
28
|
try {
|
|
@@ -46,10 +40,13 @@ let TokenService = class TokenService {
|
|
|
46
40
|
async createOpaqueToken(size = 64) {
|
|
47
41
|
return this.security.randomOpaque(size);
|
|
48
42
|
}
|
|
49
|
-
getCookieDomain() {
|
|
50
|
-
|
|
43
|
+
async getCookieDomain() {
|
|
44
|
+
const settings = await this.setting.getSettingValues([
|
|
45
|
+
'url'
|
|
46
|
+
]);
|
|
47
|
+
if (settings['url']) {
|
|
51
48
|
try {
|
|
52
|
-
return new URL(
|
|
49
|
+
return new URL(settings['url']).hostname;
|
|
53
50
|
}
|
|
54
51
|
catch (_a) {
|
|
55
52
|
return process.env.COOKIE_DOMAIN;
|
|
@@ -58,7 +55,7 @@ let TokenService = class TokenService {
|
|
|
58
55
|
return process.env.COOKIE_DOMAIN;
|
|
59
56
|
}
|
|
60
57
|
async removeRefreshTokenCookie(res) {
|
|
61
|
-
const domain = this.getCookieDomain();
|
|
58
|
+
const domain = await this.getCookieDomain();
|
|
62
59
|
const isLocalhost = !domain || domain === 'localhost';
|
|
63
60
|
const cookieOptions = {
|
|
64
61
|
httpOnly: true,
|
|
@@ -71,7 +68,7 @@ let TokenService = class TokenService {
|
|
|
71
68
|
res.clearCookie('rt', cookieOptions);
|
|
72
69
|
}
|
|
73
70
|
async setRefreshTokenCookie(locale, res, token, expires_at) {
|
|
74
|
-
const domain = this.getCookieDomain();
|
|
71
|
+
const domain = await this.getCookieDomain();
|
|
75
72
|
const isLocalhost = !domain || domain === 'localhost';
|
|
76
73
|
const maxAge = expires_at.getTime() - Date.now();
|
|
77
74
|
const cookieOptions = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.service.js","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"token.service.js","sourceRoot":"","sources":["../../src/token/token.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,3 @@
|
|
|
1
|
-
- slug: hidden
|
|
2
|
-
icon: eye-off
|
|
3
|
-
name:
|
|
4
|
-
en: Hidden
|
|
5
|
-
pt: Oculto
|
|
6
|
-
description:
|
|
7
|
-
en: Hidden settings and configurations.
|
|
8
|
-
pt: Configurações e definições ocultas.
|
|
9
|
-
relations:
|
|
10
|
-
setting:
|
|
11
|
-
- slug: configured-mail
|
|
12
|
-
type: boolean
|
|
13
|
-
name:
|
|
14
|
-
en: Configured Mail
|
|
15
|
-
pt: Email Configurado
|
|
16
|
-
description:
|
|
17
|
-
en: Indicates if the mail is configured
|
|
18
|
-
pt: Indica se o email está configurado
|
|
19
|
-
value: false
|
|
20
|
-
user_override: false
|
|
21
1
|
- slug: general
|
|
22
2
|
icon: settings
|
|
23
3
|
name:
|
|
@@ -882,6 +862,17 @@
|
|
|
882
862
|
pt: Configurar as definições de email.
|
|
883
863
|
relations:
|
|
884
864
|
setting:
|
|
865
|
+
- slug: configured-mail
|
|
866
|
+
type: boolean
|
|
867
|
+
name:
|
|
868
|
+
en: Configured Mail
|
|
869
|
+
pt: Email Configurado
|
|
870
|
+
description:
|
|
871
|
+
en: Indicates if the mail is configured
|
|
872
|
+
pt: Indica se o email está configurado
|
|
873
|
+
value: false
|
|
874
|
+
user_override: false
|
|
875
|
+
component: switch
|
|
885
876
|
- slug: mail-provider
|
|
886
877
|
type: string
|
|
887
878
|
name:
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hed-hog/core",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.10",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"dependencies": {
|
|
@@ -22,18 +22,19 @@
|
|
|
22
22
|
"handlebars": "^4.7.8",
|
|
23
23
|
"jsonwebtoken": "^9.0.2",
|
|
24
24
|
"multer": "^2.0.1",
|
|
25
|
+
"pako": "^2.1.0",
|
|
25
26
|
"png-to-ico": "^2.1.8",
|
|
26
27
|
"qrcode": "^1.5.4",
|
|
27
28
|
"rxjs": "^7.8.2",
|
|
28
29
|
"sharp": "^0.34.2",
|
|
29
30
|
"speakeasy": "^2.0.0",
|
|
30
31
|
"uuid": "^11.1.0",
|
|
31
|
-
"@hed-hog/api-prisma": "0.0.4",
|
|
32
32
|
"@hed-hog/api": "0.0.3",
|
|
33
|
-
"@hed-hog/
|
|
33
|
+
"@hed-hog/api-locale": "0.0.10",
|
|
34
|
+
"@hed-hog/api-prisma": "0.0.4",
|
|
34
35
|
"@hed-hog/api-mail": "0.0.7",
|
|
35
36
|
"@hed-hog/api-pagination": "0.0.3",
|
|
36
|
-
"@hed-hog/
|
|
37
|
+
"@hed-hog/types": "0.0.1"
|
|
37
38
|
},
|
|
38
39
|
"exports": {
|
|
39
40
|
".": {
|
|
@@ -59,7 +60,8 @@
|
|
|
59
60
|
"devDependencies": {
|
|
60
61
|
"@types/cookie-parser": "^1.4.10",
|
|
61
62
|
"@types/express": "^4.17.24",
|
|
62
|
-
"@types/multer": "^2.0.0"
|
|
63
|
+
"@types/multer": "^2.0.0",
|
|
64
|
+
"@types/pako": "^2.0.4"
|
|
63
65
|
},
|
|
64
66
|
"scripts": {
|
|
65
67
|
"_dev": "pnpm build --watch",
|
package/src/auth/auth.service.ts
CHANGED
|
@@ -6,7 +6,6 @@ import {
|
|
|
6
6
|
forwardRef,
|
|
7
7
|
Inject,
|
|
8
8
|
Injectable,
|
|
9
|
-
OnModuleInit,
|
|
10
9
|
} from '@nestjs/common';
|
|
11
10
|
import { ChallengeService } from '../challenge/challenge.service';
|
|
12
11
|
import { MailService as MailManagerService } from '../mail/mail.service';
|
|
@@ -19,8 +18,7 @@ import { ForgetDTO } from './dto/forget.dto';
|
|
|
19
18
|
import { LoginDTO } from './dto/login.dto';
|
|
20
19
|
|
|
21
20
|
@Injectable()
|
|
22
|
-
export class AuthService
|
|
23
|
-
public settings: Record<string, any> = {};
|
|
21
|
+
export class AuthService {
|
|
24
22
|
|
|
25
23
|
constructor(
|
|
26
24
|
@Inject(forwardRef(() => PrismaService))
|
|
@@ -41,21 +39,6 @@ export class AuthService implements OnModuleInit {
|
|
|
41
39
|
private readonly challenge: ChallengeService,
|
|
42
40
|
) { }
|
|
43
41
|
|
|
44
|
-
async onModuleInit() {
|
|
45
|
-
this.settings = await this.setting.getSettingValues([
|
|
46
|
-
'mfa-issuer',
|
|
47
|
-
'mfa-window',
|
|
48
|
-
'mfa-setp',
|
|
49
|
-
'system-name',
|
|
50
|
-
'google_client_id',
|
|
51
|
-
'google_client_secret',
|
|
52
|
-
'google_scopes',
|
|
53
|
-
'url',
|
|
54
|
-
'mfa-challenge-expiration-minutes',
|
|
55
|
-
'access-token-expiration-minutes'
|
|
56
|
-
]);
|
|
57
|
-
}
|
|
58
|
-
|
|
59
42
|
async getAuthenticationPayload(locale: string, userId: number, ipAddress: string,
|
|
60
43
|
userAgent: string) {
|
|
61
44
|
const payload = { sub: userId };
|
|
@@ -259,6 +242,12 @@ export class AuthService implements OnModuleInit {
|
|
|
259
242
|
|
|
260
243
|
let isValid = false;
|
|
261
244
|
|
|
245
|
+
const settings = await this.setting.getSettingValues([
|
|
246
|
+
'mfa-issuer',
|
|
247
|
+
'mfa-window',
|
|
248
|
+
'mfa-setp',
|
|
249
|
+
]);
|
|
250
|
+
|
|
262
251
|
if (methodType === 'totp') {
|
|
263
252
|
const totpMfa = user.user_mfa.find(m => m.type === 'totp' && m.user_mfa_totp);
|
|
264
253
|
if (totpMfa && totpMfa.user_mfa_totp[0]) {
|
|
@@ -267,8 +256,8 @@ export class AuthService implements OnModuleInit {
|
|
|
267
256
|
? Buffer.from(secretBuffer).toString('utf-8')
|
|
268
257
|
: String(secretBuffer);
|
|
269
258
|
|
|
270
|
-
const window =
|
|
271
|
-
const step =
|
|
259
|
+
const window = settings['mfa-window'] ?? 0;
|
|
260
|
+
const step = settings['mfa-setp'] ?? 30;
|
|
272
261
|
|
|
273
262
|
const speakeasy = require('speakeasy');
|
|
274
263
|
isValid = speakeasy.totp.verify({
|
|
@@ -302,8 +291,8 @@ export class AuthService implements OnModuleInit {
|
|
|
302
291
|
? Buffer.from(secretBuffer).toString('utf-8')
|
|
303
292
|
: String(secretBuffer);
|
|
304
293
|
|
|
305
|
-
const window =
|
|
306
|
-
const step =
|
|
294
|
+
const window = settings['mfa-window'] ?? 0;
|
|
295
|
+
const step = settings['mfa-setp'] ?? 30;
|
|
307
296
|
|
|
308
297
|
const speakeasy = require('speakeasy');
|
|
309
298
|
isValid = speakeasy.totp.verify({
|
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
import { getLocaleText } from "@hed-hog/api-locale";
|
|
2
2
|
import { PrismaService } from '@hed-hog/api-prisma';
|
|
3
|
-
import { BadRequestException, forwardRef, Inject, Injectable, NotFoundException
|
|
3
|
+
import { BadRequestException, forwardRef, Inject, Injectable, NotFoundException } from "@nestjs/common";
|
|
4
4
|
import { MailService } from "../mail/mail.service";
|
|
5
5
|
import { SecurityService } from "../security/security.service";
|
|
6
6
|
import { SettingService } from "../setting/setting.service";
|
|
7
7
|
import { TokenService } from "../token/token.service";
|
|
8
8
|
|
|
9
9
|
@Injectable()
|
|
10
|
-
export class ChallengeService
|
|
11
|
-
|
|
12
|
-
public settings: Record<string, any> = {};
|
|
10
|
+
export class ChallengeService {
|
|
13
11
|
|
|
14
12
|
constructor(
|
|
15
13
|
private readonly prisma: PrismaService,
|
|
@@ -23,15 +21,12 @@ export class ChallengeService implements OnModuleInit {
|
|
|
23
21
|
private readonly mail: MailService,
|
|
24
22
|
) { }
|
|
25
23
|
|
|
26
|
-
async
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
'mfa-email-code-length'
|
|
30
|
-
'url'
|
|
24
|
+
async verifyEmail(locale: string, userId: number, email: string) {
|
|
25
|
+
|
|
26
|
+
const settings = await this.setting.getSettingValues([
|
|
27
|
+
'mfa-email-code-length'
|
|
31
28
|
]);
|
|
32
|
-
}
|
|
33
29
|
|
|
34
|
-
async verifyEmail(locale: string, userId: number, email: string) {
|
|
35
30
|
const user = await this.prisma.user.findUnique({
|
|
36
31
|
where: { id: userId },
|
|
37
32
|
select: { name: true }
|
|
@@ -41,7 +36,7 @@ export class ChallengeService implements OnModuleInit {
|
|
|
41
36
|
throw new NotFoundException(getLocaleText('userNotFound', locale, 'User not found.'));
|
|
42
37
|
}
|
|
43
38
|
|
|
44
|
-
const code = Array.from(crypto.getRandomValues(new Uint8Array(
|
|
39
|
+
const code = Array.from(crypto.getRandomValues(new Uint8Array(settings['mfa-email-code-length'] || 6)))
|
|
45
40
|
.map(n => (n % 10).toString())
|
|
46
41
|
.join('');
|
|
47
42
|
|
|
@@ -62,6 +57,11 @@ export class ChallengeService implements OnModuleInit {
|
|
|
62
57
|
}
|
|
63
58
|
|
|
64
59
|
async verifyMultipleEmails(locale: string, userId: number, emails: string[]) {
|
|
60
|
+
|
|
61
|
+
const settings = await this.setting.getSettingValues([
|
|
62
|
+
'mfa-email-code-length',
|
|
63
|
+
]);
|
|
64
|
+
|
|
65
65
|
const user = await this.prisma.user.findUnique({
|
|
66
66
|
where: { id: userId },
|
|
67
67
|
select: { name: true }
|
|
@@ -71,7 +71,7 @@ export class ChallengeService implements OnModuleInit {
|
|
|
71
71
|
throw new NotFoundException(getLocaleText('userNotFound', locale, 'User not found.'));
|
|
72
72
|
}
|
|
73
73
|
|
|
74
|
-
const code = Array.from(crypto.getRandomValues(new Uint8Array(
|
|
74
|
+
const code = Array.from(crypto.getRandomValues(new Uint8Array(settings['mfa-email-code-length'] || 6)))
|
|
75
75
|
.map(n => (n % 10).toString())
|
|
76
76
|
.join('');
|
|
77
77
|
|
|
@@ -118,12 +118,18 @@ export class ChallengeService implements OnModuleInit {
|
|
|
118
118
|
});
|
|
119
119
|
|
|
120
120
|
if (!userMfaEmail) throw new BadRequestException(getLocaleText('forgot.userNotFound', locale, 'User not found'));
|
|
121
|
+
|
|
122
|
+
const settings = await this.setting.getSettingValues([
|
|
123
|
+
'mfa-challenge-expiration-minutes',
|
|
124
|
+
'url'
|
|
125
|
+
]);
|
|
126
|
+
|
|
121
127
|
const token = await this.token.createOpaqueToken(16);
|
|
122
128
|
const hash = this.security.hashWithPepper(token);
|
|
123
129
|
const challenge = await this.prisma.user_mfa_challenge.create({
|
|
124
130
|
data: {
|
|
125
131
|
hash,
|
|
126
|
-
expires_at: new Date(Date.now() + (
|
|
132
|
+
expires_at: new Date(Date.now() + (settings['mfa-challenge-expiration-minutes'] || 15) * 60000),
|
|
127
133
|
user_mfa_id: userMfaEmail.user_mfa_id,
|
|
128
134
|
},
|
|
129
135
|
});
|
|
@@ -135,7 +141,7 @@ export class ChallengeService implements OnModuleInit {
|
|
|
135
141
|
email,
|
|
136
142
|
slug: 'auth-forget-password',
|
|
137
143
|
variables: {
|
|
138
|
-
link: `${
|
|
144
|
+
link: `${settings['url']}/reset-password?token=${tokenBase64}`,
|
|
139
145
|
name: userMfaEmail.user_mfa.user.name,
|
|
140
146
|
}
|
|
141
147
|
}
|
|
@@ -212,12 +218,17 @@ export class ChallengeService implements OnModuleInit {
|
|
|
212
218
|
throw new BadRequestException(getLocaleText('userNotFound', locale, 'User not found.'));
|
|
213
219
|
}
|
|
214
220
|
|
|
215
|
-
const
|
|
221
|
+
const settings = await this.setting.getSettingValues([
|
|
222
|
+
'mfa-challenge-expiration-minutes',
|
|
223
|
+
'mfa-email-code-length'
|
|
224
|
+
]);
|
|
225
|
+
|
|
226
|
+
const code = Array.from(crypto.getRandomValues(new Uint8Array(settings['mfa-email-code-length'] || 6)))
|
|
216
227
|
.map(n => (n % 10).toString())
|
|
217
228
|
.join('');
|
|
218
229
|
|
|
219
230
|
const hash = this.security.hashWithPepper(code);
|
|
220
|
-
const expiresAt = new Date(Date.now() + (
|
|
231
|
+
const expiresAt = new Date(Date.now() + (settings['mfa-challenge-expiration-minutes'] || 15) * 60000);
|
|
221
232
|
const existingUserMfa = await this.prisma.user_mfa.findFirst({
|
|
222
233
|
where: { user_id: userId, type: 'email' },
|
|
223
234
|
select: { id: true }
|
|
@@ -286,12 +297,17 @@ export class ChallengeService implements OnModuleInit {
|
|
|
286
297
|
throw new BadRequestException(getLocaleText('userNotFound', locale, 'User not found.'));
|
|
287
298
|
}
|
|
288
299
|
|
|
289
|
-
const
|
|
300
|
+
const settings = await this.setting.getSettingValues([
|
|
301
|
+
'mfa-challenge-expiration-minutes',
|
|
302
|
+
'mfa-email-code-length',
|
|
303
|
+
]);
|
|
304
|
+
|
|
305
|
+
const code = Array.from(crypto.getRandomValues(new Uint8Array(settings['mfa-email-code-length'] || 6)))
|
|
290
306
|
.map(n => (n % 10).toString())
|
|
291
307
|
.join('');
|
|
292
308
|
|
|
293
309
|
const hash = this.security.hashWithPepper(code);
|
|
294
|
-
const expiresAt = new Date(Date.now() + (
|
|
310
|
+
const expiresAt = new Date(Date.now() + (settings['mfa-challenge-expiration-minutes'] || 15) * 60000);
|
|
295
311
|
|
|
296
312
|
const existingUserMfa = await this.prisma.user_mfa.findFirst({
|
|
297
313
|
where: { user_id: userId, type: 'email' },
|