added tests for cipher functions; fixed ciphers

__tests__/ciphers.test.ts

@@ -0,0 +1,27 @@
+import {decryptString, encryptString} from "../src/utils"
+import getEncryptionPassword from "../src/utils/get-encryption-password"
+
+describe("ciphers", () => {
+	const email = "test@kleckrelay.example"
+	const password = "password"
+	const salt = "salt"
+
+	it("encryption work", async () => {
+		const secret = await getEncryptionPassword(email, password, salt)
+
+		const encrypted = encryptString("test", secret)
+
+		expect(typeof encrypted).toBe("string")
+	})
+
+	it("encryption and decryption work", async () => {
+		const secret = await getEncryptionPassword(email, password, salt)
+
+		const message = "test"
+		const encrypted = encryptString(message, secret)
+
+		const decrypted = decryptString(encrypted, secret)
+
+		expect(decrypted).toBe(message)
+	})
+})

__tests__/get-encryption-password.test.ts

@@ -8,6 +8,6 @@ describe("getEncryptionPassword", () => {
 	it("returns a string", async () => {
 		const result = await getEncryptionPassword("test@kleckrelay.example", "password", "salt")
 
-		expect(typeof result).toBe("string")
+		expect(typeof result).toBe("object")
 	})
 })

src/utils/decrypt-string.ts

@@ -1,10 +1,7 @@
-import Crypto from "crypto-js"
+import {AES, enc} from "crypto-js"
 
-export default function decryptString(
+export default function decryptString(ciphertext: string, secret: CryptoJS.lib.WordArray): string {
-	ciphertext: string,
+	const bytes = AES.decrypt(ciphertext, secret.toString())
-	password: string,
-): string {
-	const bytes = Crypto.AES.decrypt(ciphertext, password)
 
-	return bytes.toString(Crypto.enc.Utf8)
+	return bytes.toString(enc.Utf8)
 }

src/utils/encrypt-string.ts

@@ -1,5 +1,5 @@
-import Crypto from "crypto-js"
+import {AES} from "crypto-js"
 
-export default function encryptString(value: string, key: CryptoKey): string {
+export default function encryptString(value: string, secret: CryptoJS.lib.WordArray): string {
-	return Crypto.AES.encrypt(value).toString()
+	return AES.encrypt(value, secret.toString()).toString()
 }

src/utils/get-encryption-password.ts

@@ -12,5 +12,6 @@ export default async function getEncryptionPassword(
 
 	return CryptoJS.PBKDF2(cryptoPassword, cryptoSalt, {
 		keySize: 512 / 32,
+		iterations: process.env.NODE_ENV === "production" ? 100_394 : 1,
 	})
 }