unleash-server 4.15.2 → 4.15.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.
- package/dist/lib/openapi/index.d.ts +5 -7
- package/dist/lib/openapi/index.js +5 -1
- package/dist/lib/openapi/index.js.map +1 -1
- package/dist/lib/openapi/spec/validate-edge-tokens-schema.d.ts +5 -7
- package/dist/lib/openapi/spec/validate-edge-tokens-schema.js +6 -4
- package/dist/lib/openapi/spec/validate-edge-tokens-schema.js.map +1 -1
- package/dist/lib/routes/logout.d.ts +1 -0
- package/dist/lib/routes/logout.js +17 -2
- package/dist/lib/routes/logout.js.map +1 -1
- package/dist/lib/routes/logout.test.js +32 -0
- package/dist/lib/routes/logout.test.js.map +1 -1
- package/dist/lib/routes/unleash-types.d.ts +1 -1
- package/dist/test/e2e/api/openapi/openapi.e2e.test.js +1 -2
- package/dist/test/e2e/api/openapi/openapi.e2e.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -10716,15 +10716,13 @@ export declare const schemas: {
|
|
|
10716
10716
|
readonly properties: {
|
|
10717
10717
|
readonly tokens: {
|
|
10718
10718
|
readonly type: "array";
|
|
10719
|
-
readonly
|
|
10720
|
-
readonly
|
|
10719
|
+
readonly items: {
|
|
10720
|
+
readonly anyOf: readonly [{
|
|
10721
10721
|
readonly $ref: "#/components/schemas/edgeTokenSchema";
|
|
10722
|
-
}
|
|
10723
|
-
}, {
|
|
10724
|
-
readonly items: {
|
|
10722
|
+
}, {
|
|
10725
10723
|
readonly type: "string";
|
|
10726
|
-
};
|
|
10727
|
-
}
|
|
10724
|
+
}];
|
|
10725
|
+
};
|
|
10728
10726
|
};
|
|
10729
10727
|
};
|
|
10730
10728
|
readonly components: {
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.createOpenApiSchema = exports.removeJsonSchemaProps = exports.schemas = void 0;
|
|
4
7
|
const addon_parameter_schema_1 = require("./spec/addon-parameter-schema");
|
|
@@ -114,6 +117,7 @@ const proxy_metrics_schema_1 = require("./spec/proxy-metrics-schema");
|
|
|
114
117
|
const set_ui_config_schema_1 = require("./spec/set-ui-config-schema");
|
|
115
118
|
const edge_token_schema_1 = require("./spec/edge-token-schema");
|
|
116
119
|
const validate_edge_tokens_schema_1 = require("./spec/validate-edge-tokens-schema");
|
|
120
|
+
const version_1 = __importDefault(require("../util/version"));
|
|
117
121
|
// All schemas in `openapi/spec` should be listed here.
|
|
118
122
|
exports.schemas = {
|
|
119
123
|
addonParameterSchema: addon_parameter_schema_1.addonParameterSchema,
|
|
@@ -248,7 +252,7 @@ const createOpenApiSchema = ({ unleashUrl, baseUriPath, }) => {
|
|
|
248
252
|
servers: url ? [{ url }] : [],
|
|
249
253
|
info: {
|
|
250
254
|
title: 'Unleash API',
|
|
251
|
-
version:
|
|
255
|
+
version: version_1.default,
|
|
252
256
|
},
|
|
253
257
|
security: [{ apiKey: [] }],
|
|
254
258
|
components: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/openapi/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/openapi/index.ts"],"names":[],"mappings":";;;;;;AACA,0EAAqE;AACrE,sDAAkD;AAClD,wDAAoD;AACpD,gEAA2D;AAC3D,8DAAyD;AACzD,gEAA2D;AAC3D,kEAA8D;AAC9D,oEAAgE;AAChE,0EAAqE;AACrE,gFAA2E;AAC3E,wEAAmE;AACnE,sFAAgF;AAChF,0EAAqE;AACrE,wEAAmE;AACnE,sEAAiE;AACjE,gEAA4D;AAC5D,sEAAiE;AACjE,wEAAmE;AACnE,4EAAsE;AACtE,wEAAmE;AACnE,0FAAoF;AACpF,kEAA6D;AAC7D,oDAAgD;AAChD,sDAAkD;AAClD,kEAA8D;AAC9D,oEAAgE;AAChE,sDAAkD;AAClD,wDAAoD;AACpD,kGAA4F;AAC5F,kFAA6E;AAC7E,wEAAmE;AACnE,0EAAqE;AACrE,0DAAsD;AACtD,4DAAwD;AACxD,4EAAuE;AACvE,4FAAsF;AACtF,kEAA6D;AAC7D,oEAA+D;AAC/D,sEAAiE;AACjE,sEAAiE;AACjE,4EAAuE;AACvE,4DAAwD;AACxD,oEAA+D;AAC/D,0EAAqE;AACrE,sEAAiE;AACjE,gDAA4C;AAC5C,kEAA6D;AAC7D,sDAAkD;AAClD,mDAA+C;AAC/C,gDAA4C;AAC5C,oDAAgD;AAChD,iDAA6C;AAC7C,4DAAwD;AACxD,gEAA4D;AAC5D,4DAAwD;AACxD,0DAAsD;AACtD,sDAAkD;AAClD,gEAA4D;AAC5D,gFAA2E;AAC3E,kFAA6E;AAC7E,sFAAiF;AACjF,gFAA2E;AAC3E,gFAA2E;AAC3E,kFAA6E;AAC7E,kFAA6E;AAC7E,0DAAsD;AACtD,4DAAwD;AACxD,wEAAmE;AACnE,oDAAgD;AAChD,kEAA6D;AAC7D,0DAAsD;AACtD,0FAAmF;AACnF,gEAA2D;AAC3D,wDAAoD;AACpD,sDAAkD;AAClD,gEAA4D;AAC5D,4DAAwD;AACxD,kDAA8C;AAC9C,oDAAgD;AAChD,4DAAuD;AACvD,8DAAyD;AACzD,4EAAsE;AACtE,gEAA2D;AAC3D,8DAAyD;AACzD,4EAAsE;AACtE,wEAAmE;AACnE,0FAAoF;AACpF,0EAAoE;AACpE,kEAA6D;AAC7D,oFAA8E;AAC9E,0EAAqE;AACrE,oDAAgD;AAChD,sDAAkD;AAClD,oEAA+D;AAC/D,8EAAyE;AACzE,8EAAwE;AACxE,0DAAsD;AACtD,4DAAwD;AACxD,0DAAsD;AAEtD,6BAA0B;AAC1B,sDAAkD;AAClD,wDAAoD;AACpD,4EAAsE;AACtE,8EAAwE;AACxE,sDAAkD;AAClD,sEAAiE;AACjE,wEAAmE;AACnE,sEAAiE;AACjE,oEAA+D;AAC/D,sEAAiE;AACjE,sEAAgE;AAChE,gEAA2D;AAC3D,oFAA8E;AAC9E,8DAAyC;AAEzC,uDAAuD;AAC1C,QAAA,OAAO,GAAG;IACnB,oBAAoB,EAApB,6CAAoB;IACpB,WAAW,EAAX,0BAAW;IACX,YAAY,EAAZ,4BAAY;IACZ,eAAe,EAAf,mCAAe;IACf,cAAc,EAAd,iCAAc;IACd,eAAe,EAAf,mCAAe;IACf,iBAAiB,EAAjB,sCAAiB;IACjB,kBAAkB,EAAlB,wCAAkB;IAClB,oBAAoB,EAApB,6CAAoB;IACpB,uBAAuB,EAAvB,mDAAuB;IACvB,mBAAmB,EAAnB,2CAAmB;IACnB,yBAAyB,EAAzB,wDAAyB;IACzB,oBAAoB,EAApB,6CAAoB;IACpB,mBAAmB,EAAnB,2CAAmB;IACnB,kBAAkB,EAAlB,yCAAkB;IAClB,gBAAgB,EAAhB,oCAAgB;IAChB,kBAAkB,EAAlB,yCAAkB;IAClB,mBAAmB,EAAnB,2CAAmB;IACnB,oBAAoB,EAApB,8CAAoB;IACpB,mBAAmB,EAAnB,2CAAmB;IACnB,2BAA2B,EAA3B,4DAA2B;IAC3B,gBAAgB,EAAhB,qCAAgB;IAChB,UAAU,EAAV,wBAAU;IACV,WAAW,EAAX,0BAAW;IACX,iBAAiB,EAAjB,sCAAiB;IACjB,kBAAkB,EAAlB,wCAAkB;IAClB,WAAW,EAAX,0BAAW;IACX,YAAY,EAAZ,4BAAY;IACZ,+BAA+B,EAA/B,oEAA+B;IAC/B,wBAAwB,EAAxB,qDAAwB;IACxB,mBAAmB,EAAnB,2CAAmB;IACnB,oBAAoB,EAApB,6CAAoB;IACpB,aAAa,EAAb,8BAAa;IACb,cAAc,EAAd,gCAAc;IACd,qBAAqB,EAArB,+CAAqB;IACrB,4BAA4B,EAA5B,8DAA4B;IAC5B,gBAAgB,EAAhB,qCAAgB;IAChB,iBAAiB,EAAjB,uCAAiB;IACjB,kBAAkB,EAAlB,yCAAkB;IAClB,kBAAkB,EAAlB,yCAAkB;IAClB,qBAAqB,EAArB,+CAAqB;IACrB,cAAc,EAAd,gCAAc;IACd,WAAW,EAAX,0BAAW;IACX,YAAY,EAAZ,4BAAY;IACZ,oBAAoB,EAApB,8CAAoB;IACpB,iBAAiB,EAAjB,uCAAiB;IACjB,oBAAoB,EAApB,6CAAoB;IACpB,kBAAkB,EAAlB,yCAAkB;IAClB,QAAQ,EAAR,oBAAQ;IACR,gBAAgB,EAAhB,qCAAgB;IAChB,WAAW,EAAX,0BAAW;IACX,QAAQ,EAAR,oBAAQ;IACR,UAAU,EAAV,wBAAU;IACV,cAAc,EAAd,gCAAc;IACd,gBAAgB,EAAhB,oCAAgB;IAChB,cAAc,EAAd,gCAAc;IACd,aAAa,EAAb,8BAAa;IACb,WAAW,EAAX,0BAAW;IACX,gBAAgB,EAAhB,oCAAgB;IAChB,uBAAuB,EAAvB,mDAAuB;IACvB,wBAAwB,EAAxB,qDAAwB;IACxB,0BAA0B,EAA1B,yDAA0B;IAC1B,uBAAuB,EAAvB,mDAAuB;IACvB,uBAAuB,EAAvB,mDAAuB;IACvB,wBAAwB,EAAxB,qDAAwB;IACxB,wBAAwB,EAAxB,qDAAwB;IACxB,aAAa,EAAb,8BAAa;IACb,cAAc,EAAd,gCAAc;IACd,mBAAmB,EAAnB,2CAAmB;IACnB,UAAU,EAAV,wBAAU;IACV,gBAAgB,EAAhB,qCAAgB;IAChB,kBAAkB,EAAlB,yCAAkB;IAClB,aAAa,EAAb,8BAAa;IACb,0BAA0B,EAA1B,2DAA0B;IAC1B,iBAAiB,EAAjB,wCAAiB;IACjB,eAAe,EAAf,mCAAe;IACf,YAAY,EAAZ,4BAAY;IACZ,WAAW,EAAX,0BAAW;IACX,gBAAgB,EAAhB,oCAAgB;IAChB,cAAc,EAAd,gCAAc;IACd,SAAS,EAAT,sBAAS;IACT,UAAU,EAAV,wBAAU;IACV,aAAa,EAAb,+BAAa;IACb,cAAc,EAAd,iCAAc;IACd,oBAAoB,EAApB,8CAAoB;IACpB,eAAe,EAAf,mCAAe;IACf,cAAc,EAAd,iCAAc;IACd,oBAAoB,EAApB,8CAAoB;IACpB,mBAAmB,EAAnB,2CAAmB;IACnB,2BAA2B,EAA3B,4DAA2B;IAC3B,mBAAmB,EAAnB,4CAAmB;IACnB,gBAAgB,EAAhB,qCAAgB;IAChB,wBAAwB,EAAxB,sDAAwB;IACxB,oBAAoB,EAApB,6CAAoB;IACpB,qBAAqB,EAArB,gDAAqB;IACrB,UAAU,EAAV,wBAAU;IACV,WAAW,EAAX,0BAAW;IACX,iBAAiB,EAAjB,uCAAiB;IACjB,sBAAsB,EAAtB,iDAAsB;IACtB,qBAAqB,EAArB,gDAAqB;IACrB,aAAa,EAAb,8BAAa;IACb,cAAc,EAAd,gCAAc;IACd,aAAa,EAAb,8BAAa;IACb,iBAAiB,EAAjB,uCAAiB;IACjB,mBAAmB,EAAnB,2CAAmB;IACnB,kBAAkB,EAAlB,yCAAkB;IAClB,kBAAkB,EAAlB,yCAAkB;IAClB,eAAe,EAAf,mCAAe;IACf,wBAAwB,EAAxB,sDAAwB;CAC3B,CAAC;AAcF,uEAAuE;AAChE,MAAM,qBAAqB,GAAG,CACjC,MAAS,EACa,EAAE;IACxB,OAAO,IAAA,oBAAQ,EAAC,MAAM,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;AACjD,CAAC,CAAC;AAJW,QAAA,qBAAqB,yBAIhC;AAEF,MAAM,WAAW,GAAwD,CACrE,UAAkB,EAClB,WAAoB,EACtB,EAAE;IACA,IAAI,CAAC,WAAW,EAAE;QACd,OAAO,UAAU,CAAC;KACrB;IACD,MAAM,OAAO,GAAG,IAAI,SAAG,CAAC,UAAU,CAAC,CAAC;IACpC,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;QAC5C,OAAO,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,IAAI,EAAE,CAAC;KACjD;IACD,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;AAC9B,CAAC,CAAC;AAEK,MAAM,mBAAmB,GAAG,CAAC,EAChC,UAAU,EACV,WAAW,GACqC,EAGlD,EAAE;IACA,MAAM,GAAG,GAAG,WAAW,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IACjD,OAAO;QACH,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;QAC7B,IAAI,EAAE;YACF,KAAK,EAAE,aAAa;YACpB,OAAO,EAAE,iBAAU;SACtB;QACD,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QAC1B,UAAU,EAAE;YACR,eAAe,EAAE;gBACb,MAAM,EAAE;oBACJ,IAAI,EAAE,QAAQ;oBACd,EAAE,EAAE,QAAQ;oBACZ,IAAI,EAAE,eAAe;iBACxB;aACJ;YACD,OAAO,EAAE,IAAA,sBAAS,EAAC,eAAO,EAAE,6BAAqB,CAAC;SACrD;QACD,IAAI,EAAE,0BAAW;KACpB,CAAC;AACN,CAAC,CAAC;AA5BW,QAAA,mBAAmB,uBA4B9B"}
|
|
@@ -7,15 +7,13 @@ export declare const validateEdgeTokensSchema: {
|
|
|
7
7
|
readonly properties: {
|
|
8
8
|
readonly tokens: {
|
|
9
9
|
readonly type: "array";
|
|
10
|
-
readonly
|
|
11
|
-
readonly
|
|
10
|
+
readonly items: {
|
|
11
|
+
readonly anyOf: readonly [{
|
|
12
12
|
readonly $ref: "#/components/schemas/edgeTokenSchema";
|
|
13
|
-
}
|
|
14
|
-
}, {
|
|
15
|
-
readonly items: {
|
|
13
|
+
}, {
|
|
16
14
|
readonly type: "string";
|
|
17
|
-
};
|
|
18
|
-
}
|
|
15
|
+
}];
|
|
16
|
+
};
|
|
19
17
|
};
|
|
20
18
|
};
|
|
21
19
|
readonly components: {
|
|
@@ -10,10 +10,12 @@ exports.validateEdgeTokensSchema = {
|
|
|
10
10
|
properties: {
|
|
11
11
|
tokens: {
|
|
12
12
|
type: 'array',
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
items: {
|
|
14
|
+
anyOf: [
|
|
15
|
+
{ $ref: '#/components/schemas/edgeTokenSchema' },
|
|
16
|
+
{ type: 'string' },
|
|
17
|
+
],
|
|
18
|
+
},
|
|
17
19
|
},
|
|
18
20
|
},
|
|
19
21
|
components: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-edge-tokens-schema.js","sourceRoot":"","sources":["../../../../src/lib/openapi/spec/validate-edge-tokens-schema.ts"],"names":[],"mappings":";;;AACA,2DAAsD;AAEzC,QAAA,wBAAwB,GAAG;IACpC,GAAG,EAAE,+CAA+C;IACpD,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,KAAK;IAC3B,QAAQ,EAAE,CAAC,QAAQ,CAAC;IACpB,UAAU,EAAE;QACR,MAAM,EAAE;YACJ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,
|
|
1
|
+
{"version":3,"file":"validate-edge-tokens-schema.js","sourceRoot":"","sources":["../../../../src/lib/openapi/spec/validate-edge-tokens-schema.ts"],"names":[],"mappings":";;;AACA,2DAAsD;AAEzC,QAAA,wBAAwB,GAAG;IACpC,GAAG,EAAE,+CAA+C;IACpD,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,KAAK;IAC3B,QAAQ,EAAE,CAAC,QAAQ,CAAC;IACpB,UAAU,EAAE;QACR,MAAM,EAAE;YACJ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,KAAK,EAAE;oBACH,EAAE,IAAI,EAAE,sCAAsC,EAAE;oBAChD,EAAE,IAAI,EAAE,QAAQ,EAAE;iBACrB;aACJ;SACJ;KACJ;IACD,UAAU,EAAE;QACR,OAAO,EAAE;YACL,eAAe,EAAf,mCAAe;SAClB;KACJ;CACK,CAAC"}
|
|
@@ -3,6 +3,7 @@ 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
|
+
const util_1 = require("util");
|
|
6
7
|
const controller_1 = __importDefault(require("./controller"));
|
|
7
8
|
class LogoutController extends controller_1.default {
|
|
8
9
|
constructor(config) {
|
|
@@ -19,10 +20,21 @@ class LogoutController extends controller_1.default {
|
|
|
19
20
|
res.redirect(req.session.logoutUrl);
|
|
20
21
|
return;
|
|
21
22
|
}
|
|
22
|
-
req.session.destroy();
|
|
23
23
|
}
|
|
24
24
|
if (req.logout) {
|
|
25
|
-
req.logout
|
|
25
|
+
if (this.isReqLogoutWithoutCallback(req.logout)) {
|
|
26
|
+
// passport < 0.6.0
|
|
27
|
+
req.logout();
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
// for passport >= 0.6.0, a callback function is expected as first argument.
|
|
31
|
+
// to reuse controller error handling, function is turned into a promise
|
|
32
|
+
const logoutAsyncFn = (0, util_1.promisify)(req.logout).bind(req);
|
|
33
|
+
await logoutAsyncFn();
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
if (req.session) {
|
|
37
|
+
req.session.destroy();
|
|
26
38
|
}
|
|
27
39
|
res.clearCookie(this.cookieName);
|
|
28
40
|
if (this.clearSiteDataOnLogout) {
|
|
@@ -30,6 +42,9 @@ class LogoutController extends controller_1.default {
|
|
|
30
42
|
}
|
|
31
43
|
res.redirect(`${this.baseUri}/`);
|
|
32
44
|
}
|
|
45
|
+
isReqLogoutWithoutCallback(logout) {
|
|
46
|
+
return logout.length === 0;
|
|
47
|
+
}
|
|
33
48
|
}
|
|
34
49
|
exports.default = LogoutController;
|
|
35
50
|
//# sourceMappingURL=logout.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/lib/routes/logout.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/lib/routes/logout.ts"],"names":[],"mappings":";;;;;AACA,+BAAiC;AAEjC,8DAAsC;AAGtC,MAAM,gBAAiB,SAAQ,oBAAU;IAOrC,YAAY,MAAsB;QAC9B,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;QACzC,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC;QAClE,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;QAC5C,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAiB,EAAE,GAAa;QACzC,IAAI,GAAG,CAAC,OAAO,EAAE;YACb,6CAA6C;YAC7C,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE;gBACvB,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACpC,OAAO;aACV;SACJ;QAED,IAAI,GAAG,CAAC,MAAM,EAAE;YACZ,IAAI,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBAC7C,mBAAmB;gBACnB,GAAG,CAAC,MAAM,EAAE,CAAC;aAChB;iBAAM;gBACH,4EAA4E;gBAC5E,wEAAwE;gBACxE,MAAM,aAAa,GAAG,IAAA,gBAAS,EAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACtD,MAAM,aAAa,EAAE,CAAC;aACzB;SACJ;QAED,IAAI,GAAG,CAAC,OAAO,EAAE;YACb,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACzB;QACD,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEjC,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC5B,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAC;SACtD;QAED,GAAG,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IACrC,CAAC;IAEO,0BAA0B,CAC9B,MAA8B;QAE9B,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/B,CAAC;CACJ;AAED,kBAAe,gBAAgB,CAAC"}
|
|
@@ -101,6 +101,38 @@ test('should call destroy on session', async () => {
|
|
|
101
101
|
await request.get(`${baseUriPath}/logout`);
|
|
102
102
|
expect(fakeSession.destroy.mock.calls.length).toBe(1);
|
|
103
103
|
});
|
|
104
|
+
test('should handle req.logout with callback function', async () => {
|
|
105
|
+
// passport >=0.6.0
|
|
106
|
+
const baseUriPath = '';
|
|
107
|
+
const logoutFunction = jest.fn((cb) => cb());
|
|
108
|
+
const app = (0, express_1.default)();
|
|
109
|
+
const config = (0, test_config_1.createTestConfig)({ server: { baseUriPath } });
|
|
110
|
+
app.use((req, res, next) => {
|
|
111
|
+
req.logout = logoutFunction;
|
|
112
|
+
next();
|
|
113
|
+
});
|
|
114
|
+
app.use('/logout', new logout_1.default(config).router);
|
|
115
|
+
const request = (0, supertest_1.default)(app);
|
|
116
|
+
await request.get(`${baseUriPath}/logout`);
|
|
117
|
+
expect(logoutFunction).toHaveBeenCalledTimes(1);
|
|
118
|
+
expect(logoutFunction).toHaveBeenCalledWith(expect.anything());
|
|
119
|
+
});
|
|
120
|
+
test('should handle req.logout without callback function', async () => {
|
|
121
|
+
// passport <0.6.0
|
|
122
|
+
const baseUriPath = '';
|
|
123
|
+
const logoutFunction = jest.fn();
|
|
124
|
+
const app = (0, express_1.default)();
|
|
125
|
+
const config = (0, test_config_1.createTestConfig)({ server: { baseUriPath } });
|
|
126
|
+
app.use((req, res, next) => {
|
|
127
|
+
req.logout = logoutFunction;
|
|
128
|
+
next();
|
|
129
|
+
});
|
|
130
|
+
app.use('/logout', new logout_1.default(config).router);
|
|
131
|
+
const request = (0, supertest_1.default)(app);
|
|
132
|
+
await request.get(`${baseUriPath}/logout`);
|
|
133
|
+
expect(logoutFunction).toHaveBeenCalledTimes(1);
|
|
134
|
+
expect(logoutFunction).toHaveBeenCalledWith();
|
|
135
|
+
});
|
|
104
136
|
test('should redirect to alternative logoutUrl', async () => {
|
|
105
137
|
const fakeSession = {
|
|
106
138
|
destroy: jest.fn(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.test.js","sourceRoot":"","sources":["../../../src/lib/routes/logout.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"logout.test.js","sourceRoot":"","sources":["../../../src/lib/routes/logout.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { Request } from 'express';
|
|
|
4
4
|
import User from '../types/user';
|
|
5
5
|
export interface IAuthRequest<PARAM = any, ResBody = any, ReqBody = any, ReqQuery = any> extends Request<PARAM, ResBody, ReqBody, ReqQuery> {
|
|
6
6
|
user: User;
|
|
7
|
-
logout: () => void;
|
|
7
|
+
logout: (() => void) | ((callback: (err?: any) => void) => void);
|
|
8
8
|
session: any;
|
|
9
9
|
}
|
|
10
10
|
export interface RequestBody<T> extends Express.Request {
|
|
@@ -30,10 +30,9 @@ test('should serve the OpenAPI spec', async () => {
|
|
|
30
30
|
.expect('Content-Type', /json/)
|
|
31
31
|
.expect(200)
|
|
32
32
|
.expect((res) => {
|
|
33
|
-
// The version field is not set when running jest without yarn/npm.
|
|
34
|
-
delete res.body.info.version;
|
|
35
33
|
// This test will fail whenever there's a change to the API spec.
|
|
36
34
|
// If the change is intended, update the snapshot with `jest -u`.
|
|
35
|
+
delete res.body.info.version;
|
|
37
36
|
expect(res.body).toMatchSnapshot();
|
|
38
37
|
});
|
|
39
38
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openapi.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/openapi/openapi.e2e.test.ts"],"names":[],"mappings":";;;;;AAAA,2DAAqD;AACrD,gFAAiD;AACjD,4EAAoD;AACpD,iFAAwD;AAExD,IAAI,GAAG,CAAC;AACR,IAAI,EAAE,CAAC;AAEP,SAAS,CAAC,KAAK,IAAI,EAAE;IACjB,EAAE,GAAG,MAAM,IAAA,uBAAM,EAAC,SAAS,EAAE,mBAAS,CAAC,CAAC;IACxC,GAAG,GAAG,MAAM,IAAA,sBAAQ,EAAC,EAAE,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;IAChB,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;IAC3C,OAAO,GAAG,CAAC,OAAO;SACb,GAAG,CAAC,gBAAgB,CAAC;SACrB,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;SAC9B,MAAM,CAAC,GAAG,CAAC;SACX,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;IAC7C,OAAO,GAAG,CAAC,OAAO;SACb,GAAG,CAAC,oBAAoB,CAAC;SACzB,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;SAC9B,MAAM,CAAC,GAAG,CAAC;SACX,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;QACZ,
|
|
1
|
+
{"version":3,"file":"openapi.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/openapi/openapi.e2e.test.ts"],"names":[],"mappings":";;;;;AAAA,2DAAqD;AACrD,gFAAiD;AACjD,4EAAoD;AACpD,iFAAwD;AAExD,IAAI,GAAG,CAAC;AACR,IAAI,EAAE,CAAC;AAEP,SAAS,CAAC,KAAK,IAAI,EAAE;IACjB,EAAE,GAAG,MAAM,IAAA,uBAAM,EAAC,SAAS,EAAE,mBAAS,CAAC,CAAC;IACxC,GAAG,GAAG,MAAM,IAAA,sBAAQ,EAAC,EAAE,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;IAChB,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;IAC3C,OAAO,GAAG,CAAC,OAAO;SACb,GAAG,CAAC,gBAAgB,CAAC;SACrB,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;SAC9B,MAAM,CAAC,GAAG,CAAC;SACX,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;IAC7C,OAAO,GAAG,CAAC,OAAO;SACb,GAAG,CAAC,oBAAoB,CAAC;SACzB,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;SAC9B,MAAM,CAAC,GAAG,CAAC;SACX,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;QACZ,iEAAiE;QACjE,iEAAiE;QACjE,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;IACvC,CAAC,CAAC,CAAC;AACX,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;IACnD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,OAAO;SAC7B,GAAG,CAAC,oBAAoB,CAAC;SACzB,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;SAC9B,MAAM,CAAC,GAAG,CAAC,CAAC;IAEjB,6DAA6D;IAC7D,uEAAuE;IACvE,IAAI;QACA,MAAM,wBAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KACtC;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,KAAK,CAAC;KAChB;AACL,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED