Merge pull request #48 from hypersign-protocol/v5.0.0

V5.0.0
hypersign-protocol · Jun 8, 2023 · 364ee13 · 364ee13
2 parents fa589b0 + 47fb5ac
commit 364ee13
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 55 deletions.
diff --git a/src/popup/router/pages/Account.vue b/src/popup/router/pages/Account.vue
@@ -464,10 +464,11 @@ export default {
           if (intersectionSchemasIds.length <= 0) {
             throw new Error('Credential not found for schemaIds ' + schemaId.join(','))
           }
-
-          if (intersectionSchemasIds.length !== schemaIds.length) {
+          
+          if (intersectionSchemasIds.length < schemaIds.length) {
             const rest = schemaIds.filter(x => intersectionSchemasIds.indexOf(x) < 0)
-            throw new Error('Credential not found for schemaIds ' + rest ? rest.join(',') : '')
+            const msg= rest ? rest.join(',') : ''
+            throw new Error('Credential not found for schemaIds ' + msg)
           }
 
           this.verifiableCredentials = this.hypersign.credentials.filter(x => {

diff --git a/src/popup/router/pages/DidsDetails.vue b/src/popup/router/pages/DidsDetails.vue
@@ -11,10 +11,10 @@
         </div>
       </div>
       <div>
-        <Button @click="selectDid" data-cy="selectDid" inline dark v-if="hypersign.did!==did">
+        <Button @click="selectDid" data-cy="selectDid" inline dark v-if="hypersign.did !== did">
           Confirm
         </Button>
-        <Button @click="register" data-cy="register-on-chain" v-if="status==='Unregistred'" inline>
+        <Button @click="register" data-cy="register-on-chain" v-if="status === 'Unregistred'" inline>
           Register
         </Button>
       </div>
@@ -60,11 +60,18 @@ export default {
         this.hdPathIndex = this.hypersign.dids[this.did].hdPathIndex;
         this.status = this.toUpper(this.hypersign.dids[this.did].status) === 'PRIVATE' ? 'Unregistred' : 'Registred';
         if (this.toUpper(this.hypersign.dids[this.did].status) === 'PRIVATE') {
-          await this.resolveDid()
+          try {
+            await this.resolveDid()
+
+          } catch (e) {
+            if (e.response.data.code == 3) {
+              console.log(e.response.data.message);
+            }
+          }
         }
       }
       this.loading = false;
-    } catch (error) {
+    } catch (e) {
       if (e.message) this.$store.dispatch('modals/open', { name: 'default', msg: e.message });
 
       this.loading = false;
@@ -81,15 +88,15 @@ export default {
       await hidWalletInstance.generateWallet(this.mnemonic);
       const hsSdk = new HypersignSsiSDK(hidWalletInstance.offlineSigner, HIDNODE_RPC, HIDNODE_REST, HIDNODE_NAMESPACE);
       await hsSdk.init();
-      const { didDocument, didDocumentMetadata } = await hsSdk.did.resolve({ did: did_id?did_id: this.did });
+      const { didDocument, didDocumentMetadata } = await hsSdk.did.resolve({ did: did_id ? did_id : this.did });
       if (didDocumentMetadata === null) {
         this.status = 'Unregistred'
       } else {
         this.status = 'Registred'
       }
     }
     ,
-   async selectDid() {
+    async selectDid() {
       try {
         await this.resolveDid(this.didDoc.id)
         this.$store.dispatch('setHSkeys', {
@@ -110,54 +117,54 @@ export default {
     },
     async register() {
       try {
-          await hidWalletInstance.generateWallet(this.mnemonic);
-            const balance= await hidWalletInstance.getBalance()
-            console.log(balance);
-            if(balance<49999){
-              this.$store.dispatch('modals/open', { name: 'default', msg: 'Insufficient balance. Buy HID and try again' });
-              this.loading = false;
-              return;
-            }
-          const register = await this.$store
-            .dispatch('modals/open', {
-              name: 'confirm',
-              title: this.$t('modals.registerDid.title'),
-              msg: this.$t('modals.registerDid.msg'),
-            }).catch(() => false);
-          if (register) {
-            this.$emit('closeMenu');
-            this.loading = true;            
-            const hsSdk = new HypersignSsiSDK(hidWalletInstance.offlineSigner, HIDNODE_RPC, HIDNODE_REST, HIDNODE_NAMESPACE);
-            await hsSdk.init();
-            const verificationMethodId = this.didDoc.id + '#key-1';
-            const publicKeyMultibase=this.didDoc.id.split(':').at(-1)
-            this.didDoc.verificationMethod[0].publicKeyMultibase=publicKeyMultibase
-            const tx = await hsSdk.did.register({
-              didDocument: this.didDoc, privateKeyMultibase: this.key.privateKeyMultibase,
-              verificationMethodId
-            });
-
-            this.status = 'Registred'
-            this.selectDid()
-          }
-
+        await hidWalletInstance.generateWallet(this.mnemonic);
+        const balance = await hidWalletInstance.getBalance()
+        console.log(balance);
+        if (balance < 49999) {
+          this.$store.dispatch('modals/open', { name: 'default', msg: 'Insufficient balance. Buy HID and try again' });
           this.loading = false;
+          return;
+        }
+        const register = await this.$store
+          .dispatch('modals/open', {
+            name: 'confirm',
+            title: this.$t('modals.registerDid.title'),
+            msg: this.$t('modals.registerDid.msg'),
+          }).catch(() => false);
+        if (register) {
+          this.$emit('closeMenu');
+          this.loading = true;
+          const hsSdk = new HypersignSsiSDK(hidWalletInstance.offlineSigner, HIDNODE_RPC, HIDNODE_REST, HIDNODE_NAMESPACE);
+          await hsSdk.init();
+          const verificationMethodId = this.didDoc.id + '#key-1';
+          const publicKeyMultibase = this.didDoc.id.split(':').at(-1)
+          this.didDoc.verificationMethod[0].publicKeyMultibase = publicKeyMultibase
+          const tx = await hsSdk.did.register({
+            didDocument: this.didDoc, privateKeyMultibase: this.key.privateKeyMultibase,
+            verificationMethodId
+          });
+
+          this.status = 'Registred'
+          this.selectDid()
         }
+
+        this.loading = false;
+      }
       catch (e) {
-          if (e.message) this.$store.dispatch('modals/open', { name: 'default', msg: e.message });
-          this.loading = false;
+        if (e.message) this.$store.dispatch('modals/open', { name: 'default', msg: e.message });
+        this.loading = false;
 
-        }
-      },
-      
-      toUpper(t) {
-        if (t)
-          return t.toString().toUpperCase();
-        else
-          return t;
-      },
+      }
     },
-  }
+
+    toUpper(t) {
+      if (t)
+        return t.toString().toUpperCase();
+      else
+        return t;
+    },
+  },
+}
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/popup/utils/hsConstants.js b/src/popup/utils/hsConstants.js
@@ -1,12 +1,12 @@
-export const SUPERHERO_HS_AUTH_BASE_URL = process.env.VUE_APP_HS_AUTH_BASE_URL || "https://stage.hypermine.in/authserver/";
+// export const SUPERHERO_HS_AUTH_BASE_URL = process.env.VUE_APP_HS_AUTH_BASE_URL || "https://stage.hypermine.in/authserver/";
 // export const SUPERHERO_HS_AUTH_BASE_URL = process.env.VUE_APP_HS_AUTH_BASE_URL || "http://localhost:8001/";
-// export const SUPERHERO_HS_AUTH_BASE_URL = process.env.VUE_APP_HS_AUTH_BASE_URL || "https://api.fyre.hypersign.id/auth/";
+export const SUPERHERO_HS_AUTH_BASE_URL = process.env.VUE_APP_HS_AUTH_BASE_URL || "https://api.fyre.hypersign.id/auth/";
 export const HS_VC_STATUS_CHECK_ATTEMPT=process.env.VUE_APP_HS_VC_STATUS_CHECK_ATTEMPT  || 15;
 export const HS_VC_STATUS_CHECK_INTERVAL=process.env.VUE_APP_  || 7000;
 export const SUPERHERO_HS_AUTH_CREDENTIAL_ISSUE_API = "hs/api/v2/register"; // change supero to hypersign later
 export const HS_AUTH_DID_URL = SUPERHERO_HS_AUTH_BASE_URL + "hs/api/v2/authdid"
 export const HS_VC_STATUS_PATH = SUPERHERO_HS_AUTH_BASE_URL + "hs/api/v2/vcstatus"
-export const WALLET_URL = process.env.VUE_APP_WALLET_URL || "https://wallet-stage.hypersign.id/";
+export const WALLET_URL = process.env.VUE_APP_WALLET_URL || "https://wallet-jagrat.hypersign.id/";
 // export const WALLET_URL=process.env.VUE_APP_WALLET_URL || "http://localhost:4999/chrome/popup/popup#/";
 // export const BUSINESSCARD_SCHEMA='sch:hid:testnet:zFc19V37DPHmdysvPDJJdeHQTLPWzuSVZq4Tn9GPXcEj2:1.0'
 export const BUSINESSCARD_SCHEMA='sch:hid:testnet:zDt4ZZwoA5vBV3t7tn8Y4KNKjH4fBDkwYxLfQK1nJC8BR:1.0'