From e4da258d46c9e5d6ad7b392307f2401edc73fea7 Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Mon, 23 Jul 2018 08:45:04 -0500
Subject: [PATCH] Default auth params version value, SFJS 0.3.6

---
 .../javascripts/app/services/authManager.js       | 15 ---------------
 .../javascripts/app/services/passcodeManager.js   | 13 +++++++++++--
 package-lock.json                                 |  6 +++---
 package.json                                      |  2 +-
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/app/services/authManager.js b/app/assets/javascripts/app/services/authManager.js
index 655ba8c26..65a8e49ac 100644
--- a/app/assets/javascripts/app/services/authManager.js
+++ b/app/assets/javascripts/app/services/authManager.js
@@ -49,21 +49,6 @@ class AuthManager extends SFAuthManager {
     }
   }
 
-  async protocolVersion() {
-    var authParams = await this.getAuthParams();
-    if(authParams && authParams.version) {
-      return authParams.version;
-    }
-
-    var keys = await this.keys();
-    if(keys && keys.ak) {
-      // If there's no version stored, and there's an ak, it has to be 002. Newer versions would have thier version stored in authParams.
-      return "002";
-    } else {
-      return "001";
-    }
-  }
-
   async getAuthParamsForEmail(url, email, extraParams) {
     return super.getAuthParamsForEmail(url, email, extraParams);
   }
diff --git a/app/assets/javascripts/app/services/passcodeManager.js b/app/assets/javascripts/app/services/passcodeManager.js
index d70ffd2f1..47c9e763b 100644
--- a/app/assets/javascripts/app/services/passcodeManager.js
+++ b/app/assets/javascripts/app/services/passcodeManager.js
@@ -23,7 +23,17 @@ angular.module('app')
       }
 
       this.passcodeAuthParams = function() {
-        return JSON.parse(storageManager.getItemSync("offlineParams", StorageManager.Fixed));
+        var authParams = JSON.parse(storageManager.getItemSync("offlineParams", StorageManager.Fixed));
+        if(authParams && !authParams.version) {
+          var keys = this.keys();
+          if(keys && keys.ak) {
+            // If there's no version stored, and there's an ak, it has to be 002. Newer versions would have thier version stored in authParams.
+            authParams.version = "002";
+          } else {
+            authParams.version = "001";
+          }
+        }
+        return authParams;
       }
 
       this.unlock = function(passcode, callback) {
@@ -58,7 +68,6 @@ angular.module('app')
           // Encrypting will initially clear localStorage
           this.encryptLocalStorage(keys, authParams);
 
-
           // After it's cleared, it's safe to write to it
           storageManager.setItem("offlineParams", JSON.stringify(authParams), StorageManager.Fixed);
           callback(true);
diff --git a/package-lock.json b/package-lock.json
index f5d6f8384..ec5057757 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9353,9 +9353,9 @@
       "dev": true
     },
     "standard-file-js": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/standard-file-js/-/standard-file-js-0.3.5.tgz",
-      "integrity": "sha512-wJY0uBHxf9Af2wEqpwPwiiCTOky4qRSqUNLIP9kfkJfgavvWJ+oQA/fI65om2vuW+ZBmoaLHRgfzGXAaWA56+w==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/standard-file-js/-/standard-file-js-0.3.6.tgz",
+      "integrity": "sha512-GhowAiZBWXxwjVJMUbq4I6ovFB2l3jSE5lLgJ56Md5l/AKlNuJwDJdoTuOfUE+FTw0Lv+P37Uk3O5FaduuiO7g==",
       "dev": true
     },
     "statuses": {
diff --git a/package.json b/package.json
index 818bf5df6..3d229ab9b 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "karma-jasmine": "^1.1.0",
     "karma-phantomjs-launcher": "^1.0.2",
     "sn-stylekit": "1.0.15",
-    "standard-file-js": "0.3.5",
+    "standard-file-js": "0.3.6",
     "sn-models": "0.1.1",
     "connect": "^3.6.6",
     "mocha": "^5.2.0",