From 473065c61b0e7bbbf4d798bb93b3b295e8f68b11 Mon Sep 17 00:00:00 2001
From: Sebastian Gierlinger <s.gierlinger@me.com>
Date: Fri, 8 Aug 2014 09:44:24 +0200
Subject: [PATCH] Improve error handling for authentication

closes #3660
- added wrapping in JSON API format to error500()
- added client side handling
---
 ghost/admin/routes/application.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ghost/admin/routes/application.js b/ghost/admin/routes/application.js
index 4b359b8f95..fe3b5d75aa 100644
--- a/ghost/admin/routes/application.js
+++ b/ghost/admin/routes/application.js
@@ -25,7 +25,12 @@ var ApplicationRoute = Ember.Route.extend(SimpleAuth.ApplicationRouteMixin, Shor
         },
 
         sessionAuthenticationFailed: function (error) {
-            this.notifications.showError(error.message);
+            if (error.errors) {
+                this.notifications.showErrors(error.errors);
+            } else {
+                // connection errors don't return proper status message, only req.body
+                this.notifications.showError('There was a problem on the server.');
+            }
         },
 
         sessionAuthenticationSucceeded: function () {