From 2e0536ea2d69d8f8c88afd4b758a57a961db3ef0 Mon Sep 17 00:00:00 2001
From: Matthew Fettig <matthew@ripple.com>
Date: Fri, 13 Jun 2014 14:35:01 -0700
Subject: [PATCH] bug fixes and documentation

---
 docs/VAULTCLIENT.md          | 11 ++++++-----
 src/js/ripple/blob.js        |  2 +-
 src/js/ripple/crypt.js       |  2 +-
 src/js/ripple/vaultclient.js | 10 +++++++++-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/docs/VAULTCLIENT.md b/docs/VAULTCLIENT.md
index 96112c55..179e3f32 100644
--- a/docs/VAULTCLIENT.md
+++ b/docs/VAULTCLIENT.md
@@ -24,14 +24,15 @@ data stored using credentials originally obtained at ripple.com
     
     vaultClient.register(options, callback);
     
-
-# Blob Client Methods
+    vaultClient.rename(options, callback);
     
-    blobClient.get(url, id, crypt, callback);
+    vaultClient.changePassword(options, callback);
     
-    blobClient.create(options, callback);
+    vaultClient.recoverBlob(options, callback);
     
-    blobClient.verify(url, username, token, callback);
+    vaultClient.verify(username, token, callback);
+    
+    vaultClient.resendEmail(options, callback);
     
 
 # Blob Methods
diff --git a/src/js/ripple/blob.js b/src/js/ripple/blob.js
index c0eef387..8df15476 100644
--- a/src/js/ripple/blob.js
+++ b/src/js/ripple/blob.js
@@ -829,7 +829,7 @@ BlobClient.get = function (url, id, crypt, fn) {
 
 BlobClient.verify = function(url, username, token, fn) {
   url += '/v1/user/' + username + '/verify/' + token;
-  request.get(url, function(err, resp){
+  request.get(url, function(err, resp) {
     if (err) {    
       fn(new Error("Failed to verify the account - XHR error"));
     } else if (resp.body && resp.body.result === 'success') {
diff --git a/src/js/ripple/crypt.js b/src/js/ripple/crypt.js
index 9427ed83..30a1d935 100644
--- a/src/js/ripple/crypt.js
+++ b/src/js/ripple/crypt.js
@@ -277,7 +277,7 @@ Crypt.signString = function(secret, data) {
  */
 
 Crypt.deriveRecoveryEncryptionKeyFromSecret = function(secret) {
-  var seed = ripple.Seed.from_json(secret).to_bits();
+  var seed = Seed.from_json(secret).to_bits();
   var hmac = new sjcl.misc.hmac(seed, sjcl.hash.sha512);
   var key  = hmac.mac('ripple/hmac/recovery_encryption_key/v1');
   key      = sjcl.bitArray.bitSlice(key, 0, 256);
diff --git a/src/js/ripple/vaultclient.js b/src/js/ripple/vaultclient.js
index bd457500..f02811f0 100644
--- a/src/js/ripple/vaultclient.js
+++ b/src/js/ripple/vaultclient.js
@@ -56,6 +56,7 @@ VaultClient.prototype.getAuthInfo = function (username, callback) {
  */
 
 VaultClient.prototype._deriveLoginKeys = function (authInfo, password, callback) {
+
   //derive login keys
   crypt.derive(authInfo.pakdf, 'login', authInfo.username.toLowerCase(), password, function(err, keys) {
     if (err) {
@@ -326,7 +327,7 @@ VaultClient.prototype.exists = function(username, callback) {
 VaultClient.prototype.verify = function(username, token, callback) {
   var self = this;
 
-  self.getAuthInfo(username, function (err, authinfo){
+  self.getAuthInfo(username, function (err, authInfo){
     if (err) {
       return callback(err);
     }
@@ -339,6 +340,11 @@ VaultClient.prototype.verify = function(username, token, callback) {
  * resendEmail
  * send a new verification email
  * @param {object}   options
+ * @param {string}   options.id
+ * @param {string}   options.username
+ * @param {string}   options.account_id
+ * @param {string}   options.email
+ * @param {string}   options.activateLink
  * @param {function} fn - Callback
  */
 
@@ -425,6 +431,8 @@ VaultClient.prototype.rename = function (options, fn) {
       
       if (authInfo && authInfo.exists) {
         return callback(new Error('username already taken.'));
+      } else {
+        authInfo.username = new_username;
       }
             
       return callback (err, authInfo, password);