Use the unified gdk login call GA_login_user

Author: jgriffiths

green_cli/authenticators/__init__.py

@@ -21,7 +21,8 @@ def __init__(self, options):
         super().__init__()
 
     def login(self, session_obj):
-        return gdk.login(session_obj, self.hw_device, self.mnemonic, self.password)
+        credentials = {'mnemonic': self.mnemonic, 'password': self.password}
+        return gdk.login_user(session_obj, self.hw_device, json.dumps(credentials))
 
     def register(self, session):
         return gdk.register_user(session, self.hw_device, self.mnemonic)

green_cli/authenticators/default.py

@@ -13,7 +13,8 @@ def login(self, session_obj):
         try:
             pin_data = open(self.pin_data_filename).read()
             pin = getpass("PIN: ")
-            return gdk.login_with_pin(session_obj, pin, pin_data)
+            credentials = {'pin': pin, 'pin_data': json.loads(pin_data)}
+            return gdk.login_user(session_obj, '{}', json.dumps(credentials))
         except IOError:
             return super().login(session_obj)
 

green_cli/authenticators/watchonly.py

@@ -15,7 +15,8 @@ def set_password(self, password):
         self._password.set(password)
 
     def login(self, session_obj):
-        return gdk.login_watch_only(session_obj, self._username.get(), self._password.get())
+        credentials = {'username': self._username.get(), 'password': self._password.get()}
+        return gdk.login_user(session_obj, '{}', json.dumps(credentials))
 
 
 def get_authenticator(options):

green_cli/decorators.py

@@ -59,11 +59,7 @@ def inner(session, *args, **kwargs):
         if not context.logged_in:
             logging.info("Logging in")
             result = context.authenticator.login(session.session_obj)
-            # authenticator.login attempts to abstract the actual login method, it may call
-            # GA_login, GA_login_with_pin or GA_login_watch_only
-            # Unfortunately only GA_login returns an auth_handler, so both cases must be handled
-            if result:
-                gdk_resolve(result)
+            gdk_resolve(result)
             context.logged_in = True
 
             if not context.no_warn_sysmsg: