Merge pull request #106 from Holo-Host/fix-launcher-hf

Fix launcher hf
Holo-Host · Aug 1, 2024 · a0cddfa · a0cddfa
2 parents ef37c61 + fd5c5aa
commit a0cddfa
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 59 deletions.
diff --git a/src/components/RegisterHapp.vue b/src/components/RegisterHapp.vue
@@ -1,40 +1,45 @@
 <template>
 
   <div v-if="shouldShowRegisterScreen" class="register-screen">
-    <img v-if="logoUrl" :src="logoUrl" class="logo" />
-    <h1 class="happ-name">{{ happName }}</h1>
-    <div class="body">
-      Please enter the email you registered with and the registration code you received in your email.
-    </div>
+    <template v-if="isLoading">
+      LOADING...
+    </template>
+    <template v-else>
+      <img v-if="logoUrl" :src="logoUrl" class="logo" />
+      <h1 class="happ-name">{{ happName }}</h1>
+      <div class="body">
+        Please enter the email you registered with and the registration code you received in your email.
+      </div>
 
-    <input type="email" id="register-email"
-      v-model="emailInput"
-      class="register-input"
-      data-testid='register-email-input'
-      placeholder="Enter Email">
+      <input type="email" id="register-email"
+        v-model="emailInput"
+        class="register-input"
+        data-testid='register-email-input'
+        placeholder="Enter Email">
 
-    <input type="text" id="register-registration-code"
-      v-model="registrationCode"
-      class="register-input"
-      data-testid='registration-code-input'
-      placeholder="Enter Registration code">
+      <input type="text" id="register-registration-code"
+        v-model="registrationCode"
+        class="register-input"
+        data-testid='registration-code-input'
+        placeholder="Enter Registration code">
 
-    <div class="buttons">
-      <button v-if="signOut" class="logout-button" @click="handleLogout">Logout</button>
-      <Button class='save-button' :color="buttonColor" :disabled="!isValid" :isBusy="isBusy" @click="handleRegister">Submit</Button>
-    </div>
+      <div class="buttons">
+        <button v-if="signOut" class="logout-button" @click="handleLogout">Logout</button>
+        <Button class='save-button' :color="buttonColor" :disabled="!isValid" :isBusy="isBusy" @click="handleRegister">Submit</Button>
+      </div>
 
-    <div class="help-text">
-      Don't have a registration code? Please <a href="https://register.holo.host/" target="_blank">register with Holo.</a>
-    </div>
+      <div class="help-text">
+        Don't have a registration code? Please <a href="https://register.holo.host/" target="_blank">register with Holo.</a>
+      </div>
+    </template>
   </div>
 
   <slot v-else />
 </template>
 
 <script>
 import Button from './Button.vue'
