Merge pull request #184 from LiskHQ/182-update_lisk-js

Updating lisk-js - Closes #182
LiskArchive · May 8, 2017 · f3c68fb · f3c68fb
2 parents 27dfbf4 + 1edd820
commit f3c68fb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/app/components/sign-verify/verify-message.js b/src/app/components/sign-verify/verify-message.js
@@ -26,12 +26,16 @@ app.component('verifyMessage', {
       try {
         this.result = lisk.crypto.verifyMessageWithPublicKey(
           this.signature.value, this.publicKey.value);
+        if (this.result && this.result.message) {
+          throw this.result;
+        }
       } catch (e) {
-        if (e.message.substring(0, 4) === 'nacl' && this.publicKey.value) {
+        if (e.message.indexOf('Invalid publicKey') !== -1 && this.publicKey.value) {
           this.publicKey.error.invalid = true;
-        } else if (e.message.indexOf('length') !== -1 && this.signature.value) {
+        } else if (e.message.indexOf('Invalid signature') !== -1 && this.signature.value) {
           this.signature.error.invalid = true;
         }
+        this.result = '';
       }
     }
   },

diff --git a/src/package.json b/src/package.json
@@ -26,7 +26,7 @@
     "bitcore-mnemonic": "=1.1.1",
     "debug": "=2.2.0",
     "jquery": "=2.2.4",
-    "lisk-js": "=0.4.0",
+    "lisk-js": "=0.4.1",
     "lodash": "=4.16.4",
     "moment": "=2.15.1",
     "ng-infinite-scroll": "=1.3.0",

diff --git a/src/test/components/sign-verify/sign-message.spec.js b/src/test/components/sign-verify/sign-message.spec.js
@@ -35,9 +35,11 @@ describe('Sign message component', () => {
     const message = 'Hello world';
     const result =
       '-----BEGIN LISK SIGNED MESSAGE-----\n' +
+      '-----MESSAGE-----\n' +
       'Hello world\n' +
-      '-----BEGIN SIGNATURE-----\n' +
+      '-----PUBLIC KEY-----\n' +
       '9d3058175acab969f41ad9b86f7a2926c74258670fe56b37c429c01fca9f2f0f\n' +
+      '-----SIGNATURE-----\n' +
       'dd01775ec30225b24a74ee2ff9578ed3515371ddf32ba50540dc79a5dab66252081d0a345be3ad5d' +
       'fcb939f018d3dd911d9eacfe8998784879cc37fdfde1200448656c6c6f20776f726c64\n' +
       '-----END LISK SIGNED MESSAGE-----';