@hedhog/admin 0.46.4 → 0.46.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.
Files changed (5) hide show
  1. package/dist/auth/guards/auth.guard.d.ts.map +1 -1
  2. package/dist/auth/guards/auth.guard.js +16 -9
  3. package/dist/auth/guards/auth.guard.js.map +1 -1
  4. package/package.json +5 -6
  5. package/src/auth/guards/auth.guard.ts +11 -7
package/dist/auth/guards/auth.guard.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auth.guard.d.ts","sourceRoot":"","sources":["../../../src/auth/guards/auth.guard.ts"],"names":[],"mappings":"AAAA,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;AAG9C,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;IA0B9D,OAAO,CAAC,sBAAsB;CAK/B"}
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"}
package/dist/auth/guards/auth.guard.js CHANGED
@@ -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 core_1 = require("@nestjs/core");
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(core_2.IS_PUBLIC_KEY, [
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
- throw new common_1.UnauthorizedException();
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
- throw new common_1.UnauthorizedException(error);
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
- core_1.Reflector])
61
+ core_2.Reflector])
55
62
  ], AuthGuard);
56
63
  //# sourceMappingURL=auth.guard.js.map
package/dist/auth/guards/auth.guard.js.map CHANGED
@@ -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;AAC9C,uCAA6C;AAGtC,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,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QACd,CAAC;QAED,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,MAAM,IAAI,8BAAqB,EAAE,CAAC;QACpC,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,MAAM,IAAI,8BAAqB,CAAC,KAAK,CAAC,CAAC;QACzC,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;AArCY,8BAAS;oBAAT,SAAS;IADrB,IAAA,mBAAU,GAAE;qCAGK,0BAAW;QACN,gBAAS;GAHnB,SAAS,CAqCrB"}
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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hedhog/admin",
3
- "version": "0.46.4",
3
+ "version": "0.46.5",
4
4
  "private": false,
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -21,12 +21,12 @@
21
21
  "license": "MIT",
22
22
  "description": "",
23
23
  "dependencies": {
24
- "@hedhog/mail": "^0.36.1"
24
+ "@hedhog/mail": "^0.46.1"
25
25
  },
26
26
  "devDependencies": {
27
- "@hedhog/locale": "^0.36.1",
28
- "@hedhog/pagination": "^0.36.1",
29
- "@hedhog/prisma": "^0.36.1",
27
+ "@hedhog/locale": "^0.46.1",
28
+ "@hedhog/pagination": "^0.46.1",
29
+ "@hedhog/prisma": "^0.46.1",
30
30
  "@hedhog/utils": "^0.0.28",
31
31
  "@nestjs/mapped-types": "^2.0.5",
32
32
  "ts-node": "^10.9.1",
@@ -34,7 +34,6 @@
34
34
  },
35
35
  "peerDependencies": {
36
36
  "@hedhog/locale": "latest",
37
- "@hedhog/mail": "latest",
38
37
  "@hedhog/pagination": "latest",
39
38
  "@hedhog/prisma": "latest",
40
39
  "@hedhog/utils": "latest",
package/src/auth/guards/auth.guard.ts 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
- throw new UnauthorizedException();
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
- throw new UnauthorizedException(error);
40
+ if (isPublic) {
41
+ return true;
42
+ } else {
43
+ throw new UnauthorizedException(error);
44
+ }
41
45
  }
42
46
  return true;
43
47
  }