listContainer now uses ldp/stat types, fix nodeSolidServer#95

nicola · nicola · commit ad47f5f622c3 · 2015-07-28T02:54:28.000+02:00
diff --git a/lib/ldp.js b/lib/ldp.js
@@ -203,9 +203,32 @@ LDP.prototype.listContainer = function (filename, uri, containerData, callback)
                     typeStatement.object);
                 });
 
+              // TODO is this a repetition?
               fs.stat(filename + file, function(err, fileStats) {
                 if (err) {}
 
+                if (fileStats.isDirectory()) {
+                  resourceGraph.add(
+                    metadataGraph.sym(fileSubject),
+                    ns.rdf('type'),
+                    ns.ldp('BasicContainer'));
+
+                  resourceGraph.add(
+                    metadataGraph.sym(fileSubject),
+                    ns.rdf('type'),
+                    ns.ldp('Container'));
+
+                  resourceGraph.add(
+                    metadataGraph.sym(fileSubject),
+                    ns.rdf('type'),
+                    ns.stat('Directory'));
+                } else {
+                  resourceGraph.add(
+                    metadataGraph.sym(fileSubject),
+                    ns.rdf('type'),
+                    ns.stat('File'));
+                }
+
                 resourceGraph.add(
                   metadataGraph.sym(fileSubject),
                   ns.stat('mtime'),
diff --git a/lib/login.js b/lib/login.js
@@ -11,7 +11,7 @@ function loginHandler(req, res, next) {
         return next();
     }
     if (req.session.userId && req.session.identified) {
-        debug("User: " + req.session.profile);
+        debug("User: " + req.session.userId);
         res.set('User', req.session.userId);
         return next();
     } else {
diff --git a/test/acl.js b/test/acl.js
@@ -1009,7 +1009,6 @@ describe('ACL Class', function () {
 
     var user1 = "https://user1.databox.me/profile/card#me";
     var user2 = "https://user2.databox.me/profile/card#me";
-    var nicola = "https://nicola.databox.me/profile/card#me";
     var address = 'https://server.tld/test';
 
     describe('readACL', function () {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ function loginHandler(req, res, next) {`
`11`	`11`	`return next();`
`12`	`12`	`}`
`13`	`13`	`if (req.session.userId && req.session.identified) {`
`14`		`- debug("User: " + req.session.profile);`
	`14`	`+ debug("User: " + req.session.userId);`
`15`	`15`	`res.set('User', req.session.userId);`
`16`	`16`	`return next();`
`17`	`17`	`} else {`