@sphereon/ssi-express-support 0.32.1-next.54 → 0.33.1-feature.vcdm2.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.
@@ -1 +1 @@
1
- {"version":3,"file":"auth-utils.d.ts","sourceRoot":"","sources":["../src/auth-utils.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAE7B,OAAO,EAAE,YAAY,EAAmB,eAAe,EAAE,MAAM,SAAS,CAAA;AAExE,eAAO,MAAM,iBAAiB,SAAU;IAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,WAAW,OAAO,CAAC,OAAO,OAAO,OAAO,CAAC,QAAQ,QAAQ,YAAY,sDAgBxI,CAAA;AAgFD,eAAO,MAAM,uBAAuB,UAAW,YAAY,WAAW,OAAO,CAAC,OAAO,OAAO,OAAO,CAAC,QAAQ,QAAQ,OAAO,CAAC,YAAY,sDAGvI,CAAA;AAED,eAAO,MAAM,sBAAsB,UAAW,YAAY,WAAW,OAAO,CAAC,OAAO,OAAO,OAAO,CAAC,QAAQ,QAAQ,OAAO,CAAC,YAAY,sDAGtI,CAAA;AAED,eAAO,MAAM,sBAAsB,QAAS,OAAO,CAAC,OAAO,OAAO,OAAO,CAAC,QAAQ,QAAQ,OAAO,CAAC,YAAY,SAI7G,CAAA;AAED,eAAO,MAAM,mBAAmB,QAAS,OAAO,CAAC,OAAO,OAAO,OAAO,CAAC,QAAQ,QAAQ,OAAO,CAAC,YAAY,sDAM1G,CAAA;AAED,eAAO,MAAM,SAAS,UAAW,YAAY,KAAG,cAAc,CAAC,gBAAgB,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAMxH,CAAA;AAED,wBAAgB,wBAAwB,CAAC,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,eAAe,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,QAetF;AAED,wBAAgB,yBAAyB,CAAC,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,QAE1F"}
1
+ {"version":3,"file":"auth-utils.d.ts","sourceRoot":"","sources":["../src/auth-utils.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAE7B,OAAO,EAAE,YAAY,EAAmB,eAAe,EAAE,MAAM,SAAS,CAAA;AAExE,eAAO,MAAM,iBAAiB,SAAU;IAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,WAAW,OAAO,CAAC,OAAO,OAAO,OAAO,CAAC,QAAQ,QAAQ,YAAY,sDAgBxI,CAAA;AAgFD,eAAO,MAAM,uBAAuB,UAAW,YAAY,WAAW,OAAO,CAAC,OAAO,OAAO,OAAO,CAAC,QAAQ,QAAQ,OAAO,CAAC,YAAY,sDAGvI,CAAA;AAED,eAAO,MAAM,sBAAsB,UAAW,YAAY,WAAW,OAAO,CAAC,OAAO,OAAO,OAAO,CAAC,QAAQ,QAAQ,OAAO,CAAC,YAAY,sDAGtI,CAAA;AAED,eAAO,MAAM,sBAAsB,QAAS,OAAO,CAAC,OAAO,OAAO,OAAO,CAAC,QAAQ,QAAQ,OAAO,CAAC,YAAY,SAI7G,CAAA;AAED,eAAO,MAAM,mBAAmB,QAAS,OAAO,CAAC,OAAO,OAAO,OAAO,CAAC,QAAQ,QAAQ,OAAO,CAAC,YAAY,sDAM1G,CAAA;AAED,eAAO,MAAM,SAAS,UAAW,YAAY,KAAG,cAAc,CAAC,gBAAgB,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAMxH,CAAA;AAED,wBAAgB,wBAAwB,CAAC,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,eAAe,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,QAmBtF;AAED,wBAAgB,yBAAyB,CAAC,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,QAE1F"}
@@ -1,20 +1,12 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.checkAuth = exports.isUserAuthenticated = exports.isUserNotAuthenticated = exports.checkAuthorizationOnly = exports.checkAuthenticationOnly = exports.checkUserIsInRole = void 0;
7
- exports.copyGlobalAuthToEndpoint = copyGlobalAuthToEndpoint;
8
- exports.copyGlobalAuthToEndpoints = copyGlobalAuthToEndpoints;
9
- const passport_1 = __importDefault(require("passport"));
10
- const express_utils_1 = require("./express-utils");
11
- const types_1 = require("./types");
12
- const checkUserIsInRole = (opts) => (req, res, next) => {
13
- if (!(opts === null || opts === void 0 ? void 0 : opts.roles) || opts.roles.length === 0) {
1
+ import passport from 'passport';
2
+ import { sendErrorResponse } from './express-utils';
3
+ import { hasEndpointOpts } from './types';
4
+ export const checkUserIsInRole = (opts) => (req, res, next) => {
5
+ if (!opts?.roles || opts.roles.length === 0) {
14
6
  return next();
15
7
  }
16
8
  const roles = Array.isArray(opts.roles) ? opts.roles : [opts.roles];
17
- if (!(req === null || req === void 0 ? void 0 : req.user) || !('role' in req.user)) {
9
+ if (!req?.user || !('role' in req.user)) {
18
10
  return res.status(401).end();
19
11
  }
20
12
  // @ts-ignore
@@ -24,9 +16,7 @@ const checkUserIsInRole = (opts) => (req, res, next) => {
24
16
  }
25
17
  return next();
26
18
  };
27
- exports.checkUserIsInRole = checkUserIsInRole;
28
19
  const checkAuthenticationImpl = (req, res, next, opts) => {
29
- var _a, _b, _c, _d, _e, _f;
30
20
  const defaultCallback = (err, user, _info, _status) => {
31
21
  if (err) {
32
22
  const message = 'message' in err ? err.message : err;
@@ -62,12 +52,16 @@ const checkAuthenticationImpl = (req, res, next, opts) => {
62
52
  console.log(`Authentication enabled, but no strategy configured. All auth request will be denied!`);
63
53
  return res.status(401).end();
64
54
  }
65
- const options = Object.assign(Object.assign({}, (_a = opts === null || opts === void 0 ? void 0 : opts.authentication) === null || _a === void 0 ? void 0 : _a.strategyOptions), { authInfo: ((_b = opts === null || opts === void 0 ? void 0 : opts.authentication) === null || _b === void 0 ? void 0 : _b.authInfo) !== false, session: ((_c = opts === null || opts === void 0 ? void 0 : opts.authentication) === null || _c === void 0 ? void 0 : _c.session) !== false });
66
- const callback = (_e = (_d = opts === null || opts === void 0 ? void 0 : opts.authentication) === null || _d === void 0 ? void 0 : _d.callback) !== null && _e !== void 0 ? _e : (((_f = opts === null || opts === void 0 ? void 0 : opts.authentication) === null || _f === void 0 ? void 0 : _f.useDefaultCallback) ? defaultCallback : undefined);
67
- passport_1.default.authenticate(opts.authentication.strategy, options, callback).call(this, req, res, next);
55
+ const options = {
56
+ ...opts?.authentication?.strategyOptions,
57
+ authInfo: opts?.authentication?.authInfo !== false,
58
+ session: opts?.authentication?.session !== false,
59
+ };
60
+ const callback = opts?.authentication?.callback ?? (opts?.authentication?.useDefaultCallback ? defaultCallback : undefined);
61
+ passport.authenticate(opts.authentication.strategy, options, callback).call(this, req, res, next);
68
62
  };
69
63
  const checkAuthorizationImpl = (req, res, next, opts) => {
70
- if (!opts || !opts.authentication || !opts.authorization || opts.authentication.enabled === false || (opts === null || opts === void 0 ? void 0 : opts.authorization.enabled) === false) {
64
+ if (!opts || !opts.authentication || !opts.authorization || opts.authentication.enabled === false || opts?.authorization.enabled === false) {
71
65
  return next();
72
66
  }
73
67
  /*if (!req.isAuthenticated()) {
@@ -79,7 +73,7 @@ const checkAuthorizationImpl = (req, res, next, opts) => {
79
73
  return res.status(401).end();
80
74
  }
81
75
  if (authorization.requireUserInRoles && authorization.requireUserInRoles.length > 0) {
82
- (0, exports.checkUserIsInRole)({ roles: authorization.requireUserInRoles });
76
+ checkUserIsInRole({ roles: authorization.requireUserInRoles });
83
77
  }
84
78
  if (authorization.enforcer) {
85
79
  const enforcer = authorization.enforcer;
@@ -91,54 +85,55 @@ const checkAuthorizationImpl = (req, res, next, opts) => {
91
85
  }
92
86
  return next();
93
87
  };
94
- const checkAuthenticationOnly = (opts) => (req, res, next) => {
88
+ export const checkAuthenticationOnly = (opts) => (req, res, next) => {
95
89
  // executeRequestHandlers(req, res, next, opts)
96
90
  return checkAuthenticationImpl(req, res, next, opts);
97
91
  };
98
- exports.checkAuthenticationOnly = checkAuthenticationOnly;
99
- const checkAuthorizationOnly = (opts) => (req, res, next) => {
92
+ export const checkAuthorizationOnly = (opts) => (req, res, next) => {
100
93
  // executeRequestHandlers(req, res, next, opts)
101
94
  return checkAuthorizationImpl(req, res, next, opts);
102
95
  };
103
- exports.checkAuthorizationOnly = checkAuthorizationOnly;
104
- const isUserNotAuthenticated = (req, res, next) => {
96
+ export const isUserNotAuthenticated = (req, res, next) => {
105
97
  if (!req.user) {
106
98
  next();
107
99
  }
108
100
  };
109
- exports.isUserNotAuthenticated = isUserNotAuthenticated;
110
- const isUserAuthenticated = (req, res, next) => {
101
+ export const isUserAuthenticated = (req, res, next) => {
111
102
  if (!req.user) {
112
- return (0, express_utils_1.sendErrorResponse)(res, 401, 'Authentication required');
103
+ return sendErrorResponse(res, 401, 'Authentication required');
113
104
  }
114
105
  else {
115
106
  return next();
116
107
  }
117
108
  };
118
- exports.isUserAuthenticated = isUserAuthenticated;
119
- const checkAuth = (opts) => {
109
+ export const checkAuth = (opts) => {
120
110
  const handlers = [];
121
- handlers.push((0, exports.checkAuthenticationOnly)(opts));
122
- handlers.push((0, exports.checkAuthorizationOnly)(opts));
123
- (opts === null || opts === void 0 ? void 0 : opts.handlers) && handlers.push(...opts.handlers);
111
+ handlers.push(checkAuthenticationOnly(opts));
112
+ handlers.push(checkAuthorizationOnly(opts));
113
+ opts?.handlers && handlers.push(...opts.handlers);
124
114
  return handlers;
125
115
  };
126
- exports.checkAuth = checkAuth;
127
- function copyGlobalAuthToEndpoint(args) {
128
- var _a, _b, _c;
129
- const opts = args === null || args === void 0 ? void 0 : args.opts;
130
- const key = args === null || args === void 0 ? void 0 : args.key;
131
- if (!opts || !key || !(0, types_1.hasEndpointOpts)(opts)) {
116
+ export function copyGlobalAuthToEndpoint(args) {
117
+ const opts = args?.opts;
118
+ const key = args?.key;
119
+ if (!opts || !key || !hasEndpointOpts(opts)) {
120
+ return;
121
+ }
122
+ if (key === 'basePath') {
123
+ // make sure to not copy base path over, as we use these at the global router, and this would repeat the path
132
124
  return;
133
125
  }
134
- if ((_a = opts.endpointOpts) === null || _a === void 0 ? void 0 : _a.globalAuth) {
135
- if (((_b = opts.endpointOpts[key]) === null || _b === void 0 ? void 0 : _b.disableGlobalAuth) === true) {
126
+ if (opts.endpointOpts?.globalAuth) {
127
+ if (opts.endpointOpts[key]?.disableGlobalAuth === true) {
136
128
  return;
137
129
  }
138
- opts.endpointOpts[key] = Object.assign(Object.assign({}, opts.endpointOpts[key]), { endpoint: Object.assign(Object.assign({}, opts.endpointOpts.globalAuth), (_c = opts.endpointOpts[key]) === null || _c === void 0 ? void 0 : _c.endpoint) });
130
+ opts.endpointOpts[key] = {
131
+ ...opts.endpointOpts[key],
132
+ endpoint: { ...opts.endpointOpts.globalAuth, ...opts.endpointOpts[key]?.endpoint },
133
+ };
139
134
  }
140
135
  }
141
- function copyGlobalAuthToEndpoints(args) {
142
- args === null || args === void 0 ? void 0 : args.keys.forEach((key) => copyGlobalAuthToEndpoint({ opts: args === null || args === void 0 ? void 0 : args.opts, key }));
136
+ export function copyGlobalAuthToEndpoints(args) {
137
+ args?.keys.forEach((key) => copyGlobalAuthToEndpoint({ opts: args?.opts, key }));
143
138
  }
144
139
  //# sourceMappingURL=auth-utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"auth-utils.js","sourceRoot":"","sources":["../src/auth-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-utils.js","sourceRoot":"","sources":["../src/auth-utils.ts"],"names":[],"mappings":"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"}
@@ -1,34 +1,7 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- var __importDefault = (this && this.__importDefault) || function (mod) {
26
- return (mod && mod.__esModule) ? mod : { "default": mod };
27
- };
28
- Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.EntraIDAuth = void 0;
30
- const passport_1 = __importDefault(require("passport"));
31
- class EntraIDAuth {
1
+ import passport from 'passport';
2
+ export class EntraIDAuth {
3
+ strategy;
4
+ options;
32
5
  static init(strategy) {
33
6
  return new EntraIDAuth(strategy);
34
7
  }
@@ -36,7 +9,10 @@ class EntraIDAuth {
36
9
  this.strategy = strategy;
37
10
  }
38
11
  withOptions(options) {
39
- this.options = Object.assign(Object.assign({}, options), { passReqToCallback: 'passReqToCallback' in options ? options.passReqToCallback : false });
12
+ this.options = {
13
+ ...options,
14
+ passReqToCallback: 'passReqToCallback' in options ? options.passReqToCallback : false,
15
+ };
40
16
  return this;
41
17
  }
42
18
  connectPassport() {
@@ -44,7 +20,8 @@ class EntraIDAuth {
44
20
  if (!_options) {
45
21
  throw Error('No options supplied for EntraID');
46
22
  }
47
- Promise.resolve().then(() => __importStar(require('passport-azure-ad'))).then((entraID) => passport_1.default.use(this.strategy, new entraID.BearerStrategy(_options, function (token, cb) {
23
+ import('passport-azure-ad')
24
+ .then((entraID) => passport.use(this.strategy, new entraID.BearerStrategy(_options, function (token, cb) {
48
25
  if (token) {
49
26
  // console.log(`token: ${JSON.stringify(token, null, 2)}`)
50
27
  return cb(null, token);
@@ -57,5 +34,4 @@ class EntraIDAuth {
57
34
  });
58
35
  }
59
36
  }
60
- exports.EntraIDAuth = EntraIDAuth;
61
37
  //# sourceMappingURL=entra-id-auth.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"entra-id-auth.js","sourceRoot":"","sources":["../src/entra-id-auth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA+B;AAG/B,MAAa,WAAW;IAIf,MAAM,CAAC,IAAI,CAAC,QAAgB;QACjC,OAAO,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAA;IAClC,CAAC;IAED,YAAoB,QAAgB;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IAEM,WAAW,CAAC,OAAiE;QAClF,IAAI,CAAC,OAAO,mCACP,OAAO,KACV,iBAAiB,EAAE,mBAAmB,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,GACtF,CAAA;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,eAAe;QACb,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAA;QAC7B,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,KAAK,CAAC,iCAAiC,CAAC,CAAA;QAChD,CAAC;QACD,kDAAO,mBAAmB,IACvB,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAChB,kBAAQ,CAAC,GAAG,CACV,IAAI,CAAC,QAAQ,EACb,IAAI,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,KAAoB,EAAE,EAAkB;YACrF,IAAI,KAAK,EAAE,CAAC;gBACV,0DAA0D;gBAC1D,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YACxB,CAAC;YACD,OAAO,EAAE,CAAC,qCAAqC,EAAE,IAAI,CAAC,CAAA;QACxD,CAAC,CAAC,CACH,CACF;aACA,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE;YAChB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACnB,MAAM,KAAK,CAAC,uHAAuH,CAAC,CAAA;QACtI,CAAC,CAAC,CAAA;IACN,CAAC;CACF;AA3CD,kCA2CC"}
1
+ {"version":3,"file":"entra-id-auth.js","sourceRoot":"","sources":["../src/entra-id-auth.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAG/B,MAAM,OAAO,WAAW;IACL,QAAQ,CAAQ;IACzB,OAAO,CAAmC;IAE3C,MAAM,CAAC,IAAI,CAAC,QAAgB;QACjC,OAAO,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAA;IAClC,CAAC;IAED,YAAoB,QAAgB;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IAEM,WAAW,CAAC,OAAiE;QAClF,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,OAAO;YACV,iBAAiB,EAAE,mBAAmB,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK;SACtF,CAAA;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,eAAe;QACb,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAA;QAC7B,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,KAAK,CAAC,iCAAiC,CAAC,CAAA;QAChD,CAAC;QACD,MAAM,CAAC,mBAAmB,CAAC;aACxB,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAChB,QAAQ,CAAC,GAAG,CACV,IAAI,CAAC,QAAQ,EACb,IAAI,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,KAAoB,EAAE,EAAkB;YACrF,IAAI,KAAK,EAAE,CAAC;gBACV,0DAA0D;gBAC1D,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YACxB,CAAC;YACD,OAAO,EAAE,CAAC,qCAAqC,EAAE,IAAI,CAAC,CAAA;QACxD,CAAC,CAAC,CACH,CACF;aACA,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE;YAChB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACnB,MAAM,KAAK,CAAC,uHAAuH,CAAC,CAAA;QACtI,CAAC,CAAC,CAAA;IACN,CAAC;CACF"}
@@ -1,49 +1,46 @@
1
- "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
- var __importDefault = (this && this.__importDefault) || function (mod) {
12
- return (mod && mod.__esModule) ? mod : { "default": mod };
13
- };
14
- Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.ExpressCorsConfigurer = exports.ExpressBuilder = void 0;
16
1
  /**
17
2
  * @public
18
3
  */
19
- const body_parser_1 = __importDefault(require("body-parser"));
20
- const cors_1 = __importDefault(require("cors"));
21
- const express_1 = __importDefault(require("express"));
22
- const express_session_1 = __importDefault(require("express-session"));
23
- const http_terminator_1 = require("http-terminator");
24
- const morgan_1 = __importDefault(require("morgan"));
25
- const passport_1 = __importDefault(require("passport"));
26
- const auth_utils_1 = require("./auth-utils");
27
- const express_utils_1 = require("./express-utils");
28
- const functions_1 = require("./functions");
29
- class ExpressBuilder {
4
+ import bodyParser from 'body-parser';
5
+ import cors from 'cors';
6
+ import express from 'express';
7
+ import expressSession from 'express-session';
8
+ import { createHttpTerminator } from 'http-terminator';
9
+ import morgan from 'morgan';
10
+ import passport from 'passport';
11
+ import { checkUserIsInRole } from './auth-utils';
12
+ import { jsonErrorHandler } from './express-utils';
13
+ import { env } from './functions';
14
+ export class ExpressBuilder {
15
+ existingExpress;
16
+ hostnameOrIP;
17
+ port;
18
+ _handlers = [];
19
+ listenCallback;
20
+ _startListen = undefined;
21
+ envVarPrefix;
22
+ _corsConfigurer;
23
+ _sessionOpts;
24
+ _usePassportAuth = false;
25
+ _passportInitOpts;
26
+ _userIsInRole;
27
+ _enforcer;
28
+ _server;
29
+ _terminator;
30
+ _morgan;
30
31
  constructor(opts) {
31
- this._handlers = [];
32
- this._startListen = undefined;
33
- this._usePassportAuth = false;
34
- const { existingExpress, envVarPrefix } = opts !== null && opts !== void 0 ? opts : {};
32
+ const { existingExpress, envVarPrefix } = opts ?? {};
35
33
  if (existingExpress) {
36
34
  this.withExpress(existingExpress);
37
35
  }
38
- this.envVarPrefix = envVarPrefix !== null && envVarPrefix !== void 0 ? envVarPrefix : '';
36
+ this.envVarPrefix = envVarPrefix ?? '';
39
37
  }
40
38
  static fromExistingExpress(opts) {
41
- return new ExpressBuilder(opts !== null && opts !== void 0 ? opts : {});
39
+ return new ExpressBuilder(opts ?? {});
42
40
  }
43
41
  static fromServerOpts(opts) {
44
- var _a;
45
- const builder = new ExpressBuilder({ existingExpress: opts === null || opts === void 0 ? void 0 : opts.existingExpress, envVarPrefix: opts === null || opts === void 0 ? void 0 : opts.envVarPrefix });
46
- return builder.withEnableListenOpts(Object.assign(Object.assign({}, opts), { hostnameOrIP: opts.hostname, startOnBuild: (_a = opts.startListening) !== null && _a !== void 0 ? _a : false }));
42
+ const builder = new ExpressBuilder({ existingExpress: opts?.existingExpress, envVarPrefix: opts?.envVarPrefix });
43
+ return builder.withEnableListenOpts({ ...opts, hostnameOrIP: opts.hostname, startOnBuild: opts.startListening ?? false });
47
44
  }
48
45
  enableListen(startOnBuild) {
49
46
  if (startOnBuild !== undefined) {
@@ -52,11 +49,10 @@ class ExpressBuilder {
52
49
  return this;
53
50
  }
54
51
  withMorganLogging(opts) {
55
- var _a, _b;
56
- if ((opts === null || opts === void 0 ? void 0 : opts.existingMorgan) && (opts.format || opts.options)) {
52
+ if (opts?.existingMorgan && (opts.format || opts.options)) {
57
53
  throw Error('Cannot using an existing morgan with either a format or options');
58
54
  }
59
- this._morgan = (_a = opts === null || opts === void 0 ? void 0 : opts.existingMorgan) !== null && _a !== void 0 ? _a : (0, morgan_1.default)((_b = opts === null || opts === void 0 ? void 0 : opts.format) !== null && _b !== void 0 ? _b : 'dev', opts === null || opts === void 0 ? void 0 : opts.options);
55
+ this._morgan = opts?.existingMorgan ?? morgan(opts?.format ?? 'dev', opts?.options);
60
56
  return this;
61
57
  }
62
58
  withEnableListenOpts({ port, hostnameOrIP, callback, startOnBuild, }) {
@@ -104,19 +100,17 @@ class ExpressBuilder {
104
100
  }
105
101
  startListening(express) {
106
102
  this._server = express.listen(this.getPort(), this.getHostname(), this.listenCallback);
107
- this._terminator = (0, http_terminator_1.createHttpTerminator)({
103
+ this._terminator = createHttpTerminator({
108
104
  server: this._server,
109
105
  // gracefulTerminationTimeout: 10
110
106
  });
111
107
  return { server: this._server, terminator: this._terminator };
112
108
  }
113
109
  getHostname() {
114
- var _a, _b;
115
- return (_b = (_a = this.hostnameOrIP) !== null && _a !== void 0 ? _a : (0, functions_1.env)('HOSTNAME', this.envVarPrefix)) !== null && _b !== void 0 ? _b : '0.0.0.0';
110
+ return this.hostnameOrIP ?? env('HOSTNAME', this.envVarPrefix) ?? '0.0.0.0';
116
111
  }
117
112
  getPort() {
118
- var _a, _b;
119
- return ((_b = (_a = this.port) !== null && _a !== void 0 ? _a : (0, functions_1.env)('PORT', this.envVarPrefix)) !== null && _b !== void 0 ? _b : 5000);
113
+ return (this.port ?? env('PORT', this.envVarPrefix) ?? 5000);
120
114
  }
121
115
  setHandlers(handlers) {
122
116
  if (Array.isArray(handlers)) {
@@ -146,7 +140,7 @@ class ExpressBuilder {
146
140
  }
147
141
  build(opts) {
148
142
  const express = this.buildExpress(opts);
149
- const startListening = (opts === null || opts === void 0 ? void 0 : opts.startListening) === undefined ? this._startListen !== true : opts.startListening;
143
+ const startListening = opts?.startListening === undefined ? this._startListen !== true : opts.startListening;
150
144
  let started = this._server !== undefined;
151
145
  if (startListening && !started) {
152
146
  this.startListening(express);
@@ -160,7 +154,7 @@ class ExpressBuilder {
160
154
  startListening,
161
155
  enforcer: this._enforcer,
162
156
  start: (opts) => {
163
- if (opts === null || opts === void 0 ? void 0 : opts.doNotStartListening) {
157
+ if (opts?.doNotStartListening) {
164
158
  console.log('Express will not start listening. You will have to start it yourself');
165
159
  }
166
160
  else {
@@ -169,41 +163,40 @@ class ExpressBuilder {
169
163
  started = true;
170
164
  }
171
165
  }
172
- if ((opts === null || opts === void 0 ? void 0 : opts.disableErrorHandler) !== true) {
173
- express.use(express_utils_1.jsonErrorHandler);
166
+ if (opts?.disableErrorHandler !== true) {
167
+ express.use(jsonErrorHandler);
174
168
  }
175
169
  return { server: this._server, terminator: this._terminator };
176
170
  },
177
- stop: (terminator) => __awaiter(this, void 0, void 0, function* () {
178
- const term = terminator !== null && terminator !== void 0 ? terminator : this._terminator;
171
+ stop: async (terminator) => {
172
+ const term = terminator ?? this._terminator;
179
173
  if (!term) {
180
174
  return false;
181
175
  }
182
- return yield term.terminate().then(() => true);
183
- }),
176
+ return await term.terminate().then(() => true);
177
+ },
184
178
  };
185
179
  }
186
180
  buildExpress(opts) {
187
- var _a, _b, _c;
188
- const app = (_b = (_a = opts === null || opts === void 0 ? void 0 : opts.express) !== null && _a !== void 0 ? _a : this.existingExpress) !== null && _b !== void 0 ? _b : (0, express_1.default)();
181
+ const app = opts?.express ?? this.existingExpress ?? express();
189
182
  if (this._morgan) {
190
183
  app.use(this._morgan);
191
184
  }
192
185
  if (this._sessionOpts) {
193
- const store = (_c = this._sessionOpts.store) !== null && _c !== void 0 ? _c : new express_session_1.default.MemoryStore();
186
+ const store = this._sessionOpts.store ?? new expressSession.MemoryStore();
194
187
  this._sessionOpts.store = store;
195
- app.use((0, express_session_1.default)(this._sessionOpts));
188
+ app.use(expressSession(this._sessionOpts));
196
189
  }
197
190
  if (this._usePassportAuth) {
198
- app.use(passport_1.default.initialize(this._passportInitOpts));
191
+ app.use(passport.initialize(this._passportInitOpts));
199
192
  if (this._sessionOpts) {
200
193
  // app.use(passport.authenticate('session'))
201
194
  //_sessionOpts are not for passport session, they are for express above
202
- app.use(passport_1.default.session());
195
+ app.use(passport.session());
203
196
  }
204
197
  }
205
198
  if (this._userIsInRole) {
206
- app.use((0, auth_utils_1.checkUserIsInRole)({ roles: this._userIsInRole }));
199
+ app.use(checkUserIsInRole({ roles: this._userIsInRole }));
207
200
  }
208
201
  if (this._corsConfigurer) {
209
202
  this._corsConfigurer.configure({ existingExpress: app });
@@ -211,17 +204,24 @@ class ExpressBuilder {
211
204
  // @ts-ignore
212
205
  this._handlers && this._handlers.length > 0 && app.use(this._handlers);
213
206
  // @ts-ignore
214
- (opts === null || opts === void 0 ? void 0 : opts.handlers) && app.use(opts.handlers);
207
+ opts?.handlers && app.use(opts.handlers);
215
208
  //fixme: this should come from the config
216
- app.use(body_parser_1.default.urlencoded({ extended: true }));
217
- app.use(body_parser_1.default.json({ limit: '5mb' }));
209
+ app.use(bodyParser.urlencoded({ extended: true }));
210
+ app.use(bodyParser.json({ limit: '5mb' }));
218
211
  return app;
219
212
  }
220
213
  }
221
- exports.ExpressBuilder = ExpressBuilder;
222
- class ExpressCorsConfigurer {
214
+ export class ExpressCorsConfigurer {
215
+ _disableCors;
216
+ _enablePreflightOptions;
217
+ _allowOrigin;
218
+ _allowMethods;
219
+ _allowedHeaders;
220
+ _allowCredentials;
221
+ _express;
222
+ _envVarPrefix;
223
223
  constructor(args) {
224
- const { existingExpress, envVarPrefix } = args !== null && args !== void 0 ? args : {};
224
+ const { existingExpress, envVarPrefix } = args ?? {};
225
225
  this._express = existingExpress;
226
226
  this._envVarPrefix = envVarPrefix;
227
227
  }
@@ -246,17 +246,16 @@ class ExpressCorsConfigurer {
246
246
  return this;
247
247
  }
248
248
  configure({ existingExpress }) {
249
- var _a, _b, _c;
250
- const express = existingExpress !== null && existingExpress !== void 0 ? existingExpress : this._express;
249
+ const express = existingExpress ?? this._express;
251
250
  if (!express) {
252
251
  throw Error('No express passed in during construction or configure');
253
252
  }
254
- const disableCorsEnv = (0, functions_1.env)('CORS_DISABLE', this._envVarPrefix);
255
- const corsDisabled = (_a = this._disableCors) !== null && _a !== void 0 ? _a : (disableCorsEnv ? /true/.test(disableCorsEnv) : false);
253
+ const disableCorsEnv = env('CORS_DISABLE', this._envVarPrefix);
254
+ const corsDisabled = this._disableCors ?? (disableCorsEnv ? /true/.test(disableCorsEnv) : false);
256
255
  if (corsDisabled) {
257
256
  return;
258
257
  }
259
- const envAllowOriginStr = (_b = (0, functions_1.env)('CORS_ALLOW_ORIGIN', this._envVarPrefix)) !== null && _b !== void 0 ? _b : '*';
258
+ const envAllowOriginStr = env('CORS_ALLOW_ORIGIN', this._envVarPrefix) ?? '*';
260
259
  let envAllowOrigin;
261
260
  if (envAllowOriginStr.includes(',')) {
262
261
  envAllowOrigin = envAllowOriginStr.split(',');
@@ -270,12 +269,18 @@ class ExpressCorsConfigurer {
270
269
  if (Array.isArray(envAllowOrigin) && envAllowOrigin.length === 1) {
271
270
  envAllowOrigin = envAllowOrigin[0];
272
271
  }
273
- const corsOptions = Object.assign(Object.assign(Object.assign(Object.assign({ origin: (_c = this._allowOrigin) !== null && _c !== void 0 ? _c : envAllowOrigin }, (this._allowMethods && { methods: this._allowMethods })), (this._allowedHeaders && { allowedHeaders: this._allowedHeaders })), (this._allowCredentials !== undefined && { credentials: this._allowCredentials })), { optionsSuccessStatus: 204 });
272
+ const corsOptions = {
273
+ origin: this._allowOrigin ?? envAllowOrigin,
274
+ // todo: env vars
275
+ ...(this._allowMethods && { methods: this._allowMethods }),
276
+ ...(this._allowedHeaders && { allowedHeaders: this._allowedHeaders }),
277
+ ...(this._allowCredentials !== undefined && { credentials: this._allowCredentials }),
278
+ optionsSuccessStatus: 204,
279
+ };
274
280
  if (this._enablePreflightOptions) {
275
- express.options('*', (0, cors_1.default)(corsOptions));
281
+ express.options('*', cors(corsOptions));
276
282
  }
277
- express.use((0, cors_1.default)(corsOptions));
283
+ express.use(cors(corsOptions));
278
284
  }
279
285
  }
280
- exports.ExpressCorsConfigurer = ExpressCorsConfigurer;
281
286
  //# sourceMappingURL=express-builders.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"express-builders.js","sourceRoot":"","sources":["../src/express-builders.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"express-builders.js","sourceRoot":"","sources":["../src/express-builders.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,4 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.jsonErrorHandler = void 0;
4
- exports.sendErrorResponse = sendErrorResponse;
5
- function sendErrorResponse(response, statusCode, message, error) {
1
+ export function sendErrorResponse(response, statusCode, message, error) {
6
2
  let msg = message;
7
3
  if (!msg) {
8
4
  console.error('Message was null when calling sendErrorResponse. This should not happen');
@@ -20,7 +16,7 @@ function sendErrorResponse(response, statusCode, message, error) {
20
16
  }
21
17
  if (statusCode >= 500) {
22
18
  console.error('Original error stack (if any) and REST API error stack:');
23
- console.error(error === null || error === void 0 ? void 0 : error.stack);
19
+ console.error(error?.stack);
24
20
  console.error(Error().stack);
25
21
  }
26
22
  if (response.headersSent) {
@@ -37,10 +33,9 @@ function sendErrorResponse(response, statusCode, message, error) {
37
33
  }
38
34
  return response.status(statusCode).json(msg);
39
35
  }
40
- const jsonErrorHandler = (err, req, res, next) => {
41
- var _a;
36
+ export const jsonErrorHandler = (err, req, res, next) => {
42
37
  const statusCode = 'statusCode' in err ? err.statusCode : 500;
43
- let errorMsg = typeof err === 'string' ? err : ((_a = err.message) !== null && _a !== void 0 ? _a : err);
38
+ let errorMsg = typeof err === 'string' ? err : (err.message ?? err);
44
39
  if (typeof errorMsg !== 'string') {
45
40
  errorMsg = JSON.stringify(errorMsg);
46
41
  }
@@ -51,5 +46,4 @@ const jsonErrorHandler = (err, req, res, next) => {
51
46
  }
52
47
  return sendErrorResponse(res, statusCode, errorMsg, err);
53
48
  };
54
- exports.jsonErrorHandler = jsonErrorHandler;
55
49
  //# sourceMappingURL=express-utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"express-utils.js","sourceRoot":"","sources":["../src/express-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"express-utils.js","sourceRoot":"","sources":["../src/express-utils.ts"],"names":[],"mappings":"AACA,MAAM,UAAU,iBAAiB,CAAC,QAA0B,EAAE,UAAkB,EAAE,OAAwB,EAAE,KAAW;IACrH,IAAI,GAAG,GAAG,OAAO,CAAA;IACjB,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,yEAAyE,CAAC,CAAA;QACxF,GAAG,GAAG,8BAA8B,CAAA;QACpC,UAAU,GAAG,GAAG,CAAA;IAClB,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAC,sBAAsB,UAAU,MAAM,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAC5G,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,CAAC,KAAK,CAAC,kBAAkB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QAClD,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IACzD,CAAC;IACD,IAAI,UAAU,IAAI,GAAG,EAAE,CAAC;QACtB,OAAO,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAA;QACxE,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;QAC3B,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;IACD,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAA;QACvD,OAAO,QAAQ,CAAA;IACjB,CAAC;IACD,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAA;IAChC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACpD,GAAG,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA;IACtB,CAAC;IACD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACnD,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;QACnD,OAAO,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC7C,CAAC;IACD,OAAO,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC9C,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAQ,EAAE,GAAoB,EAAE,GAAqB,EAAE,IAAkB,EAAE,EAAE;IAC5G,MAAM,UAAU,GAAW,YAAY,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAA;IACrE,IAAI,QAAQ,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,CAAA;IACnE,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;IACrC,CAAC;IACD,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,oFAAoF,CAAC,CAAA;QACjG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAChD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;IAClB,CAAC;IACD,OAAO,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAA;AAC1D,CAAC,CAAA"}
package/dist/functions.js CHANGED
@@ -1,7 +1,4 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.env = env;
4
- function env(key, prefix) {
1
+ export function env(key, prefix) {
5
2
  if (!key) {
6
3
  return undefined;
7
4
  }
@@ -1 +1 @@
1
- {"version":3,"file":"functions.js","sourceRoot":"","sources":["../src/functions.ts"],"names":[],"mappings":";;AAAA,kBAKC;AALD,SAAgB,GAAG,CAAC,GAAY,EAAE,MAAe;IAC/C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,CAAA;AAC5D,CAAC"}
1
+ {"version":3,"file":"functions.js","sourceRoot":"","sources":["../src/functions.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,GAAG,CAAC,GAAY,EAAE,MAAe;IAC/C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,CAAA;AAC5D,CAAC"}
package/dist/index.js CHANGED
@@ -1,28 +1,9 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
- };
16
- Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.jsonErrorHandler = exports.sendErrorResponse = void 0;
18
- __exportStar(require("./entra-id-auth"), exports);
19
- __exportStar(require("./static-bearer-auth"), exports);
20
- __exportStar(require("./auth-utils"), exports);
21
- __exportStar(require("./express-builders"), exports);
22
- __exportStar(require("./types"), exports);
23
- var express_utils_1 = require("./express-utils");
24
- Object.defineProperty(exports, "sendErrorResponse", { enumerable: true, get: function () { return express_utils_1.sendErrorResponse; } });
25
- Object.defineProperty(exports, "jsonErrorHandler", { enumerable: true, get: function () { return express_utils_1.jsonErrorHandler; } });
26
- __exportStar(require("./functions"), exports);
27
- __exportStar(require("./openid-connect-rp"), exports);
1
+ export * from './entra-id-auth';
2
+ export * from './static-bearer-auth';
3
+ export * from './auth-utils';
4
+ export * from './express-builders';
5
+ export * from './types';
6
+ export { sendErrorResponse, jsonErrorHandler } from './express-utils';
7
+ export * from './functions';
8
+ export * from './openid-connect-rp';
28
9
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kDAA+B;AAC/B,uDAAoC;AACpC,+CAA4B;AAC5B,qDAAkC;AAClC,0CAAuB;AACvB,iDAAqE;AAA5D,kHAAA,iBAAiB,OAAA;AAAE,iHAAA,gBAAgB,OAAA;AAC5C,8CAA2B;AAC3B,sDAAmC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,sBAAsB,CAAA;AACpC,cAAc,cAAc,CAAA;AAC5B,cAAc,oBAAoB,CAAA;AAClC,cAAc,SAAS,CAAA;AACvB,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AACrE,cAAc,aAAa,CAAA;AAC3B,cAAc,qBAAqB,CAAA"}
@@ -1,100 +1,66 @@
1
- "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
- var __importDefault = (this && this.__importDefault) || function (mod) {
12
- return (mod && mod.__esModule) ? mod : { "default": mod };
13
- };
14
- var _a;
15
- Object.defineProperty(exports, "__esModule", { value: true });
16
- exports.OpenIDConnectAuthApi = void 0;
17
- exports.oidcDiscoverIssuer = oidcDiscoverIssuer;
18
- exports.oidcGetClient = oidcGetClient;
19
- exports.getLoginEndpoint = getLoginEndpoint;
20
- exports.getLoginCallbackEndpoint = getLoginCallbackEndpoint;
21
- exports.getLogoutEndpoint = getLogoutEndpoint;
22
- exports.getLogoutCallbackEndpoint = getLogoutCallbackEndpoint;
23
- exports.getIdTokenEndpoint = getIdTokenEndpoint;
24
- exports.getAuthenticatedUserEndpoint = getAuthenticatedUserEndpoint;
25
- const express_1 = __importDefault(require("express"));
26
- const openid_client_1 = require("openid-client");
27
- const passport_1 = __importDefault(require("passport"));
28
- const auth_utils_1 = require("./auth-utils");
29
- const express_utils_1 = require("./express-utils");
30
- const functions_1 = require("./functions");
31
- const PREFIX = (_a = process.env.PREFIX) !== null && _a !== void 0 ? _a : '';
32
- function oidcDiscoverIssuer(opts) {
33
- return __awaiter(this, void 0, void 0, function* () {
34
- var _a, _b;
35
- const issuerUrl = (_b = (_a = opts === null || opts === void 0 ? void 0 : opts.issuerUrl) !== null && _a !== void 0 ? _a : (0, functions_1.env)('OIDC_ISSUER', PREFIX)) !== null && _b !== void 0 ? _b : 'https://auth01.test.sphereon.com/auth/realms/energy-shr';
36
- const issuer = yield openid_client_1.Issuer.discover(issuerUrl);
37
- console.log('Discovered issuer %s %O', issuer.issuer, issuer.metadata);
38
- return { issuer, issuerUrl };
39
- });
1
+ import express from 'express';
2
+ import { Issuer } from 'openid-client';
3
+ import passport from 'passport';
4
+ import { copyGlobalAuthToEndpoints, isUserAuthenticated } from './auth-utils';
5
+ import { sendErrorResponse } from './express-utils';
6
+ import { env } from './functions';
7
+ const PREFIX = process.env.PREFIX ?? '';
8
+ export async function oidcDiscoverIssuer(opts) {
9
+ const issuerUrl = opts?.issuerUrl ?? env('OIDC_ISSUER', PREFIX) ?? 'https://auth01.test.sphereon.com/auth/realms/energy-shr';
10
+ const issuer = await Issuer.discover(issuerUrl);
11
+ console.log('Discovered issuer %s %O', issuer.issuer, issuer.metadata);
12
+ return { issuer, issuerUrl };
40
13
  }
41
- function oidcGetClient(issuer, metadata, opts) {
42
- return __awaiter(this, void 0, void 0, function* () {
43
- // @ts-ignore
44
- return new issuer.Client(metadata, opts === null || opts === void 0 ? void 0 : opts.jwks, opts === null || opts === void 0 ? void 0 : opts.options);
45
- });
14
+ export async function oidcGetClient(issuer, metadata, opts) {
15
+ // @ts-ignore
16
+ return new issuer.Client(metadata, opts?.jwks, opts?.options);
46
17
  }
47
- function getLoginEndpoint(router, opts) {
48
- var _a, _b, _c, _d, _e, _f;
49
- if ((opts === null || opts === void 0 ? void 0 : opts.enabled) === false) {
18
+ export function getLoginEndpoint(router, opts) {
19
+ if (opts?.enabled === false) {
50
20
  console.log(`Login endpoint is disabled`);
51
21
  return;
52
22
  }
53
- const strategy = (_b = (_a = opts === null || opts === void 0 ? void 0 : opts.endpoint) === null || _a === void 0 ? void 0 : _a.authentication) === null || _b === void 0 ? void 0 : _b.strategy;
23
+ const strategy = opts?.endpoint?.authentication?.strategy;
54
24
  if (!strategy) {
55
25
  throw Error('strategy needs to be provided');
56
26
  }
57
- const path = (_c = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _c !== void 0 ? _c : '/authentication/login';
27
+ const path = opts?.path ?? '/authentication/login';
58
28
  router.get(path, (req, res, next) => {
59
- var _a;
60
- const redirectPage = (_a = req.get('referer')) !== null && _a !== void 0 ? _a : '/';
29
+ const redirectPage = req.get('referer') ?? '/';
61
30
  req.session.redirectPage = redirectPage;
62
31
  next();
63
- }, passport_1.default.authenticate(strategy, Object.assign(Object.assign(Object.assign({}, (_d = opts.authentication) === null || _d === void 0 ? void 0 : _d.strategyOptions), (_f = (_e = opts.endpoint) === null || _e === void 0 ? void 0 : _e.authentication) === null || _f === void 0 ? void 0 : _f.strategyOptions), { keepSessionInfo: false }), undefined));
32
+ }, passport.authenticate(strategy, { ...opts.authentication?.strategyOptions, ...opts.endpoint?.authentication?.strategyOptions, keepSessionInfo: false }, undefined));
64
33
  }
65
- function getLoginCallbackEndpoint(router, opts) {
66
- var _a, _b, _c, _d, _e, _f;
67
- if ((opts === null || opts === void 0 ? void 0 : opts.enabled) === false) {
34
+ export function getLoginCallbackEndpoint(router, opts) {
35
+ if (opts?.enabled === false) {
68
36
  console.log(`Auth callback endpoint is disabled`);
69
37
  return;
70
38
  }
71
- const strategy = (_b = (_a = opts === null || opts === void 0 ? void 0 : opts.endpoint) === null || _a === void 0 ? void 0 : _a.authentication) === null || _b === void 0 ? void 0 : _b.strategy;
39
+ const strategy = opts?.endpoint?.authentication?.strategy;
72
40
  if (!strategy) {
73
41
  throw Error('strategy needs to be provided');
74
42
  }
75
- const path = (_c = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _c !== void 0 ? _c : '/authentication/callback';
76
- router.get(path, passport_1.default.authenticate(strategy, Object.assign(Object.assign(Object.assign({}, (_d = opts.authentication) === null || _d === void 0 ? void 0 : _d.strategyOptions), (_f = (_e = opts.endpoint) === null || _e === void 0 ? void 0 : _e.authentication) === null || _f === void 0 ? void 0 : _f.strategyOptions), { keepSessionInfo: true }), undefined), (req, res, next) => {
77
- var _a, _b, _c;
43
+ const path = opts?.path ?? '/authentication/callback';
44
+ router.get(path, passport.authenticate(strategy, { ...opts.authentication?.strategyOptions, ...opts.endpoint?.authentication?.strategyOptions, keepSessionInfo: true }, undefined), (req, res, next) => {
78
45
  if (req.user) {
79
- console.log('User authenticated', (_a = req.user) === null || _a === void 0 ? void 0 : _a.name);
46
+ console.log('User authenticated', req.user?.name);
80
47
  // console.log(req.session)
81
- const redirectPage = (_b = req.session.redirectPage) !== null && _b !== void 0 ? _b : '/search';
48
+ const redirectPage = req.session.redirectPage ?? '/search';
82
49
  // console.log(`PRE LOGIN PAGE in callback: ${redirectPage}`)
83
50
  delete req.session.redirectPage;
84
51
  return res.redirect(redirectPage);
85
52
  }
86
53
  else {
87
- return res.redirect((_c = (0, functions_1.env)('OIDC_FRONTEND_LOGIN_URL', PREFIX)) !== null && _c !== void 0 ? _c : 'http://localhost:3001/authentication/login');
54
+ return res.redirect(env('OIDC_FRONTEND_LOGIN_URL', PREFIX) ?? 'http://localhost:3001/authentication/login');
88
55
  }
89
56
  });
90
57
  }
91
- function getLogoutEndpoint(router, client, opts) {
92
- var _a;
93
- if ((opts === null || opts === void 0 ? void 0 : opts.enabled) === false) {
58
+ export function getLogoutEndpoint(router, client, opts) {
59
+ if (opts?.enabled === false) {
94
60
  console.log(`Logout endpoint is disabled`);
95
61
  return;
96
62
  }
97
- const path = (_a = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _a !== void 0 ? _a : '/authentication/logout';
63
+ const path = opts?.path ?? '/authentication/logout';
98
64
  router.get(path, (req, res) => {
99
65
  try {
100
66
  if (client.endSessionUrl()) {
@@ -111,94 +77,93 @@ function getLogoutEndpoint(router, client, opts) {
111
77
  }
112
78
  });
113
79
  }
114
- function getLogoutCallbackEndpoint(router, opts) {
115
- var _a;
116
- if ((opts === null || opts === void 0 ? void 0 : opts.enabled) === false) {
80
+ export function getLogoutCallbackEndpoint(router, opts) {
81
+ if (opts?.enabled === false) {
117
82
  console.log(`Logout callback endpoint is disabled`);
118
83
  return;
119
84
  }
120
- const path = (_a = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _a !== void 0 ? _a : '/authentication/logout-callback';
85
+ const path = opts?.path ?? '/authentication/logout-callback';
121
86
  router.get(path, (req, res, next) => {
122
- var _a;
123
87
  try {
124
88
  req.logout((err) => {
125
89
  if (err) {
126
90
  console.log(`Error during calling logout-callback: ${JSON.stringify(err)}`);
127
91
  }
128
92
  });
129
- return res.redirect((_a = (0, functions_1.env)('OIDC_FRONTEND_LOGOUT_REDIRECT_URL', PREFIX)) !== null && _a !== void 0 ? _a : '/');
93
+ return res.redirect(env('OIDC_FRONTEND_LOGOUT_REDIRECT_URL', PREFIX) ?? '/');
130
94
  }
131
95
  catch (e) {
132
- return (0, express_utils_1.sendErrorResponse)(res, 500, 'An unexpected error occurred during logout callback', e);
96
+ return sendErrorResponse(res, 500, 'An unexpected error occurred during logout callback', e);
133
97
  }
134
98
  });
135
99
  }
136
- function getIdTokenEndpoint(router, client, opts) {
137
- var _a;
138
- if ((opts === null || opts === void 0 ? void 0 : opts.enabled) === false) {
100
+ export function getIdTokenEndpoint(router, client, opts) {
101
+ if (opts?.enabled === false) {
139
102
  console.log(`ID Token endpoint is disabled`);
140
103
  return;
141
104
  }
142
- const path = (_a = opts.path) !== null && _a !== void 0 ? _a : '/authentication/tokens/id';
143
- router.get(path, auth_utils_1.isUserAuthenticated, (req, res) => {
105
+ const path = opts.path ?? '/authentication/tokens/id';
106
+ router.get(path, isUserAuthenticated, (req, res) => {
144
107
  if (req.session.tokens.id_token) {
145
108
  return res.json({ id_token: req.session.tokens.id_token });
146
109
  }
147
110
  else {
148
- return (0, express_utils_1.sendErrorResponse)(res, 401, 'Authentication required');
111
+ return sendErrorResponse(res, 401, 'Authentication required');
149
112
  }
150
113
  });
151
114
  }
152
- function getAuthenticatedUserEndpoint(router, opts) {
153
- var _a;
154
- if ((opts === null || opts === void 0 ? void 0 : opts.enabled) === false) {
115
+ export function getAuthenticatedUserEndpoint(router, opts) {
116
+ if (opts?.enabled === false) {
155
117
  console.log(`Authenticated User endpoint is disabled`);
156
118
  return;
157
119
  }
158
- const path = (_a = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _a !== void 0 ? _a : '/authentication/user';
159
- router.get(path, auth_utils_1.isUserAuthenticated, (req, res, next) => {
120
+ const path = opts?.path ?? '/authentication/user';
121
+ router.get(path, isUserAuthenticated, (req, res, next) => {
160
122
  if (!req.user) {
161
- return (0, express_utils_1.sendErrorResponse)(res, 401, 'Authentication required');
123
+ return sendErrorResponse(res, 401, 'Authentication required');
162
124
  }
163
125
  let user = req.user;
164
126
  return res.json(user);
165
127
  });
166
128
  }
167
- class OpenIDConnectAuthApi {
129
+ export class OpenIDConnectAuthApi {
168
130
  get router() {
169
131
  return this._router;
170
132
  }
133
+ _express;
134
+ _agent;
135
+ _opts;
136
+ _router;
171
137
  constructor(args) {
172
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
173
138
  const { agent, opts } = args;
174
139
  this._agent = agent;
175
- (0, auth_utils_1.copyGlobalAuthToEndpoints)({ opts, keys: ['getLogin'] });
176
- (0, auth_utils_1.copyGlobalAuthToEndpoints)({ opts, keys: ['getIdToken'] });
177
- (0, auth_utils_1.copyGlobalAuthToEndpoints)({ opts, keys: ['getAuthenticatedUser'] });
140
+ copyGlobalAuthToEndpoints({ opts, keys: ['getLogin'] });
141
+ copyGlobalAuthToEndpoints({ opts, keys: ['getIdToken'] });
142
+ copyGlobalAuthToEndpoints({ opts, keys: ['getAuthenticatedUser'] });
178
143
  // no need for the logout, as you these are not protected by auth
179
144
  this._opts = opts;
180
145
  this._express = args.expressSupport.express;
181
- this._router = express_1.default.Router();
182
- const features = (_a = opts === null || opts === void 0 ? void 0 : opts.enabledFeatures) !== null && _a !== void 0 ? _a : ['login', 'logout', 'id-token', 'authenticated-user'];
146
+ this._router = express.Router();
147
+ const features = opts?.enabledFeatures ?? ['login', 'logout', 'id-token', 'authenticated-user'];
183
148
  console.log(`Authentication API enabled`);
184
149
  if (features.includes('login')) {
185
- getLoginEndpoint(this.router, (_b = opts === null || opts === void 0 ? void 0 : opts.endpointOpts) === null || _b === void 0 ? void 0 : _b.getLogin);
186
- getLoginCallbackEndpoint(this.router, (_c = opts === null || opts === void 0 ? void 0 : opts.endpointOpts) === null || _c === void 0 ? void 0 : _c.getLogin);
150
+ getLoginEndpoint(this.router, opts?.endpointOpts?.getLogin);
151
+ getLoginCallbackEndpoint(this.router, opts?.endpointOpts?.getLogin);
187
152
  }
188
153
  if (features.includes('logout')) {
189
- getLogoutEndpoint(this.router, args.client, (_d = opts === null || opts === void 0 ? void 0 : opts.endpointOpts) === null || _d === void 0 ? void 0 : _d.getLogout);
190
- getLogoutCallbackEndpoint(this.router, (_e = opts === null || opts === void 0 ? void 0 : opts.endpointOpts) === null || _e === void 0 ? void 0 : _e.getLogout);
154
+ getLogoutEndpoint(this.router, args.client, opts?.endpointOpts?.getLogout);
155
+ getLogoutCallbackEndpoint(this.router, opts?.endpointOpts?.getLogout);
191
156
  }
192
157
  if (features.includes('id-token')) {
193
- if (((_f = opts.endpointOpts) === null || _f === void 0 ? void 0 : _f.getIdToken) === undefined) {
158
+ if (opts.endpointOpts?.getIdToken === undefined) {
194
159
  throw Error('Cannot enable id-token endpoint without providing id-token endpoint options');
195
160
  }
196
- getIdTokenEndpoint(this.router, args.client, (_g = opts === null || opts === void 0 ? void 0 : opts.endpointOpts) === null || _g === void 0 ? void 0 : _g.getIdToken);
161
+ getIdTokenEndpoint(this.router, args.client, opts?.endpointOpts?.getIdToken);
197
162
  }
198
163
  if (features.includes('authenticated-user')) {
199
- getAuthenticatedUserEndpoint(this.router, (_h = opts === null || opts === void 0 ? void 0 : opts.endpointOpts) === null || _h === void 0 ? void 0 : _h.getAuthenticatedUser);
164
+ getAuthenticatedUserEndpoint(this.router, opts?.endpointOpts?.getAuthenticatedUser);
200
165
  }
201
- this._express.use((_k = (_j = opts === null || opts === void 0 ? void 0 : opts.endpointOpts) === null || _j === void 0 ? void 0 : _j.basePath) !== null && _k !== void 0 ? _k : '', this.router);
166
+ this._express.use(opts?.endpointOpts?.basePath ?? '', this.router);
202
167
  }
203
168
  get agent() {
204
169
  return this._agent;
@@ -210,5 +175,4 @@ class OpenIDConnectAuthApi {
210
175
  return this._express;
211
176
  }
212
177
  }
213
- exports.OpenIDConnectAuthApi = OpenIDConnectAuthApi;
214
178
  //# sourceMappingURL=openid-connect-rp.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"openid-connect-rp.js","sourceRoot":"","sources":["../src/openid-connect-rp.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"openid-connect-rp.js","sourceRoot":"","sources":["../src/openid-connect-rp.ts"],"names":[],"mappings":"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"}
@@ -1,40 +1,14 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- var __importDefault = (this && this.__importDefault) || function (mod) {
26
- return (mod && mod.__esModule) ? mod : { "default": mod };
27
- };
28
- Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.MapBasedStaticBearerUserProvider = exports.StaticBearerAuth = void 0;
30
- const passport_1 = __importDefault(require("passport"));
31
- const u8a = __importStar(require("uint8arrays"));
32
- class StaticBearerAuth {
1
+ import passport from 'passport';
2
+ import * as u8a from 'uint8arrays';
3
+ export class StaticBearerAuth {
4
+ strategy;
5
+ static providers = new Map();
6
+ static verifyOptions = new Map();
7
+ hashTokens = false;
33
8
  static init(strategy, provider) {
34
- return new StaticBearerAuth(strategy !== null && strategy !== void 0 ? strategy : 'bearer', provider !== null && provider !== void 0 ? provider : new MapBasedStaticBearerUserProvider(strategy));
9
+ return new StaticBearerAuth(strategy ?? 'bearer', provider ?? new MapBasedStaticBearerUserProvider(strategy));
35
10
  }
36
11
  constructor(strategy, provider) {
37
- this.hashTokens = false;
38
12
  this.strategy = strategy;
39
13
  if (StaticBearerAuth.providers.has(strategy)) {
40
14
  if (StaticBearerAuth.providers.get(strategy) !== provider) {
@@ -77,12 +51,13 @@ class StaticBearerAuth {
77
51
  }
78
52
  return cb('bearer token not found or incorrect', false);
79
53
  }
80
- Promise.resolve().then(() => __importStar(require('passport-http-bearer'))).then((httpBearer) => {
81
- var _a;
82
- const hashTokens = (_a = this.hashTokens) !== null && _a !== void 0 ? _a : false;
83
- passport_1.default.use(this.strategy, new httpBearer.Strategy({ passReqToCallback: false }, function (token, cb) {
54
+ import('passport-http-bearer')
55
+ .then((httpBearer) => {
56
+ const hashTokens = this.hashTokens ?? false;
57
+ passport.use(this.strategy, new httpBearer.Strategy({ passReqToCallback: false }, function (token, cb) {
84
58
  if (hashTokens) {
85
- Promise.resolve().then(() => __importStar(require('@noble/hashes/sha256'))).then((hash) => {
59
+ import('@noble/hashes/sha256')
60
+ .then((hash) => {
86
61
  findUser(u8a.toString(hash.sha256(token)), cb);
87
62
  })
88
63
  .catch((error) => {
@@ -101,14 +76,13 @@ class StaticBearerAuth {
101
76
  });
102
77
  }
103
78
  }
104
- exports.StaticBearerAuth = StaticBearerAuth;
105
- StaticBearerAuth.providers = new Map();
106
- StaticBearerAuth.verifyOptions = new Map();
107
- class MapBasedStaticBearerUserProvider {
79
+ export class MapBasedStaticBearerUserProvider {
80
+ _strategy;
81
+ _users = [];
82
+ _hashedTokens;
108
83
  constructor(strategy, hashedTokens) {
109
- this._users = [];
110
84
  this._strategy = strategy;
111
- this._hashedTokens = hashedTokens !== null && hashedTokens !== void 0 ? hashedTokens : false;
85
+ this._hashedTokens = hashedTokens ?? false;
112
86
  }
113
87
  get users() {
114
88
  return this._users;
@@ -128,7 +102,8 @@ class MapBasedStaticBearerUserProvider {
128
102
  if (!this.hashedTokens) {
129
103
  throw Error('Cannot hash token, when hashed tokens is not enabled on the user provider for strategy ' + this.strategy);
130
104
  }
131
- Promise.resolve().then(() => __importStar(require('@noble/hashes/sha256'))).then((hash) => {
105
+ import('@noble/hashes/sha256')
106
+ .then((hash) => {
132
107
  users.forEach((user) => (user.token = u8a.toString(hash.sha256(user.token))));
133
108
  })
134
109
  .catch((error) => {
@@ -142,5 +117,4 @@ class MapBasedStaticBearerUserProvider {
142
117
  return this._users;
143
118
  }
144
119
  }
145
- exports.MapBasedStaticBearerUserProvider = MapBasedStaticBearerUserProvider;
146
120
  //# sourceMappingURL=static-bearer-auth.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"static-bearer-auth.js","sourceRoot":"","sources":["../src/static-bearer-auth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"static-bearer-auth.js","sourceRoot":"","sources":["../src/static-bearer-auth.ts"],"names":[],"mappings":"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"}
package/dist/types.js CHANGED
@@ -1,7 +1,4 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.hasEndpointOpts = hasEndpointOpts;
4
- function hasEndpointOpts(opts) {
1
+ export function hasEndpointOpts(opts) {
5
2
  return 'endpointOpts' in opts && opts.endpointOpts;
6
3
  }
7
4
  //# sourceMappingURL=types.js.map
package/dist/types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;AAmBA,0CAEC;AAFD,SAAgB,eAAe,CAAC,IAAS;IACvC,OAAO,cAAc,IAAI,IAAI,IAAI,IAAI,CAAC,YAAY,CAAA;AACpD,CAAC"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAmBA,MAAM,UAAU,eAAe,CAAC,IAAS;IACvC,OAAO,cAAc,IAAI,IAAI,IAAI,IAAI,CAAC,YAAY,CAAA;AACpD,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sphereon/ssi-express-support",
3
- "version": "0.32.1-next.54+3b988a2b",
3
+ "version": "0.33.1-feature.vcdm2.4+9f634bdb",
4
4
  "source": "src/index.ts",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -77,5 +77,5 @@
77
77
  "Agent"
78
78
  ],
79
79
  "nx": {},
80
- "gitHead": "3b988a2bb62a7c4534a2670ea3a0985fd93d00f2"
80
+ "gitHead": "9f634bdb714061141e277508c124b08d626f6036"
81
81
  }
package/src/auth-utils.ts CHANGED
@@ -139,6 +139,10 @@ export function copyGlobalAuthToEndpoint(args?: { opts?: HasEndpointOpts; key: s
139
139
  if (!opts || !key || !hasEndpointOpts(opts)) {
140
140
  return
141
141
  }
142
+ if (key === 'basePath') {
143
+ // make sure to not copy base path over, as we use these at the global router, and this would repeat the path
144
+ return
145
+ }
142
146
  if (opts.endpointOpts?.globalAuth) {
143
147
  if (opts.endpointOpts[key]?.disableGlobalAuth === true) {
144
148
  return