@cryptexlabs/codex-nodejs-common 0.10.31 → 0.10.33
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/lib/package.json +1 -1
- package/lib/src/auth/authf.guard.js +3 -2
- package/lib/src/auth/authf.guard.js.map +1 -1
- package/lib/src/context/context.builder.js +9 -1
- package/lib/src/context/context.builder.js.map +1 -1
- package/package.json +1 -1
- package/src/auth/authf.guard.ts +5 -2
- package/src/context/context.builder.ts +10 -2
package/lib/package.json
CHANGED
|
@@ -36,7 +36,7 @@ let AuthfGuard = class AuthfGuard {
|
|
|
36
36
|
}
|
|
37
37
|
const request = context.switchToHttp().getRequest();
|
|
38
38
|
if (!((_a = request === null || request === void 0 ? void 0 : request.headers) === null || _a === void 0 ? void 0 : _a.authorization)) {
|
|
39
|
-
|
|
39
|
+
throw new common_1.UnauthorizedException(`Invalid token`);
|
|
40
40
|
}
|
|
41
41
|
const token = request.headers.authorization.replace("Bearer ", "");
|
|
42
42
|
try {
|
|
@@ -46,7 +46,7 @@ let AuthfGuard = class AuthfGuard {
|
|
|
46
46
|
return true;
|
|
47
47
|
}
|
|
48
48
|
catch (err) {
|
|
49
|
-
|
|
49
|
+
throw new common_1.UnauthorizedException(`Invalid token`);
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
async _ensurePem() {
|
|
@@ -73,6 +73,7 @@ let AuthfGuard = class AuthfGuard {
|
|
|
73
73
|
const response = keysHttpResponse.data;
|
|
74
74
|
this._jwk = response.keys[0];
|
|
75
75
|
this._pem = jwkToPem(this._jwk);
|
|
76
|
+
context.logger.debug(`Got jwk from authf`);
|
|
76
77
|
}
|
|
77
78
|
};
|
|
78
79
|
exports.AuthfGuard = AuthfGuard;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authf.guard.js","sourceRoot":"","sources":["../../../src/auth/authf.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"authf.guard.js","sourceRoot":"","sources":["../../../src/auth/authf.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sCAA0C;AAC1C,2CAMwB;AAKxB,iCAA0B;AAC1B,+BAAoC;AACpC,wCAA4C;AAC5C,uCAAuC;AACvC,oCAAoC;AAI7B,IAAM,UAAU,GAAhB,MAAM,UAAU;IAIrB,YACqC,MAAqB,EACZ,cAA8B;QADvC,WAAM,GAAN,MAAM,CAAe;QACZ,mBAAc,GAAd,cAAc,CAAgB;QAE1E,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;IAEM,WAAW,CAAC,OAAyB;;QAC1C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QAEpD,IAAI,CAAC,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,0CAAE,aAAa,CAAA,EAAE,CAAC;YACrC,MAAM,IAAI,8BAAqB,CAAC,eAAe,CAAC,CAAC;QACnD,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAEnE,IAAI,CAAC;YACH,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE;gBAC3B,UAAU,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAgB,CAAC;aACzC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,8BAAqB,CAAC,eAAe,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,UAAU;QACtB,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAC1C,OAAO;QACT,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,CAAC;QAExD,MAAM,gBAAgB,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,aAAa,EAAE;YACtD,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC7B,OAAO,EAAE;gBACP,kBAAkB,EAAE,IAAA,SAAM,GAAE;gBAC5B,iBAAiB,EAAE,OAAO;gBAC1B,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE;gBAC9B,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE;gBAC9B,oBAAoB,EAAE,SAAS;gBAC/B,cAAc,EAAE,MAAM;gBACtB,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI;gBACpC,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO;gBAC1C,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO;gBAC1C,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE;aACjC;SACF,CAAC,CAAC;QAEH,MAAM,QAAQ,GAA4B,gBAAgB,CAAC,IAAI,CAAC;QAEhE,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAW,CAAC,CAAC;QAEvC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAC7C,CAAC;CACF,CAAA;AApEY,gCAAU;qBAAV,UAAU;IADtB,IAAA,mBAAU,GAAE;IAMR,WAAA,IAAA,eAAM,EAAC,QAAQ,CAAC,CAAA;IAChB,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;qCADiB,sBAAa;QACI,wBAAc;GANjE,UAAU,CAoEtB"}
|
|
@@ -27,7 +27,15 @@ let ContextBuilder = ContextBuilder_1 = class ContextBuilder {
|
|
|
27
27
|
this.i18nDir = i18nDir;
|
|
28
28
|
}
|
|
29
29
|
build() {
|
|
30
|
-
return new ContextBuilder_1(this.logger, this.config,
|
|
30
|
+
return new ContextBuilder_1(this.logger, this.config, {
|
|
31
|
+
name: this.client.name,
|
|
32
|
+
version: this.client.version,
|
|
33
|
+
id: this.client.id,
|
|
34
|
+
variant: this.client.variant,
|
|
35
|
+
}, {
|
|
36
|
+
category: this.messageContext.category,
|
|
37
|
+
id: this.messageContext.id,
|
|
38
|
+
}, this.i18nDir);
|
|
31
39
|
}
|
|
32
40
|
setI18nDir(i18nDir) {
|
|
33
41
|
this.i18nDir = i18nDir;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.builder.js","sourceRoot":"","sources":["../../../src/context/context.builder.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAA2D;AAC3D,oEAQuC;AACvC,sCAA0C;AAC1C,uCAAoC;AACpC,+BAAoC;AACpC,kCAAqC;AACrC,+BAA4B;AAGrB,IAAM,cAAc,sBAApB,MAAM,cAAc;IAMzB,YACmB,MAAqB,EACrB,MAAqB,EAC/B,MAAuB,EACb,cAAuC,EAChD,OAAgB;QAJP,WAAM,GAAN,MAAM,CAAe;QACrB,WAAM,GAAN,MAAM,CAAe;QAC/B,WAAM,GAAN,MAAM,CAAiB;QACb,mBAAc,GAAd,cAAc,CAAyB;QAChD,YAAO,GAAP,OAAO,CAAS;IACvB,CAAC;IAEG,KAAK;QACV,OAAO,IAAI,gBAAc,CACvB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"context.builder.js","sourceRoot":"","sources":["../../../src/context/context.builder.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/auth/authf.guard.ts
CHANGED
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
ExecutionContext,
|
|
5
5
|
Inject,
|
|
6
6
|
Injectable,
|
|
7
|
+
UnauthorizedException,
|
|
7
8
|
} from "@nestjs/common";
|
|
8
9
|
import {
|
|
9
10
|
JwtKeyInterface,
|
|
@@ -40,7 +41,7 @@ export class AuthfGuard implements CanActivate {
|
|
|
40
41
|
const request = context.switchToHttp().getRequest();
|
|
41
42
|
|
|
42
43
|
if (!request?.headers?.authorization) {
|
|
43
|
-
|
|
44
|
+
throw new UnauthorizedException(`Invalid token`);
|
|
44
45
|
}
|
|
45
46
|
const token = request.headers.authorization.replace("Bearer ", "");
|
|
46
47
|
|
|
@@ -50,7 +51,7 @@ export class AuthfGuard implements CanActivate {
|
|
|
50
51
|
});
|
|
51
52
|
return true;
|
|
52
53
|
} catch (err) {
|
|
53
|
-
|
|
54
|
+
throw new UnauthorizedException(`Invalid token`);
|
|
54
55
|
}
|
|
55
56
|
}
|
|
56
57
|
|
|
@@ -82,5 +83,7 @@ export class AuthfGuard implements CanActivate {
|
|
|
82
83
|
|
|
83
84
|
this._jwk = response.keys[0];
|
|
84
85
|
this._pem = jwkToPem(this._jwk as any);
|
|
86
|
+
|
|
87
|
+
context.logger.debug(`Got jwk from authf`);
|
|
85
88
|
}
|
|
86
89
|
}
|
|
@@ -33,8 +33,16 @@ export class ContextBuilder {
|
|
|
33
33
|
return new ContextBuilder(
|
|
34
34
|
this.logger,
|
|
35
35
|
this.config,
|
|
36
|
-
{
|
|
37
|
-
|
|
36
|
+
{
|
|
37
|
+
name: this.client.name,
|
|
38
|
+
version: this.client.version,
|
|
39
|
+
id: this.client.id,
|
|
40
|
+
variant: this.client.variant,
|
|
41
|
+
},
|
|
42
|
+
{
|
|
43
|
+
category: this.messageContext.category,
|
|
44
|
+
id: this.messageContext.id,
|
|
45
|
+
},
|
|
38
46
|
this.i18nDir
|
|
39
47
|
);
|
|
40
48
|
}
|