@sphereon/ssi-express-support 0.15.2-next.3 → 0.15.2-next.33
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/dist/auth-utils.d.ts +2 -0
- package/dist/auth-utils.d.ts.map +1 -1
- package/dist/auth-utils.js +46 -20
- package/dist/auth-utils.js.map +1 -1
- package/dist/express-builders.d.ts.map +1 -1
- package/dist/express-builders.js +16 -29
- package/dist/express-builders.js.map +1 -1
- package/dist/express-utils.d.ts +1 -1
- package/dist/express-utils.d.ts.map +1 -1
- package/dist/express-utils.js +9 -2
- package/dist/express-utils.js.map +1 -1
- package/dist/functions.js +1 -1
- package/dist/functions.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +15 -0
- package/dist/index.js.map +1 -1
- package/dist/openid-connect-rp.d.ts +54 -0
- package/dist/openid-connect-rp.d.ts.map +1 -0
- package/dist/openid-connect-rp.js +214 -0
- package/dist/openid-connect-rp.js.map +1 -0
- package/dist/types.d.ts +6 -1
- package/dist/types.d.ts.map +1 -1
- package/package.json +11 -4
- package/src/auth-utils.ts +60 -32
- package/src/express-builders.ts +7 -4
- package/src/express-utils.ts +8 -2
- package/src/functions.ts +1 -1
- package/src/index.ts +3 -0
- package/src/openid-connect-rp.ts +228 -0
- package/src/types.ts +6 -1
- package/dist/openid-connect-auth.d.ts +0 -10
- package/dist/openid-connect-auth.d.ts.map +0 -1
- package/dist/openid-connect-auth.js +0 -61
- package/dist/openid-connect-auth.js.map +0 -1
- package/src/openid-connect-auth.ts +0 -47
package/dist/auth-utils.d.ts
CHANGED
|
@@ -7,6 +7,8 @@ export declare const checkUserIsInRole: (opts: {
|
|
|
7
7
|
}) => (req: express.Request, res: express.Response, next: NextFunction) => void | express.Response<any, Record<string, any>>;
|
|
8
8
|
export declare const checkAuthenticationOnly: (opts?: EndpointArgs) => (req: express.Request, res: express.Response, next: express.NextFunction) => void | express.Response<any, Record<string, any>>;
|
|
9
9
|
export declare const checkAuthorizationOnly: (opts?: EndpointArgs) => (req: express.Request, res: express.Response, next: express.NextFunction) => void | express.Response<any, Record<string, any>>;
|
|
10
|
+
export declare const isUserNotAuthenticated: (req: express.Request, res: express.Response, next: express.NextFunction) => void;
|
|
11
|
+
export declare const isUserAuthenticated: (req: express.Request, res: express.Response, next: express.NextFunction) => void | express.Response<any, Record<string, any>>;
|
|
10
12
|
export declare const checkAuth: (opts?: EndpointArgs) => RequestHandler<ParamsDictionary, any, any, ParsedQs, Record<string, any>>[];
|
|
11
13
|
export declare function copyGlobalAuthToEndpoint(args?: {
|
|
12
14
|
opts?: HasEndpointOpts;
|
package/dist/auth-utils.d.ts.map
CHANGED
|
@@ -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;
|
|
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,eAAe,OAAO,gBAAgB,QAAQ,YAAY,sDAgBxI,CAAA;AAgFD,eAAO,MAAM,uBAAuB,UAAW,YAAY,WAAW,eAAe,OAAO,gBAAgB,QAAQ,oBAAoB,sDAGvI,CAAA;AAED,eAAO,MAAM,sBAAsB,UAAW,YAAY,WAAW,eAAe,OAAO,gBAAgB,QAAQ,oBAAoB,sDAGtI,CAAA;AAED,eAAO,MAAM,sBAAsB,QAAS,eAAe,OAAO,gBAAgB,QAAQ,oBAAoB,SAI7G,CAAA;AAED,eAAO,MAAM,mBAAmB,QAAS,eAAe,OAAO,gBAAgB,QAAQ,oBAAoB,sDAM1G,CAAA;AAED,eAAO,MAAM,SAAS,UAAW,YAAY,KAAG,eAAe,gBAAgB,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,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"}
|
package/dist/auth-utils.js
CHANGED
|
@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.copyGlobalAuthToEndpoints = exports.copyGlobalAuthToEndpoint = exports.checkAuth = exports.checkAuthorizationOnly = exports.checkAuthenticationOnly = exports.checkUserIsInRole = void 0;
|
|
6
|
+
exports.copyGlobalAuthToEndpoints = exports.copyGlobalAuthToEndpoint = exports.checkAuth = exports.isUserAuthenticated = exports.isUserNotAuthenticated = exports.checkAuthorizationOnly = exports.checkAuthenticationOnly = exports.checkUserIsInRole = void 0;
|
|
7
7
|
const passport_1 = __importDefault(require("passport"));
|
|
8
|
+
const express_utils_1 = require("./express-utils");
|
|
8
9
|
const types_1 = require("./types");
|
|
9
10
|
const checkUserIsInRole = (opts) => (req, res, next) => {
|
|
10
11
|
if (!(opts === null || opts === void 0 ? void 0 : opts.roles) || opts.roles.length === 0) {
|
|
@@ -23,43 +24,53 @@ const checkUserIsInRole = (opts) => (req, res, next) => {
|
|
|
23
24
|
};
|
|
24
25
|
exports.checkUserIsInRole = checkUserIsInRole;
|
|
25
26
|
const checkAuthenticationImpl = (req, res, next, opts) => {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
}
|
|
29
|
-
if (!opts.authentication.strategy) {
|
|
30
|
-
console.log(`Authentication enabled, but no strategy configured. All auth request will be denied!`);
|
|
31
|
-
return res.status(401).end();
|
|
32
|
-
}
|
|
33
|
-
const options = { authInfo: true, session: false };
|
|
34
|
-
passport_1.default
|
|
35
|
-
.authenticate(opts.authentication.strategy, options, (err, user, _info, _status) => {
|
|
27
|
+
var _a, _b, _c, _d, _e, _f;
|
|
28
|
+
const defaultCallback = (err, user, _info, _status) => {
|
|
36
29
|
if (err) {
|
|
37
|
-
|
|
30
|
+
const message = 'message' in err ? err.message : err;
|
|
31
|
+
console.log('Authentication failed, error: ' + JSON.stringify(message));
|
|
32
|
+
return next({ statusCode: 403, message });
|
|
38
33
|
}
|
|
39
34
|
else if (!user) {
|
|
40
|
-
console.log('Authentication failed, no user object present in request');
|
|
41
|
-
|
|
35
|
+
console.log('Authentication failed, no user object present in request. Redirecting to /login');
|
|
36
|
+
// todo: configuration option
|
|
37
|
+
return res.redirect('/authentication/login');
|
|
42
38
|
}
|
|
43
39
|
if (options.session) {
|
|
44
40
|
req.logIn(user, function (err) {
|
|
45
41
|
if (err) {
|
|
46
42
|
return next(err);
|
|
47
43
|
}
|
|
48
|
-
return res.send(user);
|
|
49
44
|
});
|
|
50
45
|
}
|
|
46
|
+
/* /!*if (options.session) {
|
|
47
|
+
req.logIn(user, function (err) {
|
|
48
|
+
if (err) {
|
|
49
|
+
return next(err)
|
|
50
|
+
}
|
|
51
|
+
return res.redirect('/')
|
|
52
|
+
})
|
|
53
|
+
}*!/*/
|
|
51
54
|
return next();
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
+
};
|
|
56
|
+
if (!opts || !opts.authentication || opts.authentication.enabled === false) {
|
|
57
|
+
return next();
|
|
58
|
+
}
|
|
59
|
+
if (!opts.authentication.strategy) {
|
|
60
|
+
console.log(`Authentication enabled, but no strategy configured. All auth request will be denied!`);
|
|
61
|
+
return res.status(401).end();
|
|
62
|
+
}
|
|
63
|
+
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 });
|
|
64
|
+
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);
|
|
65
|
+
passport_1.default.authenticate(opts.authentication.strategy, options, callback).call(this, req, res, next);
|
|
55
66
|
};
|
|
56
67
|
const checkAuthorizationImpl = (req, res, next, opts) => {
|
|
57
68
|
if (!opts || !opts.authentication || !opts.authorization || opts.authentication.enabled === false || (opts === null || opts === void 0 ? void 0 : opts.authorization.enabled) === false) {
|
|
58
69
|
return next();
|
|
59
70
|
}
|
|
60
71
|
/*if (!req.isAuthenticated()) {
|
|
61
|
-
|
|
62
|
-
|
|
72
|
+
return sendErrorResponse(res, 403, 'Authorization with an unauthenticated request is not possible')
|
|
73
|
+
}*/
|
|
63
74
|
const authorization = opts.authorization;
|
|
64
75
|
if (!authorization.enforcer && (!authorization.requireUserInRoles || authorization.requireUserInRoles.length === 0)) {
|
|
65
76
|
console.log(`Authorization enabled for endpoint, but no enforcer or roles supplied`);
|
|
@@ -88,6 +99,21 @@ const checkAuthorizationOnly = (opts) => (req, res, next) => {
|
|
|
88
99
|
return checkAuthorizationImpl(req, res, next, opts);
|
|
89
100
|
};
|
|
90
101
|
exports.checkAuthorizationOnly = checkAuthorizationOnly;
|
|
102
|
+
const isUserNotAuthenticated = (req, res, next) => {
|
|
103
|
+
if (!req.user) {
|
|
104
|
+
next();
|
|
105
|
+
}
|
|
106
|
+
};
|
|
107
|
+
exports.isUserNotAuthenticated = isUserNotAuthenticated;
|
|
108
|
+
const isUserAuthenticated = (req, res, next) => {
|
|
109
|
+
if (!req.user) {
|
|
110
|
+
return (0, express_utils_1.sendErrorResponse)(res, 401, 'Authentication required');
|
|
111
|
+
}
|
|
112
|
+
else {
|
|
113
|
+
return next();
|
|
114
|
+
}
|
|
115
|
+
};
|
|
116
|
+
exports.isUserAuthenticated = isUserAuthenticated;
|
|
91
117
|
const checkAuth = (opts) => {
|
|
92
118
|
const handlers = [];
|
|
93
119
|
handlers.push((0, exports.checkAuthenticationOnly)(opts));
|
package/dist/auth-utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-utils.js","sourceRoot":"","sources":["../src/auth-utils.ts"],"names":[],"mappings":";;;;;;AAEA,wDAA+B;AAE/B,mCAAwE;AAEjE,MAAM,iBAAiB,GAAG,CAAC,IAAkC,EAAE,EAAE,CAAC,CAAC,GAAoB,EAAE,GAAqB,EAAE,IAAkB,EAAE,EAAE;IAC3I,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAA,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QAC3C,OAAO,IAAI,EAAE,CAAA;KACd;IACD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACnE,IAAI,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,CAAA,IAAI,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE;QACvC,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;KAC7B;IAED,aAAa;IACb,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;IACxF,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;KAC7B;IAED,OAAO,IAAI,EAAE,CAAA;AACf,CAAC,CAAA;AAhBY,QAAA,iBAAiB,qBAgB7B;AAED,MAAM,uBAAuB,GAAG,CAAC,GAAoB,EAAE,GAAqB,EAAE,IAA0B,EAAE,IAAmB,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"auth-utils.js","sourceRoot":"","sources":["../src/auth-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-builders.d.ts","sourceRoot":"","sources":["../src/express-builders.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"express-builders.d.ts","sourceRoot":"","sources":["../src/express-builders.ts"],"names":[],"mappings":"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"}
|
package/dist/express-builders.js
CHANGED
|
@@ -1,26 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
})
|
|
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;
|
|
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
|
+
});
|
|
24
10
|
};
|
|
25
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
@@ -32,7 +18,6 @@ exports.ExpressCorsConfigurer = exports.ExpressBuilder = void 0;
|
|
|
32
18
|
*/
|
|
33
19
|
const body_parser_1 = __importDefault(require("body-parser"));
|
|
34
20
|
const cors_1 = __importDefault(require("cors"));
|
|
35
|
-
const dotenv = __importStar(require("dotenv-flow"));
|
|
36
21
|
const express_1 = __importDefault(require("express"));
|
|
37
22
|
const express_session_1 = __importDefault(require("express-session"));
|
|
38
23
|
const http_terminator_1 = require("http-terminator");
|
|
@@ -41,7 +26,6 @@ const passport_1 = __importDefault(require("passport"));
|
|
|
41
26
|
const auth_utils_1 = require("./auth-utils");
|
|
42
27
|
const express_utils_1 = require("./express-utils");
|
|
43
28
|
const functions_1 = require("./functions");
|
|
44
|
-
dotenv.config();
|
|
45
29
|
class ExpressBuilder {
|
|
46
30
|
constructor(opts) {
|
|
47
31
|
this._handlers = [];
|
|
@@ -190,28 +174,31 @@ class ExpressBuilder {
|
|
|
190
174
|
}
|
|
191
175
|
return { server: this._server, terminator: this._terminator };
|
|
192
176
|
},
|
|
193
|
-
stop:
|
|
177
|
+
stop: (terminator) => __awaiter(this, void 0, void 0, function* () {
|
|
194
178
|
const term = terminator !== null && terminator !== void 0 ? terminator : this._terminator;
|
|
195
179
|
if (!term) {
|
|
196
180
|
return false;
|
|
197
181
|
}
|
|
198
|
-
return
|
|
199
|
-
},
|
|
182
|
+
return yield term.terminate().then(() => true);
|
|
183
|
+
}),
|
|
200
184
|
};
|
|
201
185
|
}
|
|
202
186
|
buildExpress(opts) {
|
|
203
|
-
var _a, _b;
|
|
187
|
+
var _a, _b, _c;
|
|
204
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)();
|
|
205
189
|
if (this._morgan) {
|
|
206
190
|
app.use(this._morgan);
|
|
207
191
|
}
|
|
208
192
|
if (this._sessionOpts) {
|
|
209
|
-
|
|
193
|
+
const store = (_c = this._sessionOpts.store) !== null && _c !== void 0 ? _c : new express_session_1.default.MemoryStore();
|
|
194
|
+
this._sessionOpts.store = store;
|
|
210
195
|
app.use((0, express_session_1.default)(this._sessionOpts));
|
|
211
196
|
}
|
|
212
197
|
if (this._usePassportAuth) {
|
|
213
198
|
app.use(passport_1.default.initialize(this._passportInitOpts));
|
|
214
199
|
if (this._sessionOpts) {
|
|
200
|
+
// app.use(passport.authenticate('session'))
|
|
201
|
+
//_sessionOpts are not for passport session, they are for express above
|
|
215
202
|
app.use(passport_1.default.session());
|
|
216
203
|
}
|
|
217
204
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-builders.js","sourceRoot":"","sources":["../src/express-builders.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"express-builders.js","sourceRoot":"","sources":["../src/express-builders.ts"],"names":[],"mappings":"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"}
|
package/dist/express-utils.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import express, { NextFunction } from 'express';
|
|
2
|
-
export declare function sendErrorResponse(response: express.Response, statusCode: number, message: string | object, error?: any): express.Response<any, Record<string, any
|
|
2
|
+
export declare function sendErrorResponse(response: express.Response, statusCode: number, message: string | object, error?: any): express.Response<any, Record<string, any>>;
|
|
3
3
|
export declare const jsonErrorHandler: (err: any, req: express.Request, res: express.Response, next: NextFunction) => void | express.Response<any, Record<string, any>>;
|
|
4
4
|
//# sourceMappingURL=express-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-utils.d.ts","sourceRoot":"","sources":["../src/express-utils.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC/C,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"express-utils.d.ts","sourceRoot":"","sources":["../src/express-utils.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC/C,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG,8CAwBtH;AAED,eAAO,MAAM,gBAAgB,QAAS,GAAG,OAAO,eAAe,OAAO,gBAAgB,QAAQ,YAAY,sDASzG,CAAA"}
|
package/dist/express-utils.js
CHANGED
|
@@ -3,12 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.jsonErrorHandler = exports.sendErrorResponse = void 0;
|
|
4
4
|
function sendErrorResponse(response, statusCode, message, error) {
|
|
5
5
|
console.log(`sendErrorResponse: ${message}`);
|
|
6
|
+
if (!message) {
|
|
7
|
+
console.log('Message was null when calling sendErrorResponse. This should not happen');
|
|
8
|
+
console.log(Error().stack);
|
|
9
|
+
message = 'An unexpected error occurred';
|
|
10
|
+
statusCode = 500;
|
|
11
|
+
}
|
|
6
12
|
if (error) {
|
|
7
13
|
console.log(JSON.stringify(error));
|
|
8
14
|
}
|
|
9
15
|
if (response.headersSent) {
|
|
10
16
|
console.log(`sendErrorResponse headers already sent`);
|
|
11
|
-
return;
|
|
17
|
+
return response;
|
|
12
18
|
}
|
|
13
19
|
response.statusCode = statusCode;
|
|
14
20
|
if (typeof message === 'string' && !message.startsWith('{')) {
|
|
@@ -22,8 +28,9 @@ function sendErrorResponse(response, statusCode, message, error) {
|
|
|
22
28
|
}
|
|
23
29
|
exports.sendErrorResponse = sendErrorResponse;
|
|
24
30
|
const jsonErrorHandler = (err, req, res, next) => {
|
|
31
|
+
var _a;
|
|
25
32
|
const statusCode = 'statusCode' in err ? err.statusCode : 500;
|
|
26
|
-
const errorMsg = typeof err === 'string' ? err : err.message;
|
|
33
|
+
const errorMsg = typeof err === 'string' ? err : (_a = err.message) !== null && _a !== void 0 ? _a : err;
|
|
27
34
|
if (res.headersSent) {
|
|
28
35
|
console.log('Headers already sent, when calling error handler. Will defer to next error handler');
|
|
29
36
|
console.log(`Error was: ${JSON.stringify(err)}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-utils.js","sourceRoot":"","sources":["../src/express-utils.ts"],"names":[],"mappings":";;;AACA,SAAgB,iBAAiB,CAAC,QAA0B,EAAE,UAAkB,EAAE,OAAwB,EAAE,KAAW;IACrH,OAAO,CAAC,GAAG,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAA;IAC5C,IAAI,KAAK,EAAE;QACT,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;KACnC;IACD,IAAI,QAAQ,CAAC,WAAW,EAAE;QACxB,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAA;QACrD,
|
|
1
|
+
{"version":3,"file":"express-utils.js","sourceRoot":"","sources":["../src/express-utils.ts"],"names":[],"mappings":";;;AACA,SAAgB,iBAAiB,CAAC,QAA0B,EAAE,UAAkB,EAAE,OAAwB,EAAE,KAAW;IACrH,OAAO,CAAC,GAAG,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAA;IAC5C,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,yEAAyE,CAAC,CAAA;QACtF,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAA;QAC1B,OAAO,GAAG,8BAA8B,CAAA;QACxC,UAAU,GAAG,GAAG,CAAA;KACjB;IACD,IAAI,KAAK,EAAE;QACT,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;KACnC;IACD,IAAI,QAAQ,CAAC,WAAW,EAAE;QACxB,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAA;QACrD,OAAO,QAAQ,CAAA;KAChB;IACD,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAA;IAChC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC3D,OAAO,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;KAC7B;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC1D,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;QACnD,OAAO,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;KAChD;IACD,OAAO,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAClD,CAAC;AAxBD,8CAwBC;AAEM,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,MAAM,QAAQ,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAA,GAAG,CAAC,OAAO,mCAAI,GAAG,CAAA;IACnE,IAAI,GAAG,CAAC,WAAW,EAAE;QACnB,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;KACjB;IACD,OAAO,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;AAChG,CAAC,CAAA;AATY,QAAA,gBAAgB,oBAS5B"}
|
package/dist/functions.js
CHANGED
package/dist/functions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functions.js","sourceRoot":"","sources":["../src/functions.ts"],"names":[],"mappings":";;;AAAA,SAAgB,GAAG,CAAC,GAAY,EAAE,MAAe;IAC/C,IAAI,CAAC,GAAG,EAAE;QACR,
|
|
1
|
+
{"version":3,"file":"functions.js","sourceRoot":"","sources":["../src/functions.ts"],"names":[],"mappings":";;;AAAA,SAAgB,GAAG,CAAC,GAAY,EAAE,MAAe;IAC/C,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,SAAS,CAAA;KACjB;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;AALD,kBAKC"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,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"}
|
package/dist/index.js
CHANGED
|
@@ -10,11 +10,25 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
10
10
|
if (k2 === undefined) k2 = k;
|
|
11
11
|
o[k2] = m[k];
|
|
12
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
|
+
};
|
|
13
25
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
26
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
27
|
};
|
|
16
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
29
|
exports.jsonErrorHandler = exports.sendErrorResponse = void 0;
|
|
30
|
+
const dotenv = __importStar(require("dotenv-flow"));
|
|
31
|
+
dotenv.config();
|
|
18
32
|
__exportStar(require("./entra-id-auth"), exports);
|
|
19
33
|
__exportStar(require("./static-bearer-auth"), exports);
|
|
20
34
|
__exportStar(require("./auth-utils"), exports);
|
|
@@ -24,4 +38,5 @@ var express_utils_1 = require("./express-utils");
|
|
|
24
38
|
Object.defineProperty(exports, "sendErrorResponse", { enumerable: true, get: function () { return express_utils_1.sendErrorResponse; } });
|
|
25
39
|
Object.defineProperty(exports, "jsonErrorHandler", { enumerable: true, get: function () { return express_utils_1.jsonErrorHandler; } });
|
|
26
40
|
__exportStar(require("./functions"), exports);
|
|
41
|
+
__exportStar(require("./openid-connect-rp"), exports);
|
|
27
42
|
//# 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":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAqC;AACrC,MAAM,CAAC,MAAM,EAAE,CAAA;AACf,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"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { TAgent } from '@veramo/core';
|
|
2
|
+
import express, { Express, Router } from 'express';
|
|
3
|
+
import { BaseClient, ClientMetadata, ClientOptions, Issuer } from 'openid-client';
|
|
4
|
+
import { ExpressSupport, GenericAuthArgs, ISingleEndpointOpts } from './types';
|
|
5
|
+
export declare function oidcDiscoverIssuer(opts?: {
|
|
6
|
+
issuerUrl?: string;
|
|
7
|
+
}): Promise<{
|
|
8
|
+
issuer: Issuer<BaseClient>;
|
|
9
|
+
issuerUrl: string;
|
|
10
|
+
}>;
|
|
11
|
+
export declare function oidcGetClient(issuer: Issuer<BaseClient>, metadata: ClientMetadata, opts?: {
|
|
12
|
+
jwks?: {
|
|
13
|
+
keys: JsonWebKey[];
|
|
14
|
+
};
|
|
15
|
+
options?: ClientOptions;
|
|
16
|
+
}): Promise<BaseClient>;
|
|
17
|
+
export declare function getLoginEndpoint(router: Router, opts?: ISingleEndpointOpts & {
|
|
18
|
+
redirectUrl?: string;
|
|
19
|
+
}): void;
|
|
20
|
+
export declare function getLoginCallbackEndpoint(router: Router, opts?: ISingleEndpointOpts): void;
|
|
21
|
+
export declare function getLogoutEndpoint(router: Router, client: BaseClient, opts?: ISingleEndpointOpts): void;
|
|
22
|
+
export declare function getLogoutCallbackEndpoint(router: Router, opts?: ISingleEndpointOpts): void;
|
|
23
|
+
export declare function getIdTokenEndpoint(router: Router, client: BaseClient, opts: ISingleEndpointOpts): void;
|
|
24
|
+
export declare function getAuthenticatedUserEndpoint(router: Router, opts?: ISingleEndpointOpts): void;
|
|
25
|
+
export interface IAuthenticationOpts {
|
|
26
|
+
enabledFeatures?: AuthenticationApiFeatures;
|
|
27
|
+
endpointOpts?: IAuthenticationEndpointOpts;
|
|
28
|
+
}
|
|
29
|
+
export interface IAuthenticationEndpointOpts {
|
|
30
|
+
basePath?: string;
|
|
31
|
+
globalAuth?: GenericAuthArgs;
|
|
32
|
+
getAuthenticatedUser?: ISingleEndpointOpts;
|
|
33
|
+
getLogin?: ISingleEndpointOpts;
|
|
34
|
+
getLogout?: ISingleEndpointOpts;
|
|
35
|
+
getIdToken?: ISingleEndpointOpts;
|
|
36
|
+
}
|
|
37
|
+
export type AuthenticationApiFeatures = 'login' | 'logout' | 'id-token' | 'authenticated-user';
|
|
38
|
+
export declare class OpenIDConnectAuthApi {
|
|
39
|
+
get router(): express.Router;
|
|
40
|
+
private readonly _express;
|
|
41
|
+
private readonly _agent?;
|
|
42
|
+
private readonly _opts?;
|
|
43
|
+
private readonly _router;
|
|
44
|
+
constructor(args: {
|
|
45
|
+
agent?: TAgent<any>;
|
|
46
|
+
expressSupport: ExpressSupport;
|
|
47
|
+
client: BaseClient;
|
|
48
|
+
opts: IAuthenticationOpts;
|
|
49
|
+
});
|
|
50
|
+
get agent(): TAgent<any> | undefined;
|
|
51
|
+
get opts(): IAuthenticationOpts | undefined;
|
|
52
|
+
get express(): Express;
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=openid-connect-rp.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openid-connect-rp.d.ts","sourceRoot":"","sources":["../src/openid-connect-rp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,OAAO,EAAE,EAAE,OAAO,EAAgB,MAAM,EAAE,MAAM,SAAS,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAKjF,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAG9E,wBAAsB,kBAAkB,CAAC,IAAI,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE;;;GAKrE;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,EAC1B,QAAQ,EAAE,cAAc,EACxB,IAAI,CAAC,EAAE;IACL,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,UAAU,EAAE,CAAA;KAAE,CAAA;IAC7B,OAAO,CAAC,EAAE,aAAa,CAAA;CACxB,uBAIF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,mBAAmB,GAAG;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,QAuBrG;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,mBAAmB,QA8BlF;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,mBAAmB,QAmB/F;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,mBAAmB,QAkBnF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,mBAAmB,QAa/F;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,mBAAmB,QAatF;AAED,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,yBAAyB,CAAA;IAC3C,YAAY,CAAC,EAAE,2BAA2B,CAAA;CAC3C;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,eAAe,CAAA;IAC5B,oBAAoB,CAAC,EAAE,mBAAmB,CAAA;IAC1C,QAAQ,CAAC,EAAE,mBAAmB,CAAA;IAC9B,SAAS,CAAC,EAAE,mBAAmB,CAAA;IAC/B,UAAU,CAAC,EAAE,mBAAmB,CAAA;CACjC;AAED,MAAM,MAAM,yBAAyB,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,GAAG,oBAAoB,CAAA;AAE9F,qBAAa,oBAAoB;IAC/B,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,CAE3B;IAED,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAa;IACrC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAqB;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAQ;gBAEpB,IAAI,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;QAAC,cAAc,EAAE,cAAc,CAAC;QAAC,MAAM,EAAE,UAAU,CAAC;QAAC,IAAI,EAAE,mBAAmB,CAAA;KAAE;IAiCxH,IAAI,KAAK,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAEnC;IAED,IAAI,IAAI,IAAI,mBAAmB,GAAG,SAAS,CAE1C;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;CACF"}
|