@restorecommerce/facade 1.8.1 → 1.8.2
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 +12 -0
- package/dist/modules/identity/oidc/adapter.js +1 -1
- package/dist/modules/identity/oidc/adapter.js.map +1 -1
- package/dist/modules/ostorage/objectDownloadReqHandler.d.ts.map +1 -1
- package/dist/modules/ostorage/objectDownloadReqHandler.js +6 -0
- package/dist/modules/ostorage/objectDownloadReqHandler.js.map +1 -1
- package/dist/tsconfig.lib.tsbuildinfo +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,18 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [1.8.2](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@1.8.1...@restorecommerce/facade@1.8.2) (2023-11-26)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* logger config ([1f31f47](https://github.com/restorecommerce/libs/commit/1f31f478c76a047ce0ac1f554069fa764101e300))
|
|
12
|
+
* logger message typing ([7791bde](https://github.com/restorecommerce/libs/commit/7791bdede91ea3cd2f824b4410d28075b30199f2))
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
6
18
|
## [1.8.1](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@1.8.0...@restorecommerce/facade@1.8.1) (2023-11-25)
|
|
7
19
|
|
|
8
20
|
|
|
@@ -84,7 +84,7 @@ export function createIdentityServiceAdapterClass(remoteTokenService, logger, lo
|
|
|
84
84
|
throw new Error('UNSUPPORTED');
|
|
85
85
|
}
|
|
86
86
|
async upsert(id, payload, expiresIn) {
|
|
87
|
-
logger.
|
|
87
|
+
logger.info(`Upserting ${this.type} token ${id}`, payload);
|
|
88
88
|
if (delegateToRemoteService(this.type)) {
|
|
89
89
|
try {
|
|
90
90
|
await remoteTokenService.upsert({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../src/modules/identity/oidc/adapter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../src/modules/identity/oidc/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectDownloadReqHandler.d.ts","sourceRoot":"","sources":["../../../src/modules/ostorage/objectDownloadReqHandler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"objectDownloadReqHandler.d.ts","sourceRoot":"","sources":["../../../src/modules/ostorage/objectDownloadReqHandler.ts"],"names":[],"mappings":"AAkCA,eAAO,MAAM,aAAa,WAAkB,MAAM,OAAO,MAAM,OAAO,GAAG,UAAU,GAAG,KAAG,QAAQ,GAAG,CA0GnG,CAAC"}
|
|
@@ -7,6 +7,12 @@ import pkg from 'lodash';
|
|
|
7
7
|
const { isEmpty } = pkg;
|
|
8
8
|
const cfg = createServiceConfig(process.cwd());
|
|
9
9
|
const loggerCfg = cfg.get('logger');
|
|
10
|
+
if (loggerCfg) {
|
|
11
|
+
loggerCfg.esTransformer = (msg) => {
|
|
12
|
+
msg.fields = JSON.stringify(msg.fields);
|
|
13
|
+
return msg;
|
|
14
|
+
};
|
|
15
|
+
}
|
|
10
16
|
let logger = createLogger(loggerCfg);
|
|
11
17
|
const dlQueryParamExist = (ctx) => {
|
|
12
18
|
// check if URL contains query parameter 'dl'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectDownloadReqHandler.js","sourceRoot":"","sources":["../../../src/modules/ostorage/objectDownloadReqHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,GAAG,MAAM,QAAQ,CAAC;AACzB,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;AAExB,MAAM,GAAG,GAAG,mBAAmB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,MAAM,SAAS,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"objectDownloadReqHandler.js","sourceRoot":"","sources":["../../../src/modules/ostorage/objectDownloadReqHandler.ts"],"names":[],"mappings":"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"}
|