From 917797c9be68804f328f0526431c5b0a18b3c429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20B=C3=BClow?= <johannes@jmbfountain.de>
Date: Wed, 4 Jan 2023 15:29:46 +0100
Subject: [PATCH] added decrypt, and file name handling

---
 src/lib/DecryptButton.svelte | 2 +-
 src/lib/EncryptButton.svelte | 7 ++-----
 src/lib/cryptlib.ts          | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/lib/DecryptButton.svelte b/src/lib/DecryptButton.svelte
index e732f8e..497642e 100644
--- a/src/lib/DecryptButton.svelte
+++ b/src/lib/DecryptButton.svelte
@@ -46,7 +46,7 @@
     readFileContent(file).then((fileContent) => {
       decrypt(atob(fileContent)).then(decryptedContent => {
         console.log("Decrypted Base64: ", decryptedContent)
-        console.log(decodeURIComponent(escape(atob((decryptedContent)))));
+        console.log(decodeURIComponent(decryptedContent));
         const decodedData = decodeURIComponent(escape(atob((decryptedContent))));
         const outputArray = new Uint8Array(decodedData.length)
         for (let i = 0; i < decodedData.length; i++) {
diff --git a/src/lib/EncryptButton.svelte b/src/lib/EncryptButton.svelte
index cc8b937..e3e454d 100644
--- a/src/lib/EncryptButton.svelte
+++ b/src/lib/EncryptButton.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount } from 'svelte';
   import { encrypt } from './cryptlib';
-  let filename: string = "";
+  let filename: string;
   
   function convertToBase64(blob: File): Promise<string> {
     return new Promise((resolve, reject) => {
@@ -34,13 +34,10 @@
     }
     filename = file.name;
     console.log("Uploaded ", filename)
-    //Encoding file using Base64
     convertToBase64(file).then((base64) => {
-      //encrypting the base64 encoded File
       encrypt(base64).then((encrypted_content => {
-      
+      console.log(encrypted_content)
       let encrypted_b64: string = btoa(unescape(encodeURIComponent(encrypted_content)));
-      console.log("Encrypted Base64: ", encrypted_b64)
       let encrypted_file: Blob = new Blob([encrypted_b64], {type: "text/plain"});
       let url = URL.createObjectURL(encrypted_file);
       let a = document.createElement("a");
diff --git a/src/lib/cryptlib.ts b/src/lib/cryptlib.ts
index a6920e1..ff229d6 100644
--- a/src/lib/cryptlib.ts
+++ b/src/lib/cryptlib.ts
@@ -84,7 +84,7 @@ update the "decryptedValue" box with the decrypted value.
 If there was an error decrypting,
 update the "decryptedValue" box with an error message.
 */
-export async function decrypt(string: string) {
+export async function decrypt(encryptedContent) {
   let keyMaterial = await getKeyMaterial();
   let key = await getKey(keyMaterial, salt);
 
@@ -95,7 +95,7 @@ export async function decrypt(string: string) {
         iv: iv
       },
       key,
-      ciphertext
+      encryptedContent
     );
 
     let dec = new TextDecoder();