diff --git a/crates/lox-wasm/index.js b/crates/lox-wasm/index.js index ab3045f..89e83ef 100644 --- a/crates/lox-wasm/index.js +++ b/crates/lox-wasm/index.js @@ -129,7 +129,7 @@ lox_cred = await init().then(() => { let prepared_invitation = prepare_invite(lox_cred); // Trusted Invitation Request let requested_invitation = redeem_invite(prepared_invitation, pubkeys); -// Issue an Invitation cred +// Redeem an Invitation cred let lox_cred_from_invite = await init().then(() => { set_panic_hook(); let cred = requested_cred("/redeem", requested_invitation).then((response)=> { @@ -158,7 +158,7 @@ let requested_blockage_migration = blockage_migration(lox_cred, check_migration_ set_panic_hook(); let cred = requested_cred("/blockagemigration", requested_blockage_migration).then((response)=> { console.log("Got Lox Credential for new bucket: " + response); - return handle_blockage_migration(requested_check_blockage, response); + return handle_blockage_migration(requested_blockage_migration, response, pubkeys); }); return cred; }); diff --git a/crates/lox-wasm/src/lib.rs b/crates/lox-wasm/src/lib.rs index e7547d8..74bd687 100644 --- a/crates/lox-wasm/src/lib.rs +++ b/crates/lox-wasm/src/lib.rs @@ -59,6 +59,13 @@ struct CheckBlockageReqState { state: check_blockage::State, } +#[derive(Deserialize, Serialize)] +struct BlockageMigReqState { + request: blockage_migration::Request, + state: blockage_migration::State, +} + + #[derive(Debug, Deserialize, Serialize)] struct PubKeys { @@ -530,7 +537,7 @@ pub fn check_blockage(lox_cred: String, lox_pub: String) -> Result tm_result, + match blockage_migration::request(&lox_cred.lox_credential, &mig_cred, &pubkeys.lox_pub, &pubkeys.migration_pub) { + Ok(bm_result) => bm_result, Err(e) => { log(&format!("Error: {:?}", e.to_string())); return Err(JsValue::from(e.to_string())); } }; - let req_state = MigReqState { + let req_state = BlockageMigReqState { request: bm_result.0, state: bm_result.1, }; unsafe { log(&format!( - "Formatted Trust Migration request: {}", + "Formatted Blockage Migration request: {}", serde_json::to_string(&req_state).unwrap() )); } @@ -596,11 +603,11 @@ pub fn handle_blockage_migration( lox_pub: String ) -> Result { let pubkeys: PubKeys = serde_json::from_str(&lox_pub).unwrap(); - let req_state: MigReqState = serde_json::from_str(&blockage_migration_request).unwrap(); + let req_state: BlockageMigReqState = serde_json::from_str(&blockage_migration_request).unwrap(); let deserialized_state = req_state.state; let deserialized_response = serde_json::from_str(&blockage_migration_response).unwrap(); let lox_cred = - match migration::handle_response(deserialized_state, deserialized_response, &pubkeys.lox_pub) { + match blockage_migration::handle_response(deserialized_state, deserialized_response, &pubkeys.lox_pub) { Ok(lox_cred) => LoxCredential { lox_credential: lox_cred, bridgeline: None, @@ -613,7 +620,7 @@ pub fn handle_blockage_migration( }; unsafe { log(&format!( - "Got new Level 1 Credential: {}", + "Got new Lox Credential after Migration: {}", serde_json::to_string(&lox_cred).unwrap() )); }