More chat encryption...

3 files changed, 36 insertions, 48 deletions

diff --git a/main/app/sprinkles/account/assets/userfrosting/js/pages/register.js b/main/app/sprinkles/account/assets/userfrosting/js/pages/register.js
index 97870a7..a311305 100644
--- a/main/app/sprinkles/account/assets/userfrosting/js/pages/register.js
+++ b/main/app/sprinkles/account/assets/userfrosting/js/pages/register.js
@@ -85,39 +85,7 @@ $(document).ready(function () {
         msgTarget: $("#alerts-page"),
         keyupDelay: 500
     }).on("submitSuccess.ufForm", function () {
-        // GENERATE KEYS
-        var openpgp = window.openpgp;
-        var options;
-        var randomString = Math.random().toString(36).substr(2, 11); // PRIVKEY ENCRYPTION KEY
-        openpgp.initWorker({path: '/assets-raw/core/assets/SiteAssets/js/openpgp.worker.js'});
-        options = {
-            userIds: [{name: $("#r-form-username").val(), email: $("#r-form-email").val()}],
-            curve: "curve25519",
-            passphrase: randomString
-        };
-        openpgp.generateKey(options).then(function (key) {
-            localStorage.setItem("PrivateKey", key.privateKeyArmored);
-            localStorage.setItem("🔒", randomString);
-
-            console.log(key.publicKeyArmored);
-            console.log(key.privateKeyArmored);
-            // SAVE PUBLIC KEY TO DATABASE
-            var data = {
-                csrf_name: site.csrf.name,
-                csrf_value: site.csrf.value,
-                PublicKey: key.publicKeyArmored
-            };
-            $.ajax({
-                type: 'POST',
-                url: site.uri.public + '/api/users/u/' + $("#r-form-username").val() + '/publickey',
-                data: data,
-                success: function (response) {
-                    console.log(response);
-                    //window.location.reload();
-                }
-            });
-
-        });
+        window.location.reload();
     }).on("submitError.ufForm", function () {
         // Reload captcha
         $("#captcha").captcha();
diff --git a/main/app/sprinkles/account/assets/userfrosting/js/pages/sign-in.js b/main/app/sprinkles/account/assets/userfrosting/js/pages/sign-in.js
index b627f2d..97f19e9 100644
--- a/main/app/sprinkles/account/assets/userfrosting/js/pages/sign-in.js
+++ b/main/app/sprinkles/account/assets/userfrosting/js/pages/sign-in.js
@@ -34,19 +34,40 @@ $(document).ready(function() {
         validators: page.validators.login,
         msgTarget: $("#alerts-page")
     }).on("submitSuccess.ufForm", function(event, data, textStatus, jqXHR) {
-        /* GENERATE KEYS
-        var openpgp = window.openpgp;
-        var options, PublicKey, PrivateKey;
-        openpgp.initWorker({path: '/assets-raw/core/assets/SiteAssets/js/openpgp.worker.js'});
-        options = {
-            userIds: [{user_id: current_user_id}],
-            curve: "curve25519",
-            passphrase: $("input[name='password']") // only local
-        };
-        openpgp.generateKey(options).then(function (key) {
-            PrivateKey = key.privateKeyArmored;
-            PublicKey = key.publicKeyArmored;
-        });*/
-        redirectOnLogin(jqXHR);
+        if (localStorage.getItem("PrivateKey") === null && localStorage.getItem("🔒") === null) {
+            // GENERATE KEYS
+            var openpgp = window.openpgp;
+            var options;
+            var randomString = Math.random().toString(36).substr(2, 11); // PRIVKEY ENCRYPTION KEY
+            openpgp.initWorker({path: '/assets-raw/core/assets/SiteAssets/js/openpgp.worker.js'});
+            options = {
+                userIds: [{name: $("input[name=user_name]").val()}],
+                curve: "curve25519",
+                passphrase: randomString
+            };
+            openpgp.generateKey(options).then(function (key) {
+                localStorage.setItem("PrivateKey", key.privateKeyArmored);
+                localStorage.setItem("🔒", randomString);
+
+                console.log(key.publicKeyArmored);
+                console.log(key.privateKeyArmored);
+                // SAVE PUBLIC KEY TO DATABASE
+                var data = {
+                    csrf_name: site.csrf.name,
+                    csrf_value: site.csrf.value,
+                    PublicKey: key.publicKeyArmored
+                };
+                $.ajax({
+                    type: 'POST',
+                    dataType : "json",
+                    url: site.uri.public + '/api/users/u/' + $("input[name=user_name]").val() + '/publickey',
+                    data: data,
+                    async: false
+                });
+                redirectOnLogin(jqXHR);
+            });
+        } else {
+            redirectOnLogin(jqXHR);
+        }
     });
 });
diff --git a/main/app/sprinkles/account/templates/pages/sign-in.html.twig b/main/app/sprinkles/account/templates/pages/sign-in.html.twig
index 083d170..2fb6e1c 100644
--- a/main/app/sprinkles/account/templates/pages/sign-in.html.twig
+++ b/main/app/sprinkles/account/templates/pages/sign-in.html.twig
@@ -62,7 +62,6 @@
 {% endblock %}
 
 {% block scripts_page %}
-    <script>var current_user_id = {{ current_user.id }};</script>
     <!-- Include validation rules -->
     <script>
         {% include "pages/partials/page.js.twig" %}