Return post-login data from login/pin login auth handlers

Author: jgriffiths

src/ga_auth_handlers.cpp

@@ -341,7 +341,7 @@ namespace sdk {
                     m_ca_addrs[subaccount].emplace_back(blinded_addr);
                 }
             } else {
-                m_session.login(m_mnemonic, m_password);
+                m_result = m_session.login(m_mnemonic, m_password);
             }
 
             // fall-through down to check for/upload confidential addresses requests
@@ -397,7 +397,8 @@ namespace sdk {
                 }
 
                 // Log in and set up the session
-                m_session.authenticate(args.at("signature"), "GA", m_master_xpub_bip32, std::string(), m_hw_device);
+                m_result = m_session.authenticate(
+                    args.at("signature"), "GA", m_master_xpub_bip32, std::string(), m_hw_device);
 
                 // Ask the caller for the xpubs for each subaccount
                 std::vector<nlohmann::json> paths;
@@ -451,7 +452,7 @@ namespace sdk {
 
     auth_handler::state_type login_with_pin_call::call_impl()
     {
-        m_session.login_with_pin(m_pin, m_pin_data);
+        m_result = m_session.login_with_pin(m_pin, m_pin_data);
 
         if (m_session.is_liquid()) {
             // when logged in with pin, the wallet software signer is available, thus the session is able to obtain

src/ga_rust.cpp

@@ -154,9 +154,10 @@ namespace sdk {
     }
 
     std::string ga_rust::get_challenge(const std::string& address) { throw std::runtime_error("not implemented"); }
-    void ga_rust::authenticate(const std::string& sig_der_hex, const std::string& path_hex,
+    nlohmann::json ga_rust::authenticate(const std::string& sig_der_hex, const std::string& path_hex,
         const std::string& root_xpub_bip32, const std::string& device_id, const nlohmann::json& hw_device)
     {
+        // FIXME: return post-login data
         throw std::runtime_error("not implemented");
     }
     void ga_rust::register_subaccount_xpubs(const std::vector<std::string>& bip32_xpubs)

src/ga_rust.hpp

@@ -77,7 +77,7 @@ namespace sdk {
             const std::string& gait_path_hex, bool supports_csv);
 
         std::string get_challenge(const std::string& address);
-        void authenticate(const std::string& sig_der_hex, const std::string& path_hex,
+        nlohmann::json authenticate(const std::string& sig_der_hex, const std::string& path_hex,
             const std::string& root_xpub_bip32, const std::string& device_id, const nlohmann::json& hw_device);
         void register_subaccount_xpubs(const std::vector<std::string>& bip32_xpubs);
         nlohmann::json login(const std::string& mnemonic, const std::string& password);

src/ga_session.cpp

@@ -1611,14 +1611,14 @@ namespace sdk {
         wamp_call(locker, "login.set_appearance", appearance.get());
     }
 
-    void ga_session::authenticate(const std::string& sig_der_hex, const std::string& path_hex,
+    nlohmann::json ga_session::authenticate(const std::string& sig_der_hex, const std::string& path_hex,
         const std::string& root_xpub_bip32, const std::string& device_id, const nlohmann::json& hw_device)
     {
         locker_t locker(m_mutex);
-        authenticate(locker, sig_der_hex, path_hex, root_xpub_bip32, device_id, hw_device);
+        return authenticate(locker, sig_der_hex, path_hex, root_xpub_bip32, device_id, hw_device);
     }
 
-    void ga_session::authenticate(ga_session::locker_t& locker, const std::string& sig_der_hex,
+    nlohmann::json ga_session::authenticate(ga_session::locker_t& locker, const std::string& sig_der_hex,
         const std::string& path_hex, const std::string& root_xpub_bip32, const std::string& device_id,
         const nlohmann::json& hw_device)
     {
@@ -1747,6 +1747,7 @@ namespace sdk {
         locker.unlock();
         on_new_block(nlohmann::json(
             { { "block_height", block_height }, { "block_hash", block_hash }, { "diverged_count", 0 } }));
+        return get_post_login_data();
     }
 
     void ga_session::load_client_blob(ga_session::locker_t& locker, bool encache)
@@ -1870,9 +1871,8 @@ namespace sdk {
         const auto hexder_path = sign_challenge(locker, challenge);
         m_mnemonic = mnemonic;
 
-        authenticate(
+        return authenticate(
             locker, hexder_path.first, hexder_path.second, std::string(), std::string(), nlohmann::json::object());
-        return get_post_login_data();
     }
 
     nlohmann::json ga_session::get_settings()

src/ga_session.hpp

@@ -72,7 +72,7 @@ namespace sdk {
             const std::string& gait_path_hex, bool supports_csv);
 
         std::string get_challenge(const std::string& address);
-        void authenticate(const std::string& sig_der_hex, const std::string& path_hex,
+        nlohmann::json authenticate(const std::string& sig_der_hex, const std::string& path_hex,
             const std::string& root_xpub_bip32, const std::string& device_id,
             const nlohmann::json& hw_device = nlohmann::json::object());
 
@@ -244,7 +244,7 @@ namespace sdk {
         void register_user(locker_t& locker, const std::string& master_pub_key_hex,
             const std::string& master_chain_code_hex, const std::string& gait_path_hex, bool supports_csv);
 
-        void authenticate(locker_t& locker, const std::string& sig_der_hex, const std::string& path_hex,
+        nlohmann::json authenticate(locker_t& locker, const std::string& sig_der_hex, const std::string& path_hex,
             const std::string& root_xpub_bip32, const std::string& device_id, const nlohmann::json& hw_device);
         nlohmann::json login(locker_t& locker, const std::string& mnemonic);
         void set_notification_handler(locker_t& locker, GA_notification_handler handler, void* context);

src/session.cpp

@@ -332,12 +332,12 @@ namespace sdk {
         });
     }
 
-    void session::authenticate(const std::string& sig_der_hex, const std::string& path_hex,
+    nlohmann::json session::authenticate(const std::string& sig_der_hex, const std::string& path_hex,
         const std::string& root_xpub_bip32, const std::string& device_id, const nlohmann::json& hw_device)
     {
-        exception_wrapper([&] {
+        return exception_wrapper([&] {
             auto p = get_nonnull_impl();
-            p->authenticate(sig_der_hex, path_hex, root_xpub_bip32, device_id, hw_device);
+            return p->authenticate(sig_der_hex, path_hex, root_xpub_bip32, device_id, hw_device);
         });
     }
 

src/session.hpp

@@ -56,7 +56,7 @@ namespace sdk {
             const std::string& gait_path_hex, bool supports_csv);
 
         std::string get_challenge(const std::string& address);
-        void authenticate(const std::string& sig_der_hex, const std::string& path_hex,
+        nlohmann::json authenticate(const std::string& sig_der_hex, const std::string& path_hex,
             const std::string& root_xpub_bip32, const std::string& device_id, const nlohmann::json& hw_device);
         void register_subaccount_xpubs(const std::vector<std::string>& bip32_xpubs);
         nlohmann::json login(const std::string& mnemonic, const std::string& password);

src/session_common.hpp

@@ -57,7 +57,7 @@ namespace sdk {
             = 0;
 
         virtual std::string get_challenge(const std::string& address) = 0;
-        virtual void authenticate(const std::string& sig_der_hex, const std::string& path_hex,
+        virtual nlohmann::json authenticate(const std::string& sig_der_hex, const std::string& path_hex,
             const std::string& root_xpub_bip32, const std::string& device_id, const nlohmann::json& hw_device)
             = 0;
         virtual void register_subaccount_xpubs(const std::vector<std::string>& bip32_xpubs) = 0;