Upgrade supergenpass-lib to 3

Author: denis-sokolov

package.json

@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "jquery": "^3.1.1",
-    "supergenpass-lib": "^1.0.0"
+    "supergenpass-lib": "^3.0.1"
   },
   "devDependencies": {
     "eslint": "^3.3.1",

src/lib/hash.js

@@ -1,7 +1,9 @@
 var supergenpass = require('supergenpass-lib');
 
 module.exports = function(text){
-	return supergenpass(text, 'chromegenpass-chrome-extension', {
-		length: 16
+	return new Promise(function(resolve){
+		return supergenpass.generate(text, 'chromegenpass-chrome-extension', {
+			length: 16
+		}, resolve);
 	});
 };

src/lib/storage.js

@@ -109,6 +109,29 @@ var addRaw = function(newPasswords){
 // see manifest background/persistent key.
 var cache = {};
 
+var getPassword = function(pass){
+	var currentHash = passwordSettingsHash(pass);
+	if (cache[currentHash])
+		return Promise.resolve(cache[currentHash]);
+
+	return new Promise(function(resolve, reject){
+		var tryThis = function(attempt){
+			if (!attempt) {
+				return reject(new Error('User did not authenticate'));
+			}
+			hash(attempt).then(function(hashedAttempt){
+				if (hashedAttempt === pass.hash) {
+					cache[currentHash] = attempt;
+					return resolve(attempt);
+				}
+				tryThis(window.prompt(i18n('unlock_prompt_retry', pass.name)));
+			});
+		};
+		var attempt = window.prompt(i18n('unlock_prompt', pass.name));
+		tryThis(attempt);
+	});
+};
+
 var api = {
 	passwords: {
 		add: function(pass) {
@@ -117,25 +140,15 @@ var api = {
 			return addRaw([pass]);
 		},
 		get: function(pass, domain) {
-			var currentHash = passwordSettingsHash(pass);
-			if (!cache[currentHash]) {
-				var attempt = window.prompt(i18n('unlock_prompt', pass.name));
-				for(;;){
-					if (!attempt) {
-						return Promise.reject(new Error('User did not authenticate'));
-					}
-					if (hash(attempt) === pass.hash) {
-						cache[currentHash] = attempt;
-						break;
-					}
-					attempt = window.prompt(i18n('unlock_prompt_retry', pass.name));
-				}
-			}
-			return Promise.resolve(supergenpass(cache[currentHash], domain, {
-				length: pass.len,
-				method: pass.method,
-				secret: pass.secret
-			}));
+			return getPassword(pass).then(function(password){
+				return new Promise(function(resolve){
+					supergenpass.generate(password, domain, {
+						length: pass.len,
+						method: pass.method,
+						secret: pass.secret
+					}, resolve);
+				});
+			});
 		},
 		list: list,
 		remove: function(pass) {