chore: move decryptLnurlPayAES to utils (#3576)

lnbits/static/js/components.js

@@ -111,11 +111,11 @@ window.app.component('lnbits-lnurlpay-success-action', {
   },
   mounted() {
     if (this.success_action.tag !== 'aes') return null
-    decryptLnurlPayAES(this.success_action, this.payment.preimage).then(
-      value => {
+    this.utils
+      .decryptLnurlPayAES(this.success_action, this.payment.preimage)
+      .then(value => {
         this.decryptedValue = value
-      }
-    )
+      })
   }
 })
 

lnbits/static/js/lnurl.js

@@ -1,23 +0,0 @@
-window.decryptLnurlPayAES = (success_action, preimage) => {
-  let keyb = new Uint8Array(
-    preimage.match(/[\da-f]{2}/gi).map(h => parseInt(h, 16))
-  )
-
-  return crypto.subtle
-    .importKey('raw', keyb, {name: 'AES-CBC', length: 256}, false, ['decrypt'])
-    .then(key => {
-      let ivb = Uint8Array.from(window.atob(success_action.iv), c =>
-        c.charCodeAt(0)
-      )
-      let ciphertextb = Uint8Array.from(
-        window.atob(success_action.ciphertext),
-        c => c.charCodeAt(0)
-      )
-
-      return crypto.subtle.decrypt({name: 'AES-CBC', iv: ivb}, key, ciphertextb)
-    })
-    .then(valueb => {
-      let decoder = new TextDecoder('utf-8')
-      return decoder.decode(valueb)
-    })
-}

lnbits/static/js/pages/wallet.js

@@ -456,7 +456,7 @@ window.PageWallet = {
                 })
                 break
               case 'aes':
-                decryptLnurlPayAES(action, response.data.preimage)
+                this.utils.decryptLnurlPayAES(action, response.data.preimage)
                 Quasar.Notify.create({
                   message: value,
                   caption: extra.success_action.description,

lnbits/static/js/utils.js

@@ -171,5 +171,34 @@ window._lnbitsUtils = {
     converter.setFlavor('github')
     converter.setOption('simpleLineBreaks', true)
     return converter.makeHtml(text)
+  },
+  async decryptLnurlPayAES(success_action, preimage) {
+    let keyb = new Uint8Array(
+      preimage.match(/[\da-f]{2}/gi).map(h => parseInt(h, 16))
+    )
+
+    return crypto.subtle
+      .importKey('raw', keyb, {name: 'AES-CBC', length: 256}, false, [
+        'decrypt'
+      ])
+      .then(key => {
+        let ivb = Uint8Array.from(window.atob(success_action.iv), c =>
+          c.charCodeAt(0)
+        )
+        let ciphertextb = Uint8Array.from(
+          window.atob(success_action.ciphertext),
+          c => c.charCodeAt(0)
+        )
+
+        return crypto.subtle.decrypt(
+          {name: 'AES-CBC', iv: ivb},
+          key,
+          ciphertextb
+        )
+      })
+      .then(valueb => {
+        let decoder = new TextDecoder('utf-8')
+        return decoder.decode(valueb)
+      })
   }
 }

lnbits/static/vendor.json

@@ -39,8 +39,7 @@
     "js/base.js",
     "js/windowMixin.js",
     "js/event-reactions.js",
-    "js/bolt11-decoder.js",
-    "js/lnurl.js"
+    "js/bolt11-decoder.js"
   ],
   "components": [
     "js/pages/home.js",

package.json

@@ -91,8 +91,7 @@
       "js/base.js",
       "js/windowMixin.js",
       "js/event-reactions.js",
-      "js/bolt11-decoder.js",
-      "js/lnurl.js"
+      "js/bolt11-decoder.js"
     ],
     "components": [
       "js/pages/home.js",