5htp-core 0.5.1-6 → 0.5.1-7

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.5.1-6",
+	"version": "0.5.1-7",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/src/common/errors/index.tsx

@@ -154,6 +154,27 @@ export class AuthRequired extends CoreError {
     public static msgDefaut = "Please Login to Continue.";
 }
 
+export class UpgradeRequired extends CoreError {
+    public http = 402;
+    public title = "Upgrade Required";
+    public static msgDefaut = "Please Upgrade to Continue.";
+
+    public constructor( 
+        message: string, 
+        public feature: string,
+        details?: TErrorDetails
+    ) {
+        super(message, details);
+    }
+
+    public json(): TJsonError & { feature: string } {
+        return {
+            ...super.json(),
+            feature: this.feature,
+        }
+    }
+}
+
 export class Forbidden extends CoreError {
     public http = 403;
     public title = "Access Denied";
@@ -235,6 +256,8 @@ export const fromJson = ({ code, message, ...details }: TJsonError) => {
 
         case 401: return new AuthRequired( message, details );
 
+        case 402: return new UpgradeRequired( message, details.feature, details );
+
         case 403: return new Forbidden( message, details );
 
         case 404: return new NotFound( message, details );

package/src/server/services/router/index.ts

@@ -583,11 +583,8 @@ declare type Routes = {
     private async handleError( e: CoreError, request: ServerRequest<ServerRouter> ) {
 
         const code = 'http' in e ? e.http : 500;
-        const route = this.errors[code];
-        if (route === undefined)
-            throw new Error(`No route for error code ${code}`);
 
-        const response = new ServerResponse(request).status(code).setRoute(route);
+        const response = new ServerResponse(request).status(code)
 
         // Rapport / debug
         if (code === 500) {
@@ -613,10 +610,16 @@ declare type Routes = {
 
         // Return error based on the request format
         if (request.accepts("html")) {
+
+            const route = this.errors[code];
+            if (route === undefined)
+                throw new Error(`No route for error code ${code}`);
+
             const jsonError = errorToJson(e);
-            await response.runController(route, { 
+            await response.setRoute(route).runController(route, { 
                 error: jsonError
             });
+
         } else if (request.accepts("json")) {
             const jsonError = errorToJson(e);
             await response.json(jsonError);