Merge pull request #211 from feup-infolab/merge-nelson-and-joao-tests

Merge nelson and joao tests
feup-infolab · Apr 11, 2017 · bf1efec · bf1efec
2 parents 3ba51de + 67e67f5
commit bf1efec
Show file tree

Hide file tree

Showing 79 changed files with 11,030 additions and 2,073 deletions.
diff --git a/conf/deployment_configs.json b/conf/deployment_configs.json
@@ -120,7 +120,7 @@
         "destroy_all_graphs_on_startup" : false
       },
       "session": {
-        "auto_login": true,
+        "auto_login": false,
         "login_user": "demouser1"
       },
       "files": {
@@ -162,6 +162,10 @@
       "diagnostics" :
       {
         "ram_usage_report" : true
+      },
+      "index" :
+      {
+        "elasticsearch_connection_log_type" : "trace"
       }
     },
     "startup" : {
@@ -419,7 +423,7 @@
     "debug" : {
       "active": true,
       "database" :{
-        "log_all_queries": true,
+        "log_all_queries": false,
         "destroy_all_graphs_on_startup" : false
       },
       "session": {
@@ -464,6 +468,10 @@
       "diagnostics" :
       {
         "ram_usage_report" : true
+      },
+      "index" :
+      {
+        "elasticsearch_connection_log_type" : ""
       }
     },
     "startup" : {
@@ -772,6 +780,10 @@
       "diagnostics" :
       {
         "ram_usage_report" : true
+      },
+      "index" :
+      {
+        "elasticsearch_connection_log_type" : ""
       }
     },
     "startup" : {
@@ -1082,6 +1094,10 @@
       "diagnostics" :
       {
         "ram_usage_report" : true
+      },
+      "index" :
+      {
+        "elasticsearch_connection_log_type" : ""
       }
     },
     "startup" : {

diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "dive": "^0.5.0",
     "easyimage": "^2.1.0",
     "ejs": "^2.5.6",
-    "elasticsearchclient": "^0.5.3",
+    "elasticsearch": "^12.1.3",
     "errorhandler": "^1.5.0",
     "etag": "^1.7.0",
     "excel-parser": "*",

diff --git a/src/app.js b/src/app.js
@@ -1192,7 +1192,7 @@ async.waterfall([
         app.post('/ontologies/edit', async.apply(Permissions.require, [Permissions.role.system.admin]), ontologies.edit);
 
         //descriptors
-        app.get('/descriptors/from_ontology/:ontology_prefix', async.apply(Permissions.require, [Permissions.role.system.user]), descriptors.from_ontology);
+        app.get('/descriptors/from_ontology/:ontology_prefix', async.apply(Permissions.require, [ Permissions.role.project.contributor, Permissions.role.project.creator]), descriptors.from_ontology);
 
         //research domains
 
@@ -1227,8 +1227,8 @@ async.waterfall([
 
         app.get('/project/:handle/request_access', async.apply(Permissions.require, [Permissions.role.system.user]), projects.requestAccess);
         app.post('/project/:handle/request_access', async.apply(Permissions.require, [Permissions.role.system.user]), projects.requestAccess);
-        app.post('/project/:handle/delete', async.apply(Permissions.require, [Permissions.role.system.admin]), projects.delete);
-        app.post('/project/:handle/undelete', async.apply(Permissions.require, [Permissions.role.system.admin]), projects.undelete);
+        app.post('/project/:handle/delete', async.apply(Permissions.require, [Permissions.role.project.creator]), projects.delete);
+        app.post('/project/:handle/undelete', async.apply(Permissions.require, [Permissions.role.project.creator]), projects.undelete);
 
         //interactions
         app.post("/interactions/accept_descriptor_from_quick_list", async.apply(Permissions.require, [Permissions.role.system.user]), interactions.accept_descriptor_from_quick_list);
@@ -1279,16 +1279,15 @@ async.waterfall([
 
         //external repository bookmarks
         app.get('/external_repositories/types', async.apply(Permissions.require, [Permissions.role.system.user]), repo_bookmarks.repository_types);
-        app.get('/external_repositories/my', async.apply(Permissions.require, [ Permissions.role.project.contributor, Permissions.role.project.creator]), repo_bookmarks.my);
+        app.get('/external_repositories/my', async.apply(Permissions.require, [Permissions.role.system.user ]), repo_bookmarks.my);
         app.get('/external_repositories', async.apply(Permissions.require, [Permissions.role.system.admin]), repo_bookmarks.all);
         app.post('/external_repositories/sword_collections', async.apply(Permissions.require, [Permissions.role.system.user]), datasets.sword_collections);
         app.post('/external_repositories/new', async.apply(Permissions.require, [Permissions.role.system.user]), repo_bookmarks.new);
-        app.delete('/external_repository/:username/:title', async.apply(Permissions.require, [Permissions.role.project.contributor, Permissions.role.project.creator]), repo_bookmarks.delete);
+        app.delete('/external_repository/:username/:title', async.apply(Permissions.require, [Permissions.role.system.user]), repo_bookmarks.delete);
 
         //view a project's root
         app.all(/\/project\/([^\/]+)(\/data)?\/?$/, function(req,res, next)
             {
-                //console.log("Entered Project Root Route. URL : " + req.originalUrl);
                 var defaultPermissionsInProjectRoot = [
                     Permissions.project_privacy_status.public,
                     Permissions.project_privacy_status.metadata_only,
@@ -1490,7 +1489,7 @@ async.waterfall([
                     Permissions.role.project.creator
                 ];
 
-                var modificationPermissionsBranch = [
+                const modificationPermissionsBranch = [
                     Permissions.role.project.contributor,
                     Permissions.role.project.creator
                 ];
@@ -1699,7 +1698,7 @@ async.waterfall([
                         },
                         {
                             queryKeys : ['undelete'],
-                            handler : projects.undelete,
+                            handler : files.undelete,
                             permissions : modificationPermissionsBranch,
                             authentication_error : "Permission denied : cannot undelete resource because you do not have permissions to edit this project."
                         },
@@ -1711,6 +1710,12 @@ async.waterfall([
                         }
                     ],
                     delete : [
+                        {
+                            queryKeys : ['really_delete'],
+                            handler : files.rm,
+                            permissions : modificationPermissionsBranch,
+                            authentication_error : "Permission denied : cannot delete resource because you do not have permissions to edit this project."
+                        },
                         {
                             queryKeys : [],
                             handler : files.rm,