@feathersjs/express 5.0.0-pre.11 → 5.0.0-pre.17

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.
Files changed (19) hide show
  1. package/CHANGELOG.md +64 -0
  2. package/LICENSE +1 -1
  3. package/README.md +1 -2
  4. package/lib/authentication.d.ts +5 -6
  5. package/lib/authentication.js +26 -37
  6. package/lib/authentication.js.map +1 -1
  7. package/lib/declarations.d.ts +12 -10
  8. package/lib/index.d.ts +5 -5
  9. package/lib/index.js +42 -42
  10. package/lib/index.js.map +1 -1
  11. package/lib/rest.d.ts +9 -9
  12. package/lib/rest.js +58 -73
  13. package/lib/rest.js.map +1 -1
  14. package/package.json +19 -18
  15. package/src/authentication.ts +36 -46
  16. package/src/declarations.ts +25 -23
  17. package/src/handlers.ts +4 -4
  18. package/src/index.ts +35 -30
  19. package/src/rest.ts +78 -87
package/CHANGELOG.md CHANGED
@@ -3,6 +3,70 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [5.0.0-pre.17](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.16...v5.0.0-pre.17) (2022-02-15)
7
+
8
+
9
+ ### Bug Fixes
10
+
11
+ * **express:** Fix application typings to work with typed configuration ([#2539](https://github.com/feathersjs/feathers/issues/2539)) ([b9dfaee](https://github.com/feathersjs/feathers/commit/b9dfaee834b13864c1ed4f2f6a244eb5bb70395b))
12
+
13
+
14
+
15
+
16
+
17
+ # [5.0.0-pre.16](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.15...v5.0.0-pre.16) (2022-01-12)
18
+
19
+
20
+ ### Features
21
+
22
+ * **express, koa:** make transports similar ([#2486](https://github.com/feathersjs/feathers/issues/2486)) ([26aa937](https://github.com/feathersjs/feathers/commit/26aa937c114fb8596dfefc599b1f53cead69c159))
23
+
24
+
25
+
26
+
27
+
28
+ # [5.0.0-pre.15](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.14...v5.0.0-pre.15) (2021-11-27)
29
+
30
+
31
+ ### Bug Fixes
32
+
33
+ * missing express types for Request, Response ([#2498](https://github.com/feathersjs/feathers/issues/2498)) ([ee67131](https://github.com/feathersjs/feathers/commit/ee67131bbaa24c54d3d781bdf8820015759ac488))
34
+ * **typescript:** Overall typing improvements ([#2478](https://github.com/feathersjs/feathers/issues/2478)) ([b8eb804](https://github.com/feathersjs/feathers/commit/b8eb804158556d9651a8607e3c3fda15e0bfd110))
35
+
36
+
37
+ ### Features
38
+
39
+ * **core:** add `context.http` and move `statusCode` there ([#2496](https://github.com/feathersjs/feathers/issues/2496)) ([b701bf7](https://github.com/feathersjs/feathers/commit/b701bf77fb83048aa1dffa492b3d77dd53f7b72b))
40
+ * **core:** Improve legacy hooks integration ([08c8b40](https://github.com/feathersjs/feathers/commit/08c8b40999bf3889c61a4d4fad97a2c4f78bafc9))
41
+
42
+
43
+
44
+
45
+
46
+ # [5.0.0-pre.14](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.13...v5.0.0-pre.14) (2021-10-13)
47
+
48
+ **Note:** Version bump only for package @feathersjs/express
49
+
50
+
51
+
52
+
53
+
54
+ # [5.0.0-pre.13](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.12...v5.0.0-pre.13) (2021-10-13)
55
+
56
+ **Note:** Version bump only for package @feathersjs/express
57
+
58
+
59
+
60
+
61
+
62
+ # [5.0.0-pre.12](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.11...v5.0.0-pre.12) (2021-10-12)
63
+
64
+ **Note:** Version bump only for package @feathersjs/express
65
+
66
+
67
+
68
+
69
+
6
70
  # [5.0.0-pre.11](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.10...v5.0.0-pre.11) (2021-10-06)
7
71
 
8
72
  **Note:** Version bump only for package @feathersjs/express
package/LICENSE CHANGED
@@ -1,6 +1,6 @@
1
1
  The MIT License (MIT)
2
2
 
3
- Copyright (c) 2021 Feathers
3
+ Copyright (c) 2022 Feathers
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the "Software"), to deal
package/README.md CHANGED
@@ -1,7 +1,6 @@
1
1
  # @feathersjs/express
2
2
 
3
3
  [![CI](https://github.com/feathersjs/feathers/workflows/CI/badge.svg)](https://github.com/feathersjs/feathers/actions?query=workflow%3ACI)
4
- [![Dependency Status](https://img.shields.io/david/feathersjs/feathers.svg?style=flat-square&path=packages/express)](https://david-dm.org/feathersjs/feathers?path=packages/express)
5
4
  [![Download Status](https://img.shields.io/npm/dm/@feathersjs/express.svg?style=flat-square)](https://www.npmjs.com/package/@feathersjs/express)
6
5
 
7
6
  > Feathers Express framework bindings and REST provider
@@ -18,6 +17,6 @@ Refer to the [Feathers Express API documentation](https://docs.feathersjs.com/ap
18
17
 
19
18
  ## License
20
19
 
21
- Copyright (c) 2021 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
20
+ Copyright (c) 2022 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
22
21
 
23
22
  Licensed under the [MIT license](LICENSE).
package/lib/authentication.d.ts CHANGED
@@ -1,8 +1,7 @@
1
- import { NextFunction, RequestHandler } from 'express';
2
- declare type StrategyOptions = {
1
+ import { RequestHandler } from 'express';
2
+ export declare type AuthenticationSettings = {
3
3
  service?: string;
4
- strategies: string[];
4
+ strategies?: string[];
5
5
  };
6
- export declare function parseAuthentication(settings?: any): RequestHandler;
7
- export declare function authenticate(_settings: string | StrategyOptions, ..._strategies: string[]): (_req: Request, _res: Response, next: NextFunction) => void;
8
- export {};
6
+ export declare function parseAuthentication(settings?: AuthenticationSettings): RequestHandler;
7
+ export declare function authenticate(settings: string | AuthenticationSettings, ...strategies: string[]): RequestHandler;
package/lib/authentication.js CHANGED
@@ -2,55 +2,44 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.authenticate = exports.parseAuthentication = void 0;
4
4
  const commons_1 = require("@feathersjs/commons");
5
- const lodash_1 = require("lodash");
5
+ const authentication_1 = require("@feathersjs/authentication");
6
6
  const debug = (0, commons_1.createDebug)('@feathersjs/express/authentication');
7
- const normalizeStrategy = (_settings, ..._strategies) => typeof _settings === 'string'
8
- ? { strategies: (0, lodash_1.flatten)([_settings, ..._strategies]) }
9
- : _settings;
7
+ const toHandler = (func) => {
8
+ return (req, res, next) => func(req, res, next).catch(error => next(error));
9
+ };
10
10
  function parseAuthentication(settings = {}) {
11
- return function (req, res, next) {
11
+ return toHandler(async (req, res, next) => {
12
+ var _a;
12
13
  const app = req.app;
13
- const service = app.defaultAuthentication ? app.defaultAuthentication(settings.service) : null;
14
- if (service === null) {
14
+ const service = (_a = app.defaultAuthentication) === null || _a === void 0 ? void 0 : _a.call(app, settings.service);
15
+ if (!service) {
15
16
  return next();
16
17
  }
17
18
  const config = service.configuration;
18
- const authStrategies = config.parseStrategies || config.authStrategies || [];
19
+ const authStrategies = settings.strategies || config.parseStrategies || config.authStrategies || [];
19
20
  if (authStrategies.length === 0) {
20
21
  debug('No `authStrategies` or `parseStrategies` found in authentication configuration');
21
22
  return next();
22
23
  }
23
- service.parse(req, res, ...authStrategies)
24
- .then((authentication) => {
25
- if (authentication) {
26
- debug('Parsed authentication from HTTP header', authentication);
27
- (0, lodash_1.merge)(req, {
28
- authentication,
29
- feathers: { authentication }
30
- });
31
- }
32
- next();
33
- }).catch(next);
34
- };
24
+ const authentication = await service.parse(req, res, ...authStrategies);
25
+ if (authentication) {
26
+ debug('Parsed authentication from HTTP header', authentication);
27
+ req.feathers = { ...req.feathers, authentication };
28
+ }
29
+ return next();
30
+ });
35
31
  }
36
32
  exports.parseAuthentication = parseAuthentication;
37
- function authenticate(_settings, ..._strategies) {
38
- const settings = normalizeStrategy(_settings, ..._strategies);
39
- if (!Array.isArray(settings.strategies) || settings.strategies.length === 0) {
40
- throw new Error('\'authenticate\' middleware requires at least one strategy name');
41
- }
42
- return (_req, _res, next) => {
43
- const req = _req;
44
- const { app, authentication } = req;
45
- const service = app.defaultAuthentication(settings.service);
46
- debug('Authenticating with Express middleware and strategies', settings.strategies);
47
- service.authenticate(authentication, req.feathers, ...settings.strategies)
48
- .then((authResult) => {
49
- debug('Merging request with', authResult);
50
- (0, lodash_1.merge)(req, authResult);
51
- next();
52
- }).catch(next);
53
- };
33
+ function authenticate(settings, ...strategies) {
34
+ const hook = (0, authentication_1.authenticate)(settings, ...strategies);
35
+ return toHandler(async (req, _res, next) => {
36
+ const app = req.app;
37
+ const params = req.feathers;
38
+ const context = { app, params };
39
+ await hook(context);
40
+ req.feathers = context.params;
41
+ return next();
42
+ });
54
43
  }
55
44
  exports.authenticate = authenticate;
56
45
  //# sourceMappingURL=authentication.js.map
package/lib/authentication.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"authentication.js","sourceRoot":"","sources":["../src/authentication.ts"],"names":[],"mappings":";;;AAAA,iDAAkD;AAClD,mCAAwC;AAGxC,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,oCAAoC,CAAC,CAAC;AAOhE,MAAM,iBAAiB,GAAG,CAAC,SAAiC,EAAE,GAAG,WAAqB,EAAE,EAAE,CACxF,OAAO,SAAS,KAAK,QAAQ;IAC3B,CAAC,CAAC,EAAE,UAAU,EAAE,IAAA,gBAAO,EAAC,CAAE,SAAS,EAAE,GAAG,WAAW,CAAE,CAAC,EAAE;IACxD,CAAC,CAAC,SAAS,CAAC;AAEhB,SAAgB,mBAAmB,CAAE,WAAgB,EAAE;IACrD,OAAO,UAAU,GAAG,EAAE,GAAG,EAAE,IAAI;QAC7B,MAAM,GAAG,GAAG,GAAG,CAAC,GAAU,CAAC;QAC3B,MAAM,OAAO,GAAG,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAE/F,IAAI,OAAO,KAAK,IAAI,EAAE;YACpB,OAAO,IAAI,EAAE,CAAC;SACf;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;QACrC,MAAM,cAAc,GAAG,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC;QAE7E,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,KAAK,CAAC,gFAAgF,CAAC,CAAC;YACxF,OAAO,IAAI,EAAE,CAAC;SACf;QAED,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;aACvC,IAAI,CAAC,CAAC,cAAmB,EAAE,EAAE;YAC5B,IAAI,cAAc,EAAE;gBAClB,KAAK,CAAC,wCAAwC,EAAE,cAAc,CAAC,CAAC;gBAChE,IAAA,cAAK,EAAC,GAAG,EAAE;oBACT,cAAc;oBACd,QAAQ,EAAE,EAAE,cAAc,EAAE;iBAC7B,CAAC,CAAC;aACJ;YAED,IAAI,EAAE,CAAC;QACT,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC;AA9BD,kDA8BC;AAED,SAAgB,YAAY,CAAE,SAAiC,EAAE,GAAG,WAAqB;IACvF,MAAM,QAAQ,GAAG,iBAAiB,CAAC,SAAS,EAAE,GAAG,WAAW,CAAC,CAAC;IAE9D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAC3E,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;KACpF;IAED,OAAO,CAAC,IAAa,EAAE,IAAc,EAAE,IAAkB,EAAE,EAAE;QAC3D,MAAM,GAAG,GAAG,IAAW,CAAC;QACxB,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC;QACpC,MAAM,OAAO,GAAG,GAAG,CAAC,qBAAqB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE5D,KAAK,CAAC,uDAAuD,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;QAEpF,OAAO,CAAC,YAAY,CAAC,cAAc,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC;aACvE,IAAI,CAAC,CAAC,UAAe,EAAE,EAAE;YACxB,KAAK,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;YAC1C,IAAA,cAAK,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAEvB,IAAI,EAAE,CAAC;QACT,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC;AAtBD,oCAsBC"}
1
+ {"version":3,"file":"authentication.js","sourceRoot":"","sources":["../src/authentication.ts"],"names":[],"mappings":";;;AAEA,iDAAkD;AAClD,+DAA8E;AAI9E,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,oCAAoC,CAAC,CAAC;AAEhE,MAAM,SAAS,GAAG,CAAC,IAAsE,EAAkB,EAAE;IAC3G,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;AAC9E,CAAC,CAAC;AAOF,SAAgB,mBAAmB,CAAE,WAAmC,EAAE;IACxE,OAAO,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;QACxC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAyB,CAAC;QAC1C,MAAM,OAAO,GAAG,MAAA,GAAG,CAAC,qBAAqB,+CAAzB,GAAG,EAAyB,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE9D,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,IAAI,EAAE,CAAC;SACf;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;QACrC,MAAM,cAAc,GAAG,QAAQ,CAAC,UAAU,IAAI,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC;QAEpG,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,KAAK,CAAC,gFAAgF,CAAC,CAAC;YACxF,OAAO,IAAI,EAAE,CAAC;SACf;QAED,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC,CAAA;QAEvE,IAAI,cAAc,EAAE;YAClB,KAAK,CAAC,wCAAwC,EAAE,cAAc,CAAC,CAAC;YAChE,GAAG,CAAC,QAAQ,GAAG,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;SACpD;QAED,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AA1BD,kDA0BC;AAED,SAAgB,YAAY,CAAE,QAAyC,EAAE,GAAG,UAAoB;IAC9F,MAAM,IAAI,GAAG,IAAA,6BAAgB,EAAC,QAAQ,EAAE,GAAG,UAAU,CAAC,CAAC;IAEvD,OAAO,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QACzC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAyB,CAAC;QAC1C,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC5B,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAwB,CAAC;QAEtD,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;QAEpB,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AAdD,oCAcC"}
package/lib/declarations.d.ts CHANGED
@@ -1,39 +1,41 @@
1
1
  /// <reference types="node" />
2
2
  import http from 'http';
3
3
  import express, { Express } from 'express';
4
- import { Application as FeathersApplication, Params as FeathersParams, HookContext, ServiceMethods, ServiceInterface } from '@feathersjs/feathers';
5
- interface ExpressUseHandler<T, ServiceTypes> {
6
- <L extends keyof ServiceTypes & string>(path: L, ...middlewareOrService: (Express | express.RequestHandler | (keyof any extends keyof ServiceTypes ? ServiceInterface<any> : ServiceTypes[L]))[]): T;
4
+ import { Application as FeathersApplication, Params as FeathersParams, HookContext, ServiceMethods, ServiceInterface, RouteLookup } from '@feathersjs/feathers';
5
+ interface ExpressUseHandler<T, Services> {
6
+ <L extends keyof Services & string>(path: L, ...middlewareOrService: (Express | express.RequestHandler | (keyof any extends keyof Services ? ServiceInterface : Services[L]))[]): T;
7
7
  (path: string | RegExp, ...expressHandlers: express.RequestHandler[]): T;
8
8
  (...expressHandlers: express.RequestHandler[]): T;
9
9
  (handler: Express | express.ErrorRequestHandler): T;
10
10
  }
11
- export interface ExpressOverrides<ServiceTypes> {
11
+ export interface ExpressOverrides<Services> {
12
12
  listen(port: number, hostname: string, backlog: number, callback?: () => void): Promise<http.Server>;
13
13
  listen(port: number, hostname: string, callback?: () => void): Promise<http.Server>;
14
14
  listen(port: number | string | any, callback?: () => void): Promise<http.Server>;
15
15
  listen(callback?: () => void): Promise<http.Server>;
16
- use: ExpressUseHandler<this, ServiceTypes>;
16
+ use: ExpressUseHandler<this, Services>;
17
17
  }
18
- export declare type Application<ServiceTypes = any, AppSettings = any> = Omit<Express, 'listen' | 'use'> & FeathersApplication<ServiceTypes, AppSettings> & ExpressOverrides<ServiceTypes>;
18
+ export declare type Application<Services = any, Settings = any> = Omit<Express, 'listen' | 'use' | 'get' | 'set'> & FeathersApplication<Services, Settings> & ExpressOverrides<Services>;
19
19
  declare module '@feathersjs/feathers/lib/declarations' {
20
20
  interface ServiceOptions {
21
- middleware?: {
22
- before: express.RequestHandler[];
23
- after: express.RequestHandler[];
21
+ express?: {
22
+ before?: express.RequestHandler[];
23
+ after?: express.RequestHandler[];
24
+ composed?: express.RequestHandler;
24
25
  };
25
26
  }
26
27
  }
27
28
  declare module 'express-serve-static-core' {
28
29
  interface Request {
29
30
  feathers?: Partial<FeathersParams>;
31
+ lookup?: RouteLookup;
30
32
  }
31
33
  interface Response {
32
34
  data?: any;
33
35
  hook?: HookContext;
34
36
  }
35
37
  interface IRouterMatcher<T> {
36
- <P extends Params = ParamsDictionary, ResBody = any, ReqBody = any>(path: PathParams, ...handlers: (RequestHandler<P, ResBody, ReqBody> | Partial<ServiceMethods<any, any>> | Application)[]): T;
38
+ <P extends Params = ParamsDictionary, ResBody = any, ReqBody = any>(path: PathParams, ...handlers: (RequestHandler<P, ResBody, ReqBody> | Partial<ServiceMethods> | Application)[]): T;
37
39
  }
38
40
  }
39
41
  export {};
package/lib/index.d.ts CHANGED
@@ -1,9 +1,9 @@
1
- import express, { Express, static as _static, json, raw, text, urlencoded, query } from 'express';
1
+ import { Express } from 'express';
2
2
  import { Application as FeathersApplication } from '@feathersjs/feathers';
3
3
  import { Application } from './declarations';
4
- import { errorHandler, notFound } from './handlers';
5
- import { parseAuthentication, authenticate } from './authentication';
6
- export { _static as static, json, raw, text, urlencoded, query, errorHandler, notFound, express as original, authenticate, parseAuthentication };
7
- export * from './rest';
4
+ export { default as original, static, static as serveStatic, json, raw, text, urlencoded, query } from 'express';
5
+ export * from './authentication';
8
6
  export * from './declarations';
7
+ export * from './handlers';
8
+ export * from './rest';
9
9
  export default function feathersExpress<S = any, C = any>(feathersApp?: FeathersApplication<S, C>, expressApp?: Express): Application<S, C>;
package/lib/index.js CHANGED
@@ -6,41 +6,31 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
6
6
  if (k2 === undefined) k2 = k;
7
7
  o[k2] = m[k];
8
8
  }));
9
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
10
- Object.defineProperty(o, "default", { enumerable: true, value: v });
11
- }) : function(o, v) {
12
- o["default"] = v;
13
- });
14
- var __importStar = (this && this.__importStar) || function (mod) {
15
- if (mod && mod.__esModule) return mod;
16
- var result = {};
17
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
18
- __setModuleDefault(result, mod);
19
- return result;
20
- };
21
9
  var __exportStar = (this && this.__exportStar) || function(m, exports) {
22
10
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
23
11
  };
12
+ var __importDefault = (this && this.__importDefault) || function (mod) {
13
+ return (mod && mod.__esModule) ? mod : { "default": mod };
14
+ };
24
15
  Object.defineProperty(exports, "__esModule", { value: true });
25
- exports.parseAuthentication = exports.authenticate = exports.original = exports.notFound = exports.errorHandler = exports.query = exports.urlencoded = exports.text = exports.raw = exports.json = exports.static = void 0;
26
- const express_1 = __importStar(require("express"));
27
- exports.original = express_1.default;
28
- Object.defineProperty(exports, "static", { enumerable: true, get: function () { return express_1.static; } });
29
- Object.defineProperty(exports, "json", { enumerable: true, get: function () { return express_1.json; } });
30
- Object.defineProperty(exports, "raw", { enumerable: true, get: function () { return express_1.raw; } });
31
- Object.defineProperty(exports, "text", { enumerable: true, get: function () { return express_1.text; } });
32
- Object.defineProperty(exports, "urlencoded", { enumerable: true, get: function () { return express_1.urlencoded; } });
33
- Object.defineProperty(exports, "query", { enumerable: true, get: function () { return express_1.query; } });
16
+ exports.query = exports.urlencoded = exports.text = exports.raw = exports.json = exports.serveStatic = exports.static = exports.original = void 0;
17
+ const express_1 = __importDefault(require("express"));
34
18
  const feathers_1 = require("@feathersjs/feathers");
19
+ const transport_commons_1 = require("@feathersjs/transport-commons");
35
20
  const commons_1 = require("@feathersjs/commons");
36
- const handlers_1 = require("./handlers");
37
- Object.defineProperty(exports, "errorHandler", { enumerable: true, get: function () { return handlers_1.errorHandler; } });
38
- Object.defineProperty(exports, "notFound", { enumerable: true, get: function () { return handlers_1.notFound; } });
39
- const authentication_1 = require("./authentication");
40
- Object.defineProperty(exports, "parseAuthentication", { enumerable: true, get: function () { return authentication_1.parseAuthentication; } });
41
- Object.defineProperty(exports, "authenticate", { enumerable: true, get: function () { return authentication_1.authenticate; } });
42
- __exportStar(require("./rest"), exports);
21
+ var express_2 = require("express");
22
+ Object.defineProperty(exports, "original", { enumerable: true, get: function () { return __importDefault(express_2).default; } });
23
+ Object.defineProperty(exports, "static", { enumerable: true, get: function () { return express_2.static; } });
24
+ Object.defineProperty(exports, "serveStatic", { enumerable: true, get: function () { return express_2.static; } });
25
+ Object.defineProperty(exports, "json", { enumerable: true, get: function () { return express_2.json; } });
26
+ Object.defineProperty(exports, "raw", { enumerable: true, get: function () { return express_2.raw; } });
27
+ Object.defineProperty(exports, "text", { enumerable: true, get: function () { return express_2.text; } });
28
+ Object.defineProperty(exports, "urlencoded", { enumerable: true, get: function () { return express_2.urlencoded; } });
29
+ Object.defineProperty(exports, "query", { enumerable: true, get: function () { return express_2.query; } });
30
+ __exportStar(require("./authentication"), exports);
43
31
  __exportStar(require("./declarations"), exports);
32
+ __exportStar(require("./handlers"), exports);
33
+ __exportStar(require("./rest"), exports);
44
34
  const debug = (0, commons_1.createDebug)('@feathersjs/express');
45
35
  function feathersExpress(feathersApp, expressApp = (0, express_1.default)()) {
46
36
  if (!feathersApp) {
@@ -49,9 +39,10 @@ function feathersExpress(feathersApp, expressApp = (0, express_1.default)()) {
49
39
  if (typeof feathersApp.setup !== 'function') {
50
40
  throw new Error('@feathersjs/express requires a valid Feathers application instance');
51
41
  }
52
- const { use, listen } = expressApp;
53
- // A mixin that provides the extended functionality
54
- const mixin = {
42
+ const app = expressApp;
43
+ const { use: expressUse, listen: expressListen } = expressApp;
44
+ const feathersUse = feathersApp.use;
45
+ Object.assign(app, {
55
46
  use(location, ...rest) {
56
47
  let service;
57
48
  let options = {};
@@ -77,37 +68,46 @@ function feathersExpress(feathersApp, expressApp = (0, express_1.default)()) {
77
68
  // Check for service (any object with at least one service method)
78
69
  if (hasMethod(['handle', 'set']) || !hasMethod(feathers_1.defaultServiceMethods)) {
79
70
  debug('Passing app.use call to Express app');
80
- return use.call(this, location, ...rest);
71
+ return expressUse.call(this, location, ...rest);
81
72
  }
82
73
  debug('Registering service with middleware', middleware);
83
74
  // Since this is a service, call Feathers `.use`
84
- feathersApp.use.call(this, location, service, {
75
+ feathersUse.call(this, location, service, {
85
76
  ...options,
86
- middleware
77
+ express: middleware
87
78
  });
88
79
  return this;
89
80
  },
90
81
  async listen(...args) {
91
- const server = listen.call(this, ...args);
82
+ const server = expressListen.call(this, ...args);
92
83
  await this.setup(server);
93
84
  debug('Feathers application listening');
94
85
  return server;
95
86
  }
87
+ });
88
+ const appDescriptors = {
89
+ ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(app)),
90
+ ...Object.getOwnPropertyDescriptors(app)
96
91
  };
97
- const feathersDescriptors = {
92
+ const newDescriptors = {
98
93
  ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(feathersApp)),
99
94
  ...Object.getOwnPropertyDescriptors(feathersApp)
100
95
  };
101
96
  // Copy all non-existing properties (including non-enumerables)
102
97
  // that don't already exist on the Express app
103
- Object.keys(feathersDescriptors).forEach(prop => {
104
- const feathersProp = feathersDescriptors[prop];
105
- const expressProp = Object.getOwnPropertyDescriptor(expressApp, prop);
106
- if (expressProp === undefined && feathersProp !== undefined) {
107
- Object.defineProperty(expressApp, prop, feathersProp);
98
+ Object.keys(newDescriptors).forEach(prop => {
99
+ const appProp = appDescriptors[prop];
100
+ const newProp = newDescriptors[prop];
101
+ if (appProp === undefined && newProp !== undefined) {
102
+ Object.defineProperty(expressApp, prop, newProp);
108
103
  }
109
104
  });
110
- return Object.assign(expressApp, mixin);
105
+ app.configure((0, transport_commons_1.routing)());
106
+ app.use((req, _res, next) => {
107
+ req.feathers = { ...req.feathers, provider: 'rest' };
108
+ return next();
109
+ });
110
+ return app;
111
111
  }
112
112
  exports.default = feathersExpress;
113
113
  if (typeof module !== 'undefined') {
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/lib/rest.d.ts CHANGED
@@ -1,9 +1,9 @@
1
- import { HookContext } from '@feathersjs/hooks';
2
- import { http } from '@feathersjs/transport-commons';
3
- import { Request, Response, NextFunction, RequestHandler } from 'express';
4
- export declare type ServiceCallback = (req: Request, res: Response, options: http.ServiceParams) => Promise<HookContext | any>;
5
- export declare const feathersParams: (req: Request, _res: Response, next: NextFunction) => void;
6
- export declare const formatter: (_req: Request, res: Response, next: NextFunction) => void;
7
- export declare const serviceMiddleware: (callback: ServiceCallback) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
8
- export declare const serviceMethodHandler: (service: any, methodName: string, getArgs: (opts: http.ServiceParams) => any[], headerOverride?: string) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
9
- export declare function rest(handler?: RequestHandler): (this: any, app: any) => void;
1
+ import { RequestHandler } from 'express';
2
+ import { AuthenticationSettings } from './authentication';
3
+ import { Application } from './declarations';
4
+ export declare const formatter: RequestHandler;
5
+ export declare type RestOptions = {
6
+ formatter?: RequestHandler;
7
+ authentication?: AuthenticationSettings;
8
+ };
9
+ export declare const rest: (options?: RestOptions | RequestHandler) => (app: Application) => void;
package/lib/rest.js CHANGED
@@ -1,22 +1,56 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.rest = exports.serviceMethodHandler = exports.serviceMiddleware = exports.formatter = exports.feathersParams = void 0;
3
+ exports.rest = exports.formatter = void 0;
4
+ const express_1 = require("express");
4
5
  const errors_1 = require("@feathersjs/errors");
5
6
  const commons_1 = require("@feathersjs/commons");
6
7
  const transport_commons_1 = require("@feathersjs/transport-commons");
7
8
  const feathers_1 = require("@feathersjs/feathers");
8
- const express_1 = require("express");
9
9
  const authentication_1 = require("./authentication");
10
10
  const debug = (0, commons_1.createDebug)('@feathersjs/express/rest');
11
- const feathersParams = (req, _res, next) => {
12
- req.feathers = {
13
- ...req.feathers,
14
- provider: 'rest',
15
- headers: req.headers
16
- };
17
- next();
11
+ const toHandler = (func) => {
12
+ return (req, res, next) => func(req, res, next).catch(error => next(error));
13
+ };
14
+ const serviceMiddleware = () => {
15
+ return toHandler(async (req, res, next) => {
16
+ const { query, headers, path, body: data, method: httpMethod } = req;
17
+ const methodOverride = req.headers[transport_commons_1.http.METHOD_HEADER];
18
+ const { service, params: { __id: id = null, ...route } = {} } = req.lookup;
19
+ const method = transport_commons_1.http.getServiceMethod(httpMethod, id, methodOverride);
20
+ const { methods } = (0, feathers_1.getServiceOptions)(service);
21
+ debug(`Found service for path ${path}, attempting to run '${method}' service method`);
22
+ if (!methods.includes(method) || feathers_1.defaultServiceMethods.includes(methodOverride)) {
23
+ const error = new errors_1.MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`);
24
+ res.statusCode = error.code;
25
+ throw error;
26
+ }
27
+ const createArguments = transport_commons_1.http.argumentsFor[method] || transport_commons_1.http.argumentsFor.default;
28
+ const params = { query, headers, route, ...req.feathers };
29
+ const args = createArguments({ id, data, params });
30
+ const contextBase = (0, feathers_1.createContext)(service, method, { http: {} });
31
+ res.hook = contextBase;
32
+ const context = await service[method](...args, contextBase);
33
+ res.hook = context;
34
+ const result = transport_commons_1.http.getData(context);
35
+ const statusCode = transport_commons_1.http.getStatusCode(context, result);
36
+ res.data = result;
37
+ res.statusCode = statusCode;
38
+ return next();
39
+ });
40
+ };
41
+ const servicesMiddleware = () => {
42
+ return toHandler(async (req, res, next) => {
43
+ const app = req.app;
44
+ const lookup = app.lookup(req.path);
45
+ if (!lookup) {
46
+ return next();
47
+ }
48
+ req.lookup = lookup;
49
+ const options = (0, feathers_1.getServiceOptions)(lookup.service);
50
+ const middleware = options.express.composed;
51
+ return middleware(req, res, next);
52
+ });
18
53
  };
19
- exports.feathersParams = feathersParams;
20
54
  const formatter = (_req, res, next) => {
21
55
  if (res.data === undefined) {
22
56
  return next();
@@ -28,73 +62,24 @@ const formatter = (_req, res, next) => {
28
62
  });
29
63
  };
30
64
  exports.formatter = formatter;
31
- const serviceMiddleware = (callback) => async (req, res, next) => {
32
- debug(`Running service middleware for '${req.url}'`);
33
- try {
34
- const { query, body: data } = req;
35
- const { __feathersId: id = null, ...route } = req.params;
36
- const params = { query, route, ...req.feathers };
37
- const context = await callback(req, res, { id, data, params });
38
- const result = transport_commons_1.http.getData(context);
39
- res.data = result;
40
- res.status(transport_commons_1.http.getStatusCode(context, result));
41
- next();
42
- }
43
- catch (error) {
44
- next(error);
45
- }
46
- };
47
- exports.serviceMiddleware = serviceMiddleware;
48
- const serviceMethodHandler = (service, methodName, getArgs, headerOverride) => (0, exports.serviceMiddleware)(async (req, res, options) => {
49
- const methodOverride = typeof headerOverride === 'string' && req.headers[headerOverride];
50
- const method = methodOverride ? methodOverride : methodName;
51
- const { methods } = (0, feathers_1.getServiceOptions)(service);
52
- if (!methods.includes(method) || feathers_1.defaultServiceMethods.includes(methodOverride)) {
53
- res.status(transport_commons_1.http.statusCodes.methodNotAllowed);
54
- throw new errors_1.MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`);
55
- }
56
- const args = getArgs(options);
57
- const context = (0, feathers_1.createContext)(service, method);
58
- res.hook = context;
59
- return service[method](...args, context);
60
- });
61
- exports.serviceMethodHandler = serviceMethodHandler;
62
- function rest(handler = exports.formatter) {
63
- return function (app) {
65
+ const rest = (options) => {
66
+ options = typeof options === 'function' ? { formatter: options } : options || {};
67
+ const formatterMiddleware = options.formatter || exports.formatter;
68
+ const authenticationOptions = options.authentication;
69
+ return (app) => {
64
70
  if (typeof app.route !== 'function') {
65
71
  throw new Error('@feathersjs/express/rest needs an Express compatible app.');
66
72
  }
67
- app.use(exports.feathersParams);
68
- app.use((0, authentication_1.parseAuthentication)());
69
- // Register the REST provider
70
- app.mixins.push(function (service, path, options) {
71
- const { middleware: { before = [] } } = options;
72
- let { middleware: { after = [] } } = options;
73
- if (typeof handler === 'function') {
74
- after = after.concat(handler);
75
- }
76
- const baseUri = `/${path}`;
77
- const find = (0, exports.serviceMethodHandler)(service, 'find', transport_commons_1.http.argumentsFor.find);
78
- const get = (0, exports.serviceMethodHandler)(service, 'get', transport_commons_1.http.argumentsFor.get);
79
- const create = (0, exports.serviceMethodHandler)(service, 'create', transport_commons_1.http.argumentsFor.create, transport_commons_1.http.METHOD_HEADER);
80
- const update = (0, exports.serviceMethodHandler)(service, 'update', transport_commons_1.http.argumentsFor.update);
81
- const patch = (0, exports.serviceMethodHandler)(service, 'patch', transport_commons_1.http.argumentsFor.patch);
82
- const remove = (0, exports.serviceMethodHandler)(service, 'remove', transport_commons_1.http.argumentsFor.remove);
83
- debug(`Adding REST provider for service \`${path}\` at base route \`${baseUri}\``);
84
- const idRoute = '/:__feathersId';
85
- const serviceRouter = (0, express_1.Router)({ mergeParams: true })
86
- .get('/', find)
87
- .post('/', create)
88
- .get(idRoute, get)
89
- .put('/', update)
90
- .put(idRoute, update)
91
- .patch('/', patch)
92
- .patch(idRoute, patch)
93
- .delete('/', remove)
94
- .delete(idRoute, remove);
95
- app.use(baseUri, ...before, serviceRouter, ...after);
73
+ app.use((0, authentication_1.parseAuthentication)(authenticationOptions));
74
+ app.use(servicesMiddleware());
75
+ app.mixins.push((_service, _path, options) => {
76
+ const { express: { before = [], after = [] } = {} } = options;
77
+ const middlewares = [].concat(before, serviceMiddleware(), after, formatterMiddleware);
78
+ const middleware = (0, express_1.Router)().use(middlewares);
79
+ options.express || (options.express = {});
80
+ options.express.composed = middleware;
96
81
  });
97
82
  };
98
- }
83
+ };
99
84
  exports.rest = rest;
100
85
  //# sourceMappingURL=rest.js.map
package/lib/rest.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rest.js","sourceRoot":"","sources":["../src/rest.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AAEtD,iDAAkD;AAClD,qEAAqD;AACrD,mDAA+F;AAC/F,qCAAkF;AAElF,qDAAuD;AAEvD,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,0BAA0B,CAAC,CAAC;AAI/C,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,IAAc,EAAE,IAAkB,EAAE,EAAE;IACjF,GAAG,CAAC,QAAQ,GAAG;QACb,GAAG,GAAG,CAAC,QAAQ;QACf,QAAQ,EAAE,MAAM;QAChB,OAAO,EAAE,GAAG,CAAC,OAAO;KACrB,CAAC;IACF,IAAI,EAAE,CAAC;AACT,CAAC,CAAA;AAPY,QAAA,cAAc,kBAO1B;AAEM,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IAC5E,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;QAC1B,OAAO,IAAI,EAAE,CAAC;KACf;IAED,GAAG,CAAC,MAAM,CAAC;QACT,kBAAkB;YAChB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAA;AAVY,QAAA,SAAS,aAUrB;AAGM,MAAM,iBAAiB,GAAG,CAAC,QAAyB,EAAE,EAAE,CAC7D,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IACxD,KAAK,CAAC,mCAAmC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;IAErD,IAAI;QACF,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QAClC,MAAM,EAAE,YAAY,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QACzD,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QACjD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,wBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAErC,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC;QAClB,GAAG,CAAC,MAAM,CAAC,wBAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;QAEhD,IAAI,EAAE,CAAC;KACR;IAAC,OAAO,KAAU,EAAE;QACnB,IAAI,CAAC,KAAK,CAAC,CAAC;KACb;AACH,CAAC,CAAA;AAlBU,QAAA,iBAAiB,qBAkB3B;AAEI,MAAM,oBAAoB,GAAG,CAClC,OAAY,EAAE,UAAkB,EAAE,OAA4C,EAAE,cAAuB,EACvG,EAAE,CAAC,IAAA,yBAAiB,EAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE;IACjD,MAAM,cAAc,GAAG,OAAO,cAAc,KAAK,QAAQ,IAAK,GAAG,CAAC,OAAO,CAAC,cAAc,CAAY,CAAC;IACrG,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAA;IAC3D,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,4BAAiB,EAAC,OAAO,CAAC,CAAC;IAE/C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,gCAAqB,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;QAC/E,GAAG,CAAC,MAAM,CAAC,wBAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAE9C,MAAM,IAAI,yBAAgB,CAAC,YAAY,MAAM,uCAAuC,CAAC,CAAC;KACvF;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,MAAM,OAAO,GAAG,IAAA,wBAAa,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAE/C,GAAG,CAAC,IAAI,GAAG,OAAc,CAAC;IAE1B,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC;AAnBU,QAAA,oBAAoB,wBAmB9B;AAEH,SAAgB,IAAI,CAAE,UAA0B,iBAAS;IACvD,OAAO,UAAqB,GAAQ;QAClC,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,UAAU,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;SAC9E;QAED,GAAG,CAAC,GAAG,CAAC,sBAAc,CAAC,CAAC;QACxB,GAAG,CAAC,GAAG,CAAC,IAAA,oCAAmB,GAAE,CAAC,CAAC;QAE/B,6BAA6B;QAC7B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,OAAY,EAAE,IAAY,EAAE,OAAY;YAChE,MAAM,EAAE,UAAU,EAAE,EAAE,MAAM,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;YAChD,IAAI,EAAE,UAAU,EAAE,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;YAE7C,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE;gBACjC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aAC/B;YAED,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,MAAM,EAAE,wBAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAC3E,MAAM,GAAG,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,KAAK,EAAE,wBAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACxE,MAAM,MAAM,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,QAAQ,EAAE,wBAAI,CAAC,YAAY,CAAC,MAAM,EAAE,wBAAI,CAAC,aAAa,CAAC,CAAC;YACrG,MAAM,MAAM,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,QAAQ,EAAE,wBAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACjF,MAAM,KAAK,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,OAAO,EAAE,wBAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAC9E,MAAM,MAAM,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,QAAQ,EAAE,wBAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAEjF,KAAK,CAAC,sCAAsC,IAAI,sBAAsB,OAAO,IAAI,CAAC,CAAC;YAEnF,MAAM,OAAO,GAAG,gBAAgB,CAAC;YACjC,MAAM,aAAa,GAAG,IAAA,gBAAM,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;iBAChD,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC;iBACd,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;iBACjB,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC;iBACjB,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC;iBAChB,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC;iBACpB,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC;iBACjB,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC;iBACrB,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC;iBACnB,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAE3B,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AA3CD,oBA2CC"}
1
+ {"version":3,"file":"rest.js","sourceRoot":"","sources":["../src/rest.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@feathersjs/express",
3
3
  "description": "Feathers Express framework bindings and REST provider",
4
- "version": "5.0.0-pre.11",
4
+ "version": "5.0.0-pre.17",
5
5
  "homepage": "https://feathersjs.com",
6
6
  "main": "lib/",
7
7
  "keywords": [
@@ -49,26 +49,27 @@
49
49
  "access": "public"
50
50
  },
51
51
  "dependencies": {
52
- "@feathersjs/commons": "^5.0.0-pre.11",
53
- "@feathersjs/errors": "^5.0.0-pre.11",
54
- "@feathersjs/transport-commons": "^5.0.0-pre.11",
52
+ "@feathersjs/authentication": "^5.0.0-pre.17",
53
+ "@feathersjs/commons": "^5.0.0-pre.17",
54
+ "@feathersjs/errors": "^5.0.0-pre.17",
55
+ "@feathersjs/feathers": "^5.0.0-pre.17",
56
+ "@feathersjs/transport-commons": "^5.0.0-pre.17",
55
57
  "@types/express": "^4.17.13",
56
- "express": "^4.17.1",
57
- "lodash": "^4.17.21"
58
+ "@types/express-serve-static-core": "^4.17.28",
59
+ "express": "^4.17.2"
58
60
  },
59
61
  "devDependencies": {
60
- "@feathersjs/authentication": "^5.0.0-pre.11",
61
- "@feathersjs/authentication-local": "^5.0.0-pre.11",
62
- "@feathersjs/feathers": "^5.0.0-pre.11",
63
- "@feathersjs/tests": "^5.0.0-pre.11",
64
- "@types/mocha": "^9.0.0",
65
- "@types/node": "^16.10.2",
66
- "axios": "^0.21.4",
62
+ "@feathersjs/authentication-local": "^5.0.0-pre.17",
63
+ "@feathersjs/tests": "^5.0.0-pre.17",
64
+ "@types/lodash": "^4.14.178",
65
+ "@types/mocha": "^9.1.0",
66
+ "@types/node": "^17.0.15",
67
+ "axios": "^0.25.0",
67
68
  "lodash": "^4.17.21",
68
- "mocha": "^9.1.2",
69
- "shx": "^0.3.3",
70
- "ts-node": "^10.2.1",
71
- "typescript": "^4.4.3"
69
+ "mocha": "^9.2.0",
70
+ "shx": "^0.3.4",
71
+ "ts-node": "^10.4.0",
72
+ "typescript": "^4.5.5"
72
73
  },
73
- "gitHead": "a9f7865cce8db2305b7c0d2ef4a165c2724034ef"
74
+ "gitHead": "d828748e57b40abfaa15710663afed417de14a1d"
74
75
  }
package/src/authentication.ts CHANGED
@@ -1,71 +1,61 @@
1
+ import { RequestHandler, Request, Response } from 'express';
2
+ import { HookContext } from '@feathersjs/feathers';
1
3
  import { createDebug } from '@feathersjs/commons';
2
- import { merge, flatten } from 'lodash';
3
- import { NextFunction, RequestHandler } from 'express';
4
+ import { authenticate as AuthenticateHook } from '@feathersjs/authentication';
5
+
6
+ import { Application } from './declarations';
4
7
 
5
8
  const debug = createDebug('@feathersjs/express/authentication');
6
9
 
7
- type StrategyOptions = {
8
- service?: string;
9
- strategies: string[]
10
+ const toHandler = (func: (req: Request, res: Response, next: () => void) => Promise<void>): RequestHandler => {
11
+ return (req, res, next) => func(req, res, next).catch(error => next(error));
10
12
  };
11
13
 
12
- const normalizeStrategy = (_settings: string|StrategyOptions, ..._strategies: string[]) =>
13
- typeof _settings === 'string'
14
- ? { strategies: flatten([ _settings, ..._strategies ]) }
15
- : _settings;
14
+ export type AuthenticationSettings = {
15
+ service?: string;
16
+ strategies?: string[];
17
+ };
16
18
 
17
- export function parseAuthentication (settings: any = {}): RequestHandler {
18
- return function (req, res, next) {
19
- const app = req.app as any;
20
- const service = app.defaultAuthentication ? app.defaultAuthentication(settings.service) : null;
19
+ export function parseAuthentication (settings: AuthenticationSettings = {}): RequestHandler {
20
+ return toHandler(async (req, res, next) => {
21
+ const app = req.app as any as Application;
22
+ const service = app.defaultAuthentication?.(settings.service);
21
23
 
22
- if (service === null) {
24
+ if (!service) {
23
25
  return next();
24
26
  }
25
27
 
26
28
  const config = service.configuration;
27
- const authStrategies = config.parseStrategies || config.authStrategies || [];
29
+ const authStrategies = settings.strategies || config.parseStrategies || config.authStrategies || [];
28
30
 
29
31
  if (authStrategies.length === 0) {
30
32
  debug('No `authStrategies` or `parseStrategies` found in authentication configuration');
31
33
  return next();
32
34
  }
33
35
 
34
- service.parse(req, res, ...authStrategies)
35
- .then((authentication: any) => {
36
- if (authentication) {
37
- debug('Parsed authentication from HTTP header', authentication);
38
- merge(req, {
39
- authentication,
40
- feathers: { authentication }
41
- });
42
- }
43
-
44
- next();
45
- }).catch(next);
46
- };
47
- }
36
+ const authentication = await service.parse(req, res, ...authStrategies)
37
+
38
+ if (authentication) {
39
+ debug('Parsed authentication from HTTP header', authentication);
40
+ req.feathers = { ...req.feathers, authentication };
41
+ }
48
42
 
49
- export function authenticate (_settings: string|StrategyOptions, ..._strategies: string[]) {
50
- const settings = normalizeStrategy(_settings, ..._strategies);
43
+ return next();
44
+ });
45
+ }
51
46
 
52
- if (!Array.isArray(settings.strategies) || settings.strategies.length === 0) {
53
- throw new Error('\'authenticate\' middleware requires at least one strategy name');
54
- }
47
+ export function authenticate (settings: string | AuthenticationSettings, ...strategies: string[]): RequestHandler {
48
+ const hook = AuthenticateHook(settings, ...strategies);
55
49
 
56
- return (_req: Request, _res: Response, next: NextFunction) => {
57
- const req = _req as any;
58
- const { app, authentication } = req;
59
- const service = app.defaultAuthentication(settings.service);
50
+ return toHandler(async (req, _res, next) => {
51
+ const app = req.app as any as Application;
52
+ const params = req.feathers;
53
+ const context = { app, params } as any as HookContext;
60
54
 
61
- debug('Authenticating with Express middleware and strategies', settings.strategies);
55
+ await hook(context);
62
56
 
63
- service.authenticate(authentication, req.feathers, ...settings.strategies)
64
- .then((authResult: any) => {
65
- debug('Merging request with', authResult);
66
- merge(req, authResult);
57
+ req.feathers = context.params;
67
58
 
68
- next();
69
- }).catch(next);
70
- };
59
+ return next();
60
+ });
71
61
  }
package/src/declarations.ts CHANGED
@@ -2,15 +2,15 @@ import http from 'http';
2
2
  import express, { Express } from 'express';
3
3
  import {
4
4
  Application as FeathersApplication, Params as FeathersParams,
5
- HookContext, ServiceMethods, ServiceInterface
5
+ HookContext, ServiceMethods, ServiceInterface, RouteLookup
6
6
  } from '@feathersjs/feathers';
7
7
 
8
- interface ExpressUseHandler<T, ServiceTypes> {
9
- <L extends keyof ServiceTypes & string> (
8
+ interface ExpressUseHandler<T, Services> {
9
+ <L extends keyof Services & string> (
10
10
  path: L,
11
11
  ...middlewareOrService: (
12
12
  Express|express.RequestHandler|
13
- (keyof any extends keyof ServiceTypes ? ServiceInterface<any> : ServiceTypes[L])
13
+ (keyof any extends keyof Services ? ServiceInterface : Services[L])
14
14
  )[]
15
15
  ): T;
16
16
  (path: string|RegExp, ...expressHandlers: express.RequestHandler[]): T;
@@ -18,43 +18,45 @@ interface ExpressUseHandler<T, ServiceTypes> {
18
18
  (handler: Express|express.ErrorRequestHandler): T;
19
19
  }
20
20
 
21
- export interface ExpressOverrides<ServiceTypes> {
21
+ export interface ExpressOverrides<Services> {
22
22
  listen(port: number, hostname: string, backlog: number, callback?: () => void): Promise<http.Server>;
23
23
  listen(port: number, hostname: string, callback?: () => void): Promise<http.Server>;
24
24
  listen(port: number|string|any, callback?: () => void): Promise<http.Server>;
25
25
  listen(callback?: () => void): Promise<http.Server>;
26
- use: ExpressUseHandler<this, ServiceTypes>;
26
+ use: ExpressUseHandler<this, Services>;
27
27
  }
28
28
 
29
- export type Application<ServiceTypes = any, AppSettings = any> =
30
- Omit<Express, 'listen'|'use'> &
31
- FeathersApplication<ServiceTypes, AppSettings> &
32
- ExpressOverrides<ServiceTypes>;
29
+ export type Application<Services = any, Settings = any> =
30
+ Omit<Express, 'listen'|'use'|'get'|'set'> &
31
+ FeathersApplication<Services, Settings> &
32
+ ExpressOverrides<Services>;
33
33
 
34
34
  declare module '@feathersjs/feathers/lib/declarations' {
35
- export interface ServiceOptions {
36
- middleware?: {
37
- before: express.RequestHandler[],
38
- after: express.RequestHandler[]
39
- }
35
+ interface ServiceOptions {
36
+ express?: {
37
+ before?: express.RequestHandler[];
38
+ after?: express.RequestHandler[];
39
+ composed?: express.RequestHandler;
40
+ };
40
41
  }
41
42
  }
42
43
 
43
44
  declare module 'express-serve-static-core' {
44
45
  interface Request {
45
- feathers?: Partial<FeathersParams>;
46
+ feathers?: Partial<FeathersParams>;
47
+ lookup?: RouteLookup;
46
48
  }
47
49
 
48
50
  interface Response {
49
- data?: any;
50
- hook?: HookContext;
51
+ data?: any;
52
+ hook?: HookContext;
51
53
  }
52
54
 
53
55
  interface IRouterMatcher<T> {
54
- // eslint-disable-next-line
55
- <P extends Params = ParamsDictionary, ResBody = any, ReqBody = any>(
56
- path: PathParams,
57
- ...handlers: (RequestHandler<P, ResBody, ReqBody> | Partial<ServiceMethods<any, any>> | Application)[]
58
- ): T;
56
+ // eslint-disable-next-line
57
+ <P extends Params = ParamsDictionary, ResBody = any, ReqBody = any>(
58
+ path: PathParams,
59
+ ...handlers: (RequestHandler<P, ResBody, ReqBody> | Partial<ServiceMethods> | Application)[]
60
+ ): T;
59
61
  }
60
62
  }
package/src/handlers.ts CHANGED
@@ -18,10 +18,10 @@ export function notFound ({ verbose = false } = {}): RequestHandler {
18
18
  }
19
19
 
20
20
  export type ErrorHandlerOptions = {
21
- public?: string,
22
- logger?: boolean|{ error?: (msg: any) => void, info?: (msg: any) => void },
23
- html?: any,
24
- json?: any
21
+ public?: string;
22
+ logger?: boolean|{ error?: (msg: any) => void, info?: (msg: any) => void };
23
+ html?: any;
24
+ json?: any;
25
25
  };
26
26
 
27
27
  export function errorHandler (_options: ErrorHandlerOptions = {}): ErrorRequestHandler {
package/src/index.ts CHANGED
@@ -1,23 +1,16 @@
1
- import express, {
2
- Express, static as _static, json, raw, text, urlencoded, query
3
- } from 'express';
4
- import {
5
- Application as FeathersApplication, defaultServiceMethods
6
- } from '@feathersjs/feathers';
1
+ import express, { Express } from 'express';
2
+ import { Application as FeathersApplication, defaultServiceMethods } from '@feathersjs/feathers';
3
+ import { routing } from '@feathersjs/transport-commons';
7
4
  import { createDebug } from '@feathersjs/commons';
8
5
 
9
6
  import { Application } from './declarations';
10
- import { errorHandler, notFound } from './handlers';
11
- import { parseAuthentication, authenticate } from './authentication';
12
7
 
13
- export {
14
- _static as serveStatic, _static as static, json, raw, text,
15
- urlencoded, query, errorHandler, notFound, express as original,
16
- authenticate, parseAuthentication
17
- };
8
+ export { default as original, static, static as serveStatic, json, raw, text, urlencoded, query } from 'express';
18
9
 
19
- export * from './rest';
10
+ export * from './authentication';
20
11
  export * from './declarations';
12
+ export * from './handlers';
13
+ export * from './rest';
21
14
 
22
15
  const debug = createDebug('@feathersjs/express');
23
16
 
@@ -30,10 +23,12 @@ export default function feathersExpress<S = any, C = any> (feathersApp?: Feather
30
23
  throw new Error('@feathersjs/express requires a valid Feathers application instance');
31
24
  }
32
25
 
33
- const { use, listen } = expressApp as any;
34
- // A mixin that provides the extended functionality
35
- const mixin: any = {
36
- use (location: string, ...rest: any[]) {
26
+ const app = expressApp as any as Application<S, C>;
27
+ const { use: expressUse, listen: expressListen } = expressApp as any;
28
+ const feathersUse = feathersApp.use;
29
+
30
+ Object.assign(app, {
31
+ use (location: string & keyof S, ...rest: any[]) {
37
32
  let service: any;
38
33
  let options = {};
39
34
 
@@ -60,46 +55,56 @@ export default function feathersExpress<S = any, C = any> (feathersApp?: Feather
60
55
  // Check for service (any object with at least one service method)
61
56
  if (hasMethod(['handle', 'set']) || !hasMethod(defaultServiceMethods)) {
62
57
  debug('Passing app.use call to Express app');
63
- return use.call(this, location, ...rest);
58
+ return expressUse.call(this, location, ...rest);
64
59
  }
65
60
 
66
61
  debug('Registering service with middleware', middleware);
67
62
  // Since this is a service, call Feathers `.use`
68
- (feathersApp as FeathersApplication).use.call(this, location, service, {
63
+ feathersUse.call(this, location, service, {
69
64
  ...options,
70
- middleware
65
+ express: middleware
71
66
  });
72
67
 
73
68
  return this;
74
69
  },
75
70
 
76
71
  async listen (...args: any[]) {
77
- const server = listen.call(this, ...args);
72
+ const server = expressListen.call(this, ...args);
78
73
 
79
74
  await this.setup(server);
80
75
  debug('Feathers application listening');
81
76
 
82
77
  return server;
83
78
  }
84
- };
79
+ } as Application<S, C>);
85
80
 
86
- const feathersDescriptors = {
81
+ const appDescriptors = {
82
+ ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(app)),
83
+ ...Object.getOwnPropertyDescriptors(app)
84
+ };
85
+ const newDescriptors = {
87
86
  ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(feathersApp)),
88
87
  ...Object.getOwnPropertyDescriptors(feathersApp)
89
88
  };
90
89
 
91
90
  // Copy all non-existing properties (including non-enumerables)
92
91
  // that don't already exist on the Express app
93
- Object.keys(feathersDescriptors).forEach(prop => {
94
- const feathersProp = feathersDescriptors[prop];
95
- const expressProp = Object.getOwnPropertyDescriptor(expressApp, prop);
92
+ Object.keys(newDescriptors).forEach(prop => {
93
+ const appProp = appDescriptors[prop];
94
+ const newProp = newDescriptors[prop];
96
95
 
97
- if (expressProp === undefined && feathersProp !== undefined) {
98
- Object.defineProperty(expressApp, prop, feathersProp);
96
+ if (appProp === undefined && newProp !== undefined) {
97
+ Object.defineProperty(expressApp, prop, newProp);
99
98
  }
100
99
  });
101
100
 
102
- return Object.assign(expressApp, mixin);
101
+ app.configure(routing() as any);
102
+ app.use((req, _res, next) => {
103
+ req.feathers = { ...req.feathers, provider: 'rest' };
104
+ return next();
105
+ });
106
+
107
+ return app;
103
108
  }
104
109
 
105
110
  if (typeof module !== 'undefined') {
package/src/rest.ts CHANGED
@@ -1,120 +1,111 @@
1
+ import { Request, Response, RequestHandler, Router } from 'express';
1
2
  import { MethodNotAllowed } from '@feathersjs/errors';
2
- import { HookContext } from '@feathersjs/hooks';
3
3
  import { createDebug } from '@feathersjs/commons';
4
4
  import { http } from '@feathersjs/transport-commons';
5
5
  import { createContext, defaultServiceMethods, getServiceOptions } from '@feathersjs/feathers';
6
- import { Request, Response, NextFunction, RequestHandler, Router } from 'express';
7
6
 
8
- import { parseAuthentication } from './authentication';
7
+ import { AuthenticationSettings, parseAuthentication } from './authentication';
8
+ import { Application } from './declarations';
9
9
 
10
10
  const debug = createDebug('@feathersjs/express/rest');
11
11
 
12
- export type ServiceCallback = (req: Request, res: Response, options: http.ServiceParams) => Promise<HookContext|any>;
12
+ const toHandler = (func: (req: Request, res: Response, next: () => void) => Promise<void>): RequestHandler => {
13
+ return (req, res, next) => func(req, res, next).catch(error => next(error));
14
+ };
13
15
 
14
- export const feathersParams = (req: Request, _res: Response, next: NextFunction) => {
15
- req.feathers = {
16
- ...req.feathers,
17
- provider: 'rest',
18
- headers: req.headers
19
- };
20
- next();
21
- }
16
+ const serviceMiddleware = (): RequestHandler => {
17
+ return toHandler(async (req, res, next) => {
18
+ const { query, headers, path, body: data, method: httpMethod } = req;
19
+ const methodOverride = req.headers[http.METHOD_HEADER] as string | undefined;
22
20
 
23
- export const formatter = (_req: Request, res: Response, next: NextFunction) => {
24
- if (res.data === undefined) {
25
- return next();
26
- }
21
+ const { service, params: { __id: id = null, ...route } = {} } = req.lookup!;
22
+ const method = http.getServiceMethod(httpMethod, id, methodOverride);
23
+ const { methods } = getServiceOptions(service);
27
24
 
28
- res.format({
29
- 'application/json' () {
30
- res.json(res.data);
25
+ debug(`Found service for path ${path}, attempting to run '${method}' service method`);
26
+
27
+ if (!methods.includes(method) || defaultServiceMethods.includes(methodOverride)) {
28
+ const error = new MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`);
29
+ res.statusCode = error.code;
30
+ throw error;
31
31
  }
32
- });
33
- }
34
32
 
33
+ const createArguments = http.argumentsFor[method as 'get'] || http.argumentsFor.default;
34
+ const params = { query, headers, route, ...req.feathers };
35
+ const args = createArguments({ id, data, params });
36
+ const contextBase = createContext(service, method, { http: {} });
37
+ res.hook = contextBase;
38
+
39
+ const context = await (service as any)[method](...args, contextBase);
40
+ res.hook = context;
35
41
 
36
- export const serviceMiddleware = (callback: ServiceCallback) =>
37
- async (req: Request, res: Response, next: NextFunction) => {
38
- debug(`Running service middleware for '${req.url}'`);
42
+ const result = http.getData(context);
43
+ const statusCode = http.getStatusCode(context, result);
39
44
 
40
- try {
41
- const { query, body: data } = req;
42
- const { __feathersId: id = null, ...route } = req.params;
43
- const params = { query, route, ...req.feathers };
44
- const context = await callback(req, res, { id, data, params });
45
- const result = http.getData(context);
45
+ res.data = result;
46
+ res.statusCode = statusCode;
47
+
48
+ return next();
49
+ });
50
+ };
46
51
 
47
- res.data = result;
48
- res.status(http.getStatusCode(context, result));
52
+ const servicesMiddleware = (): RequestHandler => {
53
+ return toHandler(async (req, res, next) => {
54
+ const app = req.app as any as Application;
55
+ const lookup = app.lookup(req.path);
49
56
 
50
- next();
51
- } catch (error: any) {
52
- next(error);
57
+ if (!lookup) {
58
+ return next();
53
59
  }
54
- }
55
60
 
56
- export const serviceMethodHandler = (
57
- service: any, methodName: string, getArgs: (opts: http.ServiceParams) => any[], headerOverride?: string
58
- ) => serviceMiddleware(async (req, res, options) => {
59
- const methodOverride = typeof headerOverride === 'string' && (req.headers[headerOverride] as string);
60
- const method = methodOverride ? methodOverride : methodName
61
- const { methods } = getServiceOptions(service);
61
+ req.lookup = lookup;
62
+
63
+ const options = getServiceOptions(lookup.service);
64
+ const middleware = options.express!.composed!;
62
65
 
63
- if (!methods.includes(method) || defaultServiceMethods.includes(methodOverride)) {
64
- res.status(http.statusCodes.methodNotAllowed);
66
+ return middleware(req, res, next);
67
+ });
68
+ };
65
69
 
66
- throw new MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`);
70
+ export const formatter: RequestHandler = (_req, res, next) => {
71
+ if (res.data === undefined) {
72
+ return next();
67
73
  }
68
74
 
69
- const args = getArgs(options);
70
- const context = createContext(service, method);
75
+ res.format({
76
+ 'application/json' () {
77
+ res.json(res.data);
78
+ }
79
+ });
80
+ };
81
+
82
+ export type RestOptions = {
83
+ formatter?: RequestHandler;
84
+ authentication?: AuthenticationSettings;
85
+ };
71
86
 
72
- res.hook = context as any;
87
+ export const rest = (options?: RestOptions | RequestHandler) => {
88
+ options = typeof options === 'function' ? { formatter: options } : options || {};
73
89
 
74
- return service[method](...args, context);
75
- });
90
+ const formatterMiddleware = options.formatter || formatter;
91
+ const authenticationOptions = options.authentication;
76
92
 
77
- export function rest (handler: RequestHandler = formatter) {
78
- return function (this: any, app: any) {
93
+ return (app: Application) => {
79
94
  if (typeof app.route !== 'function') {
80
95
  throw new Error('@feathersjs/express/rest needs an Express compatible app.');
81
96
  }
82
97
 
83
- app.use(feathersParams);
84
- app.use(parseAuthentication());
85
-
86
- // Register the REST provider
87
- app.mixins.push(function (service: any, path: string, options: any) {
88
- const { middleware: { before = [] } } = options;
89
- let { middleware: { after = [] } } = options;
90
-
91
- if (typeof handler === 'function') {
92
- after = after.concat(handler);
93
- }
94
-
95
- const baseUri = `/${path}`;
96
- const find = serviceMethodHandler(service, 'find', http.argumentsFor.find);
97
- const get = serviceMethodHandler(service, 'get', http.argumentsFor.get);
98
- const create = serviceMethodHandler(service, 'create', http.argumentsFor.create, http.METHOD_HEADER);
99
- const update = serviceMethodHandler(service, 'update', http.argumentsFor.update);
100
- const patch = serviceMethodHandler(service, 'patch', http.argumentsFor.patch);
101
- const remove = serviceMethodHandler(service, 'remove', http.argumentsFor.remove);
102
-
103
- debug(`Adding REST provider for service \`${path}\` at base route \`${baseUri}\``);
104
-
105
- const idRoute = '/:__feathersId';
106
- const serviceRouter = Router({ mergeParams: true })
107
- .get('/', find)
108
- .post('/', create)
109
- .get(idRoute, get)
110
- .put('/', update)
111
- .put(idRoute, update)
112
- .patch('/', patch)
113
- .patch(idRoute, patch)
114
- .delete('/', remove)
115
- .delete(idRoute, remove);
116
-
117
- app.use(baseUri, ...before, serviceRouter, ...after);
98
+ app.use(parseAuthentication(authenticationOptions));
99
+ app.use(servicesMiddleware());
100
+
101
+ app.mixins.push((_service, _path, options) => {
102
+ const { express: { before = [], after = [] } = {} } = options;
103
+
104
+ const middlewares = [].concat(before, serviceMiddleware(), after, formatterMiddleware);
105
+ const middleware = Router().use(middlewares);
106
+
107
+ options.express ||= {};
108
+ options.express.composed = middleware;
118
109
  });
119
110
  };
120
111
  }