Support custom error handling and support stack trace disabling from …

…environment variable #18

package.json

@@ -1,6 +1,6 @@
 {
   "name": "odata-v4-server",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "OData V4 Server",
   "main": "build/lib/index.js",
   "typings": "build/lib/index",

src/example/advanced.ts

@@ -1,6 +1,6 @@
 import { MongoClient, ObjectID, Db } from "mongodb";
 import { createQuery } from "odata-v4-mongodb";
-import { Edm, odata, ODataController, ODataServer, ODataQuery, createODataServer } from "../lib/index";
+import { Edm, odata, ODataController, ODataServer, ODataQuery, createODataServer, ODataErrorHandler } from "../lib/index";
 import { Category, Product, NorthwindTypes } from "./model";
 import { Writable } from "stream";
 let categories = require("./categories");
@@ -80,6 +80,11 @@ export class NorthwindODataServer extends ODataServer{
         await categoryCollection.insertMany(categories);
         await productsCollection.insertMany(products);
     }
+
+    static errorHandler(err, req, res, next){
+      delete err.stack;
+      ODataErrorHandler(err, req, res, next);
+    }
 }
 
 createODataServer(NorthwindODataServer, "/odata", 3000);

src/lib/odata.ts

@@ -1,5 +1,6 @@
 import "reflect-metadata";
 import { Token, TokenType } from "odata-v4-parser/lib/lexer";
+import { ErrorRequestHandler } from "express";
 import { ODataServer } from "./server";
 import { ODataController } from "./controller";
 import { EntityType } from "./edm";
@@ -140,6 +141,15 @@ export function validation(validator: IODataValidator, options: IODataValidatorO
     };
 }
 
+/** Set error handler
+ * @param errorHandler Error request handler to use
+ */
+export function error(errorHandler: ErrorRequestHandler) {
+  return function (target: typeof ODataServer) {
+      target.errorHandler = errorHandler;
+  };
+}
+
 /** Class decorator for server that binds the given controller to the server. 
  * @param controller    Controller to be bind to the server.
  * @param isPublic      Is the binding public or not.

src/lib/server.ts

@@ -78,6 +78,7 @@ export class ODataServerBase extends Transform{
     static parser = ODataParser;
     static connector:IODataConnector
     static validator:(odataQuery:string | Token) => null;
+    static errorHandler:express.ErrorRequestHandler = ODataErrorHandler;
     private serverType:typeof ODataServer
 
     static requestHandler(){
@@ -285,7 +286,7 @@ export class ODataServerBase extends Transform{
         }, server.document().requestHandler());
         router.get("/\\$metadata", server.$metadata().requestHandler());
         router.use(server.requestHandler());
-        router.use(ODataErrorHandler);
+        router.use(server.errorHandler);
 
         if (typeof path == "number"){
             if (typeof port == "string"){
@@ -317,7 +318,7 @@ export function ODataErrorHandler(err, _, res, next){
             error: {
                 code: statusCode,
                 message: err.message,
-                stack: err.stack
+                stack: process.env.ODATA_V4_DISABLE_STACKTRACE ? undefined : err.stack
             }
         });
     }else next();