@lenne.tech/nest-server 9.2.4 → 9.2.5
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/core/modules/auth/guards/auth.guard.js.map +1 -1
- package/dist/core/modules/auth/guards/roles.guard.js +11 -1
- package/dist/core/modules/auth/guards/roles.guard.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/core/modules/auth/guards/auth.guard.ts +1 -2
- package/src/core/modules/auth/guards/roles.guard.ts +13 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/guards/auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/guards/auth.guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,8 @@ const core_1 = require("@nestjs/core");
|
|
|
15
15
|
const graphql_1 = require("@nestjs/graphql");
|
|
16
16
|
const role_enum_1 = require("../../../common/enums/role.enum");
|
|
17
17
|
const auth_guard_strategy_enum_1 = require("../auth-guard-strategy.enum");
|
|
18
|
+
const expired_token_exception_1 = require("../exceptions/expired-token.exception");
|
|
19
|
+
const invalid_token_exception_1 = require("../exceptions/invalid-token.exception");
|
|
18
20
|
const auth_guard_1 = require("./auth.guard");
|
|
19
21
|
let RolesGuard = class RolesGuard extends (0, auth_guard_1.AuthGuard)(auth_guard_strategy_enum_1.AuthGuardStrategy.JWT) {
|
|
20
22
|
constructor(reflector) {
|
|
@@ -35,10 +37,18 @@ let RolesGuard = class RolesGuard extends (0, auth_guard_1.AuthGuard)(auth_guard
|
|
|
35
37
|
return user;
|
|
36
38
|
}
|
|
37
39
|
if (!user?.hasRole?.(roles)) {
|
|
38
|
-
const args = graphql_1.GqlExecutionContext.create(context).getArgs();
|
|
39
40
|
if ((user && roles.includes(role_enum_1.RoleEnum.S_USER)) || roles.includes(role_enum_1.RoleEnum.S_EVERYONE)) {
|
|
40
41
|
return user;
|
|
41
42
|
}
|
|
43
|
+
if (!user) {
|
|
44
|
+
if (err) {
|
|
45
|
+
throw new invalid_token_exception_1.InvalidTokenException();
|
|
46
|
+
}
|
|
47
|
+
if (info?.name === 'TokenExpiredError') {
|
|
48
|
+
throw new expired_token_exception_1.ExpiredTokenException();
|
|
49
|
+
}
|
|
50
|
+
throw new common_1.UnauthorizedException('Unauthorized');
|
|
51
|
+
}
|
|
42
52
|
throw new common_1.UnauthorizedException('Missing role');
|
|
43
53
|
}
|
|
44
54
|
return user;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roles.guard.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/guards/roles.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAqF;AACrF,uCAAyC;AACzC,6CAAsD;AACtD,+DAA2D;AAC3D,0EAAgE;AAChE,6CAAyC;AAUlC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,IAAA,sBAAS,EAAC,4CAAiB,CAAC,GAAG,CAAC;IAI9D,YAA+B,SAAoB;QACjD,KAAK,EAAE,CAAC;QADqB,cAAS,GAAT,SAAS,CAAW;IAEnD,CAAC;IAKQ,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO;QAE7C,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAa,OAAO,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC9G,MAAM,KAAK,GAAa,cAAc,CAAC,CAAC,CAAC;YACvC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;gBAC9C,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QAGtB,IAAI,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,oBAAQ,CAAC,QAAQ,CAAC,EAAE;YAC9C,MAAM,IAAI,8BAAqB,CAAC,WAAW,CAAC,CAAC;SAC9C;QAGD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;YAC7C,OAAO,IAAI,CAAC;SACb;QAGD,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE;YAE3B,
|
|
1
|
+
{"version":3,"file":"roles.guard.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/guards/roles.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAqF;AACrF,uCAAyC;AACzC,6CAAsD;AACtD,+DAA2D;AAC3D,0EAAgE;AAChE,mFAA8E;AAC9E,mFAA8E;AAC9E,6CAAyC;AAUlC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,IAAA,sBAAS,EAAC,4CAAiB,CAAC,GAAG,CAAC;IAI9D,YAA+B,SAAoB;QACjD,KAAK,EAAE,CAAC;QADqB,cAAS,GAAT,SAAS,CAAW;IAEnD,CAAC;IAKQ,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO;QAE7C,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAa,OAAO,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC9G,MAAM,KAAK,GAAa,cAAc,CAAC,CAAC,CAAC;YACvC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;gBAC9C,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QAGtB,IAAI,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,oBAAQ,CAAC,QAAQ,CAAC,EAAE;YAC9C,MAAM,IAAI,8BAAqB,CAAC,WAAW,CAAC,CAAC;SAC9C;QAGD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;YAC7C,OAAO,IAAI,CAAC;SACb;QAGD,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE;YAE3B,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,oBAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,oBAAQ,CAAC,UAAU,CAAC,EAAE;gBACpF,OAAO,IAAI,CAAC;aACb;YAGD,IAAI,CAAC,IAAI,EAAE;gBACT,IAAI,GAAG,EAAE;oBACP,MAAM,IAAI,+CAAqB,EAAE,CAAC;iBACnC;gBACD,IAAI,IAAI,EAAE,IAAI,KAAK,mBAAmB,EAAE;oBACtC,MAAM,IAAI,+CAAqB,EAAE,CAAC;iBACnC;gBACD,MAAM,IAAI,8BAAqB,CAAC,cAAc,CAAC,CAAC;aACjD;YAGD,MAAM,IAAI,8BAAqB,CAAC,cAAc,CAAC,CAAC;SACjD;QAGD,OAAO,IAAI,CAAC;IACd,CAAC;IAKD,UAAU,CAAC,OAAyB;QAClC,MAAM,GAAG,GAAG,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAChD,OAAO,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;IACvF,CAAC;CACF,CAAA;AA/DY,UAAU;IADtB,IAAA,mBAAU,GAAE;qCAK+B,gBAAS;GAJxC,UAAU,CA+DtB;AA/DY,gCAAU"}
|