-import { getMembraneProof } from '../utils/registration.hs'
+import { getMembraneProof } from '../utils/registration.js'
 
 export default {
   name: 'RegisterHapp',
@@ -92,9 +97,13 @@ export default {
   computed: {
     isValid () {
       // Simple, permissive email validation
-      const emailIsValid = this.email?.length > 5 && this.email?.includes('@')
+      const emailIsValid = this.emailInput?.length > 5 && this.emailInput?.includes('@')
+
       return  emailIsValid && this.registrationCode?.length > 0
     },
+    isLoading () {
+      return !this.agentId
+    },
     shouldShowRegisterScreen () {
       return !this.isAnonymous && !this.hasMemproofs
     },
@@ -109,7 +118,7 @@ export default {
       try {
         let memproof = await getMembraneProof({
           registration_code: this.registrationCode,
-          email: this.email,
+          email: this.emailInput,
           membrane_proof_server_url: this.membraneProofServerUrl,
           membrane_proof_server_payload: this.membraneProofServerPayload,
           agent_id: this.agentId,

diff --git a/src/stores/useClientStore.js b/src/stores/useClientStore.js
@@ -28,12 +28,18 @@ const makeUseClientStore = ({ useInterfaceStore, onInit, fetchKycLevel }) => def
         // This could be more efficient by inspecting the contents of mutation
         this.isReady = state.isReady
 
-        this.hasMemproofs = state?.agentState?.hasMemproofs
-
         if (state.appInfo?.agent_pub_key) {
           this.agentKey = state.appInfo.agent_pub_key
         }
 
+        // how we know we have memproofs in holo
+        this.hasMemproofs = state?.agentState?.hasMemproofs
+
+        // how we know we have memproofs in holochain (I realize this is not pretty rn)
+        if (state.appInfo) {
+          this.hasMemproofs = state.appInfo.status !== 'awaiting_memproofs'
+        }
+
         // we override here the above here because in the holo case, agentState is in general much more up to date than appInfo
         if (state.agentState?.pubkey) {
           this.agentKey = state.agentState.pubkey

diff --git a/src/stores/useHolochainStore.js b/src/stores/useHolochainStore.js
@@ -1,5 +1,5 @@
 import { inspect } from 'util'
-import { AdminWebsocket, AppWebsocket, generateSigningKeyPair, setSigningCredentials } from '@holochain/client'
+import { AppWebsocket } from '@holochain/client'
 import { defineStore } from 'pinia'
 import { presentHcSignal, listify } from '../utils'
 import useIsLoadingStore from './useIsLoadingStore'
@@ -9,28 +9,32 @@ import { hposHolochainCall } from '../services/hpos'
 
 const HC_APP_TIMEOUT = 35_000
 
-const makeUseHolochainStore = ({ installed_app_id, app_ws_url, hc_admin_port }) => defineStore('holochain', {
+const __HC_LAUNCHER_ENV__ = "__HC_LAUNCHER_ENV__";
+const isLauncher = () => globalThis.window && __HC_LAUNCHER_ENV__ in globalThis.window;
+
+const makeUseHolochainStore = ({ app_ws_url }) => defineStore('holochain', {
   state: () => ({
     client: null,
     // These two values are subscribed to by clientStore
     appInfo: null,
     isReady: false,
-    signingCredentials: null
   }),
   getters: {
     isAnonymous: _ => false, // for compatibility with holo
-    agentEmail: _ => null, // for compatibility with holo
+    agentEmail: _ => null, // for compatibility with holo,
+    isLauncher,
   },
   actions: {
     // BEGIN useInterfaceStore methods
 
     async initialize() {
       try {
-        const holochainClient = await AppWebsocket.connect(
-          app_ws_url,
-          HC_APP_TIMEOUT,
-          signal => useSignalStore().handleSignal(presentHcSignal(signal))
-        )
+        const holochainClient = await AppWebsocket.connect({
+          url: app_ws_url,
+          defaultTimeout: HC_APP_TIMEOUT,
+        })
+
+        holochainClient.on('signal', signal => useSignalStore().handleSignal(presentHcSignal(signal)))
 
         this.client = holochainClient
 
@@ -52,9 +56,7 @@ const makeUseHolochainStore = ({ installed_app_id, app_ws_url, hc_admin_port })
 
     async loadAppInfo() {
       try {
-        const appInfo = await this.client.appInfo({
-          installed_app_id
-        })
+        const appInfo = await this.client.appInfo()
         this.appInfo = appInfo
         this.isReady = true
 
@@ -98,13 +100,6 @@ const makeUseHolochainStore = ({ installed_app_id, app_ws_url, hc_admin_port })
         throw new Error(`Couldn't find provisioned cell with role_name ${role_name}`)
       }
 
-      if( !this.signingCredentials)
-      {
-        this.setCredentials(cellId)
-      }
-
-      await this.signingCredentials
-
       let result = null
 
       const cell_id = [new Uint8Array(listify(cellId[0], (_, value) => (Number(value)))), new Uint8Array(listify(cellId[1], (_, value) => (Number(value))))]
@@ -126,19 +121,6 @@ const makeUseHolochainStore = ({ installed_app_id, app_ws_url, hc_admin_port })
 
       return result
     },
-    setCredentials(cellId) {
-      this.signingCredentials = new Promise(async (resolve, reject) => {
-        try {
-          const adminWs = await AdminWebsocket.connect(`ws:localhost:${hc_admin_port}`)
-          await adminWs.authorizeSigningCredentials(cellId)
-        } catch(e) {
-          console.log(`holochainCallZome error authorizeSigningCredentials AdminWebsocket: ws:localhost:${hc_admin_port}`, e)
-          reject()
-        }
-
-        resolve()
-      })
-    },
     async fetchAgentKycLevel(_, __) {
       const kycLevel = await hposHolochainCall({path: 'host/kyc_level', headers: {}, params: {}, method: 'get'})
       return kycLevel ? (kycLevel === kycLevel2) ? 2 : 1 : null