From 01fadd8f8c97c87b31424d0f33b7c0e0580c3231 Mon Sep 17 00:00:00 2001
From: rr- <rr-@sakuya.pl>
Date: Sat, 24 Sep 2016 08:49:07 +0200
Subject: [PATCH] client/api: fix reporting errors for bad logins

---
 client/js/api.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/client/js/api.js b/client/js/api.js
index ab93b9ad..e2932f2a 100644
--- a/client/js/api.js
+++ b/client/js/api.js
@@ -80,16 +80,24 @@ class Api extends events.EventTarget {
                     req.attach(key, files[key] || new Blob());
                 }
             }
-            if (this.userName && this.userPassword) {
-                req.auth(this.userName, this.userPassword);
+            try {
+                if (this.userName && this.userPassword) {
+                    req.auth(
+                        this.userName,
+                        this.userPassword);
+                }
+            } catch (e) {
+                reject({
+                    title: 'Authentication error',
+                    description: 'Malformed credentials'});
             }
             req.set('Accept', 'application/json')
                 .end((error, response) => {
                     nprogress.done();
                     if (error) {
                         reject(response && response.body ? response.body : {
-                            'title': 'Networking error',
-                            'description': error.message});
+                            title: 'Networking error',
+                            description: error.message});
                     } else {
                         resolve(response.body);
                     }
@@ -152,7 +160,7 @@ class Api extends events.EventTarget {
                     resolve();
                     this.dispatchEvent(new CustomEvent('login'));
                 }, response => {
-                    reject(response.description);
+                    reject(response.description || response || 'Unknown error');
                     this.logout();
                 });
         });