trust / app.id fix

decal.html

@@ -435,8 +435,8 @@ <h1 id="header">Unknown app</h1>
           await Pear.Window.self.close()
         })
       }
-      setKey (key) {
-        this.key.innerText = 'pear://' + key
+      setLink (link) {
+        this.key.innerText = link
       }
     })
   </script>
@@ -644,14 +644,14 @@ <h1 id="header">Unknown app</h1>
             }
 
             if (type === 'permissionRequired') {
-              const decalDialog = document.createElement('decal-dialog')
+              const trustConfirm = document.createElement('decal-dialog')
               const ctrl = document.createElement('pear-ctrl')
               document.documentElement.classList.add('dialog')
               document.body.appendChild(ctrl)
-              document.body.appendChild(decalDialog)
-              decalDialog.setKey(report.key)
-              decalDialog.trust = async () => {
-                await this.ipc.trust({ id: this.gid, key: report.key })
+              document.body.appendChild(trustConfirm)
+              trustConfirm.setLink(report.key.link)
+              trustConfirm.trust = async () => {
+                await this.ipc.trust({ z32: report.key.z32 })
                 await this.ipc.restart({ id: this.gid })
               }
 

electron-main.js

@@ -25,17 +25,20 @@ async function electronMain (cmd) {
     flags: cmd.flags
   })
   Context.storage(ctx)
+
   if (ctx.error) {
     console.error(ctx.error)
     electron.app.quit(1)
     return
   }
+
   const gui = new GUI({
     socketPath: SOCKET_PATH,
     connectTimeout: CONNECT_TIMEOUT,
     tryboot,
     ctx
   })
+
   await gui.ready()
 
   // note: would be unhandled rejection on failure, but should never fail:

gui/gui.js

@@ -1024,9 +1024,10 @@ class Window extends GuiCtrl {
       }
     })
 
+    if (this.id === null) this.id = idify(this)
+    this.constructor[kMap].set(this.id, this)
+
     if (decal === false) {
-      if (this.id === null) this.id = idify(this)
-      this.constructor[kMap].set(this.id, this)
       await this.win.loadURL(this.entry)
       this.opening = false
       this.closed = false
@@ -1070,10 +1071,8 @@ class Window extends GuiCtrl {
     viewInitialized()
     this.view.webContents.once('did-finish-load', () => { viewLoaded() })
 
-    if (this.id === null) {
-      this.id = idify(this)
-      this.constructor[kMap].set(this.id, this)
-    }
+    this.id = idify(this)
+    this.constructor[kMap].set(this.id, this)
 
     await decalLoading
     if (this.closing) return false
@@ -1673,7 +1672,7 @@ class PearGUI extends ReadyResource {
 
   reports () { return this.ipc.reports() }
 
-  trust ({ id, key }) { return this.ipc.trust({ z32: key }) }
+  trust ({ z32 }) { return this.ipc.trust({ z32 }) }
 
   // DEPRECATED - assess to remove from Sep 2024
   preferences () { return this.ipc.preferences() }

gui/preload.js

@@ -11,6 +11,7 @@ module.exports = class PearGUI extends ReadyResource {
   constructor ({ API, ctx }) {
     super()
     const id = this.id = electron.ipcRenderer.sendSync('id')
+
     this.ipc = new IPC()
     electron.ipcRenderer.on('ipc', (e, data) => {
       this.ipc.stream.push(Buffer.from(data))