Throw InvalidUserLogin error when login fails

fixes https://github.com/mcrute/pydora/issues/41

3 files changed, 30 insertions, 10 deletions

diff --git a/pandora/client.py b/pandora/client.py
index 403216e..7c9791e 100644
--- a/pandora/client.py
+++ b/pandora/client.py
@@ -73,16 +73,19 @@ class BaseAPIClient(object):
     def _authenticate(self):
         self._partner_login()
 
-        user = self.transport("auth.userLogin",
-                              loginType="user",
-                              username=self.username,
-                              password=self.password,
-                              includePandoraOneInfo=True,
-                              includeSubscriptionExpiration=True,
-                              returnCapped=True,
-                              includeAdAttributes=True,
-                              includeAdvertiserAttributes=True,
-                              xplatformAdCapable=True)
+        try:
+            user = self.transport("auth.userLogin",
+                                  loginType="user",
+                                  username=self.username,
+                                  password=self.password,
+                                  includePandoraOneInfo=True,
+                                  includeSubscriptionExpiration=True,
+                                  returnCapped=True,
+                                  includeAdAttributes=True,
+                                  includeAdvertiserAttributes=True,
+                                  xplatformAdCapable=True)
+        except errors.InvalidPartnerLogin:
+            raise errors.InvalidUserLogin()
 
         self.transport.set_user(user)
 
diff --git a/pandora/errors.py b/pandora/errors.py
index 3944490..9fbd00e 100644
--- a/pandora/errors.py
+++ b/pandora/errors.py
@@ -95,3 +95,14 @@ class PandoraException(Exception):
 
 
 PandoraException._export_exceptions(locals())
+
+
+class InvalidUserLogin(InvalidPartnerLogin):
+    """Pydora Internal Login Error
+
+    This is thrown around a user login to disambiguate a login that is invalid
+    due to user error vs a login that is invalid due to a partner credential
+    error. The Pandora API returns 1002 in both cases.
+    """
+
+    message = "Invalid User Login"
diff --git a/tests/test_pandora/test_client.py b/tests/test_pandora/test_client.py
index f7f0574..ce91e21 100644
--- a/tests/test_pandora/test_client.py
+++ b/tests/test_pandora/test_client.py
@@ -42,6 +42,12 @@ class TestAPIClientLogin(TestCase):
         self.assertIs(self.StubTransport.FAKE_USER, transport.user)
         self.assertIs(self.StubTransport.FAKE_PARTNER, transport.partner)
 
+    def test_login_user_error(self):
+        with self.assertRaises(errors.InvalidUserLogin):
+            transport = Mock(side_effect=[None, errors.InvalidPartnerLogin])
+            client = BaseAPIClient(transport, None, None, None)
+            client.login("foobear", "secret")
+
 
 class TestCallingAPIClient(TestCase):