Merge pull request #238 from hunterwilliams/fix-updating-user

Fix #229 Account Edits
marklogic-community · Sep 25, 2015 · 9f67975 · 9f67975
2 parents f9c615c + f923ca2
commit 9f67975
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 10 deletions.
diff --git a/app/templates/node-server/routes.js b/app/templates/node-server/routes.js
@@ -16,14 +16,47 @@ var options = {
 };
 
 router.get('/user/status', function(req, res) {
+  var headers = req.headers;
   noCache(res);
   if (req.session.user === undefined) {
-    res.send('{"authenticated": false}');
+    res.send({authenticated: false});
   } else {
-    res.send({
-      authenticated: true,
-      username: req.session.user.name,
-      profile: req.session.user.profile
+    delete headers['content-length'];
+    var status = http.get({
+      hostname: options.mlHost,
+      port: options.mlHttpPort,
+      path: '/v1/documents?uri=/api/users/' + req.session.user.name + '.json',
+      headers: headers,
+      auth: req.session.user.name + ':' + req.session.user.password
+    }, function(response) {
+      if (response.statusCode === 200) {
+        response.on('data', function(chunk) {
+          var json = JSON.parse(chunk);
+          if (json.user !== undefined) {
+            res.status(200).send({
+              authenticated: true,
+              username: req.session.user.name,
+              profile: json.user
+            });
+          } else {
+            console.log('did not find chunk.user');
+          }
+        });
+      } else if (response.statusCode === 404) {
+        //no profile yet for user
+        res.status(200).send({
+          authenticated: true,
+          username: req.session.user.name,
+          profile: {}
+        });
+      } else {
+        res.send({authenticated: false});
+      }
+    });
+
+    status.on('error', function(e) {
+      console.log(JSON.stringify(e));
+      console.log('status check failed: ' + e.statusCode);
     });
   }
 });
@@ -72,14 +105,10 @@ router.post('/user/login', function(req, res) {
         response.on('data', function(chunk) {
           var json = JSON.parse(chunk);
           if (json.user !== undefined) {
-            req.session.user.profile = {
-              fullname: json.user.fullname,
-              emails: json.user.emails
-            };
             res.status(200).send({
               authenticated: true,
               username: username,
-              profile: req.session.user.profile
+              profile: json.user
             });
           } else {
             console.log('did not find chunk.user');

diff --git a/app/templates/ui/app/user/profile.controller.js b/app/templates/ui/app/user/profile.controller.js
@@ -44,6 +44,10 @@
       if (form.$valid) {
         addEmail();
 
+        if (ctrl.user.emails) {
+          _.pull(ctrl.user.emails, '');
+        }
+
         mlRest.updateDocument({
           user: {
             'fullname': ctrl.user.fullname,

diff --git a/app/templates/ui/app/user/user.service.spec.js b/app/templates/ui/app/user/user.service.spec.js
@@ -59,6 +59,7 @@
       loginService.login('test', 'abc').then(function(response) {
         expect(response.data).to.deep.eq({ authenticated: true, username: 'bob' });
         expect(service.currentUser()).to.deep.eq({ name: 'bob' });
+        expect(service.getUser()).to.deep.eq({ name: 'bob' });
       });
       expect($http.post).to.have.been.calledOnce;
       $rootScope.$apply();