[FIX] Resend email without unlock (RT-3104)

Sign-up: resend email without requiring unlock
ripple · Feb 17, 2015 · 548942a · 548942a
1 parent 222f3c6
commit 548942a
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 25 deletions.
diff --git a/src/js/services/id.js b/src/js/services/id.js
@@ -430,6 +430,13 @@ module.factory('rpId', ['$rootScope', '$location', '$route', '$routeParams', '$t
 
         if (!emailVerified) {
           $scope.unverified = true;
+          // get secret to allow email re-send without unlocking
+          $authflow.unlock(Id.normalizeUsernameForInternals(username), password, function(err, resp) {
+            if (!err && resp) {
+              $scope.keyOpen = resp.secret;
+            }
+          });
+
           $location.path('/register');
 
           callback(new Error("Email has not been verified!"));

diff --git a/src/js/tabs/register.js b/src/js/tabs/register.js
@@ -137,39 +137,46 @@ RegisterTab.prototype.angular = function (module) {
       });
     };
 
+    var _resnedEmail = function(masterkey) {
+      id.resendEmail({
+        id:$scope.userBlob.id,
+        url:$scope.userBlob.url,
+        username: $scope.userCredentials.username,
+        account_id: $scope.userBlob.data.account_id,
+        email: $scope.newEmail || $scope.userBlob.data.email,
+        masterkey: masterkey
+      }, function(err, response){
+        if (err) {
+          console.log('Error', err);
+          return;
+        }
+
+        // Update the blob
+        $scope.userBlob.set('/email', $scope.newEmail || $scope.userBlob.data.email);
+
+        $scope.resendLoading = false;
+        $scope.resendSuccess = true;
+      });
+    }
+
     $scope.resendEmail = function()
     {
       $scope.resendLoading = true;
 
-      keychain.requestSecret(id.account, id.username,
-        function (err, masterkey) {
-          if (err) {
-            console.log('client: register tab: error while ' +
-              'unlocking wallet: ', err);
-            $scope.mode = 'verification';
-            return;
-          }
-
-          id.resendEmail({
-            id:$scope.userBlob.id,
-            url:$scope.userBlob.url,
-            username: $scope.userCredentials.username,
-            account_id: $scope.userBlob.data.account_id,
-            email: $scope.newEmail || $scope.userBlob.data.email,
-            masterkey: masterkey
-          }, function(err, response){
+      if ($scope.keyOpen) {
+        _resnedEmail($scope.keyOpen);
+      } else {
+        keychain.requestSecret(id.account, id.username,
+          function (err, masterkey) {
             if (err) {
-              console.log('Error', err);
+              console.log('client: register tab: error while ' +
+                'unlocking wallet: ', err);
+              $scope.mode = 'verification';
               return;
             }
-
-            // Update the blob
-            $scope.userBlob.set('/email', $scope.newEmail || $scope.userBlob.data.email);
-
-            $scope.resendLoading = false;
-            $scope.resendSuccess = true;
+            _resnedEmail(masterkey);
           });
-        });
+      }
     };
 
     var updateFormFields = function() {