@servicelabsco/nestjs-utility-services 1.2.40 → 1.2.42
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/system/services/client.credential.service.js +4 -2
- package/dist/system/services/client.credential.service.js.map +1 -1
- package/dist/system/services/internal.server.connect.service.d.ts +1 -1
- package/dist/system/services/internal.server.connect.service.js +3 -3
- package/dist/system/services/internal.server.connect.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.ClientCredentialService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const date_fns_1 = require("date-fns");
|
|
15
|
+
const access_exception_1 = require("../../common/exceptions/access.exception");
|
|
15
16
|
const hash_1 = require("../../common/libraries/hash");
|
|
16
17
|
const cache_service_1 = require("../../platformUtility/services/cache.service");
|
|
17
18
|
const client_credential_entity_1 = require("../entities/client.credential.entity");
|
|
@@ -22,15 +23,16 @@ let ClientCredentialService = class ClientCredentialService {
|
|
|
22
23
|
async validate(payload) {
|
|
23
24
|
const data = await this.getCredential(payload.client_id);
|
|
24
25
|
if (!data)
|
|
25
|
-
|
|
26
|
+
throw new access_exception_1.AccessException(`Invalid client id`);
|
|
26
27
|
const validated = hash_1.Hash.compare(payload.client_secret, data.credential);
|
|
27
28
|
if (!validated)
|
|
28
|
-
|
|
29
|
+
throw new access_exception_1.AccessException(`Invalid client credential`);
|
|
29
30
|
if (!data.ips.length)
|
|
30
31
|
return data.client_id;
|
|
31
32
|
const isIpSet = data.ips.includes(payload.ip);
|
|
32
33
|
if (isIpSet)
|
|
33
34
|
return data.client_id;
|
|
35
|
+
throw new access_exception_1.AccessException(`IP is not whitelisted`);
|
|
34
36
|
}
|
|
35
37
|
async setCredentialCache(key) {
|
|
36
38
|
const identifier = this.getCacheIdentifier(key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.credential.service.js","sourceRoot":"","sources":["../../../src/system/services/client.credential.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAAsC;AACtC,sDAAmD;AACnD,gFAA4E;AAE5E,mFAA8E;AAQvE,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAMhC,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAQ3D,KAAK,CAAC,QAAQ,CAAC,OAA4B;QACvC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI;YAAE,
|
|
1
|
+
{"version":3,"file":"client.credential.service.js","sourceRoot":"","sources":["../../../src/system/services/client.credential.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export declare class InternalServerConnectService {
|
|
|
6
6
|
private credentials;
|
|
7
7
|
constructor(remoteRequestService: RemoteRequestService, propertyService: PropertyService);
|
|
8
8
|
post(type: string, endPoint: string, data: Object): Promise<any>;
|
|
9
|
-
get(type: string, endPoint: string
|
|
9
|
+
get(type: string, endPoint: string): Promise<any>;
|
|
10
10
|
private getCredential;
|
|
11
11
|
private setCredential;
|
|
12
12
|
}
|
|
@@ -33,16 +33,16 @@ let InternalServerConnectService = class InternalServerConnectService {
|
|
|
33
33
|
};
|
|
34
34
|
return this.remoteRequestService.getProxyResponse(options);
|
|
35
35
|
}
|
|
36
|
-
async get(type, endPoint
|
|
36
|
+
async get(type, endPoint) {
|
|
37
37
|
const credential = await this.getCredential(type);
|
|
38
38
|
const headers = { 'x-client-id': credential.clientId, 'x-client-secret': credential.clientSecret };
|
|
39
39
|
const url = `${credential.url}/internal/${endPoint}`;
|
|
40
40
|
const options = {
|
|
41
41
|
method: 'GET',
|
|
42
|
-
url
|
|
42
|
+
url,
|
|
43
43
|
headers,
|
|
44
|
-
params,
|
|
45
44
|
};
|
|
45
|
+
global.console.log('options', options);
|
|
46
46
|
return this.remoteRequestService.getProxyResponse(options);
|
|
47
47
|
}
|
|
48
48
|
async getCredential(type) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal.server.connect.service.js","sourceRoot":"","sources":["../../../src/system/services/internal.server.connect.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAAsC;AACtC,qFAAiF;AACjF,kGAA6F;AAC7F,yDAAqD;AAQ9C,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAerC,YACqB,oBAA0C,EAC1C,eAAgC;QADhC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,oBAAe,GAAf,eAAe,CAAiB;QAV7C,gBAAW,GAAQ,EAAE,CAAC;IAW3B,CAAC;IAUJ,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,QAAgB,EAAE,IAAY;QACnD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,EAAE,aAAa,EAAE,UAAU,CAAC,QAAQ,EAAE,iBAAiB,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC;QAEnG,MAAM,GAAG,GAAG,GAAG,UAAU,CAAC,GAAG,aAAa,QAAQ,EAAE,CAAC;QAErD,MAAM,OAAO,GAAG;YACZ,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,GAAG;YACR,OAAO;YACP,IAAI;SACP,CAAC;QAEF,OAAO,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAUD,KAAK,CAAC,GAAG,CAAC,IAAY,EAAE,QAAgB
|
|
1
|
+
{"version":3,"file":"internal.server.connect.service.js","sourceRoot":"","sources":["../../../src/system/services/internal.server.connect.service.ts"],"names":[],"mappings":"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"}
|