@entur-partner/bff 1.2.6 → 1.2.8-alpha.0

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.
@@ -7,13 +7,14 @@ var proxy = require('express-http-proxy');
7
7
  var requireOAuth = function requireOAuth(req) {
8
8
  return /(^undefined$)|(^Bearer .+$)/gim.test(req.headers.authorization || "");
9
9
  };
10
- var proxyConfig = function proxyConfig(methods, proxyReqPathResolver) {
10
+ var proxyConfig = function proxyConfig(methods, proxyReqPathResolver, proxyReqOptDecorator) {
11
11
  var httpMethods = Array.isArray(methods) ? methods : [methods];
12
12
  return {
13
13
  filter: function filter(req) {
14
14
  return httpMethods.includes(req.method) && requireOAuth(req);
15
15
  },
16
16
  proxyReqPathResolver: proxyReqPathResolver,
17
+ proxyReqOptDecorator: proxyReqOptDecorator,
17
18
  proxyReqBodyDecorator: function proxyReqBodyDecorator(bodyContent, _srcReq) {
18
19
  return bodyContent;
19
20
  },
@@ -23,12 +24,15 @@ var proxyConfig = function proxyConfig(methods, proxyReqPathResolver) {
23
24
  var stripTrailingSlash = function stripTrailingSlash(url) {
24
25
  return url.endsWith("/") ? url.substring(0, url.length - 1) : url;
25
26
  };
27
+ console.log("WHATAFUCK?");
26
28
  // forwards a call of a specific url / set of methods to a remote server
27
29
  var forwardingProxy = function forwardingProxy(apiUrl) {
28
- return function (method, forwardPath) {
30
+ return function (method, forwardPath, proxyReqOptDecorator) {
31
+ var methodsForLog = Array.isArray(method) ? method.join(", ") : method;
32
+ console.log("Setting up forwarding proxy to " + apiUrl + " for methods: " + methodsForLog);
29
33
  return proxy(apiUrl, proxyConfig(method, function () {
30
34
  return stripTrailingSlash(new URL(apiUrl).pathname) + forwardPath.apply(void 0, arguments);
31
- }));
35
+ }, proxyReqOptDecorator));
32
36
  };
33
37
  };
34
38
 
@@ -1 +1 @@
1
- {"version":3,"file":"bff.cjs.development.js","sources":["../src/forwardingproxy.ts"],"sourcesContent":["import type { Request } from \"express\";\nimport proxy, { type ProxyOptions } from \"express-http-proxy\";\n\nconst requireOAuth = (req: Request) =>\n\t/(^undefined$)|(^Bearer .+$)/gim.test(req.headers.authorization || \"\");\n\nexport const proxyConfig = (\n\tmethods: string[],\n\tproxyReqPathResolver: Required<ProxyOptions>[\"proxyReqPathResolver\"],\n): Parameters<typeof proxy>[1] => {\n\tconst httpMethods = Array.isArray(methods) ? methods : [methods];\n\n\treturn {\n\t\tfilter: (req: Request) =>\n\t\t\thttpMethods.includes(req.method) && requireOAuth(req),\n\t\tproxyReqPathResolver,\n\t\tproxyReqBodyDecorator: (bodyContent, _srcReq) => bodyContent,\n\t\tlimit: `${process.env.UPLOAD_LIMIT_MB || 200}mb`,\n\t};\n};\n\nconst stripTrailingSlash = (url: string) =>\n\turl.endsWith(\"/\") ? url.substring(0, url.length - 1) : url;\n\n// forwards a call of a specific url / set of methods to a remote server\nexport const forwardingProxy =\n\t(apiUrl: string) =>\n\t(method: string[], forwardPath: (...reqs: Request[]) => string) =>\n\t\tproxy(\n\t\t\tapiUrl,\n\t\t\tproxyConfig(\n\t\t\t\tmethod,\n\t\t\t\t(...params) =>\n\t\t\t\t\tstripTrailingSlash(new URL(apiUrl).pathname) + forwardPath(...params),\n\t\t\t),\n\t\t);\n"],"names":["requireOAuth","req","test","headers","authorization","proxyConfig","methods","proxyReqPathResolver","httpMethods","Array","isArray","filter","includes","method","proxyReqBodyDecorator","bodyContent","_srcReq","limit","process","env","UPLOAD_LIMIT_MB","stripTrailingSlash","url","endsWith","substring","length","forwardingProxy","apiUrl","forwardPath","proxy","URL","pathname","apply","arguments"],"mappings":";;;;;;AAGA,IAAMA,YAAY,GAAG,SAAfA,YAAYA,CAAIC,GAAY,EAAA;EAAA,OACjC,gCAAgC,CAACC,IAAI,CAACD,GAAG,CAACE,OAAO,CAACC,aAAa,IAAI,EAAE,CAAC,CAAA;AAAA,CAAA,CAAA;AAEhE,IAAMC,WAAW,GAAG,SAAdA,WAAWA,CACvBC,OAAiB,EACjBC,oBAAoE,EACpC;AAChC,EAAA,IAAMC,WAAW,GAAGC,KAAK,CAACC,OAAO,CAACJ,OAAO,CAAC,GAAGA,OAAO,GAAG,CAACA,OAAO,CAAC,CAAA;EAEhE,OAAO;AACNK,IAAAA,MAAM,EAAE,SAARA,MAAMA,CAAGV,GAAY,EAAA;AAAA,MAAA,OACpBO,WAAW,CAACI,QAAQ,CAACX,GAAG,CAACY,MAAM,CAAC,IAAIb,YAAY,CAACC,GAAG,CAAC,CAAA;AAAA,KAAA;AACtDM,IAAAA,oBAAoB,EAApBA,oBAAoB;AACpBO,IAAAA,qBAAqB,EAAE,SAAvBA,qBAAqBA,CAAGC,WAAW,EAAEC,OAAO,EAAA;AAAA,MAAA,OAAKD,WAAW,CAAA;AAAA,KAAA;AAC5DE,IAAAA,KAAK,GAAKC,OAAO,CAACC,GAAG,CAACC,eAAe,IAAI,GAAG,IAAA,IAAA;GAC5C,CAAA;AACF,EAAC;AAED,IAAMC,kBAAkB,GAAG,SAArBA,kBAAkBA,CAAIC,GAAW,EAAA;EAAA,OACtCA,GAAG,CAACC,QAAQ,CAAC,GAAG,CAAC,GAAGD,GAAG,CAACE,SAAS,CAAC,CAAC,EAAEF,GAAG,CAACG,MAAM,GAAG,CAAC,CAAC,GAAGH,GAAG,CAAA;AAAA,CAAA,CAAA;AAE3D;IACaI,eAAe,GAC3B,SADYA,eAAeA,CAC1BC,MAAc,EAAA;EAAA,OACf,UAACd,MAAgB,EAAEe,WAA2C,EAAA;AAAA,IAAA,OAC7DC,KAAK,CACJF,MAAM,EACNtB,WAAW,CACVQ,MAAM,EACN,YAAA;AAAA,MAAA,OACCQ,kBAAkB,CAAC,IAAIS,GAAG,CAACH,MAAM,CAAC,CAACI,QAAQ,CAAC,GAAGH,WAAW,CAAAI,KAAA,CAAA,KAAA,CAAA,EAAAC,SAAU,CAAC,CAAA;AAAA,KAAA,CACtE,CACD,CAAA;AAAA,GAAA,CAAA;AAAA;;;;;"}
1
+ {"version":3,"file":"bff.cjs.development.js","sources":["../src/forwardingproxy.ts"],"sourcesContent":["import type { Request } from \"express\";\nimport proxy, { type ProxyOptions } from \"express-http-proxy\";\n\nconst requireOAuth = (req: Request) =>\n\t/(^undefined$)|(^Bearer .+$)/gim.test(req.headers.authorization || \"\");\n\nexport const proxyConfig = (\n\tmethods: string[],\n\tproxyReqPathResolver: Required<ProxyOptions>[\"proxyReqPathResolver\"],\n\tproxyReqOptDecorator?: Required<ProxyOptions>[\"proxyReqOptDecorator\"],\n): Parameters<typeof proxy>[1] => {\n\tconst httpMethods = Array.isArray(methods) ? methods : [methods];\n\n\treturn {\n\t\tfilter: (req: Request) =>\n\t\t\thttpMethods.includes(req.method) && requireOAuth(req),\n\t\tproxyReqPathResolver,\n\t\tproxyReqOptDecorator,\n\t\tproxyReqBodyDecorator: (bodyContent, _srcReq) => bodyContent,\n\t\tlimit: `${process.env.UPLOAD_LIMIT_MB || 200}mb`,\n\t};\n};\n\nconst stripTrailingSlash = (url: string) =>\n\turl.endsWith(\"/\") ? url.substring(0, url.length - 1) : url;\n\nexport type ForwardingProxyType = {\n\tmethod: string[];\n\tforwardPath: (...reqs: Request[]) => string;\n\tproxyReqOptDecorator?: Required<ProxyOptions>[\"proxyReqOptDecorator\"];\n};\nconsole.log(\"WHATAFUCK?\");\n// forwards a call of a specific url / set of methods to a remote server\nexport const forwardingProxy =\n\t(apiUrl: string) =>\n\t(\n\t\tmethod: ForwardingProxyType[\"method\"],\n\t\tforwardPath: ForwardingProxyType[\"forwardPath\"],\n\t\tproxyReqOptDecorator?: ForwardingProxyType[\"proxyReqOptDecorator\"],\n\t) => {\n\t\tconst methodsForLog = Array.isArray(method) ? method.join(\", \") : method;\n\t\tconsole.log(\n\t\t\t`Setting up forwarding proxy to ${apiUrl} for methods: ${methodsForLog}`,\n\t\t);\n\t\treturn proxy(\n\t\t\tapiUrl,\n\t\t\tproxyConfig(\n\t\t\t\tmethod,\n\t\t\t\t(...params) =>\n\t\t\t\t\tstripTrailingSlash(new URL(apiUrl).pathname) + forwardPath(...params),\n\t\t\t\tproxyReqOptDecorator,\n\t\t\t),\n\t\t);\n\t};\n"],"names":["requireOAuth","req","test","headers","authorization","proxyConfig","methods","proxyReqPathResolver","proxyReqOptDecorator","httpMethods","Array","isArray","filter","includes","method","proxyReqBodyDecorator","bodyContent","_srcReq","limit","process","env","UPLOAD_LIMIT_MB","stripTrailingSlash","url","endsWith","substring","length","console","log","forwardingProxy","apiUrl","forwardPath","methodsForLog","join","proxy","URL","pathname","apply","arguments"],"mappings":";;;;;;AAGA,IAAMA,YAAY,GAAG,SAAfA,YAAYA,CAAIC,GAAY,EAAA;EAAA,OACjC,gCAAgC,CAACC,IAAI,CAACD,GAAG,CAACE,OAAO,CAACC,aAAa,IAAI,EAAE,CAAC,CAAA;AAAA,CAAA,CAAA;AAEhE,IAAMC,WAAW,GAAG,SAAdA,WAAWA,CACvBC,OAAiB,EACjBC,oBAAoE,EACpEC,oBAAqE,EACrC;AAChC,EAAA,IAAMC,WAAW,GAAGC,KAAK,CAACC,OAAO,CAACL,OAAO,CAAC,GAAGA,OAAO,GAAG,CAACA,OAAO,CAAC,CAAA;EAEhE,OAAO;AACNM,IAAAA,MAAM,EAAE,SAARA,MAAMA,CAAGX,GAAY,EAAA;AAAA,MAAA,OACpBQ,WAAW,CAACI,QAAQ,CAACZ,GAAG,CAACa,MAAM,CAAC,IAAId,YAAY,CAACC,GAAG,CAAC,CAAA;AAAA,KAAA;AACtDM,IAAAA,oBAAoB,EAApBA,oBAAoB;AACpBC,IAAAA,oBAAoB,EAApBA,oBAAoB;AACpBO,IAAAA,qBAAqB,EAAE,SAAvBA,qBAAqBA,CAAGC,WAAW,EAAEC,OAAO,EAAA;AAAA,MAAA,OAAKD,WAAW,CAAA;AAAA,KAAA;AAC5DE,IAAAA,KAAK,GAAKC,OAAO,CAACC,GAAG,CAACC,eAAe,IAAI,GAAG,IAAA,IAAA;GAC5C,CAAA;AACF,EAAC;AAED,IAAMC,kBAAkB,GAAG,SAArBA,kBAAkBA,CAAIC,GAAW,EAAA;EAAA,OACtCA,GAAG,CAACC,QAAQ,CAAC,GAAG,CAAC,GAAGD,GAAG,CAACE,SAAS,CAAC,CAAC,EAAEF,GAAG,CAACG,MAAM,GAAG,CAAC,CAAC,GAAGH,GAAG,CAAA;AAAA,CAAA,CAAA;AAO3DI,OAAO,CAACC,GAAG,CAAC,YAAY,CAAC,CAAA;AACzB;IACaC,eAAe,GAC3B,SADYA,eAAeA,CAC1BC,MAAc,EAAA;AAAA,EAAA,OACf,UACChB,MAAqC,EACrCiB,WAA+C,EAC/CvB,oBAAkE,EAC/D;AACH,IAAA,IAAMwB,aAAa,GAAGtB,KAAK,CAACC,OAAO,CAACG,MAAM,CAAC,GAAGA,MAAM,CAACmB,IAAI,CAAC,IAAI,CAAC,GAAGnB,MAAM,CAAA;AACxEa,IAAAA,OAAO,CAACC,GAAG,CAAA,iCAAA,GACwBE,MAAM,GAAA,gBAAA,GAAiBE,aAAe,CACxE,CAAA;AACD,IAAA,OAAOE,KAAK,CACXJ,MAAM,EACNzB,WAAW,CACVS,MAAM,EACN,YAAA;AAAA,MAAA,OACCQ,kBAAkB,CAAC,IAAIa,GAAG,CAACL,MAAM,CAAC,CAACM,QAAQ,CAAC,GAAGL,WAAW,CAAAM,KAAA,CAAA,KAAA,CAAA,EAAAC,SAAU,CAAC,CAAA;KACtE9B,EAAAA,oBAAoB,CACpB,CACD,CAAA;GACD,CAAA;AAAA;;;;;"}
@@ -1,2 +1,2 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var r=require("express-http-proxy"),e=function(r,e){var t=Array.isArray(r)?r:[r];return{filter:function(r){return t.includes(r.method)&&function(r){return/(^undefined$)|(^Bearer .+$)/gim.test(r.headers.authorization||"")}(r)},proxyReqPathResolver:e,proxyReqBodyDecorator:function(r,e){return r},limit:(process.env.UPLOAD_LIMIT_MB||200)+"mb"}};exports.forwardingProxy=function(t){return function(n,o){return r(t,e(n,function(){return((r=new URL(t).pathname).endsWith("/")?r.substring(0,r.length-1):r)+o.apply(void 0,arguments);var r}))}},exports.proxyConfig=e;
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var r=require("express-http-proxy"),e=function(r,e,o){var t=Array.isArray(r)?r:[r];return{filter:function(r){return t.includes(r.method)&&function(r){return/(^undefined$)|(^Bearer .+$)/gim.test(r.headers.authorization||"")}(r)},proxyReqPathResolver:e,proxyReqOptDecorator:o,proxyReqBodyDecorator:function(r,e){return r},limit:(process.env.UPLOAD_LIMIT_MB||200)+"mb"}};console.log("WHATAFUCK?"),exports.forwardingProxy=function(o){return function(t,n,i){var u=Array.isArray(t)?t.join(", "):t;return console.log("Setting up forwarding proxy to "+o+" for methods: "+u),r(o,e(t,function(){return((r=new URL(o).pathname).endsWith("/")?r.substring(0,r.length-1):r)+n.apply(void 0,arguments);var r},i))}},exports.proxyConfig=e;
2
2
  //# sourceMappingURL=bff.cjs.production.min.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"bff.cjs.production.min.js","sources":["../src/forwardingproxy.ts"],"sourcesContent":["import type { Request } from \"express\";\nimport proxy, { type ProxyOptions } from \"express-http-proxy\";\n\nconst requireOAuth = (req: Request) =>\n\t/(^undefined$)|(^Bearer .+$)/gim.test(req.headers.authorization || \"\");\n\nexport const proxyConfig = (\n\tmethods: string[],\n\tproxyReqPathResolver: Required<ProxyOptions>[\"proxyReqPathResolver\"],\n): Parameters<typeof proxy>[1] => {\n\tconst httpMethods = Array.isArray(methods) ? methods : [methods];\n\n\treturn {\n\t\tfilter: (req: Request) =>\n\t\t\thttpMethods.includes(req.method) && requireOAuth(req),\n\t\tproxyReqPathResolver,\n\t\tproxyReqBodyDecorator: (bodyContent, _srcReq) => bodyContent,\n\t\tlimit: `${process.env.UPLOAD_LIMIT_MB || 200}mb`,\n\t};\n};\n\nconst stripTrailingSlash = (url: string) =>\n\turl.endsWith(\"/\") ? url.substring(0, url.length - 1) : url;\n\n// forwards a call of a specific url / set of methods to a remote server\nexport const forwardingProxy =\n\t(apiUrl: string) =>\n\t(method: string[], forwardPath: (...reqs: Request[]) => string) =>\n\t\tproxy(\n\t\t\tapiUrl,\n\t\t\tproxyConfig(\n\t\t\t\tmethod,\n\t\t\t\t(...params) =>\n\t\t\t\t\tstripTrailingSlash(new URL(apiUrl).pathname) + forwardPath(...params),\n\t\t\t),\n\t\t);\n"],"names":["proxyConfig","methods","proxyReqPathResolver","httpMethods","Array","isArray","filter","req","includes","method","test","headers","authorization","requireOAuth","proxyReqBodyDecorator","bodyContent","_srcReq","limit","process","env","UPLOAD_LIMIT_MB","apiUrl","forwardPath","proxy","url","URL","pathname","endsWith","substring","length","apply","arguments"],"mappings":"wGAMaA,EAAc,SAC1BC,EACAC,GAEA,IAAMC,EAAcC,MAAMC,QAAQJ,GAAWA,EAAU,CAACA,GAExD,MAAO,CACNK,OAAQ,SAACC,GAAY,OACpBJ,EAAYK,SAASD,EAAIE,SAXP,SAACF,GAAY,MACjC,iCAAiCG,KAAKH,EAAII,QAAQC,eAAiB,GAAG,CAUhCC,CAAaN,EAAI,EACtDL,qBAAAA,EACAY,sBAAuB,SAACC,EAAaC,GAAO,OAAKD,CAAW,EAC5DE,OAAUC,QAAQC,IAAIC,iBAAmB,KAAG,KAE9C,0BAOC,SAACC,GAAc,OACf,SAACZ,EAAkBa,GAA2C,OAC7DC,EACCF,EACArB,EACCS,EACA,WAAA,QAXwBe,EAYJ,IAAIC,IAAIJ,GAAQK,UAXnCC,SAAS,KAAOH,EAAII,UAAU,EAAGJ,EAAIK,OAAS,GAAKL,GAWJF,EAAWQ,WAAA,EAAAC,WAZpC,IAACP,CAY8C,GAEvE,CAAA"}
1
+ {"version":3,"file":"bff.cjs.production.min.js","sources":["../src/forwardingproxy.ts"],"sourcesContent":["import type { Request } from \"express\";\nimport proxy, { type ProxyOptions } from \"express-http-proxy\";\n\nconst requireOAuth = (req: Request) =>\n\t/(^undefined$)|(^Bearer .+$)/gim.test(req.headers.authorization || \"\");\n\nexport const proxyConfig = (\n\tmethods: string[],\n\tproxyReqPathResolver: Required<ProxyOptions>[\"proxyReqPathResolver\"],\n\tproxyReqOptDecorator?: Required<ProxyOptions>[\"proxyReqOptDecorator\"],\n): Parameters<typeof proxy>[1] => {\n\tconst httpMethods = Array.isArray(methods) ? methods : [methods];\n\n\treturn {\n\t\tfilter: (req: Request) =>\n\t\t\thttpMethods.includes(req.method) && requireOAuth(req),\n\t\tproxyReqPathResolver,\n\t\tproxyReqOptDecorator,\n\t\tproxyReqBodyDecorator: (bodyContent, _srcReq) => bodyContent,\n\t\tlimit: `${process.env.UPLOAD_LIMIT_MB || 200}mb`,\n\t};\n};\n\nconst stripTrailingSlash = (url: string) =>\n\turl.endsWith(\"/\") ? url.substring(0, url.length - 1) : url;\n\nexport type ForwardingProxyType = {\n\tmethod: string[];\n\tforwardPath: (...reqs: Request[]) => string;\n\tproxyReqOptDecorator?: Required<ProxyOptions>[\"proxyReqOptDecorator\"];\n};\nconsole.log(\"WHATAFUCK?\");\n// forwards a call of a specific url / set of methods to a remote server\nexport const forwardingProxy =\n\t(apiUrl: string) =>\n\t(\n\t\tmethod: ForwardingProxyType[\"method\"],\n\t\tforwardPath: ForwardingProxyType[\"forwardPath\"],\n\t\tproxyReqOptDecorator?: ForwardingProxyType[\"proxyReqOptDecorator\"],\n\t) => {\n\t\tconst methodsForLog = Array.isArray(method) ? method.join(\", \") : method;\n\t\tconsole.log(\n\t\t\t`Setting up forwarding proxy to ${apiUrl} for methods: ${methodsForLog}`,\n\t\t);\n\t\treturn proxy(\n\t\t\tapiUrl,\n\t\t\tproxyConfig(\n\t\t\t\tmethod,\n\t\t\t\t(...params) =>\n\t\t\t\t\tstripTrailingSlash(new URL(apiUrl).pathname) + forwardPath(...params),\n\t\t\t\tproxyReqOptDecorator,\n\t\t\t),\n\t\t);\n\t};\n"],"names":["proxyConfig","methods","proxyReqPathResolver","proxyReqOptDecorator","httpMethods","Array","isArray","filter","req","includes","method","test","headers","authorization","requireOAuth","proxyReqBodyDecorator","bodyContent","_srcReq","limit","process","env","UPLOAD_LIMIT_MB","console","log","apiUrl","forwardPath","methodsForLog","join","proxy","url","URL","pathname","endsWith","substring","length","apply","arguments"],"mappings":"wGAMaA,EAAc,SAC1BC,EACAC,EACAC,GAEA,IAAMC,EAAcC,MAAMC,QAAQL,GAAWA,EAAU,CAACA,GAExD,MAAO,CACNM,OAAQ,SAACC,GAAY,OACpBJ,EAAYK,SAASD,EAAIE,SAZP,SAACF,GAAY,MACjC,iCAAiCG,KAAKH,EAAII,QAAQC,eAAiB,GAAG,CAWhCC,CAAaN,EAAI,EACtDN,qBAAAA,EACAC,qBAAAA,EACAY,sBAAuB,SAACC,EAAaC,GAAO,OAAKD,CAAW,EAC5DE,OAAUC,QAAQC,IAAIC,iBAAmB,KAAG,KAE9C,EAUAC,QAAQC,IAAI,sCAGX,SAACC,GAAc,OACf,SACCd,EACAe,EACAtB,GAEA,IAAMuB,EAAgBrB,MAAMC,QAAQI,GAAUA,EAAOiB,KAAK,MAAQjB,EAIlE,OAHAY,QAAQC,IAAG,kCACwBC,EAAM,iBAAiBE,GAEnDE,EACNJ,EACAxB,EACCU,EACA,WAAA,QAzBwBmB,EA0BJ,IAAIC,IAAIN,GAAQO,UAzBnCC,SAAS,KAAOH,EAAII,UAAU,EAAGJ,EAAIK,OAAS,GAAKL,GAyBJJ,EAAWU,WAAA,EAAAC,WA1BpC,IAACP,GA2BxB1B,IAGF"}
package/dist/bff.esm.js CHANGED
@@ -3,13 +3,14 @@ import proxy from 'express-http-proxy';
3
3
  var requireOAuth = function requireOAuth(req) {
4
4
  return /(^undefined$)|(^Bearer .+$)/gim.test(req.headers.authorization || "");
5
5
  };
6
- var proxyConfig = function proxyConfig(methods, proxyReqPathResolver) {
6
+ var proxyConfig = function proxyConfig(methods, proxyReqPathResolver, proxyReqOptDecorator) {
7
7
  var httpMethods = Array.isArray(methods) ? methods : [methods];
8
8
  return {
9
9
  filter: function filter(req) {
10
10
  return httpMethods.includes(req.method) && requireOAuth(req);
11
11
  },
12
12
  proxyReqPathResolver: proxyReqPathResolver,
13
+ proxyReqOptDecorator: proxyReqOptDecorator,
13
14
  proxyReqBodyDecorator: function proxyReqBodyDecorator(bodyContent, _srcReq) {
14
15
  return bodyContent;
15
16
  },
@@ -19,12 +20,15 @@ var proxyConfig = function proxyConfig(methods, proxyReqPathResolver) {
19
20
  var stripTrailingSlash = function stripTrailingSlash(url) {
20
21
  return url.endsWith("/") ? url.substring(0, url.length - 1) : url;
21
22
  };
23
+ console.log("WHATAFUCK?");
22
24
  // forwards a call of a specific url / set of methods to a remote server
23
25
  var forwardingProxy = function forwardingProxy(apiUrl) {
24
- return function (method, forwardPath) {
26
+ return function (method, forwardPath, proxyReqOptDecorator) {
27
+ var methodsForLog = Array.isArray(method) ? method.join(", ") : method;
28
+ console.log("Setting up forwarding proxy to " + apiUrl + " for methods: " + methodsForLog);
25
29
  return proxy(apiUrl, proxyConfig(method, function () {
26
30
  return stripTrailingSlash(new URL(apiUrl).pathname) + forwardPath.apply(void 0, arguments);
27
- }));
31
+ }, proxyReqOptDecorator));
28
32
  };
29
33
  };
30
34
 
@@ -1 +1 @@
1
- {"version":3,"file":"bff.esm.js","sources":["../src/forwardingproxy.ts"],"sourcesContent":["import type { Request } from \"express\";\nimport proxy, { type ProxyOptions } from \"express-http-proxy\";\n\nconst requireOAuth = (req: Request) =>\n\t/(^undefined$)|(^Bearer .+$)/gim.test(req.headers.authorization || \"\");\n\nexport const proxyConfig = (\n\tmethods: string[],\n\tproxyReqPathResolver: Required<ProxyOptions>[\"proxyReqPathResolver\"],\n): Parameters<typeof proxy>[1] => {\n\tconst httpMethods = Array.isArray(methods) ? methods : [methods];\n\n\treturn {\n\t\tfilter: (req: Request) =>\n\t\t\thttpMethods.includes(req.method) && requireOAuth(req),\n\t\tproxyReqPathResolver,\n\t\tproxyReqBodyDecorator: (bodyContent, _srcReq) => bodyContent,\n\t\tlimit: `${process.env.UPLOAD_LIMIT_MB || 200}mb`,\n\t};\n};\n\nconst stripTrailingSlash = (url: string) =>\n\turl.endsWith(\"/\") ? url.substring(0, url.length - 1) : url;\n\n// forwards a call of a specific url / set of methods to a remote server\nexport const forwardingProxy =\n\t(apiUrl: string) =>\n\t(method: string[], forwardPath: (...reqs: Request[]) => string) =>\n\t\tproxy(\n\t\t\tapiUrl,\n\t\t\tproxyConfig(\n\t\t\t\tmethod,\n\t\t\t\t(...params) =>\n\t\t\t\t\tstripTrailingSlash(new URL(apiUrl).pathname) + forwardPath(...params),\n\t\t\t),\n\t\t);\n"],"names":["requireOAuth","req","test","headers","authorization","proxyConfig","methods","proxyReqPathResolver","httpMethods","Array","isArray","filter","includes","method","proxyReqBodyDecorator","bodyContent","_srcReq","limit","process","env","UPLOAD_LIMIT_MB","stripTrailingSlash","url","endsWith","substring","length","forwardingProxy","apiUrl","forwardPath","proxy","URL","pathname","apply","arguments"],"mappings":";;AAGA,IAAMA,YAAY,GAAG,SAAfA,YAAYA,CAAIC,GAAY,EAAA;EAAA,OACjC,gCAAgC,CAACC,IAAI,CAACD,GAAG,CAACE,OAAO,CAACC,aAAa,IAAI,EAAE,CAAC,CAAA;AAAA,CAAA,CAAA;AAEhE,IAAMC,WAAW,GAAG,SAAdA,WAAWA,CACvBC,OAAiB,EACjBC,oBAAoE,EACpC;AAChC,EAAA,IAAMC,WAAW,GAAGC,KAAK,CAACC,OAAO,CAACJ,OAAO,CAAC,GAAGA,OAAO,GAAG,CAACA,OAAO,CAAC,CAAA;EAEhE,OAAO;AACNK,IAAAA,MAAM,EAAE,SAARA,MAAMA,CAAGV,GAAY,EAAA;AAAA,MAAA,OACpBO,WAAW,CAACI,QAAQ,CAACX,GAAG,CAACY,MAAM,CAAC,IAAIb,YAAY,CAACC,GAAG,CAAC,CAAA;AAAA,KAAA;AACtDM,IAAAA,oBAAoB,EAApBA,oBAAoB;AACpBO,IAAAA,qBAAqB,EAAE,SAAvBA,qBAAqBA,CAAGC,WAAW,EAAEC,OAAO,EAAA;AAAA,MAAA,OAAKD,WAAW,CAAA;AAAA,KAAA;AAC5DE,IAAAA,KAAK,GAAKC,OAAO,CAACC,GAAG,CAACC,eAAe,IAAI,GAAG,IAAA,IAAA;GAC5C,CAAA;AACF,EAAC;AAED,IAAMC,kBAAkB,GAAG,SAArBA,kBAAkBA,CAAIC,GAAW,EAAA;EAAA,OACtCA,GAAG,CAACC,QAAQ,CAAC,GAAG,CAAC,GAAGD,GAAG,CAACE,SAAS,CAAC,CAAC,EAAEF,GAAG,CAACG,MAAM,GAAG,CAAC,CAAC,GAAGH,GAAG,CAAA;AAAA,CAAA,CAAA;AAE3D;IACaI,eAAe,GAC3B,SADYA,eAAeA,CAC1BC,MAAc,EAAA;EAAA,OACf,UAACd,MAAgB,EAAEe,WAA2C,EAAA;AAAA,IAAA,OAC7DC,KAAK,CACJF,MAAM,EACNtB,WAAW,CACVQ,MAAM,EACN,YAAA;AAAA,MAAA,OACCQ,kBAAkB,CAAC,IAAIS,GAAG,CAACH,MAAM,CAAC,CAACI,QAAQ,CAAC,GAAGH,WAAW,CAAAI,KAAA,CAAA,KAAA,CAAA,EAAAC,SAAU,CAAC,CAAA;AAAA,KAAA,CACtE,CACD,CAAA;AAAA,GAAA,CAAA;AAAA;;;;"}
1
+ {"version":3,"file":"bff.esm.js","sources":["../src/forwardingproxy.ts"],"sourcesContent":["import type { Request } from \"express\";\nimport proxy, { type ProxyOptions } from \"express-http-proxy\";\n\nconst requireOAuth = (req: Request) =>\n\t/(^undefined$)|(^Bearer .+$)/gim.test(req.headers.authorization || \"\");\n\nexport const proxyConfig = (\n\tmethods: string[],\n\tproxyReqPathResolver: Required<ProxyOptions>[\"proxyReqPathResolver\"],\n\tproxyReqOptDecorator?: Required<ProxyOptions>[\"proxyReqOptDecorator\"],\n): Parameters<typeof proxy>[1] => {\n\tconst httpMethods = Array.isArray(methods) ? methods : [methods];\n\n\treturn {\n\t\tfilter: (req: Request) =>\n\t\t\thttpMethods.includes(req.method) && requireOAuth(req),\n\t\tproxyReqPathResolver,\n\t\tproxyReqOptDecorator,\n\t\tproxyReqBodyDecorator: (bodyContent, _srcReq) => bodyContent,\n\t\tlimit: `${process.env.UPLOAD_LIMIT_MB || 200}mb`,\n\t};\n};\n\nconst stripTrailingSlash = (url: string) =>\n\turl.endsWith(\"/\") ? url.substring(0, url.length - 1) : url;\n\nexport type ForwardingProxyType = {\n\tmethod: string[];\n\tforwardPath: (...reqs: Request[]) => string;\n\tproxyReqOptDecorator?: Required<ProxyOptions>[\"proxyReqOptDecorator\"];\n};\nconsole.log(\"WHATAFUCK?\");\n// forwards a call of a specific url / set of methods to a remote server\nexport const forwardingProxy =\n\t(apiUrl: string) =>\n\t(\n\t\tmethod: ForwardingProxyType[\"method\"],\n\t\tforwardPath: ForwardingProxyType[\"forwardPath\"],\n\t\tproxyReqOptDecorator?: ForwardingProxyType[\"proxyReqOptDecorator\"],\n\t) => {\n\t\tconst methodsForLog = Array.isArray(method) ? method.join(\", \") : method;\n\t\tconsole.log(\n\t\t\t`Setting up forwarding proxy to ${apiUrl} for methods: ${methodsForLog}`,\n\t\t);\n\t\treturn proxy(\n\t\t\tapiUrl,\n\t\t\tproxyConfig(\n\t\t\t\tmethod,\n\t\t\t\t(...params) =>\n\t\t\t\t\tstripTrailingSlash(new URL(apiUrl).pathname) + forwardPath(...params),\n\t\t\t\tproxyReqOptDecorator,\n\t\t\t),\n\t\t);\n\t};\n"],"names":["requireOAuth","req","test","headers","authorization","proxyConfig","methods","proxyReqPathResolver","proxyReqOptDecorator","httpMethods","Array","isArray","filter","includes","method","proxyReqBodyDecorator","bodyContent","_srcReq","limit","process","env","UPLOAD_LIMIT_MB","stripTrailingSlash","url","endsWith","substring","length","console","log","forwardingProxy","apiUrl","forwardPath","methodsForLog","join","proxy","URL","pathname","apply","arguments"],"mappings":";;AAGA,IAAMA,YAAY,GAAG,SAAfA,YAAYA,CAAIC,GAAY,EAAA;EAAA,OACjC,gCAAgC,CAACC,IAAI,CAACD,GAAG,CAACE,OAAO,CAACC,aAAa,IAAI,EAAE,CAAC,CAAA;AAAA,CAAA,CAAA;AAEhE,IAAMC,WAAW,GAAG,SAAdA,WAAWA,CACvBC,OAAiB,EACjBC,oBAAoE,EACpEC,oBAAqE,EACrC;AAChC,EAAA,IAAMC,WAAW,GAAGC,KAAK,CAACC,OAAO,CAACL,OAAO,CAAC,GAAGA,OAAO,GAAG,CAACA,OAAO,CAAC,CAAA;EAEhE,OAAO;AACNM,IAAAA,MAAM,EAAE,SAARA,MAAMA,CAAGX,GAAY,EAAA;AAAA,MAAA,OACpBQ,WAAW,CAACI,QAAQ,CAACZ,GAAG,CAACa,MAAM,CAAC,IAAId,YAAY,CAACC,GAAG,CAAC,CAAA;AAAA,KAAA;AACtDM,IAAAA,oBAAoB,EAApBA,oBAAoB;AACpBC,IAAAA,oBAAoB,EAApBA,oBAAoB;AACpBO,IAAAA,qBAAqB,EAAE,SAAvBA,qBAAqBA,CAAGC,WAAW,EAAEC,OAAO,EAAA;AAAA,MAAA,OAAKD,WAAW,CAAA;AAAA,KAAA;AAC5DE,IAAAA,KAAK,GAAKC,OAAO,CAACC,GAAG,CAACC,eAAe,IAAI,GAAG,IAAA,IAAA;GAC5C,CAAA;AACF,EAAC;AAED,IAAMC,kBAAkB,GAAG,SAArBA,kBAAkBA,CAAIC,GAAW,EAAA;EAAA,OACtCA,GAAG,CAACC,QAAQ,CAAC,GAAG,CAAC,GAAGD,GAAG,CAACE,SAAS,CAAC,CAAC,EAAEF,GAAG,CAACG,MAAM,GAAG,CAAC,CAAC,GAAGH,GAAG,CAAA;AAAA,CAAA,CAAA;AAO3DI,OAAO,CAACC,GAAG,CAAC,YAAY,CAAC,CAAA;AACzB;IACaC,eAAe,GAC3B,SADYA,eAAeA,CAC1BC,MAAc,EAAA;AAAA,EAAA,OACf,UACChB,MAAqC,EACrCiB,WAA+C,EAC/CvB,oBAAkE,EAC/D;AACH,IAAA,IAAMwB,aAAa,GAAGtB,KAAK,CAACC,OAAO,CAACG,MAAM,CAAC,GAAGA,MAAM,CAACmB,IAAI,CAAC,IAAI,CAAC,GAAGnB,MAAM,CAAA;AACxEa,IAAAA,OAAO,CAACC,GAAG,CAAA,iCAAA,GACwBE,MAAM,GAAA,gBAAA,GAAiBE,aAAe,CACxE,CAAA;AACD,IAAA,OAAOE,KAAK,CACXJ,MAAM,EACNzB,WAAW,CACVS,MAAM,EACN,YAAA;AAAA,MAAA,OACCQ,kBAAkB,CAAC,IAAIa,GAAG,CAACL,MAAM,CAAC,CAACM,QAAQ,CAAC,GAAGL,WAAW,CAAAM,KAAA,CAAA,KAAA,CAAA,EAAAC,SAAU,CAAC,CAAA;KACtE9B,EAAAA,oBAAoB,CACpB,CACD,CAAA;GACD,CAAA;AAAA;;;;"}
@@ -1,4 +1,9 @@
1
1
  import type { Request } from "express";
2
2
  import proxy, { type ProxyOptions } from "express-http-proxy";
3
- export declare const proxyConfig: (methods: string[], proxyReqPathResolver: Required<ProxyOptions>["proxyReqPathResolver"]) => Parameters<typeof proxy>[1];
4
- export declare const forwardingProxy: (apiUrl: string) => (method: string[], forwardPath: (...reqs: Request[]) => string) => import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
3
+ export declare const proxyConfig: (methods: string[], proxyReqPathResolver: Required<ProxyOptions>["proxyReqPathResolver"], proxyReqOptDecorator?: Required<ProxyOptions>["proxyReqOptDecorator"]) => Parameters<typeof proxy>[1];
4
+ export type ForwardingProxyType = {
5
+ method: string[];
6
+ forwardPath: (...reqs: Request[]) => string;
7
+ proxyReqOptDecorator?: Required<ProxyOptions>["proxyReqOptDecorator"];
8
+ };
9
+ export declare const forwardingProxy: (apiUrl: string) => (method: ForwardingProxyType["method"], forwardPath: ForwardingProxyType["forwardPath"], proxyReqOptDecorator?: ForwardingProxyType["proxyReqOptDecorator"]) => import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@entur-partner/bff",
3
- "version": "1.2.6",
3
+ "version": "1.2.8-alpha.0",
4
4
  "license": "EUPL-1.2",
5
5
  "main": "dist/index.js",
6
6
  "module": "dist/bff.esm.js",
@@ -29,6 +29,7 @@
29
29
  "@types/express-http-proxy": "1.6.6"
30
30
  },
31
31
  "jest": {
32
+ "globalSetup": "../../global-jest-setup.js",
32
33
  "collectCoverageFrom": [
33
34
  "<rootDir>/src/**/*.{js,jsx,ts,tsx}"
34
35
  ]
@@ -38,5 +39,5 @@
38
39
  "reportFile": "jest-sonar-report.xml",
39
40
  "indent": 4
40
41
  },
41
- "gitHead": "b0db40c8aac1a8d043af35c5b7da726b81456110"
42
+ "gitHead": "1822e8405da7670f164d6cd5d6e87a3cca01ba13"
42
43
  }