Some minor fixes

1 files changed, 73 insertions, 73 deletions

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 769a1b3..7362d6d 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
@@ -1,73 +1,73 @@
-/**
- * Page-specific Javascript file.  Should generally be included as a separate asset bundle in your page template.
- * example: {{ assets.js('js/pages/sign-in-or-register') | raw }}
- *
- * This script depends on validation rules specified in pages/partials/page.js.twig.
- *
- * Target page: account/sign-in
- */
-$(document).ready(function () {
-    /**
-     * If there is a redirect parameter in the query string, redirect to that page.
-     * Otherwise, if there is a UF-Redirect header, redirect to that page.
-     * Otherwise, redirect to the home page.
-     */
-    function redirectOnLogin(jqXHR) {
-        var components = URI.parse(window.location.href);
-        var query = URI.parseQuery(components['query']);
-
-        if (query && query['redirect']) {
-            // Strip leading slashes from redirect strings           
-            var redirectString = site.uri.public + '/' + query['redirect'].replace(/^\/+/, "");
-            // Strip excess trailing slashes for clean URLs. e.g. if redirect=%2F
-            redirectString = redirectString.replace(/\/+$/, "/");
-            // Redirect
-            window.location.replace(redirectString);
-        } else if (jqXHR.getResponseHeader('UF-Redirect')) {
-            window.location.replace(jqXHR.getResponseHeader('UF-Redirect'));
-        } else {
-            window.location.replace(site.uri.public);
-        }
-    }
-
-    $("#sign-in").ufForm({
-        validators: page.validators.login,
-        msgTarget: $("#alerts-page")
-    }).on("submitSuccess.ufForm", function (event, data, textStatus, 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);
-        }
-    });
-});
+/**

+ * Page-specific Javascript file.  Should generally be included as a separate asset bundle in your page template.

+ * example: {{ assets.js('js/pages/sign-in-or-register') | raw }}

+ *

+ * This script depends on validation rules specified in pages/partials/page.js.twig.

+ *

+ * Target page: account/sign-in

+ */

+$(document).ready(function () {

+    /**

+     * If there is a redirect parameter in the query string, redirect to that page.

+     * Otherwise, if there is a UF-Redirect header, redirect to that page.

+     * Otherwise, redirect to the home page.

+     */

+    function redirectOnLogin(jqXHR) {

+        var components = URI.parse(window.location.href);

+        var query = URI.parseQuery(components['query']);

+

+        if (query && query['redirect']) {

+            // Strip leading slashes from redirect strings           

+            var redirectString = site.uri.public + '/' + query['redirect'].replace(/^\/+/, "");

+            // Strip excess trailing slashes for clean URLs. e.g. if redirect=%2F

+            redirectString = redirectString.replace(/\/+$/, "/");

+            // Redirect

+            window.location.replace(redirectString);

+        } else if (jqXHR.getResponseHeader('UF-Redirect')) {

+            window.location.replace(jqXHR.getResponseHeader('UF-Redirect'));

+        } else {

+            window.location.replace(site.uri.public);

+        }

+    }

+

+    $("#sign-in").ufForm({

+        validators: page.validators.login,

+        msgTarget: $("#alerts-page")

+    }).on("submitSuccess.ufForm", function (event, data, textStatus, 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);

+        }

+    });

+});