fix(js): several fixes for js wrapper (openwallet-foundation#111)

Signed-off-by: Timo Glastra <[email protected]>
jamshale · Mar 7, 2023 · 978842a · 978842a
1 parent fecfcf1
commit 978842a
Show file tree

Hide file tree

Showing 21 changed files with 921 additions and 575 deletions.
diff --git a/wrappers/javascript/aries-askar-nodejs/src/NodeJSAriesAskar.ts b/wrappers/javascript/aries-askar-nodejs/src/NodeJSAriesAskar.ts
diff --git a/wrappers/javascript/aries-askar-nodejs/tests/store.test.ts b/wrappers/javascript/aries-askar-nodejs/tests/store.test.ts
@@ -172,7 +172,7 @@ describe('Store and Session', () => {
       metadata: 'updated metadata',
     })
 
-    expect(key.jwkThumbprint === fetchedKey1.key.jwkThumbprint).toBeTruthy()
+    expect(key.jwkThumbprint === fetchedKey1?.key.jwkThumbprint).toBeTruthy()
 
     const found = await session.fetchAllKeys({
       algorithm: KeyAlgs.Ed25519,
@@ -184,13 +184,13 @@ describe('Store and Session', () => {
 
     await session.removeKey({ name: keyName })
 
-    await expect(session.fetchKey({ name: keyName })).rejects.toThrowError(AriesAskarError)
+    await expect(session.fetchKey({ name: keyName })).resolves.toBeNull()
 
     await session.close()
 
     // Clear objects
-    fetchedKey1.key.handle.free()
-    fetchedKey2.key.handle.free()
+    fetchedKey1?.key.handle.free()
+    fetchedKey2?.key.handle.free()
     key.handle.free()
     found.forEach((entry) => entry.key.handle.free())
   })

diff --git a/wrappers/javascript/aries-askar-react-native/cpp/HostObject.cpp b/wrappers/javascript/aries-askar-react-native/cpp/HostObject.cpp
@@ -2,13 +2,17 @@
 #include <algorithm>
 #include <vector>
 
-
-AriesAskarTurboModuleHostObject::AriesAskarTurboModuleHostObject(jsi::Runtime &rt) { return; }
+AriesAskarTurboModuleHostObject::AriesAskarTurboModuleHostObject(
+    jsi::Runtime &rt) {
+  return;
+}
 FunctionMap AriesAskarTurboModuleHostObject::functionMapping(jsi::Runtime &rt) {
   FunctionMap fMap;
 
   fMap.insert(std::make_tuple("version", &ariesAskar::version));
   fMap.insert(std::make_tuple("getCurrentError", &ariesAskar::getCurrentError));
+  fMap.insert(
+      std::make_tuple("setDefaultLogger", &ariesAskar::setDefaultLogger));
 
   fMap.insert(std::make_tuple("storeOpen", &ariesAskar::storeOpen));
   fMap.insert(
@@ -130,8 +134,8 @@ FunctionMap AriesAskarTurboModuleHostObject::functionMapping(jsi::Runtime &rt) {
   return fMap;
 }
 
-jsi::Function AriesAskarTurboModuleHostObject::call(jsi::Runtime &rt, const char *name,
-                                          Cb cb) {
+jsi::Function AriesAskarTurboModuleHostObject::call(jsi::Runtime &rt,
+                                                    const char *name, Cb cb) {
   return jsi::Function::createFromHostFunction(
       rt, jsi::PropNameID::forAscii(rt, name), 1,
       [this, cb](jsi::Runtime &rt, const jsi::Value &thisValue,
@@ -153,8 +157,9 @@ AriesAskarTurboModuleHostObject::getPropertyNames(jsi::Runtime &rt) {
   return result;
 }
 
-jsi::Value AriesAskarTurboModuleHostObject::get(jsi::Runtime &rt,
-                                      const jsi::PropNameID &propNameId) {
+jsi::Value
+AriesAskarTurboModuleHostObject::get(jsi::Runtime &rt,
+                                     const jsi::PropNameID &propNameId) {
   auto propName = propNameId.utf8(rt);
   auto fMap = AriesAskarTurboModuleHostObject::functionMapping(rt);
   for (FunctionMap::iterator it = fMap.begin(); it != fMap.end(); ++it) {