@squiz/render-runtime-lib 1.80.2 → 1.80.3
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/ioc.d.ts +2 -3
- package/lib/ioc.js +0 -1
- package/lib/ioc.js.map +1 -1
- package/lib/test/helpers/stack.js +0 -1
- package/lib/test/helpers/stack.js.map +1 -1
- package/lib/webserver/DxpSessionMiddlewareTsoa.d.ts +1 -1
- package/lib/webserver/DxpSessionMiddlewareTsoa.js +6 -1
- package/lib/webserver/DxpSessionMiddlewareTsoa.js.map +1 -1
- package/package.json +1 -1
package/lib/ioc.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { ContentItemService } from '@squiz/component-lib';
|
|
|
9
9
|
import { ApiKeyValidationService } from '@squiz/dx-common-lib';
|
|
10
10
|
import { RenderInputService } from './RenderInputService';
|
|
11
11
|
import { Sandbox } from '@squiz/runtime-sandbox-common';
|
|
12
|
-
import { DxpSessionMiddleware
|
|
12
|
+
import { DxpSessionMiddleware } from './webserver/DxpSessionMiddlewareTsoa';
|
|
13
13
|
export interface Services {
|
|
14
14
|
sandbox: Sandbox;
|
|
15
15
|
logger: Logger;
|
|
@@ -23,8 +23,7 @@ export interface Services {
|
|
|
23
23
|
apiKeyService: ApiKeyValidationService;
|
|
24
24
|
renderInputService: RenderInputService;
|
|
25
25
|
componentRootUrlResolver: ComponentRootUrlResolver;
|
|
26
|
-
|
|
27
|
-
dxpSessionMiddleware: DxpSessionMiddleware;
|
|
26
|
+
dxpSessionMiddleware?: DxpSessionMiddleware;
|
|
28
27
|
}
|
|
29
28
|
export interface Config {
|
|
30
29
|
enableDevMode?: boolean;
|
package/lib/ioc.js
CHANGED
|
@@ -30,7 +30,6 @@ const initIocContainer = (services, config) => {
|
|
|
30
30
|
container
|
|
31
31
|
.bind('ComponentRootUrlResolver')
|
|
32
32
|
.toConstantValue(services.componentRootUrlResolver);
|
|
33
|
-
container.bind('ISessionParser').toConstantValue(services.dxpSessionParser);
|
|
34
33
|
container.bind(DxpSessionMiddlewareTsoa_1.DxpSessionMiddleware).toConstantValue(services.dxpSessionMiddleware);
|
|
35
34
|
exports.iocContainer = iocContainer = container;
|
|
36
35
|
return container;
|
package/lib/ioc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ioc.js","sourceRoot":"","sources":["../src/ioc.ts"],"names":[],"mappings":";;;AAAA,yCAA4D;AAC5D,+EAAmE;AACnE,+BAAgD;AAWhD,
|
|
1
|
+
{"version":3,"file":"ioc.js","sourceRoot":"","sources":["../src/ioc.ts"],"names":[],"mappings":";;;AAAA,yCAA4D;AAC5D,+EAAmE;AACnE,+BAAgD;AAWhD,mFAA4E;AAE5E,IAAA,oBAAQ,EAAC,IAAA,sBAAU,GAAE,EAAE,iBAAU,CAAC,CAAC,CAAC,qCAAqC;AAsBzE,0EAA0E;AAC1E,uFAAuF;AACvF,uFAAuF;AACvF,IAAI,YAA0B,CAAC;AAExB,MAAM,gBAAgB,GAAG,CAAC,QAAkB,EAAE,MAAc,EAAE,EAAE;IACrE,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;IAClC,SAAS,CAAC,IAAI,CAAC,IAAA,kDAAmB,GAAE,CAAC,CAAC;IACtC,SAAS,CAAC,IAAI,CAAS,QAAQ,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IACzD,SAAS,CAAC,IAAI,CAAU,SAAS,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACrE,SAAS,CAAC,IAAI,CAAS,QAAQ,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClE,SAAS;SACN,IAAI,CAA2B,0BAA0B,CAAC;SAC1D,eAAe,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IACtD,SAAS,CAAC,IAAI,CAAyB,wBAAwB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;IAClH,SAAS,CAAC,IAAI,CAAsB,qBAAqB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IACzG,SAAS,CAAC,IAAI,CAAkB,iBAAiB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC7F,SAAS,CAAC,IAAI,CAAqB,oBAAoB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IACtG,SAAS,CAAC,IAAI,CAAiC,oBAAoB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IAClH,SAAS,CAAC,IAAI,CAA0B,yBAAyB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;IACrH,SAAS,CAAC,IAAI,CAAiC,oBAAoB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IAClH,SAAS,CAAC,IAAI,CAA0B,yBAAyB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC3G,SAAS;SACN,IAAI,CAA2B,0BAA0B,CAAC;SAC1D,eAAe,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IACtD,SAAS,CAAC,IAAI,CAAmC,+CAAoB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAEtH,uBAAA,YAAY,GAAG,SAAS,CAAC;IACzB,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAxBW,QAAA,gBAAgB,oBAwB3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stack.js","sourceRoot":"","sources":["../../../src/test/helpers/stack.ts"],"names":[],"mappings":";;;;;;AAsDA,wDAGC;AAED,
|
|
1
|
+
{"version":3,"file":"stack.js","sourceRoot":"","sources":["../../../src/test/helpers/stack.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,4 +14,4 @@ export declare class DxpSessionMiddleware {
|
|
|
14
14
|
constructor(sessionParser: ISessionParser, authenticator: IAuthenticator, config: Config);
|
|
15
15
|
use(req: Request, res: Response, next: NextFunction): Promise<void>;
|
|
16
16
|
}
|
|
17
|
-
export declare const dxpSessionMiddleware: (req: Request, res: Response, next: NextFunction) => Promise<void>;
|
|
17
|
+
export declare const dxpSessionMiddleware: (req: Request, res: Response, next: NextFunction) => void | Promise<void>;
|
|
@@ -49,7 +49,12 @@ exports.DxpSessionMiddleware = DxpSessionMiddleware = __decorate([
|
|
|
49
49
|
], DxpSessionMiddleware);
|
|
50
50
|
const dxpSessionMiddleware = (req, res, next) => {
|
|
51
51
|
const middleware = ioc_1.iocContainer.get(DxpSessionMiddleware);
|
|
52
|
-
|
|
52
|
+
if (middleware) {
|
|
53
|
+
return middleware.use(req, res, next);
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
return next();
|
|
57
|
+
}
|
|
53
58
|
};
|
|
54
59
|
exports.dxpSessionMiddleware = dxpSessionMiddleware;
|
|
55
60
|
//# sourceMappingURL=DxpSessionMiddlewareTsoa.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DxpSessionMiddlewareTsoa.js","sourceRoot":"","sources":["../../src/webserver/DxpSessionMiddlewareTsoa.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4BAA0B;AAE1B,yCAAuC;AACvC,gCAA8C;AAC9C,wDAAmE;AAU5D,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YAAoB,aAA6B,EAAU,aAA6B,EAAU,MAAc;QAA5F,kBAAa,GAAb,aAAa,CAAgB;QAAU,kBAAa,GAAb,aAAa,CAAgB;QAAU,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAEpH,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACvD,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;YAC9B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QACD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpD,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,IAAK,KAAe,CAAC,OAAO,KAAK,0BAA0B,EAAE,CAAC;oBAC5D,MAAM,KAAK,CAAC;gBACd,CAAC;gBACD,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAC7C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC,IAAI,2CAA2B,CAAE,KAAe,CAAC,OAAO,CAAC,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC;CACF,CAAA;AAtBY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,sBAAU,GAAE;;GACA,oBAAoB,CAsBhC;AAEM,MAAM,oBAAoB,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IACtF,MAAM,UAAU,GAAG,kBAAY,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAC1D,OAAO,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"DxpSessionMiddlewareTsoa.js","sourceRoot":"","sources":["../../src/webserver/DxpSessionMiddlewareTsoa.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4BAA0B;AAE1B,yCAAuC;AACvC,gCAA8C;AAC9C,wDAAmE;AAU5D,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YAAoB,aAA6B,EAAU,aAA6B,EAAU,MAAc;QAA5F,kBAAa,GAAb,aAAa,CAAgB;QAAU,kBAAa,GAAb,aAAa,CAAgB;QAAU,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAEpH,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACvD,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;YAC9B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QACD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpD,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,IAAK,KAAe,CAAC,OAAO,KAAK,0BAA0B,EAAE,CAAC;oBAC5D,MAAM,KAAK,CAAC;gBACd,CAAC;gBACD,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAC7C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC,IAAI,2CAA2B,CAAE,KAAe,CAAC,OAAO,CAAC,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC;CACF,CAAA;AAtBY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,sBAAU,GAAE;;GACA,oBAAoB,CAsBhC;AAEM,MAAM,oBAAoB,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IACtF,MAAM,UAAU,GAAG,kBAAY,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAC1D,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;AACH,CAAC,CAAC;AAPW,QAAA,oBAAoB,wBAO/B"}
|