From 9d89ac0b1ed901697e4fc1070882644873511ad4 Mon Sep 17 00:00:00 2001
From: Sambo Chea <sombochea@cubetiqs.com>
Date: Mon, 14 Feb 2022 18:41:48 +0700
Subject: [PATCH] Task: Fixed aes and tests

---
 dummy/{ase-256-16.key => aes-256-16.key} |  0
 dummy/{ase-256-32.key => aes-256-32.key} |  0
 dummy/{ase-256.json => aes-256.json}     |  0
 dummy/aes-256.keys.json                  |  4 ++++
 dummy/ase-256.keys.json                  |  4 ----
 test/crypto.test.ts                      | 20 ++++++++++++++++++--
 test/validate-ase.test.ts                |  8 ++++----
 7 files changed, 26 insertions(+), 10 deletions(-)
 rename dummy/{ase-256-16.key => aes-256-16.key} (100%)
 rename dummy/{ase-256-32.key => aes-256-32.key} (100%)
 rename dummy/{ase-256.json => aes-256.json} (100%)
 create mode 100644 dummy/aes-256.keys.json
 delete mode 100644 dummy/ase-256.keys.json

diff --git a/dummy/ase-256-16.key b/dummy/aes-256-16.key
similarity index 100%
rename from dummy/ase-256-16.key
rename to dummy/aes-256-16.key
diff --git a/dummy/ase-256-32.key b/dummy/aes-256-32.key
similarity index 100%
rename from dummy/ase-256-32.key
rename to dummy/aes-256-32.key
diff --git a/dummy/ase-256.json b/dummy/aes-256.json
similarity index 100%
rename from dummy/ase-256.json
rename to dummy/aes-256.json
diff --git a/dummy/aes-256.keys.json b/dummy/aes-256.keys.json
new file mode 100644
index 0000000..44694d4
--- /dev/null
+++ b/dummy/aes-256.keys.json
@@ -0,0 +1,4 @@
+{
+    "keyPath": "./dummy/aes-256-32.key",
+    "ivPath": "./dummy/aes-256-16.key"
+}
diff --git a/dummy/ase-256.keys.json b/dummy/ase-256.keys.json
deleted file mode 100644
index 8c3d731..0000000
--- a/dummy/ase-256.keys.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "keyPath": "./dummy/ase-256-32.key",
-    "ivPath": "./dummy/ase-256-16.key"
-}
diff --git a/test/crypto.test.ts b/test/crypto.test.ts
index ec6a1ba..7f71041 100644
--- a/test/crypto.test.ts
+++ b/test/crypto.test.ts
@@ -7,8 +7,8 @@ import {
 // DefaultCryptoProvider
 const key = "67rKmuc6DiDukE0jsUP421Eizo4CreaL6Q7Pg/NmH/s="
 const iv = "FEFM9AY2m5jDq6GZ+CfLIA=="
-const keyJsonFileValuesDefault = "./dummy/ase-256.json"
-const keyJsonFileKeysDefault = "./dummy/ase-256.keys.json"
+const keyJsonFileValuesDefault = "./dummy/aes-256.json"
+const keyJsonFileKeysDefault = "./dummy/aes-256.keys.json"
 
 // E2ECryptoProvider
 const PRIVATE_KEY_VALUE =
@@ -36,6 +36,22 @@ test("test: Default Encryption From Values", () => {
     expect(decrypted).toBe(TEXT)
 })
 
+test("test: Default Encryption with Hello World", () => {
+    const data = "Hello World"
+    const provider = CryptoProvider.newInstance(
+        new DefaultCryptoProvider({
+            key: key,
+            iv: iv,
+        })
+    )
+
+    const encrypted = provider.encrypt(data)
+    const decrypted = provider.decrypt(encrypted)
+    const decrypted2 = provider.decrypt("6Rkfueq+fT3vPgWTST1lXg==")
+    expect(decrypted).toBe(data)
+    expect(decrypted2).toBe(data)
+})
+
 test("test: Default Encryption From JsonFile Values", () => {
     const provider = CryptoProvider.newInstance(
         new DefaultCryptoProvider({
diff --git a/test/validate-ase.test.ts b/test/validate-ase.test.ts
index 268b45f..eea8eba 100644
--- a/test/validate-ase.test.ts
+++ b/test/validate-ase.test.ts
@@ -4,15 +4,15 @@ const key = "67rKmuc6DiDukE0jsUP421Eizo4CreaL6Q7Pg/NmH/s="
 const iv = "FEFM9AY2m5jDq6GZ+CfLIA=="
 
 test("test: readFileToString", () => {
-    const value1 = readFileToString("./dummy/ase-256-32.key")
-    const value2 = readFileToString("./dummy/ase-256-16.key")
+    const value1 = readFileToString("./dummy/aes-256-32.key")
+    const value2 = readFileToString("./dummy/aes-256-16.key")
 
     expect(value1).toBe(key)
     expect(value2).toBe(iv)
 })
 
 test("test: readFileToString with jsonFile key-paths", () => {
-    const json = readFileToJson("./dummy/ase-256.keys.json")
+    const json = readFileToJson("./dummy/aes-256.keys.json")
     const value1 = readFileToString(json.keyPath)
     const value2 = readFileToString(json.ivPath)
     expect(value1).toBe(key)
@@ -20,7 +20,7 @@ test("test: readFileToString with jsonFile key-paths", () => {
 })
 
 test("test: readFileToString with jsonFile values", () => {
-    const json = readFileToJson("./dummy/ase-256.json")
+    const json = readFileToJson("./dummy/aes-256.json")
     const value1 = json.key
     const value2 = json.iv
     expect(value1).toBe(key)