Improve handling of card request not found/wrong state errors (see #12)

protocubo · Jan 12, 2018 · 635548a · 635548a
1 parent cb90e8e
commit 635548a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/RequestError.hx b/src/RequestError.hx
@@ -1,4 +1,4 @@
 enum RequestError {
-	SecurityError(err:String, ?userMsg:String);
+	SecurityError(err:String, ?userMsg:String, clean:Bool);
 }
 
diff --git a/src/Server.hx b/src/Server.hx
@@ -187,8 +187,8 @@ class Server {
 			}
 		} catch (err:RequestError) {
 			switch err {
-			case SecurityError(err, userMsg):
-				abort(req_t, err, 400, userMsg);
+			case SecurityError(err, userMsg, clean):
+				abort(req_t, err, 400, userMsg, clean);
 			}
 		} catch (err:Dynamic) {
 			abort(req_t, err, 500);
@@ -197,7 +197,7 @@ class Server {
 		shortId = requestId = null;
 	}
 
-	static function abort(req_t:Float, err:Dynamic, status:Int, ?userMessage:String)
+	static function abort(req_t:Float, err:Dynamic, status:Int, ?userMessage:String, clean=false)
 	{
 		try
 			Web.setReturnCode(status)
@@ -209,9 +209,11 @@ class Server {
 			trace('could not return error view anymore');
 		var stack = StringTools.trim(haxe.CallStack.toString(haxe.CallStack.exceptionStack()));
 		trace('ERROR after ${since(req_t)} ms: $err', stack);
-		if (ManagedModule.cacheEnabled)
-			ManagedModule.uncache();
-		ManagedModule.callFinalizers();
+		if (!clean) {
+			if (ManagedModule.cacheEnabled)
+				ManagedModule.uncache();
+			ManagedModule.callFinalizers();
+		}
 	}
 
 	static inline function since(ref:Float)

diff --git a/src/route/Novo.hx b/src/route/Novo.hx
@@ -90,9 +90,9 @@ class Novo {
 			}
 #else
 			if (user == null)
-				trace('abort: user not found (${args.belNumber})');  // TODO consider switching to SecurityError
+				trace('abort: user not found (${args.belNumber})');
 			else
-				trace('abort: cpf does not match user (user ${user.belNumber}, cpf ${args.cpf})');  // TODO consider switching to SecurityError
+				trace('abort: cpf does not match user (user ${user.belNumber}, cpf ${args.cpf})');
 			getDefault('Consultor não encontrado ou CPF não bate');
 			return;
 #end
@@ -147,7 +147,7 @@ class Novo {
 			show(Web.getCookies().get(CARD_COOKIE));
 			if (card != null)
 				show(Type.enumConstructor(card.state));
-			throw SecurityError("card request not found or in wrong state");
+			throw SecurityError("card request not found or in wrong state", "Você precisa começar uma nova solicitação.", true);
 		}
 		show(card.requestId);
 
@@ -223,7 +223,7 @@ class Novo {
 			show(Web.getCookies().get(CARD_COOKIE));
 			if (card != null)
 				show(Type.enumConstructor(card.state));
-			throw SecurityError("card request not found or in wrong state");
+			throw SecurityError("card request not found or in wrong state", "Você precisa começar uma nova solicitação.", true);
 		}
 		show(card.requestId);
 
@@ -244,7 +244,7 @@ class Novo {
 	{
 		var card = db.CardRequest.manager.select($requestId == key);
 		if (card == null)
-			throw SecurityError("card request not found", "Não encontramos o cartão na nossa base.");
+			throw SecurityError("card request not found", "Não encontramos o cartão na nossa base.", true);
 		show(Type.enumConstructor(card.state));
 
 		Web.setReturnCode(200);