fix: Safely catch legacy flags on interactive login for other cmds (#828)

* safely catch legacy flags on interactive login for other cmds

* skip the test

---------

Co-authored-by: Matt Kramer <mkramer@anaconda.com>

Author: AlbertDeFusco

binstar_client/commands/login.py

@@ -102,7 +102,7 @@ def interactive_get_token(args, fail_if_already_exists=True):
 
     api_client.check_server()
 
-    has_legacy_flags = getattr(args, "login_username") or getattr(args, "login_password")
+    has_legacy_flags = getattr(args, "login_username", None) or getattr(args, "login_password", None)
 
     if not (LEGACY_INTERACTIVE_LOGIN or has_legacy_flags):
         # If the user already has a token, prompt them if they want to login again.

tests/test_login.py

@@ -2,10 +2,14 @@
 
 """Tests for authentication commands."""
 
+import json
 import unittest.mock
 
+from binstar_client import errors
+
 from tests.fixture import CLITestCase, main
 from tests.urlmock import urlpatch
+from tests.utils.utils import data_dir
 
 
 class Test(CLITestCase):
@@ -111,3 +115,33 @@ def test_legacy_login_user_pass_flags(self, urls, store_token, _do_auth_flow):
 
         self.assertTrue(store_token.called)
         self.assertEqual(store_token.call_args[0][0], 'a-token')
+
+    @unittest.mock.patch('binstar_client.commands.login.bool_input')
+    @unittest.mock.patch('binstar_client.commands.login._do_auth_flow')
+    @urlpatch
+    @unittest.skip("Cannot accurately test this scenario")
+    def test_login_required_args(self, urls, _do_auth_flow, bool_input):
+        org_data = {
+            "company": "foo",
+            "created_at": "2015-11-19 18:22:23.061000+00:00",
+            "description": "",
+            "location": "here",
+            "login": "org-name",
+            "name": "Me",
+            "url": "",
+            "user_type": "org",
+        }
+
+        urls.register(method='HEAD', path='/', status=200)
+        urls.register(method='GET', path='/user/org-name', content=json.dumps(org_data))
+        urls.register(method="GET", path="/dist/org-name/foo/0.1/osx-64/foo-0.1-0.tar.bz2", status=401, content={})
+
+        # We just need make sure we get past the legacy_flag determination
+        # We don't need to finish login or upload
+        bool_input.return_value = False
+
+        with self.assertRaises(SystemExit):
+            main(['--show-traceback', 'upload', "-u", "org-name", data_dir('foo-0.1-0.tar.bz2')])
+
+        self.assertIn("\"org-name\" as upload username", self.stream.getvalue())
+        self.assertIn("The action you are performing requires authentication", self.stream.getvalue())