@servicelabsco/nestjs-utility-services 2.0.3 → 2.0.4
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.
|
@@ -23,10 +23,12 @@ let ClientConnectMiddleware = class ClientConnectMiddleware {
|
|
|
23
23
|
async use(req, res, next) {
|
|
24
24
|
const clientId = req.headers['x-client-id'];
|
|
25
25
|
const clientSecret = req.headers['x-client-secret'];
|
|
26
|
+
console.log(clientId, clientSecret);
|
|
26
27
|
if (!(clientId && clientSecret))
|
|
27
28
|
throw new access_exception_1.AccessException('Invalid client headers');
|
|
28
29
|
const ip = req.headers['x-forwarded-for'] || req.ip || req.ips[0];
|
|
29
30
|
const payload = { client_id: clientId, client_secret: clientSecret, ip: ip?.split(',') || [] };
|
|
31
|
+
console.log(`validating against payload`, payload);
|
|
30
32
|
const client = await this.clientCredentialService.validate(payload);
|
|
31
33
|
if (!client)
|
|
32
34
|
throw new access_exception_1.AccessException(`Invalid credentials`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.connect.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/client.connect.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAE5D,+EAA2E;AAC3E,sDAAmD;AACnD,+FAA0F;AAC1F,2DAAuD;AAUhD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAMhC,YACqB,WAAwB,EACxB,uBAAgD;QADhD,gBAAW,GAAX,WAAW,CAAa;QACxB,4BAAuB,GAAvB,uBAAuB,CAAyB;IAClE,CAAC;IAaJ,KAAK,CAAC,GAAG,CAAC,GAAQ,EAAE,GAAa,EAAE,IAAc;QAC7C,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAEpD,IAAI,CAAC,CAAC,QAAQ,IAAI,YAAY,CAAC;YAAE,MAAM,IAAI,kCAAe,CAAC,wBAAwB,CAAC,CAAC;QAErF,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAElE,MAAM,OAAO,GAAwB,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;QAEpH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,kCAAe,CAAC,qBAAqB,CAAC,CAAC;QAE9D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAC7D,YAAY,CAAC,eAAe,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;QAGrD,WAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAEzB,IAAI,EAAE,CAAC;IACX,CAAC;CACJ,CAAA;
|
|
1
|
+
{"version":3,"file":"client.connect.middleware.js","sourceRoot":"","sources":["../../../src/auth/middlewares/client.connect.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4D;AAE5D,+EAA2E;AAC3E,sDAAmD;AACnD,+FAA0F;AAC1F,2DAAuD;AAUhD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAMhC,YACqB,WAAwB,EACxB,uBAAgD;QADhD,gBAAW,GAAX,WAAW,CAAa;QACxB,4BAAuB,GAAvB,uBAAuB,CAAyB;IAClE,CAAC;IAaJ,KAAK,CAAC,GAAG,CAAC,GAAQ,EAAE,GAAa,EAAE,IAAc;QAC7C,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAEpD,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAEpC,IAAI,CAAC,CAAC,QAAQ,IAAI,YAAY,CAAC;YAAE,MAAM,IAAI,kCAAe,CAAC,wBAAwB,CAAC,CAAC;QAErF,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAElE,MAAM,OAAO,GAAwB,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;QAEpH,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,kCAAe,CAAC,qBAAqB,CAAC,CAAC;QAE9D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAC7D,YAAY,CAAC,eAAe,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;QAGrD,WAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAEzB,IAAI,EAAE,CAAC;IACX,CAAC;CACJ,CAAA;AA/CY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;qCAQyB,0BAAW;QACC,mDAAuB;GAR5D,uBAAuB,CA+CnC"}
|
|
@@ -27,11 +27,14 @@ let ClientCredentialService = class ClientCredentialService {
|
|
|
27
27
|
const validated = hash_1.Hash.compare(payload.client_secret, data.credential);
|
|
28
28
|
if (!validated)
|
|
29
29
|
throw new access_exception_1.AccessException(`Invalid client credential`);
|
|
30
|
+
console.log(`client secret validated`, validated);
|
|
30
31
|
if (!data.ips.length)
|
|
31
32
|
return data.client_id;
|
|
33
|
+
console.log(`data.ips`, data.ips);
|
|
32
34
|
const matches = payload.ip.some((ip) => data.ips.includes(ip));
|
|
33
35
|
if (matches)
|
|
34
36
|
return data.client_id;
|
|
37
|
+
console.log(`ip has not matched`, matches);
|
|
35
38
|
throw new access_exception_1.AccessException(`IP ${payload.ip} is not whitelisted`);
|
|
36
39
|
}
|
|
37
40
|
async setCredentialCache(key) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.credential.service.js","sourceRoot":"","sources":["../../../src/system/services/client.credential.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"client.credential.service.js","sourceRoot":"","sources":["../../../src/system/services/client.credential.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED