meta vault web:

 - progress in the registration step
 - send http requests using meta-secret-core rust lib
 - migrate to openapi objects generation

Signed-off-by: metabynull <[email protected]>

Author: cypherkitty

.gitignore

@@ -13,3 +13,4 @@ web-cli/wasm/target
 web-cli/ui/src/model
 web-cli/ui/node_modules
 meta-secret-core/schema/openapitools.json
+/meta-secret-core/schema/openapitools.json

web-cli/ui/src/views/VaultView.vue

@@ -1,7 +1,13 @@
 <script lang="ts">
 import {defineComponent} from 'vue'
-import init, {generate_security_box, get_user_sig, register} from "meta-secret-web-cli";
-import type {DeviceInfo, UserSecurityBox, UserSignature} from "@/model/models";
+import init, {generate_security_box, get_user_sig, get_vault, register} from "meta-secret-web-cli";
+import {
+  type DeviceInfo,
+  RegistrationStatus,
+  type UserSecurityBox,
+  type UserSignature,
+  VaultInfoStatus
+} from "@/model/models";
 
 interface User {
   securityBox?: UserSecurityBox,
@@ -26,10 +32,15 @@ export default defineComponent({
     return {
       user: defaultUser,
       userId: '',
-      passwordStorage: defaultPasswordStorage
+      joinComponent: false,
+      passwordStorage: defaultPasswordStorage,
     }
   },
   mounted() {
+    if (localStorage.userId) {
+      this.userId = localStorage.userId;
+    }
+
     if (localStorage.user) {
       this.user = localStorage.user;
     }
@@ -39,10 +50,13 @@ export default defineComponent({
     }
   },
 
+  /**
+   * https://v2.vuejs.org/v2/cookbook/client-side-storage.html
+   */
   watch: {
     user(newUser) {
-      localStorage.user = newUser;
-    }
+      localStorage.user = JSON.stringify(newUser);
+    },
   },
 
   methods: {
@@ -53,21 +67,59 @@ export default defineComponent({
           deviceName: "d1"
         }
 
-        let securityBox = generate_security_box("test_vault_web");
+        let securityBox = generate_security_box(this.userId);
         let userSig = get_user_sig(securityBox, device);
+        console.log("generated user sig: ", userSig);
 
         this.user = {
           securityBox: securityBox,
           userSig: userSig
         };
+        this.initUser();
 
-        let registrationStatus = await register(userSig);
-        console.log("Registration status: ", registrationStatus);
+        let vault = await get_vault(userSig);
+        console.log("vault: ", JSON.stringify(vault));
 
+        if (vault.data.vaultInfo === VaultInfoStatus.NotFound) {
+          await this.userRegistration();
+        }
 
+        // Unknown status means, user is not a member of a vault
+        if (vault.data.vaultInfo === VaultInfoStatus.Unknown) {
+          //join to the vault or choose another vault name
+          this.joinComponent = true;
+        }
       })
     },
 
+    async join() {
+      init().then(async () => {
+        //send join request
+        console.log("js user sig: ", JSON.parse(localStorage.user).userSig);
+        return await this.userRegistration();
+      })
+    },
+
+    async userRegistration() {
+      let userSig = JSON.parse(localStorage.user).userSig;
+      alert("User registration with: " + userSig);
+
+      let registrationStatus = await register(userSig);
+      console.log("registration status: ", registrationStatus.data);
+      switch (registrationStatus.data) {
+        case RegistrationStatus.Registered:
+          // register button gets unavailable, userId kept in local storage
+          alert("Your vault has been registered");
+          return;
+        case RegistrationStatus.AlreadyExists:
+          alert("Join request has been sent, please wait for approval");
+          return;
+        default:
+          alert("Unknown error!!!!! Unknown registration status! Invalid response from server");
+          return;
+      }
+    },
+
     addPassword() {
       console.log("Add password into a distributed storage");
 
@@ -84,8 +136,23 @@ export default defineComponent({
       this.passwordStorage.shares.push(share1);
     },
 
-    alert() {
-      alert('yay');
+    cleanUpUser() {
+      localStorage.setItem('userId', '');
+    },
+
+    isNewUser() {
+      if (localStorage.userId) {
+        if (localStorage.userId !== '') {
+          return false;
+        }
+      }
+
+      return true;
+    },
+
+    initUser() {
+      localStorage.userId = this.userId;
+      localStorage.user = JSON.stringify(this.user);
     }
   }
 })
@@ -104,28 +171,52 @@ export default defineComponent({
 
   <div class="py-4"></div>
 
-  <div class="container flex items-center justify-center max-w-md border-b border-t py-2 px-4">
-    <label>@</label>
-    <input
-        class="appearance-none bg-transparent border-none w-full text-gray-700 mr-3 py-1 px-2 leading-tight focus:outline-none"
-        type="text"
-        placeholder="user_id"
-        aria-label="Full name"
-        v-model="userId"
-    >
-    <button
-        class="flex-shrink-0 bg-teal-500 hover:bg-teal-700 border-teal-500 hover:border-teal-700 text-sm border-4 text-white py-1 px-2 rounded"
-        type="button"
-        @click="generateUser"
-    >
-      Register
-    </button>
+  <div>
+    <div class="container flex items-center max-w-md py-2">
+      <label>User:</label>
+    </div>
+
+    <div class="container flex items-center justify-center max-w-md border-b border-t border-l border-r py-2 px-4">
+      <label>@</label>
+      <input
+          class="appearance-none bg-transparent border-none w-full text-gray-700 mr-3 py-1 px-2 leading-tight focus:outline-none"
+          type="text"
+          placeholder="user_id"
+          aria-label="Full name"
+          v-model="userId"
+          v-bind:disabled="!isNewUser"
+      >
+      <button
+          class="flex-shrink-0 bg-teal-500 hover:bg-teal-700 border-teal-500 hover:border-teal-700 text-sm border-4 text-white py-1 px-2 rounded"
+          type="button"
+          @click="generateUser"
+          v-if="isNewUser"
+      >
+        Register
+      </button>
+    </div>
+  </div>
+
+  <div v-if="joinComponent">
+    <div class="container flex items-center max-w-md py-2 px-4">
+      <label
+          class="appearance-none bg-transparent border-none w-full text-gray-700 mr-3 py-1 leading-tight focus:outline-none">
+        Vault already exists, would you like to join?
+      </label>
+      <button
+          class="flex-shrink-0 bg-teal-500 hover:bg-teal-700 border-teal-500 hover:border-teal-700 text-sm border-4 text-white py-1 px-4 rounded"
+          type="button"
+          @click="join"
+      >
+        Join
+      </button>
+    </div>
   </div>
 
-  <div class="py-4"/>
+  <div class="py-8"/>
 
   <div class="container flex flex-col items-center justify-center max-w-md py-2 px-4">
-    <div class="">
+    <div class="flex">
       <p class="text-xl py-2">Password</p>
     </div>
 
@@ -141,8 +232,6 @@ export default defineComponent({
       <div class="px-4">id: 12345678</div>
       <div class="px-4">share: my share 1</div>
     </div>
-
-
   </div>
 
 

web-cli/wasm/Cargo.toml

@@ -13,8 +13,8 @@ default = ["console_error_panic_hook"]
 [dependencies]
 wasm-bindgen = { version = "0.2.83", features = ["serde-serialize"] }
 
-meta-secret-core = { version = "1.10.0" }
-#meta-secret-core = { path = "../../../meta-secret-core/core" }
+#meta-secret-core = { version = "1.10.0" }
+meta-secret-core = { path = "../../meta-secret-core/core" }
 
 serde = { version = "1.0.151", features = ["derive"] }
 serde_json = "1.0.90"

web-cli/wasm/src/lib.rs

@@ -30,7 +30,7 @@ extern "C" {
 
 #[wasm_bindgen]
 pub fn register(user_sig: JsValue) -> Promise {
-    log("wasm: register a new user!");
+    log(format!("wasm: register a new user! with: {:?}", user_sig).as_str());
 
     let user_sig = serde_wasm_bindgen::from_value(user_sig).unwrap();
     let task = server_registration(user_sig);
@@ -43,6 +43,23 @@ async fn server_registration(user_sig: UserSignature) -> Result<JsValue, JsValue
     Ok(serde_wasm_bindgen::to_value(&register_async_task).unwrap())
 }
 
+#[wasm_bindgen]
+pub fn get_vault(user_sig: JsValue) -> Promise {
+    log("wasm: get vault!");
+
+    let user_sig = serde_wasm_bindgen::from_value(user_sig).unwrap();
+    log("wasm: user sig!");
+    let vault_future = get_vault_from_server(user_sig);
+    log("wasm: request!");
+    future_to_promise(vault_future)
+}
+
+async fn get_vault_from_server(user_sig: UserSignature) -> Result<JsValue, JsValue> {
+    log("wasm: get vault request");
+    let get_vault_task = server_api::get_vault(&user_sig).await.unwrap();
+    Ok(serde_wasm_bindgen::to_value(&get_vault_task).unwrap())
+}
+
 #[wasm_bindgen]
 pub fn generate_security_box(vault_name: &str) -> JsValue {
     log("generate new user! wasm");