Integrate new APIs in node-wrapper

Signed-off-by: Patrik Stas <[email protected]>

aries_vcx/src/handlers/issuance/issuer.rs

@@ -38,6 +38,7 @@ fn _build_credential_preview(credential_json: &str) -> VcxResult<CredentialPrevi
         "Issuer::_build_credential_preview >>> credential_json: {:?}",
         secret!(credential_json)
     );
+
     let cred_values: serde_json::Value = serde_json::from_str(credential_json).map_err(|err| {
         AriesVcxError::from_msg(
             AriesVcxErrorKind::InvalidJson,
@@ -48,6 +49,7 @@ fn _build_credential_preview(credential_json: &str) -> VcxResult<CredentialPrevi
         )
     })?;
 
+    // todo: should throw err if cred_values is not serde_json::Value::Array or serde_json::Value::Object
     let mut credential_preview = CredentialPreviewData::new();
     match cred_values {
         serde_json::Value::Array(cred_values) => {

wrappers/node-napi-rs/api-node/src/api/credential.rs

@@ -43,7 +43,7 @@ fn credential_deserialize(data: String) -> napi::Result<u32> {
 
 // todo: flip order of arguments
 #[napi]
-async fn v2_credential_update_state(
+async fn v2_credential_update_state_with_message(
     handle_credential: u32,
     message: Option<String>,
     connection_handle: u32,
@@ -53,6 +53,16 @@ async fn v2_credential_update_state(
         .map_err(to_napi_err)
 }
 
+#[napi]
+async fn v2_credential_update_state(
+    handle_credential: u32,
+    connection_handle: u32,
+) -> napi::Result<u32> {
+    credential::update_state(handle_credential, None, connection_handle)
+        .await
+        .map_err(to_napi_err)
+}
+
 #[napi]
 fn credential_get_state(handle: u32) -> napi::Result<u32> {
     credential::get_state(handle).map_err(to_napi_err)

wrappers/node-napi-rs/api-node/src/error.rs

@@ -3,6 +3,7 @@ use vcx::errors::error::LibvcxError;
 use vcx::serde_json::json;
 
 pub fn to_napi_err(err: LibvcxError) -> napi::Error {
+    warn!("to_napi_err: {:?}", err);
     let reason = json!({
         "vcxErrKind": err.kind().to_string(),
         "vcxErrCode": u32::from(err.kind()),

wrappers/node-napi-rs/index.d.ts

@@ -7,13 +7,15 @@ export function updateWebhookUrl(webhookUrl: string): Promise<void>
 export function createAgencyClientForMainWallet(config: string): void
 export function provisionCloudAgent(config: string): Promise<string>
 export function messagesUpdateStatus(statusCode: string, uidsByConns: string): Promise<void>
+export function generatePublicInvitation(publicDid: string, label: string): string
 export function credentialCreateWithOffer(sourceId: string, offer: string): number
 export function credentialRelease(handle: number): void
 export function credentialSendRequest(handle: number, handleConnection: number): Promise<void>
 export function credentialDeclineOffer(handle: number, handleConnection: number, comment?: string | undefined | null): Promise<void>
 export function credentialSerialize(handle: number): string
 export function credentialDeserialize(data: string): number
-export function v2CredentialUpdateState(handleCredential: number, message: string | undefined | null, connectionHandle: number): Promise<number>
+export function v2CredentialUpdateStateWithMessage(handleCredential: number, message: string | undefined | null, connectionHandle: number): Promise<number>
+export function v2CredentialUpdateState(handleCredential: number, connectionHandle: number): Promise<number>
 export function credentialGetState(handle: number): number
 export function credentialGetOffers(handleConnection: number): Promise<string>
 export function credentialGetAttributes(handle: number): string
@@ -168,4 +170,3 @@ export function getVerkeyFromWallet(did: string): Promise<string>
 export function rotateVerkey(did: string): Promise<void>
 export function rotateVerkeyStart(did: string): Promise<string>
 export function rotateVerkeyApply(did: string, tempVk: string): Promise<void>
-export function generatePublicInvitation(publicDid: string, label: string): string

wrappers/node/package.json

@@ -72,7 +72,7 @@
     "lint-fix": "npm run lint -- --fix",
     "jslint:fix": "standard --fix",
     "test": "npm run test:connection && npm run test:credentialDef && npm run test:credential && npm run test:disclosedProof && npm run test:issuerCredential && npm run test:proof && npm run test:oob && npm run test:schema && npm run test:utils && npm run test:wallet && npm run test:ffi",
-    "test:connection": "      TS_NODE_PROJECT=./test/tsconfig.json NODE_ENV=test RUST_BACKTRACE=full ./node_modules/.bin/mocha --timeout 60000 --v8-expose-gc --v8-use-strict --exit --recursive --require ts-node/register ./test/suite1/ariesvcx-connection.test.ts",
+    "test:connection": "      TS_NODE_PROJECT=./test/tsconfig.json NODE_ENV=test RUST_BACKTRACE=full ./node_modules/.bin/mocha --timeout 60000 --v8-expose-gc --v8-use-strict --exit --recursive --require ts-node/register test/suite1/ariesvcx-mediated-connection.test.ts",
     "test:credentialDef": "   TS_NODE_PROJECT=./test/tsconfig.json NODE_ENV=test RUST_BACKTRACE=full ./node_modules/.bin/mocha --timeout 60000 --v8-expose-gc --v8-use-strict --exit --recursive --require ts-node/register ./test/suite1/ariesvcx-credential-def.test.ts",
     "test:credential": "      TS_NODE_PROJECT=./test/tsconfig.json NODE_ENV=test RUST_BACKTRACE=full ./node_modules/.bin/mocha --timeout 60000 --v8-expose-gc --v8-use-strict --exit --recursive --require ts-node/register ./test/suite1/ariesvcx-credential.test.ts",
     "test:disclosedProof": "  TS_NODE_PROJECT=./test/tsconfig.json NODE_ENV=test RUST_BACKTRACE=full ./node_modules/.bin/mocha --timeout 60000 --v8-expose-gc --v8-use-strict --exit --recursive --require ts-node/register ./test/suite1/ariesvcx-disclosed-proof.test.ts",