1 files changed, 33 insertions, 8 deletions
diff --git a/server/lib/api.js b/server/lib/api.js
index 85c5b85..cf2a911 100644
--- a/server/lib/api.js
+++ b/server/lib/api.js
@@ -6,6 +6,7 @@ var passport = require('passport'),
 	crypto = require('crypto'),
 	_ = require('lodash'),
 	util = require('./util'),
+	upload = require('./upload'),
 	config = require('../../config.json'),
 	User = require('./schemas/User');
 
@@ -21,9 +22,9 @@ var api = {
 		
 		update: function(req, res){
 			var data = util.cleanQuery(req.body)
-			if (data.new_password.length) {
-				if (req.user.checkPassword(data.old_password)) {
-					res.json({ error: { errors: { username: { message: "Old password is incorrect" } } } })
+			if (data.new_password && data.new_password.length) {
+				if (! data.old_password || ! req.user.checkPassword(data.old_password)) {
+					res.json({ error: { errors: { password: { message: "Old password is incorrect" } } } })
 				}
 				
 				var shasum = crypto.createHash('sha1')
@@ -35,11 +36,35 @@ var api = {
 			delete data.old_password
 			delete data.new_password
 			delete data.isAdmin
-			_.extend( req.user, data )
-			req.user.save(function(err, msg) {
-				err ? res.json({ status: "FAIL", error: err })
-					: res.json({ status: "OK", payload: req.user })
-			})
+			
+			if (req.files.avatar) {
+				// handle the upload here
+				console.log("GOT SOME FILES")
+				upload.put("avatars", req.files.avatar, {
+					acceptable: function(){
+						console.log("acceptable")
+					},
+					unacceptable: function(err){
+						console.log("unacceptable")
+						res.json({ error: { errors: { avatar: { message: "Problem saving avatar: " + err } } } })
+					},
+					success: function(url){
+						data.photo = url
+						done()
+					}
+				})
+			}
+			else {
+				done()
+			}
+			
+			function done () {
+				_.extend( req.user, data )
+				req.user.save(function(err, msg) {
+					err ? res.json({ status: "FAIL", error: err })
+						: res.json({ status: "OK", payload: req.user })
+				})
+			}
 		}
 	}