@squiz/render-runtime-lib 1.80.0 → 1.80.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/lib/ioc.d.ts CHANGED
@@ -9,8 +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 } from './webserver/DxpSessionMiddlewareTsoa';
13
- import { DxpSessionParser } from '@squiz/dxp-session-lib';
12
+ import { DxpSessionMiddleware, ISessionParser } from './webserver/DxpSessionMiddlewareTsoa';
14
13
  export interface Services {
15
14
  sandbox: Sandbox;
16
15
  logger: Logger;
@@ -24,7 +23,7 @@ export interface Services {
24
23
  apiKeyService: ApiKeyValidationService;
25
24
  renderInputService: RenderInputService;
26
25
  componentRootUrlResolver: ComponentRootUrlResolver;
27
- dxpSessionParser: DxpSessionParser;
26
+ dxpSessionParser: ISessionParser;
28
27
  dxpSessionMiddleware: DxpSessionMiddleware;
29
28
  }
30
29
  export interface Config {
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,mFAA4F;AAG5F,IAAA,oBAAQ,EAAC,IAAA,sBAAU,GAAE,EAAE,iBAAU,CAAC,CAAC,CAAC,qCAAqC;AAuBzE,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,CAAiB,gBAAgB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC5F,SAAS,CAAC,IAAI,CAAC,+CAAoB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAEpF,uBAAA,YAAY,GAAG,SAAS,CAAC;IACzB,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAzBW,QAAA,gBAAgB,oBAyB3B"}
1
+ {"version":3,"file":"ioc.js","sourceRoot":"","sources":["../src/ioc.ts"],"names":[],"mappings":";;;AAAA,yCAA4D;AAC5D,+EAAmE;AACnE,+BAAgD;AAWhD,mFAA4F;AAE5F,IAAA,oBAAQ,EAAC,IAAA,sBAAU,GAAE,EAAE,iBAAU,CAAC,CAAC,CAAC,qCAAqC;AAuBzE,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,CAAiB,gBAAgB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC5F,SAAS,CAAC,IAAI,CAAC,+CAAoB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAEpF,uBAAA,YAAY,GAAG,SAAS,CAAC;IACzB,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAzBW,QAAA,gBAAgB,oBAyB3B"}
@@ -13,6 +13,7 @@ exports.dxpSessionMiddleware = exports.DxpSessionMiddleware = void 0;
13
13
  require("reflect-metadata");
14
14
  const inversify_1 = require("inversify");
15
15
  const ioc_1 = require("../ioc");
16
+ const dx_common_lib_1 = require("@squiz/dx-common-lib");
16
17
  let DxpSessionMiddleware = class DxpSessionMiddleware {
17
18
  constructor(sessionParser, authenticator, config) {
18
19
  this.sessionParser = sessionParser;
@@ -35,7 +36,7 @@ let DxpSessionMiddleware = class DxpSessionMiddleware {
35
36
  await this.authenticator.authenticate(req);
36
37
  }
37
38
  catch (error) {
38
- return next(error);
39
+ return next(new dx_common_lib_1.UnAuthenticatedRequestError(error.message));
39
40
  }
40
41
  }
41
42
  next();
@@ -1 +1 @@
1
- {"version":3,"file":"DxpSessionMiddlewareTsoa.js","sourceRoot":"","sources":["../../src/webserver/DxpSessionMiddlewareTsoa.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4BAA0B;AAE1B,yCAAuC;AACvC,gCAA8C;AAUvC,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,KAAK,CAAC,CAAC;YACrB,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;AACxC,CAAC,CAAC;AAHW,QAAA,oBAAoB,wBAG/B"}
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;AACxC,CAAC,CAAC;AAHW,QAAA,oBAAoB,wBAG/B"}
@@ -1,7 +1,7 @@
1
1
  import { type Express } from 'express';
2
2
  import { type Services, type Config } from '../ioc';
3
- import { DxpSession } from '@squiz/dxp-session-lib';
4
- declare module 'express' {
3
+ import type { DxpSession } from '@squiz/dxp-session-lib';
4
+ declare module 'express-serve-static-core' {
5
5
  interface Request {
6
6
  session: DxpSession;
7
7
  }
@@ -4,7 +4,7 @@ import { MANIFEST_MODELS } from '@squiz/dx-json-schema-lib';
4
4
  import { ComponentRunnerService } from '../../component-runner';
5
5
  import { Config } from '../../ioc';
6
6
  import { Request as ExpressRequest } from 'express';
7
- type ComponentManifest = MANIFEST_MODELS.v1.ComponentManifest;
7
+ type ComponentManifestType = MANIFEST_MODELS.v1.ComponentManifest;
8
8
  type ComponentSchema = {
9
9
  name: string;
10
10
  schema: object;
@@ -14,8 +14,8 @@ export declare class DevelopmentController extends Controller {
14
14
  private manifestService;
15
15
  private componentRunnerService;
16
16
  constructor(config: Config, manifestService: ManifestService, componentRunnerService: ComponentRunnerService);
17
- getComponents(): Promise<ComponentManifest[]>;
18
- Manifest(namespace: string, componentName: string, version: string): Promise<ComponentManifest>;
17
+ getComponents(): Promise<ComponentManifestType[]>;
18
+ Manifest(namespace: string, componentName: string, version: string): Promise<ComponentManifestType>;
19
19
  getContentSchema(namespace: string, componentName: string, version: string): Promise<ComponentSchema[]>;
20
20
  TemporaryPreview(req: ExpressRequest, namespace: string, componentName: string, version: string, functionName: string, headers?: any, envVars?: any, data?: any): Promise<void>;
21
21
  }