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

jgriffiths · jgriffiths · commit ace0465c23ec · 2021-04-23T12:04:25.000+12:00
diff --git a/src/ga_auth_handlers.cpp b/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
diff --git a/src/ga_rust.cpp b/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)
diff --git a/src/ga_rust.hpp b/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);
diff --git a/src/ga_session.cpp b/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()
diff --git a/src/ga_session.hpp b/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);
diff --git a/src/session.cpp b/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);
         });
     }
 
diff --git a/src/session.hpp b/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);
diff --git a/src/session_common.hpp b/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;

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ namespace sdk {`
`341`	`341`	`m_ca_addrs[subaccount].emplace_back(blinded_addr);`
`342`	`342`	`}`
`343`	`343`	`} else {`
`344`		`- m_session.login(m_mnemonic, m_password);`
	`344`	`+ m_result = m_session.login(m_mnemonic, m_password);`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`// fall-through down to check for/upload confidential addresses requests`
`@@ -397,7 +397,8 @@ namespace sdk {`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`// Log in and set up the session`
`400`		`- m_session.authenticate(args.at("signature"), "GA", m_master_xpub_bip32, std::string(), m_hw_device);`
	`400`	`+ m_result = m_session.authenticate(`
	`401`	`+ args.at("signature"), "GA", m_master_xpub_bip32, std::string(), m_hw_device);`
`401`	`402`
`402`	`403`	`// Ask the caller for the xpubs for each subaccount`
`403`	`404`	`std::vector<nlohmann::json> paths;`
`@@ -451,7 +452,7 @@ namespace sdk {`
`451`	`452`
`452`	`453`	`auth_handler::state_type login_with_pin_call::call_impl()`
`453`	`454`	`{`
`454`		`- m_session.login_with_pin(m_pin, m_pin_data);`
	`455`	`+ m_result = m_session.login_with_pin(m_pin, m_pin_data);`
`455`	`456`
`456`	`457`	`if (m_session.is_liquid()) {`
`457`	`458`	`// when logged in with pin, the wallet software signer is available, thus the session is able to obtain`
Original file line number	Diff line number	Diff line change
`@@ -154,9 +154,10 @@ namespace sdk {`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`std::string ga_rust::get_challenge(const std::string& address) { throw std::runtime_error("not implemented"); }`
`157`		`- void ga_rust::authenticate(const std::string& sig_der_hex, const std::string& path_hex,`
	`157`	`+ nlohmann::json ga_rust::authenticate(const std::string& sig_der_hex, const std::string& path_hex,`
`158`	`158`	`const std::string& root_xpub_bip32, const std::string& device_id, const nlohmann::json& hw_device)`
`159`	`159`	`{`
	`160`	`+ // FIXME: return post-login data`
`160`	`161`	`throw std::runtime_error("not implemented");`
`161`	`162`	`}`
`162`	`163`	`void ga_rust::register_subaccount_xpubs(const std::vector<std::string>& bip32_xpubs)`
Original file line number	Diff line number	Diff line change
`@@ -1611,14 +1611,14 @@ namespace sdk {`
`1611`	`1611`	`wamp_call(locker, "login.set_appearance", appearance.get());`
`1612`	`1612`	`}`
`1613`	`1613`
`1614`		`- void ga_session::authenticate(const std::string& sig_der_hex, const std::string& path_hex,`
	`1614`	`+ nlohmann::json ga_session::authenticate(const std::string& sig_der_hex, const std::string& path_hex,`
`1615`	`1615`	`const std::string& root_xpub_bip32, const std::string& device_id, const nlohmann::json& hw_device)`
`1616`	`1616`	`{`
`1617`	`1617`	`locker_t locker(m_mutex);`
`1618`		`- authenticate(locker, sig_der_hex, path_hex, root_xpub_bip32, device_id, hw_device);`
	`1618`	`+ return authenticate(locker, sig_der_hex, path_hex, root_xpub_bip32, device_id, hw_device);`
`1619`	`1619`	`}`
`1620`	`1620`
`1621`		`- void ga_session::authenticate(ga_session::locker_t& locker, const std::string& sig_der_hex,`
	`1621`	`+ nlohmann::json ga_session::authenticate(ga_session::locker_t& locker, const std::string& sig_der_hex,`
`1622`	`1622`	`const std::string& path_hex, const std::string& root_xpub_bip32, const std::string& device_id,`
`1623`	`1623`	`const nlohmann::json& hw_device)`
`1624`	`1624`	`{`
`@@ -1747,6 +1747,7 @@ namespace sdk {`
`1747`	`1747`	`locker.unlock();`
`1748`	`1748`	`on_new_block(nlohmann::json(`
`1749`	`1749`	`{ { "block_height", block_height }, { "block_hash", block_hash }, { "diverged_count", 0 } }));`
	`1750`	`+ return get_post_login_data();`
`1750`	`1751`	`}`
`1751`	`1752`
`1752`	`1753`	`void ga_session::load_client_blob(ga_session::locker_t& locker, bool encache)`
`@@ -1870,9 +1871,8 @@ namespace sdk {`
`1870`	`1871`	`const auto hexder_path = sign_challenge(locker, challenge);`
`1871`	`1872`	`m_mnemonic = mnemonic;`
`1872`	`1873`
`1873`		`- authenticate(`
	`1874`	`+ return authenticate(`
`1874`	`1875`	`locker, hexder_path.first, hexder_path.second, std::string(), std::string(), nlohmann::json::object());`
`1875`		`- return get_post_login_data();`
`1876`	`1876`	`}`
`1877`	`1877`
`1878`	`1878`	`nlohmann::json ga_session::get_settings()`
Original file line number	Diff line number	Diff line change
`@@ -332,12 +332,12 @@ namespace sdk {`
`332`	`332`	`});`
`333`	`333`	`}`
`334`	`334`
`335`		`- void session::authenticate(const std::string& sig_der_hex, const std::string& path_hex,`
	`335`	`+ nlohmann::json session::authenticate(const std::string& sig_der_hex, const std::string& path_hex,`
`336`	`336`	`const std::string& root_xpub_bip32, const std::string& device_id, const nlohmann::json& hw_device)`
`337`	`337`	`{`
`338`		`- exception_wrapper([&] {`
	`338`	`+ return exception_wrapper([&] {`
`339`	`339`	`auto p = get_nonnull_impl();`
`340`		`- p->authenticate(sig_der_hex, path_hex, root_xpub_bip32, device_id, hw_device);`
	`340`	`+ return p->authenticate(sig_der_hex, path_hex, root_xpub_bip32, device_id, hw_device);`
`341`	`341`	`});`
`342`	`342`	`}`
`343`	`343`