use GA_destroy_json to prevent memory leaks, remove useless TwoFactor…

…Call class

android/CMakeLists.txt

@@ -27,7 +27,6 @@ add_library(
         ../cpp/GdkHostObject.cpp
         ../cpp/json.cpp
         ../cpp/utils.cpp
-        ../cpp/TwoFactorCall.cpp
         ../cpp/ThreadPool.cpp
 )
 

cpp/GdkHostObject.hpp

@@ -5,7 +5,6 @@
 #include "utils.hpp"
 #include "json.hpp"
 #include <ReactCommon/CallInvoker.h>
-#include "TwoFactorCall.hpp"
 #include "ThreadPool.hpp"
 
 using namespace facebook;

cpp/utils.cpp

@@ -99,17 +99,24 @@ namespace utils {
         return res;
     }
 
-
-    json resolve(TwoFactorCall call) {
+    json resolve(GA_auth_handler* call) {
         while (true) {
-            json obj = call.getStatus();
+            GA_json *resJson;
+            GA_auth_handler_get_status(call, &resJson);
+            char *stringJson;
+            GA_convert_json_to_string(resJson, &stringJson);
+            GA_destroy_json(resJson);
+            std::string s(stringJson);
+            json obj = json::parse(s);
             std::string status = obj["status"];
 
             if (status == "call") {
-                call.call();
+                GA_auth_handler_call(call);
             } else if (status == "done") {
+                GA_destroy_auth_handler(call);
                 return obj;
             } else {
+                GA_destroy_auth_handler(call);
                 return obj;
             }
         }
@@ -129,6 +136,7 @@ namespace utils {
 
         char *stringJson;
         GA_convert_json_to_string(details, &stringJson);
+        GA_destroy_json(details);
         std::string s(stringJson);
         json res = json::parse(s);
 

cpp/utils.hpp

@@ -10,7 +10,6 @@
 
 #include <gdk.h>
 #include <jsi/jsi.h>
-#include "TwoFactorCall.hpp"
 #include "GdkHostObject.hpp"
 #include "json.hpp"
 
@@ -29,8 +28,8 @@ namespace utils {
     // debug utility
     int consoleLog(jsi::Runtime &rt, std::string msg);
 
-    // resolve a TwoFactorCall
-    json resolve(TwoFactorCall call);
+    // resolve a auth handler call
+    json resolve(GA_auth_handler* call);
 
 
     // handle notifications
@@ -42,7 +41,7 @@ namespace utils {
     // definition of js JSON.stringify and JSON.parse
     std::string stringify(jsi::Runtime &runtime, const jsi::Value &value);
     jsi::Value parse(jsi::Runtime &runtime, std::string src);
-    
+
 
     // promise definition
     struct Promise {
@@ -56,7 +55,7 @@ namespace utils {
         jsi::Function reject_;
     };
     using Promised = std::function<void(jsi::Runtime &rt, std::shared_ptr<Promise>)>;
-    
+
     // creates and returns a promise given the funnction to be wrapped in promise
     jsi::Value makePromise(jsi::Runtime &rt, const Promised func);
 

docs/about_gdk.md

@@ -31,13 +31,12 @@ This is the struct that will hold the session informations. It is created using
 It is stored as a member of the `GdkHostObject` class and it is used to call all GDK functions that require a session.
 
 ## `GA_auth_handler`
-This is the struct that holds the reference to an authenticated function/network call. Use it wrapped with `TwoFactorCall` object and complete the call using `utils::resolve(twoFactorCall)`.
+This is the struct that holds the reference to an authenticated function/network call. Use it wrapped `utils::resolve(call)`.
 
 ```cpp
 GA_auth_handler *call; // create the auth handler
 utils::wrapCall(GA_register_user(session, hw_device_json, details_json, &call)); // make the authenticated net call
-TwoFactorCall twoFactorCall(call); // pass the call to the TwoFactorCall class
-json res = utils::resolve(twoFactorCall); // resolve the call using the utility function
+json res = utils::resolve(call); // resolve the call using the utility function
 
 ```
 

docs/about_jsi.md

@@ -27,7 +27,6 @@ react-native-gdk
 │           └── GdkPackage.java
 └── cpp
     ├── GdkHostObject.cpp
-    ├── TwoFactorCall.cpp
     ├── ThreadPool.cpp
     ├── json.cpp
     └── utils.cpp
@@ -49,7 +48,6 @@ react-native-gdk
 `cpp`
 - Contains all the non platform specific code, the core of the application that will be compiled for both platforms
 - `GdkHostObject.cpp` is the host object that will be created in the native runtime and exposed to JavaScript, its methods will be callable from JS
-- `TwoFactorCall.cpp` resolves a GDK http request that requires authentication
 - `utils.cpp` contains some utility functions to semplify the workflows
 - `ThreadPool.cpp` implementation of a thread pool used to execute async tasks,  source here https://github.com/OP-Engineering/op-sqlite/blob/main/cpp/ThreadPool.cpp
 - `json.cpp` contains an implementation of JSON objects in cpp, source here https://github.com/nlohmann/json
@@ -136,8 +134,7 @@ return jsi::Function::createFromHostFunction(runtime, // create function using r
                 try {
                     GA_auth_handler *call;
                     utils::wrapCall(GA_get_receive_address(session, details, &call));
-                    TwoFactorCall twoFactorCall(call);
-                    json res = utils::resolve(twoFactorCall);
+                    json res = utils::resolve(call);
                     // the long running task finishes and we need to resolve or reject the promise
                     // lock the weak pointer to the invoker to gain control of the runtime
                     std::shared_ptr<react::CallInvoker> c = invoker.lock();

example/src/App.tsx

@@ -55,7 +55,7 @@ const App: React.FunctionComponent = () => {
         }} />
         <Button title="register" onPress={async() => {
           try {
-            await gdk.register({}, { mnemonic, password: "" })
+            console.log(await gdk.register({}, { mnemonic, password: "" }))
           } catch (error) {
             console.log("ERROR", error)
           }