Add the ability to set tags in create/forkDrive when prompt=false (#1864

)
beakerbrowser · Dec 7, 2020 · 945b871 · 945b871
1 parent 7537c71
commit 945b871
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/app/bg/web-apis/bg/hyperdrive.js b/app/bg/web-apis/bg/hyperdrive.js
@@ -55,8 +55,15 @@ export default {
       if (!res || !res.url) throw new UserDeniedError()
       newDriveUrl = res.url
     } else {
+      if (tags && typeof tags === 'string') {
+        tags = tags.split(' ')
+      } else if (tags && !Array.isArray(tags)) {
+        tags = undefined
+      }
+      tags = tags.filter(v => typeof v === 'string')
+
       // no modal, ask for permission
-      await assertCreateDrivePermission(this.sender)
+      await assertCreateDrivePermission(this.sender, {title, tags})
 
       let importFolder = undefined
       if (fromGitUrl) {
@@ -122,8 +129,15 @@ export default {
       if (!res || !res.url) throw new UserDeniedError()
       newDriveUrl = res.url
     } else {
+      if (tags && typeof tags === 'string') {
+        tags = tags.split(' ')
+      } else if (tags && !Array.isArray(tags)) {
+        tags = undefined
+      }
+      tags = tags.filter(v => typeof v === 'string')
+
       // no modal, ask for permission
-      await assertCreateDrivePermission(this.sender)
+      await assertCreateDrivePermission(this.sender, {title, tags})
 
       let key = await lookupUrlDriveKey(url)
 
@@ -756,14 +770,14 @@ function assertBeakerOnly (sender) {
   }
 }
 
-async function assertCreateDrivePermission (sender) {
+async function assertCreateDrivePermission (sender, opts) {
   // beaker: always allowed
   if (wcTrust.isWcTrusted(sender)) {
     return true
   }
 
   // ask the user
-  let allowed = await permissions.requestPermission('createDrive', sender)
+  let allowed = await permissions.requestPermission('createDrive', sender, opts)
   if (!allowed) {
     throw new UserDeniedError()
   }

diff --git a/app/lib/permissions.js b/app/lib/permissions.js
@@ -243,6 +243,7 @@ export function renderPermDesc ({html, bg, url, permId, permParam, permOpts}) {
       return html`<span>Download ${permOpts.filename}</span>`
 
     case 'createDrive':
+      if (permOpts.tags) return `Create a new hyperdrive tagged "${permOpts.tags.join(', ')}"`
       if (permOpts.title) return `Create a new hyperdrive, "${permOpts.title}"`
       return 'Create a new hyperdrive'