fix: this time make sure we use proper fields

makeomatic · Aug 18, 2016 · aa827c7 · aa827c7
1 parent e8ee45a
commit aa827c7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/actions/activate.js b/src/actions/activate.js
@@ -56,7 +56,7 @@ function verifyChallenge(request) {
     .get('id');
 
   function activateAccount(data) {
-    const user = data.username;
+    const user = data[USERS_USERNAME_FIELD];
     const alias = data[USERS_ALIAS_FIELD];
     const userKey = redisKey(user, USERS_DATA);
 
@@ -81,7 +81,8 @@ function verifyChallenge(request) {
         if (status === 'true') {
           throw new Errors.HttpStatusError(417, `Account ${user} was already activated`);
         }
-      });
+      })
+      .return(user);
   }
 
   function hook(user) {
@@ -92,8 +93,7 @@ function verifyChallenge(request) {
     .bind(this, username)
     .then(username ? userExists : verifyToken)
     .then(getInternalData)
-    .get(USERS_USERNAME_FIELD)
-    .tap(activateAccount)
+    .then(activateAccount)
     .tap(hook)
     .then(user => [user, audience])
     .spread(jwt.login);