@igea/oac_backend 1.0.73 → 1.0.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igea/oac_backend",
-  "version": "1.0.73",
+  "version": "1.0.75",
   "description": "Backend service for the OAC project",
   "main": "src/index.js",
   "bin": {

package/src/controllers/auth.js

@@ -38,6 +38,12 @@ module.exports = function(jwtLib){
   }
 
   router.get('/exposed_config', (req, res) => {  
+      const ip = req.headers['x-forwarded-for'] || req.socket.remoteAddress;
+      if(ip.includes("127.0.0.1"))
+        EXPOSED.host = "127.0.0.1"
+      else if(ip.includes("localhost"))
+        EXPOSED.host = "localhost"
+
       res.json({ 
           success: true, 
           data: EXPOSED

package/src/controllers/fuseki.js

@@ -60,6 +60,11 @@ router.post('/attachment', upload.single('file'), (req, res) => {
         let protocol = process.env.OAC_EXPOSED_PROTOCOL || 'http';
         let host = process.env.OAC_EXPOSED_HOST || '127.0.0.1';
         if(host=="localhost") host="127.0.0.1";
+        
+        const ip = req.headers['x-forwarded-for'] || req.socket.remoteAddress;
+        if(host=="127.0.0.1" && ip.includes("localhost"))
+            host="localhost"
+        
         let port = process.env.OAC_EXPOSED_PORT || '4000';
         deleteFiles([req.file])
         res.json({ 

package/src/controllers/ontology.js

@@ -16,7 +16,7 @@ const axios = require('axios');
 
 let SCHEMAS = {}
 
-const getSchema = function(format){
+const getSchema = function(format, req){
     let fileContent = null;
     let filePath = null;
     let fileType = null;
@@ -25,8 +25,8 @@ const getSchema = function(format){
             filePath = 'config.shacl.ttl'; //'schema_v1.shacl.ttl';
             fileType = 'text/turtle';
             break;
-        case 'ttl2':
-            filePath = 'schema_v2.shacl.ttl';
+        case 'editing':
+            filePath = 'schema_editing.ttl';
             fileType = 'text/turtle';
             break;
         case 'advanced':
@@ -59,6 +59,11 @@ const getSchema = function(format){
         let protocol = process.env.OAC_EXPOSED_PROTOCOL || 'http';
         let host = process.env.OAC_EXPOSED_HOST || '127.0.0.1';
         if(host=="localhost") host="127.0.0.1";
+
+        const ip = req.headers['x-forwarded-for'] || req.socket.remoteAddress;
+        if(host=="127.0.0.1" && ip.includes("localhost"))
+            host="localhost"
+
         let port = process.env.OAC_EXPOSED_PORT || '4000';
         fileContent = fileContent.replace(/OAC_EXPOSED_PROTOCOL/g, protocol);
         fileContent = fileContent.replace(/OAC_EXPOSED_HOST/g, host);
@@ -71,7 +76,7 @@ const getSchema = function(format){
 router.get('/schema/:format', (req, res) => {
     console.log(`Requesting SHACL schema in format: ${req.params.format}`); 
     let format = req.params.format || 'ttl';
-    let schema = getSchema(format);
+    let schema = getSchema(format, req);
     let fileContent = schema.content;
     res.setHeader('Content-Type', schema.type);
     const tempFile = tmp.fileSync({ postfix: schema.path });
@@ -107,7 +112,7 @@ router.get('/counter/:name', (req, res) => {
 
 router.post('/validate', (req, res) => {
     let turtle = req.body.turtle;
-    let schema = getSchema('ttl2');
+    let schema = getSchema('editing', req);
     console.log("validate...")
     let shacl = schema.content.replace(/owl:imports/g, '#owl:imports');
     Validator.validateDataSyntax(turtle, shacl).then( (result) => {

package/src/models/investigations.js

@@ -19,10 +19,13 @@ class Investigations {
             try{
                 const sql = `SELECT 
                     id, uuid,
-                    array_to_string(
-                        regexp_split_to_array(?,'[^[:alnum:]_/:]+')
-                        ,','
-                    ) as label
+                    array_to_string(ARRAY(
+                        SELECT token
+                            FROM unnest(
+                                regexp_split_to_array(dataset, '[^[:alnum:]_/:]+')
+                            ) AS token
+                        WHERE token ILIKE ?
+                    ), ',') AS label
                 FROM investigations
                 WHERE dataset_search @@ plainto_tsquery('simple', ?)
                     OR dataset ILIKE ?
@@ -31,7 +34,7 @@ class Investigations {
                 const tsQuery = `${text}:*`;
                 const ilikeQuery = `%${text}%`;
                 const result = await db.raw(sql, 
-                    [txtQuery, tsQuery, ilikeQuery, limit, offset]
+                    [ilikeQuery, tsQuery, ilikeQuery, limit, offset]
                 );
                 resolve(result.rows)
             }catch(e){
@@ -63,6 +66,7 @@ class Investigations {
                     .first();
                 let operation = existing ? 'UPDATE' : 'INSERT';
                 if(existing){
+                    delete item["id"]
                     await db(table)
                         .where({uuid: item.uuid})
                         .update(item);