diff options
author | Marius David Wieschollek <passwords.public@mdns.eu> | 2019-06-22 17:23:41 +0300 |
---|---|---|
committer | Marius David Wieschollek <passwords.public@mdns.eu> | 2019-06-22 17:23:41 +0300 |
commit | dc70f25e1e6d3c08f97b635e208b216096b1d91f (patch) | |
tree | a617ca1903eb4a9208646a29909a6e102cf401ab | |
parent | fca6f62b530ccae42c7533636d9c9095ecbf6daa (diff) |
Updated challenge handling
-rw-r--r-- | package-lock.json | 2 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/Classes/EnhancedApi.js | 4 | ||||
-rw-r--r-- | src/Classes/SimpleApi.js | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/package-lock.json b/package-lock.json index 858b136..919b75b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "passwords-client", - "version": "0.0.1", + "version": "0.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1302bc9..d7310ed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "passwords-client", - "version": "0.0.2", + "version": "0.0.3", "description": "JS client library for the Nextcloud Passwords app", "main": "src/main.js", "author": "Marius Wieschollek", diff --git a/src/Classes/EnhancedApi.js b/src/Classes/EnhancedApi.js index 25b8a10..221afc8 100644 --- a/src/Classes/EnhancedApi.js +++ b/src/Classes/EnhancedApi.js @@ -85,7 +85,7 @@ export default class EnhancedApi extends SimpleApi { async openSession(login) { let password = null; if(login.hasOwnProperty('password')) { - login.secret = this.config.encryption.solveChallenge(login.password, login.salts); + login.challenge = this.config.encryption.solveChallenge(login.password, login.salts); password = login.password; delete login.salts; delete login.password; @@ -134,7 +134,7 @@ export default class EnhancedApi extends SimpleApi { let challenge = this.config.encryption.createChallenge(password); - let result = await super.setAccountChallenge(challenge.salts, challenge.secret, oldSecret); + let result = await super.setAccountChallenge(challenge.secret, challenge.salts, oldSecret); if(result.success) { let keychain = this.config.encryption.getKeychain(password); await super.setKeychain('CSEv1r1', keychain); diff --git a/src/Classes/SimpleApi.js b/src/Classes/SimpleApi.js index c2dcfbd..6001cb6 100644 --- a/src/Classes/SimpleApi.js +++ b/src/Classes/SimpleApi.js @@ -632,8 +632,8 @@ export default class SimpleApi { * * @returns {Promise} */ - setAccountChallenge(salts, secret, oldSecret = null) { - return this._sendRequest('challenge.set', {salts, secret, oldSecret}); + setAccountChallenge(secret, data, oldSecret = null) { + return this._sendRequest('challenge.set', {secret, data, oldSecret}); } /** |