Merge pull request #197 from burst-apps-team/develop

Fix JS failing to load
signum-network · Jul 14, 2019 · 8b0f9ff · 8b0f9ff
2 parents 324b006 + 64e2351
commit 8b0f9ff
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/html/ui/js/brs.encryption.js b/html/ui/js/brs.encryption.js
@@ -19,8 +19,8 @@ var BRS = (function(BRS, $, undefined) {
 	    if (BRS.rememberPassword) {
 		secretPhrase = _password;
 	    }
-            else {
-		throw $.t("error_generate_public_key_no_password");
+        else {
+		    throw $.t("error_generate_public_key_no_password");
 	    }
 	}
 

diff --git a/html/ui/js/brs.server.js b/html/ui/js/brs.server.js
@@ -234,19 +234,21 @@ var BRS = (function(BRS, $, undefined) {
             }
         }
 
-        if (BRS.rememberPassword) {
-            secretPhrase = _password;
-        } else {
-            secretPhrase = data.secretPhrase;
-        }
+        if (type == "POST") {
+            if (BRS.rememberPassword) {
+                secretPhrase = _password;
+            } else {
+                secretPhrase = data.secretPhrase;
+            }
 
-        delete data.secretPhrase;
+            delete data.secretPhrase;
 
-        if (BRS.accountInfo && BRS.accountInfo.publicKey) {
-            data.publicKey = BRS.accountInfo.publicKey;
-        } else {
-            data.publicKey = BRS.generatePublicKey(secretPhrase);
-            BRS.accountInfo.publicKey = data.publicKey;
+            if (BRS.accountInfo && BRS.accountInfo.publicKey) {
+                data.publicKey = BRS.accountInfo.publicKey;
+            } else {
+                data.publicKey = BRS.generatePublicKey(secretPhrase);
+                BRS.accountInfo.publicKey = data.publicKey;
+            }
         }
 
         $.support.cors = true;

diff --git a/src/brs/db/sql/Db.java b/src/brs/db/sql/Db.java
@@ -8,9 +8,6 @@
 import brs.props.Props;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
-import io.reactivex.Completable;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.configuration.FluentConfiguration;
 import org.jooq.DSLContext;