@volontariapp/auth 2.1.16-snap-e3bade7 → 3.0.0-snap-55be23a
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/CHANGELOG.md +5 -4
- package/dist/auth.module.d.ts +3 -0
- package/dist/auth.module.d.ts.map +1 -1
- package/dist/auth.module.js +60 -10
- package/dist/auth.module.js.map +1 -1
- package/dist/constants/index.d.ts +2 -0
- package/dist/constants/index.d.ts.map +1 -1
- package/dist/constants/index.js +2 -0
- package/dist/constants/index.js.map +1 -1
- package/dist/decorators/public.decorator.d.ts +2 -0
- package/dist/decorators/public.decorator.d.ts.map +1 -0
- package/dist/decorators/public.decorator.js +4 -0
- package/dist/decorators/public.decorator.js.map +1 -0
- package/dist/decorators/refresh-token.decorator.d.ts +2 -0
- package/dist/decorators/refresh-token.decorator.d.ts.map +1 -0
- package/dist/decorators/refresh-token.decorator.js +7 -0
- package/dist/decorators/refresh-token.decorator.js.map +1 -0
- package/dist/guards/access-token.guard.d.ts +3 -1
- package/dist/guards/access-token.guard.d.ts.map +1 -1
- package/dist/guards/access-token.guard.js +25 -5
- package/dist/guards/access-token.guard.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/interceptors/grpc-internal.interceptor.d.ts +3 -3
- package/dist/interceptors/grpc-internal.interceptor.d.ts.map +1 -1
- package/dist/interceptors/grpc-internal.interceptor.js +10 -7
- package/dist/interceptors/grpc-internal.interceptor.js.map +1 -1
- package/dist/middlewares/access-token.middleware.d.ts.map +1 -1
- package/dist/middlewares/access-token.middleware.js +3 -0
- package/dist/middlewares/access-token.middleware.js.map +1 -1
- package/dist/middlewares/refresh-token.middleware.d.ts.map +1 -1
- package/dist/middlewares/refresh-token.middleware.js +9 -1
- package/dist/middlewares/refresh-token.middleware.js.map +1 -1
- package/dist/services/grpc-metadata.helper.d.ts +1 -1
- package/dist/services/grpc-metadata.helper.d.ts.map +1 -1
- package/dist/services/grpc-metadata.helper.js +2 -1
- package/dist/services/grpc-metadata.helper.js.map +1 -1
- package/dist/test/example/public-test.controller.d.ts +23 -0
- package/dist/test/example/public-test.controller.d.ts.map +1 -0
- package/dist/test/example/public-test.controller.js +83 -0
- package/dist/test/example/public-test.controller.js.map +1 -0
- package/dist/test/integration/full-auth-flow.int.spec.js +31 -10
- package/dist/test/integration/full-auth-flow.int.spec.js.map +1 -1
- package/dist/test/integration/public-bypass.int.spec.d.ts +2 -0
- package/dist/test/integration/public-bypass.int.spec.d.ts.map +1 -0
- package/dist/test/integration/public-bypass.int.spec.js +127 -0
- package/dist/test/integration/public-bypass.int.spec.js.map +1 -0
- package/dist/test/unit/access-token.guard.unit.spec.d.ts +2 -0
- package/dist/test/unit/access-token.guard.unit.spec.d.ts.map +1 -0
- package/dist/test/unit/access-token.guard.unit.spec.js +69 -0
- package/dist/test/unit/access-token.guard.unit.spec.js.map +1 -0
- package/dist/test/unit/access-token.middleware.unit.spec.d.ts +2 -0
- package/dist/test/unit/access-token.middleware.unit.spec.d.ts.map +1 -0
- package/dist/test/unit/access-token.middleware.unit.spec.js +65 -0
- package/dist/test/unit/access-token.middleware.unit.spec.js.map +1 -0
- package/dist/test/unit/grpc-internal.interceptor.unit.spec.js +14 -7
- package/dist/test/unit/grpc-internal.interceptor.unit.spec.js.map +1 -1
- package/dist/test/unit/grpc-metadata.helper.unit.spec.d.ts +2 -0
- package/dist/test/unit/grpc-metadata.helper.unit.spec.d.ts.map +1 -0
- package/dist/test/unit/grpc-metadata.helper.unit.spec.js +25 -0
- package/dist/test/unit/grpc-metadata.helper.unit.spec.js.map +1 -0
- package/dist/test/unit/refresh-token.guard.unit.spec.d.ts +2 -0
- package/dist/test/unit/refresh-token.guard.unit.spec.d.ts.map +1 -0
- package/dist/test/unit/refresh-token.guard.unit.spec.js +43 -0
- package/dist/test/unit/refresh-token.guard.unit.spec.js.map +1 -0
- package/dist/test/unit/refresh-token.middleware.unit.spec.d.ts +2 -0
- package/dist/test/unit/refresh-token.middleware.unit.spec.d.ts.map +1 -0
- package/dist/test/unit/refresh-token.middleware.unit.spec.js +44 -0
- package/dist/test/unit/refresh-token.middleware.unit.spec.js.map +1 -0
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
-
##
|
|
3
|
+
## 3.0.0
|
|
4
4
|
|
|
5
|
-
###
|
|
5
|
+
### Major Changes
|
|
6
6
|
|
|
7
|
-
-
|
|
8
|
-
|
|
7
|
+
- Added support for user roles
|
|
8
|
+
- Added support for grpc internal requests
|
|
9
|
+
- Added support for grpc internal responses
|
|
9
10
|
|
|
10
11
|
## 2.1.15
|
|
11
12
|
|
package/dist/auth.module.d.ts
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import type { DynamicModule } from '@nestjs/common';
|
|
2
2
|
import type { AuthConfig } from './interfaces/index.js';
|
|
3
3
|
export declare class AuthModule {
|
|
4
|
+
private static createCommonProviders;
|
|
4
5
|
static register(options: AuthConfig): DynamicModule;
|
|
6
|
+
static registerGateway(options: AuthConfig): DynamicModule;
|
|
7
|
+
static registerMicroservice(options: AuthConfig): DynamicModule;
|
|
5
8
|
}
|
|
6
9
|
//# sourceMappingURL=auth.module.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.module.d.ts","sourceRoot":"","sources":["../src/auth.module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"auth.module.d.ts","sourceRoot":"","sources":["../src/auth.module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAY,MAAM,gBAAgB,CAAC;AAI9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAQxD,qBAEa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAepC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,aAAa;IAuBnD,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,UAAU,GAAG,aAAa;IAqB1D,MAAM,CAAC,oBAAoB,CAAC,OAAO,EAAE,UAAU,GAAG,aAAa;CAOhE"}
|
package/dist/auth.module.js
CHANGED
|
@@ -9,23 +9,73 @@ import { Module, Global } from '@nestjs/common';
|
|
|
9
9
|
import { JwtService } from './services/jwt.service.js';
|
|
10
10
|
import { AUTH_OPTIONS } from './constants/index.js';
|
|
11
11
|
import { GrpcMetadataHelper } from './services/grpc-metadata.helper.js';
|
|
12
|
+
import { GrpcInternalInterceptor } from './interceptors/grpc-internal.interceptor.js';
|
|
13
|
+
import { AccessTokenGuard } from './guards/access-token.guard.js';
|
|
14
|
+
import { RefreshTokenGuard } from './guards/refresh-token.guard.js';
|
|
15
|
+
import { RolesGuard } from './guards/roles.guard.js';
|
|
16
|
+
import { GrpcInternalGuard } from './guards/grpc-internal.guard.js';
|
|
12
17
|
let AuthModule = AuthModule_1 = class AuthModule {
|
|
18
|
+
static createCommonProviders(options) {
|
|
19
|
+
return [
|
|
20
|
+
{
|
|
21
|
+
provide: AUTH_OPTIONS,
|
|
22
|
+
useValue: options,
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
provide: JwtService,
|
|
26
|
+
useFactory: (opts) => new JwtService(opts),
|
|
27
|
+
inject: [AUTH_OPTIONS],
|
|
28
|
+
},
|
|
29
|
+
GrpcMetadataHelper,
|
|
30
|
+
];
|
|
31
|
+
}
|
|
13
32
|
static register(options) {
|
|
14
33
|
return {
|
|
15
34
|
module: AuthModule_1,
|
|
16
35
|
providers: [
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
36
|
+
...this.createCommonProviders(options),
|
|
37
|
+
AccessTokenGuard,
|
|
38
|
+
RefreshTokenGuard,
|
|
39
|
+
RolesGuard,
|
|
40
|
+
GrpcInternalGuard,
|
|
41
|
+
GrpcInternalInterceptor,
|
|
42
|
+
],
|
|
43
|
+
exports: [
|
|
44
|
+
JwtService,
|
|
45
|
+
GrpcMetadataHelper,
|
|
46
|
+
AccessTokenGuard,
|
|
47
|
+
RefreshTokenGuard,
|
|
48
|
+
RolesGuard,
|
|
49
|
+
GrpcInternalGuard,
|
|
50
|
+
GrpcInternalInterceptor,
|
|
51
|
+
],
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
static registerGateway(options) {
|
|
55
|
+
return {
|
|
56
|
+
module: AuthModule_1,
|
|
57
|
+
providers: [
|
|
58
|
+
...this.createCommonProviders(options),
|
|
59
|
+
AccessTokenGuard,
|
|
60
|
+
RefreshTokenGuard,
|
|
61
|
+
RolesGuard,
|
|
62
|
+
GrpcInternalInterceptor,
|
|
63
|
+
],
|
|
64
|
+
exports: [
|
|
65
|
+
JwtService,
|
|
26
66
|
GrpcMetadataHelper,
|
|
67
|
+
AccessTokenGuard,
|
|
68
|
+
RefreshTokenGuard,
|
|
69
|
+
RolesGuard,
|
|
70
|
+
GrpcInternalInterceptor,
|
|
27
71
|
],
|
|
28
|
-
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
static registerMicroservice(options) {
|
|
75
|
+
return {
|
|
76
|
+
module: AuthModule_1,
|
|
77
|
+
providers: [...this.createCommonProviders(options), GrpcInternalGuard],
|
|
78
|
+
exports: [JwtService, GrpcMetadataHelper, GrpcInternalGuard],
|
|
29
79
|
};
|
|
30
80
|
}
|
|
31
81
|
};
|
package/dist/auth.module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../src/auth.module.ts"],"names":[],"mappings":";;;;;;;AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../src/auth.module.ts"],"names":[],"mappings":";;;;;;;AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAI7D,IAAM,UAAU,kBAAhB,MAAM,UAAU;IACb,MAAM,CAAC,qBAAqB,CAAC,OAAmB;QACtD,OAAO;YACL;gBACE,OAAO,EAAE,YAAY;gBACrB,QAAQ,EAAE,OAAO;aAClB;YACD;gBACE,OAAO,EAAE,UAAU;gBACnB,UAAU,EAAE,CAAC,IAAgB,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC;gBACtD,MAAM,EAAE,CAAC,YAAY,CAAC;aACvB;YACD,kBAAkB;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,OAAmB;QACjC,OAAO;YACL,MAAM,EAAE,YAAU;YAClB,SAAS,EAAE;gBACT,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC;gBACtC,gBAAgB;gBAChB,iBAAiB;gBACjB,UAAU;gBACV,iBAAiB;gBACjB,uBAAuB;aACxB;YACD,OAAO,EAAE;gBACP,UAAU;gBACV,kBAAkB;gBAClB,gBAAgB;gBAChB,iBAAiB;gBACjB,UAAU;gBACV,iBAAiB;gBACjB,uBAAuB;aACxB;SACF,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,OAAmB;QACxC,OAAO;YACL,MAAM,EAAE,YAAU;YAClB,SAAS,EAAE;gBACT,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC;gBACtC,gBAAgB;gBAChB,iBAAiB;gBACjB,UAAU;gBACV,uBAAuB;aACxB;YACD,OAAO,EAAE;gBACP,UAAU;gBACV,kBAAkB;gBAClB,gBAAgB;gBAChB,iBAAiB;gBACjB,UAAU;gBACV,uBAAuB;aACxB;SACF,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAC,OAAmB;QAC7C,OAAO;YACL,MAAM,EAAE,YAAU;YAClB,SAAS,EAAE,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE,iBAAiB,CAAC;YACtE,OAAO,EAAE,CAAC,UAAU,EAAE,kBAAkB,EAAE,iBAAiB,CAAC;SAC7D,CAAC;IACJ,CAAC;CACF,CAAA;AAnEY,UAAU;IAFtB,MAAM,EAAE;IACR,MAAM,CAAC,EAAE,CAAC;GACE,UAAU,CAmEtB"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
export declare const INTERNAL_TOKEN_METADATA_KEY = "x-internal-token";
|
|
2
2
|
export declare const AUTH_OPTIONS = "AUTH_OPTIONS";
|
|
3
|
+
export declare const IS_PUBLIC_KEY = "isPublic";
|
|
4
|
+
export declare const IS_REFRESH_TOKEN_KEY = "isRefreshToken";
|
|
3
5
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,2BAA2B,qBAAqB,CAAC;AAC9D,eAAO,MAAM,YAAY,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,2BAA2B,qBAAqB,CAAC;AAC9D,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAC3C,eAAO,MAAM,aAAa,aAAa,CAAC;AACxC,eAAO,MAAM,oBAAoB,mBAAmB,CAAC"}
|
package/dist/constants/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,2BAA2B,GAAG,kBAAkB,CAAC;AAC9D,MAAM,CAAC,MAAM,YAAY,GAAG,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,2BAA2B,GAAG,kBAAkB,CAAC;AAC9D,MAAM,CAAC,MAAM,YAAY,GAAG,cAAc,CAAC;AAC3C,MAAM,CAAC,MAAM,aAAa,GAAG,UAAU,CAAC;AACxC,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"public.decorator.d.ts","sourceRoot":"","sources":["../../src/decorators/public.decorator.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,MAAM,wDAAyC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"public.decorator.js","sourceRoot":"","sources":["../../src/decorators/public.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refresh-token.decorator.d.ts","sourceRoot":"","sources":["../../src/decorators/refresh-token.decorator.ts"],"names":[],"mappings":"AAIA,wBAAgB,eAAe,IAAI,eAAe,GAAG,cAAc,CAKlE"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { applyDecorators, SetMetadata, UseGuards } from '@nestjs/common';
|
|
2
|
+
import { IS_REFRESH_TOKEN_KEY } from '../constants/index.js';
|
|
3
|
+
import { RefreshTokenGuard } from '../guards/refresh-token.guard.js';
|
|
4
|
+
export function UseRefreshToken() {
|
|
5
|
+
return applyDecorators(SetMetadata(IS_REFRESH_TOKEN_KEY, true), UseGuards(RefreshTokenGuard));
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=refresh-token.decorator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refresh-token.decorator.js","sourceRoot":"","sources":["../../src/decorators/refresh-token.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,MAAM,UAAU,eAAe;IAC7B,OAAO,eAAe,CACpB,WAAW,CAAC,oBAAoB,EAAE,IAAI,CAAC,EACvC,SAAS,CAAC,iBAAiB,CAAC,CACO,CAAC;AACxC,CAAC"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import type { CanActivate, ExecutionContext } from '@nestjs/common';
|
|
2
|
+
import { Reflector } from '@nestjs/core';
|
|
2
3
|
import { JwtService } from '../services/jwt.service.js';
|
|
3
4
|
export declare class AccessTokenGuard implements CanActivate {
|
|
4
5
|
private readonly jwtService;
|
|
6
|
+
private readonly reflector;
|
|
5
7
|
private readonly logger;
|
|
6
|
-
constructor(jwtService: JwtService);
|
|
8
|
+
constructor(jwtService: JwtService, reflector: Reflector);
|
|
7
9
|
canActivate(context: ExecutionContext): Promise<boolean>;
|
|
8
10
|
}
|
|
9
11
|
//# sourceMappingURL=access-token.guard.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-token.guard.d.ts","sourceRoot":"","sources":["../../src/guards/access-token.guard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"access-token.guard.d.ts","sourceRoot":"","sources":["../../src/guards/access-token.guard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAKxD,qBACa,gBAAiB,YAAW,WAAW;IAGhD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAH5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+D;gBAEnE,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS;IAGjC,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAuC/D"}
|
|
@@ -8,20 +8,38 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
10
|
import { Injectable } from '@nestjs/common';
|
|
11
|
+
import { Reflector } from '@nestjs/core';
|
|
11
12
|
import { JwtService } from '../services/jwt.service.js';
|
|
12
13
|
import { MISSING_ACCESS_TOKEN, INVALID_ACCESS_TOKEN } from '@volontariapp/errors-nest';
|
|
13
14
|
import { Logger } from '@volontariapp/logger';
|
|
15
|
+
import { IS_PUBLIC_KEY, IS_REFRESH_TOKEN_KEY } from '../constants/index.js';
|
|
14
16
|
let AccessTokenGuard = class AccessTokenGuard {
|
|
15
17
|
jwtService;
|
|
18
|
+
reflector;
|
|
16
19
|
logger = new Logger({ context: 'AccessTokenGuard', format: 'json' });
|
|
17
|
-
constructor(jwtService) {
|
|
20
|
+
constructor(jwtService, reflector) {
|
|
18
21
|
this.jwtService = jwtService;
|
|
22
|
+
this.reflector = reflector;
|
|
19
23
|
}
|
|
20
24
|
async canActivate(context) {
|
|
25
|
+
const isPublic = this.reflector.getAllAndOverride(IS_PUBLIC_KEY, [
|
|
26
|
+
context.getHandler(),
|
|
27
|
+
context.getClass(),
|
|
28
|
+
]);
|
|
29
|
+
const isRefreshToken = this.reflector.getAllAndOverride(IS_REFRESH_TOKEN_KEY, [
|
|
30
|
+
context.getHandler(),
|
|
31
|
+
context.getClass(),
|
|
32
|
+
]);
|
|
33
|
+
if (isPublic || isRefreshToken) {
|
|
34
|
+
this.logger.debug(isPublic
|
|
35
|
+
? 'Route is public, bypassing authentication'
|
|
36
|
+
: 'Route is refresh token route, bypassing access token verification');
|
|
37
|
+
return true;
|
|
38
|
+
}
|
|
21
39
|
const request = context.switchToHttp().getRequest();
|
|
22
40
|
const token = request['accessToken'];
|
|
23
41
|
if (typeof token !== 'string') {
|
|
24
|
-
this.logger.warn('Access token is missing from request');
|
|
42
|
+
this.logger.warn('Authentication failed: Access token is missing from request');
|
|
25
43
|
throw MISSING_ACCESS_TOKEN();
|
|
26
44
|
}
|
|
27
45
|
try {
|
|
@@ -31,14 +49,16 @@ let AccessTokenGuard = class AccessTokenGuard {
|
|
|
31
49
|
return true;
|
|
32
50
|
}
|
|
33
51
|
catch (error) {
|
|
34
|
-
|
|
35
|
-
|
|
52
|
+
const message = error instanceof Error ? error.message : 'Unknown error';
|
|
53
|
+
this.logger.error(`Authentication failed: Access token verification failed - ${message}`);
|
|
54
|
+
throw INVALID_ACCESS_TOKEN(message);
|
|
36
55
|
}
|
|
37
56
|
}
|
|
38
57
|
};
|
|
39
58
|
AccessTokenGuard = __decorate([
|
|
40
59
|
Injectable(),
|
|
41
|
-
__metadata("design:paramtypes", [JwtService
|
|
60
|
+
__metadata("design:paramtypes", [JwtService,
|
|
61
|
+
Reflector])
|
|
42
62
|
], AccessTokenGuard);
|
|
43
63
|
export { AccessTokenGuard };
|
|
44
64
|
//# sourceMappingURL=access-token.guard.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-token.guard.js","sourceRoot":"","sources":["../../src/guards/access-token.guard.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"access-token.guard.js","sourceRoot":"","sources":["../../src/guards/access-token.guard.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAGrE,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAGR;IACA;IAHF,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACtF,YACmB,UAAsB,EACtB,SAAoB;QADpB,eAAU,GAAV,UAAU,CAAY;QACtB,cAAS,GAAT,SAAS,CAAW;IACpC,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,OAAyB;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAU,aAAa,EAAE;YACxE,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACnB,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAU,oBAAoB,EAAE;YACrF,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACnB,CAAC,CAAC;QAEH,IAAI,QAAQ,IAAI,cAAc,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,QAAQ;gBACN,CAAC,CAAC,2CAA2C;gBAC7C,CAAC,CAAC,mEAAmE,CACxE,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAA2B,CAAC;QAC7E,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;QAErC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;YAChF,MAAM,oBAAoB,EAAE,CAAC;QAC/B,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAC5D,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,EAAE,kCAAkC,CAAC,CAAC;YACrE,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;YACzE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6DAA6D,OAAO,EAAE,CAAC,CAAC;YAC1F,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;CACF,CAAA;AA9CY,gBAAgB;IAD5B,UAAU,EAAE;qCAIoB,UAAU;QACX,SAAS;GAJ5B,gBAAgB,CA8C5B"}
|
package/dist/index.d.ts
CHANGED
|
@@ -12,5 +12,7 @@ export * from './middlewares/access-token.middleware.js';
|
|
|
12
12
|
export * from './middlewares/refresh-token.middleware.js';
|
|
13
13
|
export * from './decorators/current-user.decorator.js';
|
|
14
14
|
export * from './decorators/roles.decorator.js';
|
|
15
|
+
export * from './decorators/public.decorator.js';
|
|
16
|
+
export * from './decorators/refresh-token.decorator.js';
|
|
15
17
|
export * from './interceptors/grpc-internal.interceptor.js';
|
|
16
18
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oCAAoC,CAAC;AACnD,cAAc,kBAAkB,CAAC;AACjC,cAAc,iCAAiC,CAAC;AAChD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,yBAAyB,CAAC;AACxC,cAAc,0CAA0C,CAAC;AACzD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,wCAAwC,CAAC;AACvD,cAAc,iCAAiC,CAAC;AAChD,cAAc,6CAA6C,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oCAAoC,CAAC;AACnD,cAAc,kBAAkB,CAAC;AACjC,cAAc,iCAAiC,CAAC;AAChD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,yBAAyB,CAAC;AACxC,cAAc,0CAA0C,CAAC;AACzD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,wCAAwC,CAAC;AACvD,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,yCAAyC,CAAC;AACxD,cAAc,6CAA6C,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -12,5 +12,7 @@ export * from './middlewares/access-token.middleware.js';
|
|
|
12
12
|
export * from './middlewares/refresh-token.middleware.js';
|
|
13
13
|
export * from './decorators/current-user.decorator.js';
|
|
14
14
|
export * from './decorators/roles.decorator.js';
|
|
15
|
+
export * from './decorators/public.decorator.js';
|
|
16
|
+
export * from './decorators/refresh-token.decorator.js';
|
|
15
17
|
export * from './interceptors/grpc-internal.interceptor.js';
|
|
16
18
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oCAAoC,CAAC;AACnD,cAAc,kBAAkB,CAAC;AACjC,cAAc,iCAAiC,CAAC;AAChD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,yBAAyB,CAAC;AACxC,cAAc,0CAA0C,CAAC;AACzD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,wCAAwC,CAAC;AACvD,cAAc,iCAAiC,CAAC;AAChD,cAAc,6CAA6C,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oCAAoC,CAAC;AACnD,cAAc,kBAAkB,CAAC;AACjC,cAAc,iCAAiC,CAAC;AAChD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,yBAAyB,CAAC;AACxC,cAAc,0CAA0C,CAAC;AACzD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,wCAAwC,CAAC;AACvD,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,yCAAyC,CAAC;AACxD,cAAc,6CAA6C,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import type { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
|
|
2
2
|
import type { Observable } from 'rxjs';
|
|
3
|
-
import {
|
|
3
|
+
import { GrpcMetadataHelper } from '../services/grpc-metadata.helper.js';
|
|
4
4
|
export declare class GrpcInternalInterceptor implements NestInterceptor {
|
|
5
|
-
private readonly
|
|
5
|
+
private readonly metadataHelper;
|
|
6
6
|
private readonly logger;
|
|
7
|
-
constructor(
|
|
7
|
+
constructor(metadataHelper: GrpcMetadataHelper);
|
|
8
8
|
intercept(context: ExecutionContext, next: CallHandler): Observable<unknown>;
|
|
9
9
|
}
|
|
10
10
|
//# sourceMappingURL=grpc-internal.interceptor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grpc-internal.interceptor.d.ts","sourceRoot":"","sources":["../../src/interceptors/grpc-internal.interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAErF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGvC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"grpc-internal.interceptor.d.ts","sourceRoot":"","sources":["../../src/interceptors/grpc-internal.interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAErF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAKzE,qBACa,uBAAwB,YAAW,eAAe;IAEjD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAD3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsE;gBAChE,cAAc,EAAE,kBAAkB;IAE/D,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU,CAAC,OAAO,CAAC;CAmB7E"}
|
|
@@ -10,13 +10,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
import { Injectable } from '@nestjs/common';
|
|
11
11
|
import { from } from 'rxjs';
|
|
12
12
|
import { switchMap } from 'rxjs/operators';
|
|
13
|
-
import {
|
|
13
|
+
import { GrpcMetadataHelper } from '../services/grpc-metadata.helper.js';
|
|
14
|
+
import { INTERNAL_TOKEN_METADATA_KEY } from '../constants/index.js';
|
|
14
15
|
import { Logger } from '@volontariapp/logger';
|
|
15
16
|
let GrpcInternalInterceptor = class GrpcInternalInterceptor {
|
|
16
|
-
|
|
17
|
+
metadataHelper;
|
|
17
18
|
logger = new Logger({ context: 'GrpcInternalInterceptor', format: 'json' });
|
|
18
|
-
constructor(
|
|
19
|
-
this.
|
|
19
|
+
constructor(metadataHelper) {
|
|
20
|
+
this.metadataHelper = metadataHelper;
|
|
20
21
|
}
|
|
21
22
|
intercept(context, next) {
|
|
22
23
|
const httpRequest = context.switchToHttp().getRequest();
|
|
@@ -24,17 +25,19 @@ let GrpcInternalInterceptor = class GrpcInternalInterceptor {
|
|
|
24
25
|
if (!user) {
|
|
25
26
|
return next.handle();
|
|
26
27
|
}
|
|
27
|
-
return from(this.
|
|
28
|
-
|
|
28
|
+
return from(this.metadataHelper.createInternalMetadata(user)).pipe(switchMap((metadata) => {
|
|
29
|
+
const token = metadata.get(INTERNAL_TOKEN_METADATA_KEY)[0];
|
|
30
|
+
this.logger.debug(`Transformed Access Token to Internal Token for user ${user.id}`);
|
|
29
31
|
const req = httpRequest;
|
|
30
32
|
req['internalToken'] = token;
|
|
33
|
+
req['internalMetadata'] = metadata;
|
|
31
34
|
return next.handle();
|
|
32
35
|
}));
|
|
33
36
|
}
|
|
34
37
|
};
|
|
35
38
|
GrpcInternalInterceptor = __decorate([
|
|
36
39
|
Injectable(),
|
|
37
|
-
__metadata("design:paramtypes", [
|
|
40
|
+
__metadata("design:paramtypes", [GrpcMetadataHelper])
|
|
38
41
|
], GrpcInternalInterceptor);
|
|
39
42
|
export { GrpcInternalInterceptor };
|
|
40
43
|
//# sourceMappingURL=grpc-internal.interceptor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grpc-internal.interceptor.js","sourceRoot":"","sources":["../../src/interceptors/grpc-internal.interceptor.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"grpc-internal.interceptor.js","sourceRoot":"","sources":["../../src/interceptors/grpc-internal.interceptor.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAEpE,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGvC,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAEL;IADZ,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7F,YAA6B,cAAkC;QAAlC,mBAAc,GAAd,cAAc,CAAoB;IAAG,CAAC;IAEnE,SAAS,CAAC,OAAyB,EAAE,IAAiB;QACpD,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAuB,CAAC;QAC7E,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;QAE9B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAChE,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE;YACrB,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAW,CAAC;YACrE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YACpF,MAAM,GAAG,GAAG,WAAiD,CAAC;YAC9D,GAAG,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC;YAC7B,GAAG,CAAC,kBAAkB,CAAC,GAAG,QAAQ,CAAC;YACnC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAA;AAvBY,uBAAuB;IADnC,UAAU,EAAE;qCAGkC,kBAAkB;GAFpD,uBAAuB,CAuBnC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-token.middleware.d.ts","sourceRoot":"","sources":["../../src/middlewares/access-token.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIrD,qBACa,qBAAsB,YAAW,cAAc;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoE;IAC3F,GAAG,QAAS,OAAO,QAAQ,OAAO,QAAQ,OAAO,KAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"access-token.middleware.d.ts","sourceRoot":"","sources":["../../src/middlewares/access-token.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIrD,qBACa,qBAAsB,YAAW,cAAc;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoE;IAC3F,GAAG,QAAS,OAAO,QAAQ,OAAO,QAAQ,OAAO,KAAG,IAAI,CAyBtD;CACH"}
|
|
@@ -27,6 +27,9 @@ let AccessTokenMiddleware = class AccessTokenMiddleware {
|
|
|
27
27
|
request['accessToken'] = token;
|
|
28
28
|
this.logger.debug('Extracted access token from request');
|
|
29
29
|
}
|
|
30
|
+
else {
|
|
31
|
+
this.logger.debug('No access token found in headers or cookies');
|
|
32
|
+
}
|
|
30
33
|
nextFn();
|
|
31
34
|
};
|
|
32
35
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-token.middleware.js","sourceRoot":"","sources":["../../src/middlewares/access-token.middleware.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGvC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IACf,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,OAAO,EAAE,uBAAuB,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3F,GAAG,GAAG,CAAC,GAAY,EAAE,IAAa,EAAE,IAAa,EAAQ,EAAE;QACzD,MAAM,OAAO,GAAG,GAA8B,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAkB,CAAC;QAClC,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAA4B,CAAC;QACtE,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;QAC5C,IAAI,KAAyB,CAAC;QAE9B,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACvE,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC;aAAM,IACL,OAAO,CAAC,SAAS,CAAC,KAAK,SAAS;YAChC,OAAO,OAAO,CAAC,SAAS,CAAC,KAAK,QAAQ;YACtC,OAAO,CAAC,SAAS,CAAC,KAAK,IAAI,EAC3B,CAAC;YACD,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAuC,CAAC;YACzE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;YAC9C,OAAO,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAC3D,CAAC;QACD,MAAM,EAAE,CAAC;IACX,CAAC,CAAC;CACH,CAAA;
|
|
1
|
+
{"version":3,"file":"access-token.middleware.js","sourceRoot":"","sources":["../../src/middlewares/access-token.middleware.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGvC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IACf,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,OAAO,EAAE,uBAAuB,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3F,GAAG,GAAG,CAAC,GAAY,EAAE,IAAa,EAAE,IAAa,EAAQ,EAAE;QACzD,MAAM,OAAO,GAAG,GAA8B,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAkB,CAAC;QAClC,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAA4B,CAAC;QACtE,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;QAC5C,IAAI,KAAyB,CAAC;QAE9B,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACvE,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC;aAAM,IACL,OAAO,CAAC,SAAS,CAAC,KAAK,SAAS;YAChC,OAAO,OAAO,CAAC,SAAS,CAAC,KAAK,QAAQ;YACtC,OAAO,CAAC,SAAS,CAAC,KAAK,IAAI,EAC3B,CAAC;YACD,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAuC,CAAC;YACzE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;YAC9C,OAAO,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACnE,CAAC;QACD,MAAM,EAAE,CAAC;IACX,CAAC,CAAC;CACH,CAAA;AA5BY,qBAAqB;IADjC,UAAU,EAAE;GACA,qBAAqB,CA4BjC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh-token.middleware.d.ts","sourceRoot":"","sources":["../../src/middlewares/refresh-token.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIrD,qBACa,sBAAuB,YAAW,cAAc;IAC3D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqE;IAC5F,GAAG,QAAS,OAAO,QAAQ,OAAO,QAAQ,OAAO,KAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"refresh-token.middleware.d.ts","sourceRoot":"","sources":["../../src/middlewares/refresh-token.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIrD,qBACa,sBAAuB,YAAW,cAAc;IAC3D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqE;IAC5F,GAAG,QAAS,OAAO,QAAQ,OAAO,QAAQ,OAAO,KAAG,IAAI,CAyBtD;CACH"}
|
|
@@ -11,8 +11,13 @@ let RefreshTokenMiddleware = class RefreshTokenMiddleware {
|
|
|
11
11
|
use = (req, _res, next) => {
|
|
12
12
|
const request = req;
|
|
13
13
|
const nextFn = next;
|
|
14
|
+
const headers = (request['headers'] ?? {});
|
|
15
|
+
const authHeader = headers['authorization'];
|
|
14
16
|
let token;
|
|
15
|
-
if (
|
|
17
|
+
if (typeof authHeader === 'string' && authHeader.startsWith('Bearer ')) {
|
|
18
|
+
token = authHeader.split(' ')[1];
|
|
19
|
+
}
|
|
20
|
+
else if (request['cookies'] !== undefined &&
|
|
16
21
|
typeof request['cookies'] === 'object' &&
|
|
17
22
|
request['cookies'] !== null) {
|
|
18
23
|
const cookies = request['cookies'];
|
|
@@ -22,6 +27,9 @@ let RefreshTokenMiddleware = class RefreshTokenMiddleware {
|
|
|
22
27
|
request['refreshToken'] = token;
|
|
23
28
|
this.logger.debug('Extracted refresh token from request');
|
|
24
29
|
}
|
|
30
|
+
else {
|
|
31
|
+
this.logger.warn('No refresh token found in headers or cookies');
|
|
32
|
+
}
|
|
25
33
|
nextFn();
|
|
26
34
|
};
|
|
27
35
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh-token.middleware.js","sourceRoot":"","sources":["../../src/middlewares/refresh-token.middleware.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGvC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAChB,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,OAAO,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5F,GAAG,GAAG,CAAC,GAAY,EAAE,IAAa,EAAE,IAAa,EAAQ,EAAE;QACzD,MAAM,OAAO,GAAG,GAA8B,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAkB,CAAC;QAClC,IAAI,KAAyB,CAAC;QAE9B,
|
|
1
|
+
{"version":3,"file":"refresh-token.middleware.js","sourceRoot":"","sources":["../../src/middlewares/refresh-token.middleware.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGvC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAChB,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,OAAO,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5F,GAAG,GAAG,CAAC,GAAY,EAAE,IAAa,EAAE,IAAa,EAAQ,EAAE;QACzD,MAAM,OAAO,GAAG,GAA8B,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAkB,CAAC;QAClC,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAA4B,CAAC;QACtE,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;QAC5C,IAAI,KAAyB,CAAC;QAE9B,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACvE,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC;aAAM,IACL,OAAO,CAAC,SAAS,CAAC,KAAK,SAAS;YAChC,OAAO,OAAO,CAAC,SAAS,CAAC,KAAK,QAAQ;YACtC,OAAO,CAAC,SAAS,CAAC,KAAK,IAAI,EAC3B,CAAC;YACD,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAuC,CAAC;YACzE,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC9D,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;YAC9C,OAAO,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC5D,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;QACnE,CAAC;QACD,MAAM,EAAE,CAAC;IACX,CAAC,CAAC;CACH,CAAA;AA5BY,sBAAsB;IADlC,UAAU,EAAE;GACA,sBAAsB,CA4BlC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Metadata } from '@grpc/grpc-js';
|
|
2
|
-
import
|
|
2
|
+
import { JwtService } from './jwt.service.js';
|
|
3
3
|
import type { AuthUser } from '../interfaces/index.js';
|
|
4
4
|
export declare class GrpcMetadataHelper {
|
|
5
5
|
private readonly jwtService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grpc-metadata.helper.d.ts","sourceRoot":"","sources":["../../src/services/grpc-metadata.helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"grpc-metadata.helper.d.ts","sourceRoot":"","sources":["../../src/services/grpc-metadata.helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGvD,qBACa,kBAAkB;IAEjB,OAAO,CAAC,QAAQ,CAAC,UAAU;IADvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiE;gBAC3D,UAAU,EAAE,UAAU;IAE7C,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;CAOhE"}
|
|
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
};
|
|
10
10
|
import { Injectable } from '@nestjs/common';
|
|
11
11
|
import { Metadata } from '@grpc/grpc-js';
|
|
12
|
+
import { JwtService } from './jwt.service.js';
|
|
12
13
|
import { INTERNAL_TOKEN_METADATA_KEY } from '../constants/index.js';
|
|
13
14
|
import { Logger } from '@volontariapp/logger';
|
|
14
15
|
let GrpcMetadataHelper = class GrpcMetadataHelper {
|
|
@@ -27,7 +28,7 @@ let GrpcMetadataHelper = class GrpcMetadataHelper {
|
|
|
27
28
|
};
|
|
28
29
|
GrpcMetadataHelper = __decorate([
|
|
29
30
|
Injectable(),
|
|
30
|
-
__metadata("design:paramtypes", [
|
|
31
|
+
__metadata("design:paramtypes", [JwtService])
|
|
31
32
|
], GrpcMetadataHelper);
|
|
32
33
|
export { GrpcMetadataHelper };
|
|
33
34
|
//# sourceMappingURL=grpc-metadata.helper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grpc-metadata.helper.js","sourceRoot":"","sources":["../../src/services/grpc-metadata.helper.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"grpc-metadata.helper.js","sourceRoot":"","sources":["../../src/services/grpc-metadata.helper.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAEpE,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGvC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAEA;IADZ,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACxF,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEvD,KAAK,CAAC,sBAAsB,CAAC,IAAc;QACzC,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACvD,QAAQ,CAAC,GAAG,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QACnE,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF,CAAA;AAXY,kBAAkB;IAD9B,UAAU,EAAE;qCAG8B,UAAU;GAFxC,kBAAkB,CAW9B"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
export declare class PublicTestController {
|
|
2
|
+
getRefresh(): {
|
|
3
|
+
status: string;
|
|
4
|
+
};
|
|
5
|
+
getOpen(): {
|
|
6
|
+
status: string;
|
|
7
|
+
};
|
|
8
|
+
getClosed(): {
|
|
9
|
+
status: string;
|
|
10
|
+
};
|
|
11
|
+
getMixed(): {
|
|
12
|
+
status: string;
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
export declare class PublicClassTestController {
|
|
16
|
+
getOne(): {
|
|
17
|
+
status: string;
|
|
18
|
+
};
|
|
19
|
+
getTwo(): {
|
|
20
|
+
status: string;
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=public-test.controller.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"public-test.controller.d.ts","sourceRoot":"","sources":["../../../src/test/example/public-test.controller.ts"],"names":[],"mappings":"AAGA,qBACa,oBAAoB;IAG/B,UAAU;;;IAMV,OAAO;;;IAKP,SAAS;;;IAOT,QAAQ;;;CAGT;AAED,qBAEa,yBAAyB;IAEpC,MAAM;;;IAKN,MAAM;;;CAGP"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
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;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
10
|
+
import { Controller, Get, UseGuards } from '@nestjs/common';
|
|
11
|
+
import { Public, AccessTokenGuard, UseRefreshToken } from '../../index.js';
|
|
12
|
+
let PublicTestController = class PublicTestController {
|
|
13
|
+
getRefresh() {
|
|
14
|
+
return { status: 'refreshed' };
|
|
15
|
+
}
|
|
16
|
+
getOpen() {
|
|
17
|
+
return { status: 'open' };
|
|
18
|
+
}
|
|
19
|
+
getClosed() {
|
|
20
|
+
return { status: 'closed' };
|
|
21
|
+
}
|
|
22
|
+
getMixed() {
|
|
23
|
+
return { status: 'mixed' };
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
__decorate([
|
|
27
|
+
UseRefreshToken(),
|
|
28
|
+
Get('refresh'),
|
|
29
|
+
__metadata("design:type", Function),
|
|
30
|
+
__metadata("design:paramtypes", []),
|
|
31
|
+
__metadata("design:returntype", void 0)
|
|
32
|
+
], PublicTestController.prototype, "getRefresh", null);
|
|
33
|
+
__decorate([
|
|
34
|
+
Public(),
|
|
35
|
+
Get('open'),
|
|
36
|
+
__metadata("design:type", Function),
|
|
37
|
+
__metadata("design:paramtypes", []),
|
|
38
|
+
__metadata("design:returntype", void 0)
|
|
39
|
+
], PublicTestController.prototype, "getOpen", null);
|
|
40
|
+
__decorate([
|
|
41
|
+
Get('closed'),
|
|
42
|
+
__metadata("design:type", Function),
|
|
43
|
+
__metadata("design:paramtypes", []),
|
|
44
|
+
__metadata("design:returntype", void 0)
|
|
45
|
+
], PublicTestController.prototype, "getClosed", null);
|
|
46
|
+
__decorate([
|
|
47
|
+
Public(),
|
|
48
|
+
Get('mixed'),
|
|
49
|
+
UseGuards(AccessTokenGuard),
|
|
50
|
+
__metadata("design:type", Function),
|
|
51
|
+
__metadata("design:paramtypes", []),
|
|
52
|
+
__metadata("design:returntype", void 0)
|
|
53
|
+
], PublicTestController.prototype, "getMixed", null);
|
|
54
|
+
PublicTestController = __decorate([
|
|
55
|
+
Controller('public-test')
|
|
56
|
+
], PublicTestController);
|
|
57
|
+
export { PublicTestController };
|
|
58
|
+
let PublicClassTestController = class PublicClassTestController {
|
|
59
|
+
getOne() {
|
|
60
|
+
return { status: 'one' };
|
|
61
|
+
}
|
|
62
|
+
getTwo() {
|
|
63
|
+
return { status: 'two' };
|
|
64
|
+
}
|
|
65
|
+
};
|
|
66
|
+
__decorate([
|
|
67
|
+
Get('one'),
|
|
68
|
+
__metadata("design:type", Function),
|
|
69
|
+
__metadata("design:paramtypes", []),
|
|
70
|
+
__metadata("design:returntype", void 0)
|
|
71
|
+
], PublicClassTestController.prototype, "getOne", null);
|
|
72
|
+
__decorate([
|
|
73
|
+
Get('two'),
|
|
74
|
+
__metadata("design:type", Function),
|
|
75
|
+
__metadata("design:paramtypes", []),
|
|
76
|
+
__metadata("design:returntype", void 0)
|
|
77
|
+
], PublicClassTestController.prototype, "getTwo", null);
|
|
78
|
+
PublicClassTestController = __decorate([
|
|
79
|
+
Public(),
|
|
80
|
+
Controller('public-class-test')
|
|
81
|
+
], PublicClassTestController);
|
|
82
|
+
export { PublicClassTestController };
|
|
83
|
+
//# sourceMappingURL=public-test.controller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"public-test.controller.js","sourceRoot":"","sources":["../../../src/test/example/public-test.controller.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGpE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAG/B,UAAU;QACR,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IACjC,CAAC;IAID,OAAO;QACL,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC5B,CAAC;IAGD,SAAS;QACP,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAC9B,CAAC;IAKD,QAAQ;QACN,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IAC7B,CAAC;CACF,CAAA;AArBC;IAFC,eAAe,EAAE;IACjB,GAAG,CAAC,SAAS,CAAC;;;;sDAGd;AAID;IAFC,MAAM,EAAE;IACR,GAAG,CAAC,MAAM,CAAC;;;;mDAGX;AAGD;IADC,GAAG,CAAC,QAAQ,CAAC;;;;qDAGb;AAKD;IAHC,MAAM,EAAE;IACR,GAAG,CAAC,OAAO,CAAC;IACZ,SAAS,CAAC,gBAAgB,CAAC;;;;oDAG3B;AAvBU,oBAAoB;IADhC,UAAU,CAAC,aAAa,CAAC;GACb,oBAAoB,CAwBhC;;AAIM,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAEpC,MAAM;QACJ,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAC3B,CAAC;IAGD,MAAM;QACJ,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAC3B,CAAC;CACF,CAAA;AARC;IADC,GAAG,CAAC,KAAK,CAAC;;;;uDAGV;AAGD;IADC,GAAG,CAAC,KAAK,CAAC;;;;uDAGV;AATU,yBAAyB;IAFrC,MAAM,EAAE;IACR,UAAU,CAAC,mBAAmB,CAAC;GACnB,yBAAyB,CAUrC"}
|