@cryptexlabs/codex-nodejs-common 0.11.0 → 0.11.1
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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cryptexlabs/codex-nodejs-common",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.1",
|
|
4
4
|
"description": "Common code for Codex framework",
|
|
5
5
|
"main": "lib/src/index.js",
|
|
6
6
|
"repository": "git@gitlab.com:cryptexlabs/public/codex-nodejs-common.git",
|
|
@@ -24,6 +24,10 @@
|
|
|
24
24
|
"axios": "^1.7.7",
|
|
25
25
|
"rxjs": "^7.1.0"
|
|
26
26
|
},
|
|
27
|
+
"resolutions": {
|
|
28
|
+
"**/string-width": "4.2.3",
|
|
29
|
+
"**/wrap-ansi": "7.0.0"
|
|
30
|
+
},
|
|
27
31
|
"dependencies": {
|
|
28
32
|
"@cryptexlabs/authf-data-model": "^0.9.15",
|
|
29
33
|
"@cryptexlabs/codex-data-model": "0.1.9",
|
|
@@ -84,10 +88,6 @@
|
|
|
84
88
|
"test": "jest",
|
|
85
89
|
"postinstall": "install-peers || true"
|
|
86
90
|
},
|
|
87
|
-
"resolutions": {
|
|
88
|
-
"axios": "0.19.0",
|
|
89
|
-
"**/undici": "5.0.0"
|
|
90
|
-
},
|
|
91
91
|
"husky": {
|
|
92
92
|
"hooks": {
|
|
93
93
|
"pre-commit": "yarn prettier && yarn lint && yarn test && yarn build"
|
|
@@ -24,8 +24,10 @@ let AuthfGuard = class AuthfGuard {
|
|
|
24
24
|
constructor(config, contextBuilder) {
|
|
25
25
|
this.config = config;
|
|
26
26
|
this.contextBuilder = contextBuilder;
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
if (config.authEnabled) {
|
|
28
|
+
this._ensurePem().then();
|
|
29
|
+
this._watchBlacklist().then();
|
|
30
|
+
}
|
|
29
31
|
this._blacklistedSubjects = [];
|
|
30
32
|
}
|
|
31
33
|
canActivate(context) {
|
|
@@ -72,7 +74,7 @@ let AuthfGuard = class AuthfGuard {
|
|
|
72
74
|
};
|
|
73
75
|
}
|
|
74
76
|
async _ensurePem() {
|
|
75
|
-
if (this._pem
|
|
77
|
+
if (this._pem) {
|
|
76
78
|
return;
|
|
77
79
|
}
|
|
78
80
|
const context = this.contextBuilder.build().getResult();
|
|
@@ -1 +1 @@
|
|
|
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,wCAAqD;AACrD,uCAAuC;AACvC,oCAAoC;AAI7B,IAAM,UAAU,GAAhB,MAAM,UAAU;IAKrB,YACqC,MAAqB,EACZ,cAA8B;QADvC,WAAM,GAAN,MAAM,CAAe;QACZ,mBAAc,GAAd,cAAc,CAAgB;QAE1E,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"authf.guard.js","sourceRoot":"","sources":["../../../src/auth/authf.guard.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cryptexlabs/codex-nodejs-common",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.1",
|
|
4
4
|
"description": "Common code for Codex framework",
|
|
5
5
|
"main": "lib/src/index.js",
|
|
6
6
|
"repository": "git@gitlab.com:cryptexlabs/public/codex-nodejs-common.git",
|
|
@@ -24,6 +24,10 @@
|
|
|
24
24
|
"axios": "^1.7.7",
|
|
25
25
|
"rxjs": "^7.1.0"
|
|
26
26
|
},
|
|
27
|
+
"resolutions": {
|
|
28
|
+
"**/string-width": "4.2.3",
|
|
29
|
+
"**/wrap-ansi": "7.0.0"
|
|
30
|
+
},
|
|
27
31
|
"dependencies": {
|
|
28
32
|
"@cryptexlabs/authf-data-model": "^0.9.15",
|
|
29
33
|
"@cryptexlabs/codex-data-model": "0.1.9",
|
|
@@ -84,10 +88,6 @@
|
|
|
84
88
|
"test": "jest",
|
|
85
89
|
"postinstall": "install-peers || true"
|
|
86
90
|
},
|
|
87
|
-
"resolutions": {
|
|
88
|
-
"axios": "0.19.0",
|
|
89
|
-
"**/undici": "5.0.0"
|
|
90
|
-
},
|
|
91
91
|
"husky": {
|
|
92
92
|
"hooks": {
|
|
93
93
|
"pre-commit": "yarn prettier && yarn lint && yarn test && yarn build"
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { AuthfGuard } from "./authf.guard";
|
|
2
|
+
import { DefaultConfig } from "../config";
|
|
3
|
+
import { instance, mock, when } from "ts-mockito";
|
|
4
|
+
import { Context, ContextBuilder } from "../context";
|
|
5
|
+
|
|
6
|
+
describe("AuthGuard", () => {
|
|
7
|
+
let authGuard: AuthfGuard;
|
|
8
|
+
let ConfigMock: DefaultConfig;
|
|
9
|
+
let ContextBuilderMock: ContextBuilder;
|
|
10
|
+
let ContextMock: Context;
|
|
11
|
+
|
|
12
|
+
beforeEach(() => {
|
|
13
|
+
ConfigMock = mock(DefaultConfig);
|
|
14
|
+
ContextBuilderMock = mock(ContextBuilder);
|
|
15
|
+
ContextMock = mock(Context);
|
|
16
|
+
|
|
17
|
+
when(ConfigMock.authEnabled).thenReturn(false);
|
|
18
|
+
when(ContextBuilderMock.build()).thenReturn(instance(ContextBuilderMock));
|
|
19
|
+
when(ContextBuilderMock.getResult()).thenReturn(instance(ContextMock));
|
|
20
|
+
when(ContextMock.logger).thenReturn({
|
|
21
|
+
debug: () => {},
|
|
22
|
+
warn: () => {},
|
|
23
|
+
} as any);
|
|
24
|
+
|
|
25
|
+
authGuard = new AuthfGuard(
|
|
26
|
+
instance(ConfigMock),
|
|
27
|
+
instance(ContextBuilderMock)
|
|
28
|
+
);
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
it("should be defined", () => {
|
|
32
|
+
expect(true).toBe(true);
|
|
33
|
+
});
|
|
34
|
+
});
|
package/src/auth/authf.guard.ts
CHANGED
|
@@ -27,8 +27,10 @@ export class AuthfGuard implements CanActivate {
|
|
|
27
27
|
@Inject("CONFIG") private readonly config: DefaultConfig,
|
|
28
28
|
@Inject("CONTEXT_BUILDER") private readonly contextBuilder: ContextBuilder
|
|
29
29
|
) {
|
|
30
|
-
|
|
31
|
-
|
|
30
|
+
if (config.authEnabled) {
|
|
31
|
+
this._ensurePem().then();
|
|
32
|
+
this._watchBlacklist().then();
|
|
33
|
+
}
|
|
32
34
|
this._blacklistedSubjects = [];
|
|
33
35
|
}
|
|
34
36
|
|
|
@@ -84,14 +86,14 @@ export class AuthfGuard implements CanActivate {
|
|
|
84
86
|
}
|
|
85
87
|
|
|
86
88
|
private async _ensurePem(): Promise<void> {
|
|
87
|
-
if (this._pem
|
|
89
|
+
if (this._pem) {
|
|
88
90
|
return;
|
|
89
91
|
}
|
|
90
92
|
const context = this.contextBuilder.build().getResult();
|
|
91
93
|
|
|
92
94
|
const keysHttpResponse = await axios.get(`/api/v1/key`, {
|
|
93
|
-
baseURL: this.config.authfUrl,
|
|
94
|
-
headers: this._getApiHeaders(context),
|
|
95
|
+
baseURL: this.config.authfUrl as string,
|
|
96
|
+
headers: this._getApiHeaders(context) as any,
|
|
95
97
|
});
|
|
96
98
|
|
|
97
99
|
const response: JwtKeyResponseInterface = keysHttpResponse.data;
|