@hedhog/admin 0.46.4 → 0.46.6
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/guards/auth.guard.d.ts.map +1 -1
- package/dist/auth/guards/auth.guard.js +16 -9
- package/dist/auth/guards/auth.guard.js.map +1 -1
- package/dist/menu/menu.controller.d.ts +6 -6
- package/dist/menu/menu.service.d.ts +6 -6
- package/hedhog.yaml +0 -125
- package/package.json +1 -1
- package/src/auth/guards/auth.guard.ts +11 -7
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"auth.guard.d.ts","sourceRoot":"","sources":["../../../src/auth/guards/auth.guard.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"auth.guard.d.ts","sourceRoot":"","sources":["../../../src/auth/guards/auth.guard.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,gBAAgB,EAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,qBACa,SAAU,YAAW,WAAW;IAEzC,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,SAAS;gBADT,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,SAAS;IAGxB,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA8B9D,OAAO,CAAC,sBAAsB;CAK/B"}
|
@@ -10,34 +10,41 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
10
10
|
};
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
12
12
|
exports.AuthGuard = void 0;
|
13
|
+
const core_1 = require("@hedhog/core");
|
13
14
|
const common_1 = require("@nestjs/common");
|
14
|
-
const
|
15
|
+
const core_2 = require("@nestjs/core");
|
15
16
|
const auth_service_1 = require("../auth.service");
|
16
|
-
const core_2 = require("@hedhog/core");
|
17
17
|
let AuthGuard = class AuthGuard {
|
18
18
|
constructor(auth, reflector) {
|
19
19
|
this.auth = auth;
|
20
20
|
this.reflector = reflector;
|
21
21
|
}
|
22
22
|
async canActivate(context) {
|
23
|
-
const isPublic = this.reflector.getAllAndOverride(
|
23
|
+
const isPublic = this.reflector.getAllAndOverride(core_1.IS_PUBLIC_KEY, [
|
24
24
|
context.getHandler(),
|
25
25
|
context.getClass(),
|
26
26
|
]);
|
27
|
-
if (isPublic) {
|
28
|
-
return true;
|
29
|
-
}
|
30
27
|
const request = context.switchToHttp().getRequest();
|
31
28
|
const token = this.extractTokenFromHeader(request);
|
32
29
|
if (!token) {
|
33
|
-
|
30
|
+
if (isPublic) {
|
31
|
+
return true;
|
32
|
+
}
|
33
|
+
else {
|
34
|
+
throw new common_1.UnauthorizedException();
|
35
|
+
}
|
34
36
|
}
|
35
37
|
try {
|
36
38
|
const payload = await this.auth.verifyToken(token);
|
37
39
|
request['auth'] = payload;
|
38
40
|
}
|
39
41
|
catch (error) {
|
40
|
-
|
42
|
+
if (isPublic) {
|
43
|
+
return true;
|
44
|
+
}
|
45
|
+
else {
|
46
|
+
throw new common_1.UnauthorizedException(error);
|
47
|
+
}
|
41
48
|
}
|
42
49
|
return true;
|
43
50
|
}
|
@@ -51,6 +58,6 @@ exports.AuthGuard = AuthGuard;
|
|
51
58
|
exports.AuthGuard = AuthGuard = __decorate([
|
52
59
|
(0, common_1.Injectable)(),
|
53
60
|
__metadata("design:paramtypes", [auth_service_1.AuthService,
|
54
|
-
|
61
|
+
core_2.Reflector])
|
55
62
|
], AuthGuard);
|
56
63
|
//# sourceMappingURL=auth.guard.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../../src/auth/guards/auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAKwB;AACxB,uCAAyC;AAEzC,kDAA8C;
|
1
|
+
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../../src/auth/guards/auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA6C;AAC7C,2CAKwB;AACxB,uCAAyC;AAEzC,kDAA8C;AAGvC,IAAM,SAAS,GAAf,MAAM,SAAS;IACpB,YACU,IAAiB,EACjB,SAAoB;QADpB,SAAI,GAAJ,IAAI,CAAa;QACjB,cAAS,GAAT,SAAS,CAAW;IAC3B,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,OAAyB;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAU,oBAAa,EAAE;YACxE,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACnB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAEnD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,8BAAqB,EAAE,CAAC;YACpC,CAAC;QACH,CAAC;QACD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAEnD,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;QAC5B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,8BAAqB,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,sBAAsB,CAAC,OAAgB;;QAC7C,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAA,MAAA,OAAO,CAAC,OAAO,CAAC,aAAa,0CAAE,KAAK,CAAC,GAAG,CAAC,mCAAI,EAAE,CAAC;QAEtE,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/C,CAAC;CACF,CAAA;AAzCY,8BAAS;oBAAT,SAAS;IADrB,IAAA,mBAAU,GAAE;qCAGK,0BAAW;QACN,gBAAS;GAHnB,SAAS,CAyCrB"}
|
@@ -43,31 +43,31 @@ export declare class MenuController {
|
|
43
43
|
id: number;
|
44
44
|
created_at: Date;
|
45
45
|
updated_at: Date;
|
46
|
-
slug: string;
|
47
|
-
icon: string | null;
|
48
46
|
menu_id: number | null;
|
47
|
+
slug: string;
|
49
48
|
url: string | null;
|
50
49
|
order: number;
|
50
|
+
icon: string | null;
|
51
51
|
}>;
|
52
52
|
create(data: CreateDTO): Promise<{
|
53
53
|
id: number;
|
54
54
|
created_at: Date;
|
55
55
|
updated_at: Date;
|
56
|
-
slug: string;
|
57
|
-
icon: string | null;
|
58
56
|
menu_id: number | null;
|
57
|
+
slug: string;
|
59
58
|
url: string | null;
|
60
59
|
order: number;
|
60
|
+
icon: string | null;
|
61
61
|
}>;
|
62
62
|
update(menuId: number, data: UpdateDTO): Promise<{
|
63
63
|
id: number;
|
64
64
|
created_at: Date;
|
65
65
|
updated_at: Date;
|
66
|
-
slug: string;
|
67
|
-
icon: string | null;
|
68
66
|
menu_id: number | null;
|
67
|
+
slug: string;
|
69
68
|
url: string | null;
|
70
69
|
order: number;
|
70
|
+
icon: string | null;
|
71
71
|
}>;
|
72
72
|
delete(data: DeleteDTO): Promise<import(".prisma/client").Prisma.BatchPayload>;
|
73
73
|
updateOrder(data: OrderDTO): Promise<void>;
|
@@ -44,21 +44,21 @@ export declare class MenuService {
|
|
44
44
|
id: number;
|
45
45
|
created_at: Date;
|
46
46
|
updated_at: Date;
|
47
|
-
slug: string;
|
48
|
-
icon: string | null;
|
49
47
|
menu_id: number | null;
|
48
|
+
slug: string;
|
50
49
|
url: string | null;
|
51
50
|
order: number;
|
51
|
+
icon: string | null;
|
52
52
|
}>;
|
53
53
|
create({ slug, url, icon, order, menuId }: CreateDTO): Promise<{
|
54
54
|
id: number;
|
55
55
|
created_at: Date;
|
56
56
|
updated_at: Date;
|
57
|
-
slug: string;
|
58
|
-
icon: string | null;
|
59
57
|
menu_id: number | null;
|
58
|
+
slug: string;
|
60
59
|
url: string | null;
|
61
60
|
order: number;
|
61
|
+
icon: string | null;
|
62
62
|
}>;
|
63
63
|
update({ id, data }: {
|
64
64
|
id: number;
|
@@ -67,11 +67,11 @@ export declare class MenuService {
|
|
67
67
|
id: number;
|
68
68
|
created_at: Date;
|
69
69
|
updated_at: Date;
|
70
|
-
slug: string;
|
71
|
-
icon: string | null;
|
72
70
|
menu_id: number | null;
|
71
|
+
slug: string;
|
73
72
|
url: string | null;
|
74
73
|
order: number;
|
74
|
+
icon: string | null;
|
75
75
|
}>;
|
76
76
|
delete({ ids }: DeleteDTO): Promise<import(".prisma/client").Prisma.BatchPayload>;
|
77
77
|
updateOrder({ ids }: OrderDTO): Promise<void>;
|
package/hedhog.yaml
CHANGED
@@ -86,26 +86,6 @@ data:
|
|
86
86
|
method: PATCH
|
87
87
|
- url: /screen
|
88
88
|
method: DELETE
|
89
|
-
- url: /setting
|
90
|
-
method: GET
|
91
|
-
- url: /setting/group/:slug
|
92
|
-
method: GET
|
93
|
-
- url: /setting/group
|
94
|
-
method: GET
|
95
|
-
- url: /setting/:settingId
|
96
|
-
method: GET
|
97
|
-
- url: /setting
|
98
|
-
method: POST
|
99
|
-
- url: /setting
|
100
|
-
method: PUT
|
101
|
-
- url: /setting/:slug
|
102
|
-
method: PUT
|
103
|
-
- url: /setting/user/:slug
|
104
|
-
method: PUT
|
105
|
-
- url: /setting/:settingId
|
106
|
-
method: PATCH
|
107
|
-
- url: /setting
|
108
|
-
method: DELETE
|
109
89
|
- url: /user
|
110
90
|
method: GET
|
111
91
|
- url: /user/:userId/role
|
@@ -301,47 +281,6 @@ data:
|
|
301
281
|
en: Route
|
302
282
|
pt: Rotas
|
303
283
|
slug: /management/route
|
304
|
-
- url: /management/setting
|
305
|
-
icon: settings
|
306
|
-
name:
|
307
|
-
en: Setting
|
308
|
-
pt: Configurações
|
309
|
-
slug: /management/setting
|
310
|
-
- menu_id:
|
311
|
-
where:
|
312
|
-
slug: /management
|
313
|
-
slug: /settings
|
314
|
-
icon: settings
|
315
|
-
name:
|
316
|
-
en: Settings
|
317
|
-
pt: Configurações
|
318
|
-
- menu_id:
|
319
|
-
where:
|
320
|
-
slug: /settings
|
321
|
-
name:
|
322
|
-
en: Setting Group
|
323
|
-
pt: Grupo de Configuração
|
324
|
-
icon: settings
|
325
|
-
url: /settings/setting-group
|
326
|
-
slug: /settings/setting-group
|
327
|
-
- menu_id:
|
328
|
-
where:
|
329
|
-
slug: /settings
|
330
|
-
name:
|
331
|
-
en: Setting User
|
332
|
-
pt: Configuração de Usuário
|
333
|
-
icon: user-cog
|
334
|
-
url: /settings/setting-user
|
335
|
-
slug: /settings/setting-user
|
336
|
-
- menu_id:
|
337
|
-
where:
|
338
|
-
slug: /settings
|
339
|
-
name:
|
340
|
-
en: Locale
|
341
|
-
pt: Locale
|
342
|
-
icon: world
|
343
|
-
url: /settings/locale
|
344
|
-
slug: /settings/locale
|
345
284
|
screen:
|
346
285
|
- slug: /management/user
|
347
286
|
icon: user
|
@@ -408,48 +347,6 @@ data:
|
|
408
347
|
- where:
|
409
348
|
url:
|
410
349
|
like: /route%
|
411
|
-
- slug: /management/setting
|
412
|
-
icon: settings
|
413
|
-
name:
|
414
|
-
en: Setting
|
415
|
-
pt: Configurações
|
416
|
-
description:
|
417
|
-
en: Manage system setting and configurations.
|
418
|
-
pt: Gerenciar configurações e definições do sistema.
|
419
|
-
relations:
|
420
|
-
route:
|
421
|
-
- where:
|
422
|
-
url:
|
423
|
-
like: /setting%
|
424
|
-
- name:
|
425
|
-
en: Setting Group
|
426
|
-
pt: Grupo de Configuração
|
427
|
-
slug: /settings/setting-group
|
428
|
-
description:
|
429
|
-
en: Screen to manage a group of settings
|
430
|
-
pt: Tela para gerenciar grupo de configurações
|
431
|
-
icon: settings
|
432
|
-
- name:
|
433
|
-
en: Setting User
|
434
|
-
pt: Configuração de Usuário
|
435
|
-
slug: /settings/setting-user
|
436
|
-
description:
|
437
|
-
en: Screen to manage user settings
|
438
|
-
pt: Tela para gerenciar configurações de usuário
|
439
|
-
icon: user-cog
|
440
|
-
- name:
|
441
|
-
en: Locale
|
442
|
-
pt: Locale
|
443
|
-
slug: /settings/locale
|
444
|
-
description:
|
445
|
-
en: Screen to manage locale
|
446
|
-
pt: Tela para gerenciar localização/tradução
|
447
|
-
icon: world
|
448
|
-
relations:
|
449
|
-
route:
|
450
|
-
- where:
|
451
|
-
url:
|
452
|
-
like: /locale%
|
453
350
|
multifactor:
|
454
351
|
- name:
|
455
352
|
en: Email
|
@@ -883,25 +780,3 @@ tables:
|
|
883
780
|
- type: created_at
|
884
781
|
- type: updated_at
|
885
782
|
ifNotExists: true
|
886
|
-
setting_user:
|
887
|
-
columns:
|
888
|
-
- name: user_id
|
889
|
-
type: fk
|
890
|
-
isPrimary: true
|
891
|
-
references:
|
892
|
-
table: user
|
893
|
-
column: id
|
894
|
-
onDelete: CASCADE
|
895
|
-
- name: setting_id
|
896
|
-
type: fk
|
897
|
-
isPrimary: true
|
898
|
-
references:
|
899
|
-
table: setting
|
900
|
-
column: id
|
901
|
-
onDelete: CASCADE
|
902
|
-
- name: value
|
903
|
-
length: 1023
|
904
|
-
isNullable: true
|
905
|
-
- type: created_at
|
906
|
-
- type: updated_at
|
907
|
-
ifNotExists: true
|
package/package.json
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
import { IS_PUBLIC_KEY } from '@hedhog/core';
|
1
2
|
import {
|
2
3
|
CanActivate,
|
3
4
|
ExecutionContext,
|
@@ -7,7 +8,6 @@ import {
|
|
7
8
|
import { Reflector } from '@nestjs/core';
|
8
9
|
import { Request } from 'express';
|
9
10
|
import { AuthService } from '../auth.service';
|
10
|
-
import { IS_PUBLIC_KEY } from '@hedhog/core';
|
11
11
|
|
12
12
|
@Injectable()
|
13
13
|
export class AuthGuard implements CanActivate {
|
@@ -22,22 +22,26 @@ export class AuthGuard implements CanActivate {
|
|
22
22
|
context.getClass(),
|
23
23
|
]);
|
24
24
|
|
25
|
-
if (isPublic) {
|
26
|
-
return true;
|
27
|
-
}
|
28
|
-
|
29
25
|
const request = context.switchToHttp().getRequest();
|
30
26
|
const token = this.extractTokenFromHeader(request);
|
31
27
|
|
32
28
|
if (!token) {
|
33
|
-
|
29
|
+
if (isPublic) {
|
30
|
+
return true;
|
31
|
+
} else {
|
32
|
+
throw new UnauthorizedException();
|
33
|
+
}
|
34
34
|
}
|
35
35
|
try {
|
36
36
|
const payload = await this.auth.verifyToken(token);
|
37
37
|
|
38
38
|
request['auth'] = payload;
|
39
39
|
} catch (error) {
|
40
|
-
|
40
|
+
if (isPublic) {
|
41
|
+
return true;
|
42
|
+
} else {
|
43
|
+
throw new UnauthorizedException(error);
|
44
|
+
}
|
41
45
|
}
|
42
46
|
return true;
|
43
47
|
}
|