Merged branch 'master' into es17.05

2017-06-09 10:41:10 +02:00
parent 3389fb8809 78ef7af5f8
commit e93af8da39
87 changed files with 1174 additions and 566 deletions
--- a/dev_modules/masquerade_auth/masquerade_auth_module.e
+++ b/dev_modules/masquerade_auth/masquerade_auth_module.e
@@ -183,10 +183,10 @@ feature {NONE} -- Implementation: routes
 					create {BAD_REQUEST_ERROR_CMS_RESPONSE} r.make (req, res, api)
 					r.add_block (login_block ("login", "Wrong username", r), "content")
 				end
+				r.execute
 			else
-				create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
+				api.response_api.send_access_denied (Void, req, res)
 			end
-			r.execute
 		end

 feature -- Hooks configuration