Added prettier exporting and encryption check

2 files changed, 85 insertions, 61 deletions

diff --git a/public/scripts/2_encryption.js b/public/scripts/2_encryption.js
index 4d05780..9140a3a 100644
--- a/public/scripts/2_encryption.js
+++ b/public/scripts/2_encryption.js
@@ -16,10 +16,11 @@ async function generateKeys(userId, passphrase) {
         passphrase: passphrase
     };
 
-    openpgp.generateKey(options).then((key) => {
+    await openpgp.generateKey(options).then((key) => {
         localStorage.setItem('private_key', key.privateKeyArmored);
         localStorage.setItem('public_key', key.publicKeyArmored);
         localStorage.setItem('revocation_certificate', key.revocationCertificate);
+        console.log('[LOG] Successfully generated and stored keys!')
     });
 }
 
@@ -72,6 +73,17 @@ async function decrypt(data, publicKey, privateKey, passphrase) {
 }
 
 /**
+ * Checks whether the user has keys
+ * @returns {boolean}
+ */
+function isEncrypted() {
+    const hasPrivateKey = localStorage.getItem('private_key') !== null;
+    const hasPublicKey = localStorage.getItem('public_key') !== null;
+    const hasRevocationCertificate = localStorage.getItem('revocation_certificate') !== null;
+    return (hasPrivateKey && hasPublicKey && hasRevocationCertificate);
+}
+
+/**
  * Just a general test case
  */
 function testEncryption() {
@@ -85,9 +97,8 @@ function testEncryption() {
     })
 }
 
-// TODO: Export as module or sth
-// REMEMBER: UGLY EXPORT!
-window.generateKeys = generateKeys;
-window.encrypt = encrypt;
-window.decrypt = decrypt;
-window.testEncryption = testEncryption;
+exports.generate = generateKeys;
+exports.encrypt = encrypt;
+exports.decrypt = decrypt;
+exports.check = isEncrypted;
+exports.test = testEncryption;
diff --git a/public/scripts/chat.js b/public/scripts/chat.js
index b33d503..e8b53c0 100644
--- a/public/scripts/chat.js
+++ b/public/scripts/chat.js
@@ -1,70 +1,83 @@
 const $ = require('jquery');
+const encryption = require('./2_encryption');
 const nanoid = require('nanoid');
 
 let connectedUserId, connectedUser;
 const userId = nanoid();
-const peer = new Peer(userId, {host: '127.0.0.1', port: 4242, path: '/', debug: 3});
 
-// Peer events
-peer.on('open', id => console.log('[LOG] Your ID is', id));
-peer.on('error', err => console.error(err));
-peer.on('connection', conn => {
-    connectedUser = conn;
-    console.log('[LOG] Connected with', conn.peer);
-    conn.on('data', message => receivedMessage(message));
-});
+// setup encryption
+if (encryption.check()) {
+    // TODO: Ask for password
+    chat();
+} else {
+    console.log('[LOG] No existing keys found! Generating...');
+    encryption.generate(userId, 'supersecure').then(() => chat());
+}
 
-/**
- * Connects to an user via his id
- * @param id
- */
-function connect(id) {
-    const connectionId = nanoid();
-    console.log('[LOG] Connecting to', id);
-    console.log('[LOG] Your connection ID is', connectionId);
-    connectedUser = peer.connect(id, {label: connectionId, reliable: true});
-    connectedUserId = id;
+function chat() {
+    const peer = new Peer(userId, {host: '127.0.0.1', port: 4242, path: '/', debug: 3});
 
-    // setup listener
-    connectedUser.on('open', () => {
-        // TODO: Activate chat or sth
-        // TODO: Send public key
+    // Peer events
+    peer.on('open', id => console.log('[LOG] Your ID is', id));
+    peer.on('error', err => console.error(err));
+    peer.on('connection', conn => {
+        connectedUser = conn;
+        console.log('[LOG] Connected with', conn.peer);
+        conn.on('data', message => receivedMessage(message));
     });
 
-    connectedUser.on('data', message => receivedMessage(message))
-}
+    /**
+     * Connects to an user via his id
+     * @param id
+     */
+    function connect(id) {
+        const connectionId = nanoid();
+        console.log('[LOG] Connecting to', id);
+        console.log('[LOG] Your connection ID is', connectionId);
+        connectedUser = peer.connect(id, {label: connectionId, reliable: true});
+        connectedUserId = id;
 
-/**
- * Sends a message to the user with which you're currently connected
- * @param message
- */
-function sendMessage(message) {
-    console.log(`[LOG] Sending message ${message} to ${connectedUserId}`);
-    connectedUser.send(message);
-    receivedMessage(message, true);
-}
+        // setup listener
+        connectedUser.on('open', () => {
+            // TODO: Activate chat or sth
+            // TODO: Send public key
+        });
 
-/**
- * Renders the incoming messages
- * @param message
- * @param self
- */
-function receivedMessage(message, self = false) {
-    if (self) {
-        $('#messages').append(`<span style="color: green">${message}</span><br>`);
-    } else {
-        $('#messages').append(`${message}<br>`);
+        connectedUser.on('data', message => receivedMessage(message))
+    }
+
+    /**
+     * Sends a message to the user with which you're currently connected
+     * @param message
+     */
+    function sendMessage(message) {
+        console.log(`[LOG] Sending message ${message} to ${connectedUserId}`);
+        connectedUser.send(message);
+        receivedMessage(message, true);
+    }
+
+    /**
+     * Renders the incoming messages
+     * @param message
+     * @param self
+     */
+    function receivedMessage(message, self = false) {
+        if (self) {
+            $('#messages').append(`<span style="color: green">${message}</span><br>`);
+        } else {
+            $('#messages').append(`${message}<br>`);
+        }
     }
-}
 
-/**
- * Events after load
- */
-$(document).ready(() => {
-    $('#add_user_id').on('click', () => connect($('#user_id').val()));
-    $('#send_message').on('click', () => sendMessage($('#message').val()));
+    /**
+     * Events after load
+     */
+    $(document).ready(() => {
+        $('#add_user_id').on('click', () => connect($('#user_id').val()));
+        $('#send_message').on('click', () => sendMessage($('#message').val()));
 
-    $('[toggle-contact-modal]').on('click', () => $('#add_contact_modal').toggleClass('is-active'))
-});
+        $('[toggle-contact-modal]').on('click', () => $('#add_contact_modal').toggleClass('is-active'))
+    });
+}
 
-testEncryption();
+//encryption.test(); // TESTING IF ENCRYPTION WORKS