unleash-server 4.15.0 → 4.15.3

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.
@@ -8,5 +8,6 @@ declare class LogoutController extends Controller {
8
8
  private baseUri;
9
9
  constructor(config: IUnleashConfig);
10
10
  logout(req: IAuthRequest, res: Response): Promise<void>;
11
+ private isReqLogoutWithoutCallback;
11
12
  }
12
13
  export default LogoutController;
@@ -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":";;;;;AAEA,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;YAED,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SACzB;QAED,IAAI,GAAG,CAAC,MAAM,EAAE;YACZ,GAAG,CAAC,MAAM,EAAE,CAAC;SAChB;QAED,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;CACJ;AAED,kBAAe,gBAAgB,CAAC"}
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 {
@@ -21,6 +21,7 @@ export declare class ApiTokenService {
21
21
  */
22
22
  createApiToken(newToken: Omit<ILegacyApiTokenCreate, 'secret'>): Promise<IApiToken>;
23
23
  createApiTokenWithProjects(newToken: Omit<IApiTokenCreate, 'secret'>): Promise<IApiToken>;
24
+ createMigratedProxyApiToken(newToken: Omit<IApiTokenCreate, 'secret'>): Promise<IApiToken>;
24
25
  private insertNewApiToken;
25
26
  private findInvalidProject;
26
27
  private generateSecretKey;
@@ -111,6 +111,14 @@ class ApiTokenService {
111
111
  const createNewToken = { ...newToken, secret };
112
112
  return this.insertNewApiToken(createNewToken);
113
113
  }
114
+ // TODO: Remove this service method after embedded proxy has been released in
115
+ // 4.16.0
116
+ async createMigratedProxyApiToken(newToken) {
117
+ (0, api_token_1.validateApiToken)(newToken);
118
+ const secret = this.generateSecretKey(newToken);
119
+ const createNewToken = { ...newToken, secret };
120
+ return this.insertNewApiToken(createNewToken);
121
+ }
114
122
  async insertNewApiToken(newApiToken) {
115
123
  try {
116
124
  const token = await this.store.insert(newApiToken);
@@ -1 +1 @@
1
- {"version":3,"file":"api-token-service.js","sourceRoot":"","sources":["../../../src/lib/services/api-token-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api-token-service.js","sourceRoot":"","sources":["../../../src/lib/services/api-token-service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "unleash-server",
3
3
  "description": "Unleash is an enterprise ready feature toggles service. It provides different strategies for handling feature toggles.",
4
- "version": "4.15.0",
4
+ "version": "4.15.3",
5
5
  "keywords": [
6
6
  "unleash",
7
7
  "feature toggle",