@bidding-micro/shared 1.0.5 → 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/constants/enum.constant.js.map +1 -1
- package/dist/constants/rolePermissionsMap.constant.js.map +1 -1
- package/dist/decorators/currentUser.decorator.js.map +1 -1
- package/dist/guard/role.guard.js +9 -8
- package/dist/guard/role.guard.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +32 -32
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enum.constant.js","sourceRoot":"","sources":["../../src/constants/enum.constant.ts"],"names":[],"mappings":";;;AAAA,6CAAmD;AAEnD,IAAY,IAGX;AAHD,WAAY,IAAI;IACd,uBAAe,CAAA;IACf,qBAAa,CAAA;AACf,CAAC,EAHW,IAAI,oBAAJ,IAAI,QAGf;AACY,QAAA,QAAQ,GAAW,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAEpD,IAAY,
|
|
1
|
+
{"version":3,"file":"enum.constant.js","sourceRoot":"","sources":["../../src/constants/enum.constant.ts"],"names":[],"mappings":";;;AAAA,6CAAmD;AAEnD,IAAY,IAGX;AAHD,WAAY,IAAI;IACd,uBAAe,CAAA;IACf,qBAAa,CAAA;AACf,CAAC,EAHW,IAAI,oBAAJ,IAAI,QAGf;AACY,QAAA,QAAQ,GAAW,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAEpD,IAAY,UAaX;AAbD,WAAY,UAAU;IAEpB,yCAA2B,CAAA;IAC3B,yCAA2B,CAAA;IAC3B,+CAAiC,CAAA;IACjC,qCAAuB,CAAA;IACvB,qDAAuC,CAAA;IAGvC,+CAAiC,CAAA;IACjC,iDAAmC,CAAA;IACnC,iDAAmC,CAAA;IACnC,+BAAiB,CAAA;AACnB,CAAC,EAbW,UAAU,0BAAV,UAAU,QAarB;AAED,IAAA,0BAAgB,EAAC,UAAU,EAAE;IAC3B,IAAI,EAAE,YAAY;IAClB,WAAW,EAAE,oCAAoC;CAClD,CAAC,CAAC;AAEH,IAAA,0BAAgB,EAAC,IAAI,EAAE;IACrB,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,0BAA0B;CACxC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rolePermissionsMap.constant.js","sourceRoot":"","sources":["../../src/constants/rolePermissionsMap.constant.ts"],"names":[],"mappings":";;;AAAA,mDAAmD;AAEtC,QAAA,kBAAkB,GAA+B;IAC5D,CAAC,oBAAI,CAAC,KAAK,CAAC,EAAE;QAEZ,0BAAU,CAAC,WAAW;QACtB,0BAAU,CAAC,WAAW;QACtB,0BAAU,CAAC,cAAc;QACzB,0BAAU,CAAC,cAAc;QACzB,0BAAU,CAAC,eAAe;QAC1B,0BAAU,CAAC,eAAe;QAC1B,0BAAU,CAAC,MAAM;QACjB,0BAAU,CAAC,SAAS;QACpB,0BAAU,CAAC,iBAAiB;
|
|
1
|
+
{"version":3,"file":"rolePermissionsMap.constant.js","sourceRoot":"","sources":["../../src/constants/rolePermissionsMap.constant.ts"],"names":[],"mappings":";;;AAAA,mDAAmD;AAEtC,QAAA,kBAAkB,GAA+B;IAC5D,CAAC,oBAAI,CAAC,KAAK,CAAC,EAAE;QAEZ,0BAAU,CAAC,WAAW;QACtB,0BAAU,CAAC,WAAW;QACtB,0BAAU,CAAC,cAAc;QACzB,0BAAU,CAAC,cAAc;QACzB,0BAAU,CAAC,eAAe;QAC1B,0BAAU,CAAC,eAAe;QAC1B,0BAAU,CAAC,MAAM;QACjB,0BAAU,CAAC,SAAS;QACpB,0BAAU,CAAC,iBAAiB;KAC7B;IAED,CAAC,oBAAI,CAAC,IAAI,CAAC,EAAE;QAEX,0BAAU,CAAC,WAAW;QACtB,0BAAU,CAAC,cAAc;QACzB,0BAAU,CAAC,eAAe;QAC1B,0BAAU,CAAC,eAAe;QAC1B,0BAAU,CAAC,MAAM;KAClB;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"currentUser.decorator.js","sourceRoot":"","sources":["../../src/decorators/currentUser.decorator.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"currentUser.decorator.js","sourceRoot":"","sources":["../../src/decorators/currentUser.decorator.ts"],"names":[],"mappings":";;;AAAA,6CAAsD;AACtD,sEAAgE;AAChE,2CAIwB;AAEX,QAAA,WAAW,GAAG,IAAA,6BAAoB,EAC7C,CAAC,IAAa,EAAE,OAAyB,EAAE,EAAE;IAC3C,MAAM,GAAG,GAAG,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;IAC7D,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;IAC1B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,4BAAmB,CAAC,kCAAc,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CACF,CAAC"}
|
package/dist/guard/role.guard.js
CHANGED
|
@@ -31,7 +31,10 @@ let RoleGuard = class RoleGuard {
|
|
|
31
31
|
throw new Error('USER_SERVICE not provided in AuthCommonModule context');
|
|
32
32
|
}
|
|
33
33
|
const ctx = graphql_1.GqlExecutionContext.create(context);
|
|
34
|
-
const request = ctx.getContext()
|
|
34
|
+
const request = ctx.getContext()?.req;
|
|
35
|
+
if (!request) {
|
|
36
|
+
return true;
|
|
37
|
+
}
|
|
35
38
|
const token = await this.extractTokenFromHeader(request);
|
|
36
39
|
if (!token) {
|
|
37
40
|
throw new common_1.UnauthorizedException(await this.i18n.t('user.NO_TOKEN'));
|
|
@@ -45,16 +48,11 @@ let RoleGuard = class RoleGuard {
|
|
|
45
48
|
}
|
|
46
49
|
const userResponse = await this.userService.findById(userId);
|
|
47
50
|
const user = userResponse.data || userResponse;
|
|
48
|
-
console.log("user", user);
|
|
49
51
|
const hasRole = this.validateRole(user.role, requiredRoles);
|
|
50
|
-
console.log(hasRole);
|
|
51
52
|
const userPermissions = rolePermissionsMap_constant_1.rolePermissionsMap[user.role] ?? [];
|
|
52
|
-
console.log(userPermissions);
|
|
53
53
|
const hasPermissions = this.validatePermissions(userPermissions, requiredPermissions);
|
|
54
|
-
|
|
55
|
-
if (!hasRole || !hasPermissions) {
|
|
54
|
+
if (!hasRole || !hasPermissions)
|
|
56
55
|
throw new common_1.UnauthorizedException(await this.i18n.t('user.INSUFFICIENT_PERMISSIONS'));
|
|
57
|
-
}
|
|
58
56
|
request['user'] = {
|
|
59
57
|
id: user.id,
|
|
60
58
|
email: user.email,
|
|
@@ -64,7 +62,10 @@ let RoleGuard = class RoleGuard {
|
|
|
64
62
|
return true;
|
|
65
63
|
}
|
|
66
64
|
extractTokenFromHeader(request) {
|
|
67
|
-
const
|
|
65
|
+
const authHeader = request?.headers?.['authorization'];
|
|
66
|
+
if (!authHeader)
|
|
67
|
+
return null;
|
|
68
|
+
const [type, token] = authHeader.split(' ');
|
|
68
69
|
return type === 'Bearer' ? token : null;
|
|
69
70
|
}
|
|
70
71
|
async verifyToken(token) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.guard.js","sourceRoot":"","sources":["../../src/guard/role.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAOwB;AACxB,uCAAyC;AACzC,6CAAsD;AACtD,qCAAyC;AACzC,6CAA0C;AAE1C,0FAA8E;AASvE,IAAM,SAAS,GAAf,MAAM,SAAS;IACpB,YACmB,IAAiB,EACjB,UAAsB,EACtB,SAAoB,EAGpB,WAA0B;QAL1B,SAAI,GAAJ,IAAI,CAAa;QACjB,eAAU,GAAV,UAAU,CAAY;QACtB,cAAS,GAAT,SAAS,CAAW;QAGpB,gBAAW,GAAX,WAAW,CAAe;IAC1C,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,OAAyB;QACzC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,GAAG,GAAG,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"role.guard.js","sourceRoot":"","sources":["../../src/guard/role.guard.ts"],"names":[],"mappings":"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"}
|