From becb4fa5d5ee94881e337738b7f35d9c54b7f394 Mon Sep 17 00:00:00 2001
From: Austen Collins <austencollins@gmail.com>
Date: Wed, 5 Aug 2015 20:34:49 -0700
Subject: [PATCH] Fix signin bug that creates an entirely new user

---
 api/users/show/event.json |  2 +-
 lib/models/model_user.js  | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/api/users/show/event.json b/api/users/show/event.json
index 997ac75bb3d..b3589f16246 100644
--- a/api/users/show/event.json
+++ b/api/users/show/event.json
@@ -1,4 +1,4 @@
 {
     "body": {},
-    "access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiJ1X2RmNzVmNWUwLTNiZDktMTFlNS1iZTk4LWI5NjFjMzVmOWZjNyIsImlhdCI6MTQzODgyNDI5OCwiZXhwIjoxNDM5NDI5MDk4LCJpc3MiOiJKQVdTIn0.G2Ugcds7Q6gQ5arP_fp-rbn4-xg1QQ3-OrdJO9iAdDo"
+    "access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiJ1X2FkN2Y5MGMwLTNiZWItMTFlNS05MDVjLWUzNzViNDljNDhkMiIsImlhdCI6MTQzODgzMTk3NSwiZXhwIjoxNDM5NDM2Nzc1LCJpc3MiOiJKQVdTIn0.FlISdHxUrFdrDkovrq_RRwxHqlzaSL3GShr27xlvcB0"
 }
\ No newline at end of file
diff --git a/lib/models/model_user.js b/lib/models/model_user.js
index e5c5543d801..eda0eec7eda 100755
--- a/lib/models/model_user.js
+++ b/lib/models/model_user.js
@@ -170,7 +170,7 @@ User.prototype.signIn = function(data, callback) {
         // Update User
         user.sign_in_count++;
 
-        console.log(user);
+
 
         /**
          * Save
@@ -319,6 +319,8 @@ User.prototype.save = function(user, callback) {
         message: 'Bad Request: Password is required'
     }, null);
 
+    console.log(user);
+
 
     /**
      * Perform Save
@@ -328,8 +330,7 @@ User.prototype.save = function(user, callback) {
         TableName: dynamodb_table,
         ReturnValues: 'ALL_NEW',
         Key: {
-            '_id': user._id,
-            'created': moment().unix()
+            '_id': user._id
         },
         UpdateExpression: 'SET ',
         ExpressionAttributeNames: {},
@@ -366,13 +367,18 @@ User.prototype.save = function(user, callback) {
     params.ExpressionAttributeNames['#a4'] = 'sign_in_count';
     params.ExpressionAttributeValues[':sign_in_count_val'] = user.sign_in_count;
 
+    // created
+    if (isNaN(user.created)) user.created = moment(user.created).unix();
+    params.UpdateExpression = params.UpdateExpression + '#b0 = :created_val, ';
+    params.ExpressionAttributeNames['#b0'] = 'created';
+    params.ExpressionAttributeValues[':created_val'] = user.created;
+
     // updated
-    params.UpdateExpression = params.UpdateExpression + '#b0 = :updated_val, ';
-    params.ExpressionAttributeNames['#b0'] = 'updated';
+    params.UpdateExpression = params.UpdateExpression + '#b1 = :updated_val, ';
+    params.ExpressionAttributeNames['#b1'] = 'updated';
     params.ExpressionAttributeValues[':updated_val'] = moment().unix();
 
 
-
     /**
      * Save
      */