Updated dependancies, improved error handling and hide secret

Ali60351 · Apr 26, 2018 · 54db7aa · 54db7aa
1 parent 05dc493
commit 54db7aa
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 5 deletions.
diff --git a/app/index.html b/app/index.html
@@ -41,7 +41,7 @@
               <v-btn @click="selectDir" block primary>Select</v-btn>
             </v-flex>
             <v-flex v-if="modeOfOperation === 'symmetric'" xs12>
-              <v-text-field v-model="symmetricPassword" label="Enter password"></v-text-field>
+              <v-text-field  :append-icon="visibility ? 'visibility' : 'visibility_off'" v-model="symmetricPassword" :append-icon-cb="() => (visibility = !visibility)" :type="visibility ? 'password' : 'text'" label="Enter password"></v-text-field>
             </v-flex>
           </v-layout>
           <v-layout row wrap text-xs-center>

diff --git a/app/javascripts/main/app.js b/app/javascripts/main/app.js
@@ -31,6 +31,7 @@ var app = new Vue({
     infoFlag: false,
     modeOfOperation: 'Unsecure',
     symmetricPassword: '',
+    visibility: true,
     items: [{
         icon: 'home',
         title: 'Home',
@@ -81,7 +82,7 @@ var app = new Vue({
       var files = getFiles(this.selectedDir);
 
       if (files.length == 0) {
-        alert('This directory does not contains any files');
+        error('This directory does not contains any files');
         return;
       }
 
@@ -129,6 +130,16 @@ var app = new Vue({
                 properties: ["openFile"]
               });
 
+              if (privatePath == null) {
+                error('No private key selected');
+                return;
+              }
+
+              if (publicPath == null) {
+                error('No public key selected');
+                return;
+              }
+
               hashArr = getHashes(app.queue);
               encryptHashPublicDual(hashArr, privatePath[0], publicPath[0]);
             } else if (app.modeOfOperation === 'onePublic') {
@@ -139,11 +150,20 @@ var app = new Vue({
                 properties: ["openFile"]
               });
 
+              if (privatePath == null) {
+                error('No private key selected');
+                return;
+              }
+
               hashArr = getHashes(app.queue);
               encryptHashPublicSingle(hashArr, privatePath[0]);
             } else if (app.modeOfOperation === 'symmetric') {
+              if (app.symmetricPassword === '') {
+                error('No password selected. Please type password before selecting directory');
+                return;
+              }
+
               hashArr = getHashes(app.queue);
-              // console.log(hashArr);
               encryptHashSymmetric(hashArr);
             }
 
@@ -167,6 +187,16 @@ var app = new Vue({
                 properties: ["openFile"]
               });
 
+              if (privatePathD == null) {
+                error('No private key selected');
+                return;
+              }
+
+              if (publicPathD == null) {
+                error('No public key selected');
+                return;
+              }
+
               var verifyArrDecrypted = decryptHashPublicDual(path.resolve(app.selectedDir, 'QuickFIV.json'), privatePathD[0], publicPathD[0]);
               getAlgorithms(verifyArrDecrypted);
               hashArr = getHashes(app.queue);
@@ -177,19 +207,28 @@ var app = new Vue({
                 properties: ["openFile"]
               });
 
+              if (publicPathD == null) {
+                error('No public key selected');
+                return;
+              }
+
               var verifyArrDecrypted = decryptHashPublicSingle(path.resolve(app.selectedDir, 'QuickFIV.json'), publicPathD[0]);
               getAlgorithms(verifyArrDecrypted);
               hashArr = getHashes(app.queue);
               verifyHashes(verifyArrDecrypted);
             } else if (app.modeOfOperation === 'symmetric') {
+              if (app.symmetricPassword === '') {
+                error('No password selected. Please type password before selecting directory');
+                return;
+              }
+
               var verifyArrDecrypted = decryptHashSymmetric(path.resolve(app.selectedDir, 'QuickFIV.json'));
               getAlgorithms(verifyArrDecrypted);
               hashArr = getHashes(app.queue);
               verifyHashes(verifyArrDecrypted);
             }
           }
         } catch (err) {
-          // console.log(err);
           error(err.toString());
         }
       }, 1000)
@@ -209,6 +248,14 @@ var app = new Vue({
         defaultPath: path.resolve('..', 'Public.qfv')
       });
 
+      if (privatePath == null || publicPath == null)
+      {
+        alert('Invalid Location');
+        return;
+      }
+
+      console.log(privatePath);
+
       var public = key.exportKey("public");
       var private = key.exportKey("private");
 

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   },
   "devDependencies": {
     "electron": "^1.8.4",
-    "electron-builder": "^19.48.2",
+    "electron-builder": "^20.10.0",
     "gulp": "^3.9.1",
     "mocha": "^4.0.1",
     "spectron": "^3.7.2",