Merge pull request #229 from Inist-CNRS/host_config

[RFR] Rework URIs
Inist-CNRS · Apr 3, 2017 · a859cf1 · a859cf1
2 parents b136330 + ffc5ec0
commit a859cf1
Show file tree

Hide file tree

Showing 44 changed files with 271 additions and 281 deletions.
diff --git a/README.md b/README.md
@@ -68,6 +68,7 @@ On EzMaster, you can edit the instance configuration:
 - `exporters`: Required - an array of the allowed exporters
 
 - `loader`: Required - an array of loaders (which import your data) with their options
+- `host`: Optional - the public host which will be used to generate resources URIs. It will fallback on the EzMaster environment variable `EZMASTER_PUBLIC_URL`. Format is `http://[host]` (no ending slash)
 
 - `mongo`: Optional - Allow to override the default mongo configuration given by ezMaster. You can override all or part of the config, available properties are :
 

diff --git a/config/development-dist.js b/config/development-dist.js
@@ -10,4 +10,5 @@ module.exports = {
         host: 'mongo:27017',
         dbName: 'lodex',
     },
+    host: 'http://localhost:3000',
 };
diff --git a/package.json b/package.json
@@ -84,7 +84,7 @@
     "react-motion": "0.4.7",
     "react-motion-ui-pack": "0.10.2",
     "react-redux": "5.0.2",
-    "react-router": "3.0.2",
+    "react-router": "3.0.3",
     "react-router-redux": "4.0.7",
     "react-share": "1.12.1",
     "react-tap-event-plugin": "2.0.1",

diff --git a/src/api/controller/api/ark.js b/src/api/controller/api/ark.js
@@ -4,32 +4,34 @@ const ARK_URI = new RegExp(/ark:\/(\d{5,})/, 'i');
 
 export default async (ctx, next) => {
     const uri = ctx.path;
-    const matches = ARK_URI.exec(uri);
-
-    if (!uri.startsWith('ark:/') && !ctx.query.uri) {
+    if (!uri.startsWith('ark:/') && !uri.startsWith('uid:/') && !ctx.query.uri) {
         await next();
         return;
     }
 
+    const arkMatches = ARK_URI.exec(uri);
+
     if (ctx.query.uri) {
         ctx.body = await ctx.publishedDataset.findByUri(ctx.query.uri);
         return;
     }
 
-    if (!matches) {
+    if (!arkMatches) {
         ctx.status = 404;
         return;
     }
 
-    const ark = new InistArk({
-        naan: matches[1],
-    });
+    if (arkMatches) {
+        const ark = new InistArk({
+            naan: arkMatches[1],
+        });
 
-    const validation = ark.validate(uri);
+        const validation = ark.validate(uri);
 
-    if (!validation.ark) {
-        ctx.status = 404;
-        return;
+        if (!validation.ark) {
+            ctx.status = 404;
+            return;
+        }
     }
 
     ctx.body = await ctx.publishedDataset.findByUri(uri);

diff --git a/src/api/controller/front/index.js b/src/api/controller/front/index.js
@@ -11,7 +11,15 @@ const middleware = process.env.NODE_ENV === 'development' ? dev() : prod();
 app.use(async (ctx, next) => {
     const uri = ctx.path;
 
-    if (uri.startsWith('/ark:/') || uri.startsWith('/uid:/')) {
+    if (!uri.startsWith('/api')
+        && uri !== '/admin'
+        && uri.indexOf('.js') === -1
+        && uri.indexOf('__webpack_hmr') === -1) {
+        if (uri.startsWith('/admin')) {
+            ctx.path = '/admin';
+            await next();
+            return;
+        }
         // Override the path so that webpack serves the application correctly
         ctx.path = '/';
     }

diff --git a/src/api/models/publishedDataset.js b/src/api/models/publishedDataset.js
@@ -2,6 +2,8 @@ import { ObjectID } from 'mongodb';
 import chunk from 'lodash.chunk';
 import omit from 'lodash.omit';
 import compose from 'lodash.compose';
+import config from 'config';
+import { getResourceUri } from '../../common/uris';
 
 import { VALIDATED, PROPOSED } from '../../common/propositionStatus';
 
@@ -106,7 +108,14 @@ export default (db) => {
         )({ removedAt: { $exists: false } });
         const cursor = collection.getFindCursor(filters, sortBy, sortDir);
 
-        return cursor.stream();
+        return cursor
+            .map(resource => (
+                resource.uri.startsWith('http') ? resource : ({
+                    ...resource,
+                    uri: getResourceUri(resource, config.host),
+                })
+            ))
+            .stream();
     };
 
     collection.findById = async (id) => {

diff --git a/src/app/custom/index.html b/src/app/custom/index.html
@@ -16,11 +16,11 @@
         <nav class="navbar navbar-default navbar-fixed-top">
             <div class="container-fluid">
                 <div class="navbar-header">
-                    <a class="navbar-brand" href="#">Lodex</a>
+                    <a class="navbar-brand" href="/">Lodex</a>
                 </div>
                 <ul class="nav navbar-nav">
                     <li><a class="btn-admin" href="/admin">Administration</a></li>
-                    <li><a class="btn-sign-in" href="#/login">Connection</a></li>
+                    <li><a class="btn-sign-in" href="/login">Connection</a></li>
                 </ul>
             </div>
         </nav>

diff --git a/src/app/e2e/addCharacteristic.spec.js b/src/app/e2e/addCharacteristic.spec.js
@@ -14,7 +14,7 @@ describe('add characteristic', function homePublishedDataTests() {
     before(async () => {
         await clear();
         await loadFixtures(fixtures);
-        await loginAsJulia('/', '/');
+        await loginAsJulia('/');
     });
 
     it('should display the dataset characteristics', async () => {

diff --git a/src/app/e2e/admin/composedOf.json b/src/app/e2e/admin/composedOf.json
@@ -72,7 +72,7 @@
     ],
     "dataset": [
         {
-            "id": 5,
+            "id": "1",
             "firstname": "PEREGRIN",
             "name": "TOOK",
             "email": "peregrin.took@shire.net",

diff --git a/src/app/e2e/admin/composedOf.spec.js b/src/app/e2e/admin/composedOf.spec.js
@@ -12,7 +12,7 @@ import driver from '../../../common/tests/chromeDriver';
 import { clear, loadFixtures } from '../../../common/tests/fixtures';
 import fixtures from './composedOf.json';
 import { inputElementIsFocusable } from '../../../common/tests/conditions';
-import loginAsJulia from '../loginAsJulia';
+import loginAsJulia from './loginAsJulia';
 import waitForPreviewComputing from './waitForPreviewComputing';
 
 describe('Admin', () => {
@@ -27,7 +27,7 @@ describe('Admin', () => {
             await driver.get('http://localhost:3100/admin');
             await driver.executeScript('return localStorage.clear();');
             await driver.executeScript('return sessionStorage.clear();');
-            await loginAsJulia('/admin', '/');
+            await loginAsJulia('/admin');
         });
         let fieldForm;
 

diff --git a/src/app/e2e/admin/contributedResources.json b/src/app/e2e/admin/contributedResources.json
@@ -67,7 +67,7 @@
     ],
     "publishedDataset": [
         {
-            "uri" : "1",
+            "uri" : "uid:/1",
             "versions": [{
                 "fullname" : "PEREGRIN.TOOK",
                 "email" : "peregrin.took@shire.net"
@@ -99,7 +99,7 @@
             }
         },
         {
-            "uri" : "2",
+            "uri" : "uid:/2",
             "versions": [{
                 "fullname" : "SAMSAGET.GAMGIE",
                 "email" : "samsaget.gamgie@shire.net"
@@ -121,7 +121,7 @@
             }
         },
         {
-            "uri" : "3",
+            "uri" : "uid:/3",
             "versions": [{
                 "fullname" : "BILBON.BAGGINS",
                 "email" : "bilbon.saquet@shire.net"
@@ -143,14 +143,14 @@
             }
         },
         {
-            "uri" : "4",
+            "uri" : "uid:/4",
             "versions": [{
                 "fullname" : "FRODO.BAGGINS",
                 "email" : "frodo.saquet@shire.net"
             }]
         },
         {
-            "uri" : "5",
+            "uri" : "uid:/5",
             "versions": [{
                 "fullname" : "MERIADOC.BRANDYBUCK",
                 "email" : "meriadoc.brandybuck@shire.net"

diff --git a/src/app/e2e/admin/contributedResources.spec.js b/src/app/e2e/admin/contributedResources.spec.js
@@ -5,7 +5,7 @@ import { elementIsClicked } from 'selenium-smart-wait';
 import driver from '../../../common/tests/chromeDriver';
 import { clear, loadFixtures } from '../../../common/tests/fixtures';
 import fixtures from './contributedResources.json';
-import loginAsJulia from '../loginAsJulia';
+import loginAsJulia from './loginAsJulia';
 
 describe('Admin', () => {
     describe('Contributed Resource management', function homePublishedDataTests() {
@@ -15,7 +15,7 @@ describe('Admin', () => {
         before(async () => {
             await clear(); // Had to ensure clear state for unknown reason
             await loadFixtures(fixtures);
-            await loginAsJulia('/admin', '/');
+            await loginAsJulia('/admin');
         });
 
         it('should display the proposed contributed resources', async () => {
@@ -88,6 +88,7 @@ describe('Admin', () => {
 
         it('should go to resource page when clicking on review', async () => {
             const reviewButton = '.btn-review-resource';
+            await driver.sleep(10000);
             await driver.wait(elementIsClicked(reviewButton), DEFAULT_WAIT_TIMEOUT);
             await driver.wait(until.elementLocated(By.css('.resource')));
         });

diff --git a/src/app/e2e/admin/import.spec.js b/src/app/e2e/admin/import.spec.js
@@ -5,7 +5,7 @@ import { elementIsClicked, elementsCountIs, elementTextIs, elementTextMatches }
 
 import driver from '../../../common/tests/chromeDriver';
 import { clear } from '../../../common/tests/fixtures';
-import loginAsJulia from '../loginAsJulia';
+import loginAsJulia from './loginAsJulia';
 
 describe('Admin', () => {
     describe('Import model', function homeTests() {
@@ -19,7 +19,7 @@ describe('Admin', () => {
             await driver.executeScript('return localStorage.clear();');
             await driver.executeScript('return sessionStorage.clear();');
 
-            await loginAsJulia('/admin', '/');
+            await loginAsJulia('/admin');
         });
 
         describe('Uploading dataset', () => {

diff --git a/src/app/e2e/admin/loginAsJulia.js b/src/app/e2e/admin/loginAsJulia.js
@@ -0,0 +1,22 @@
+import { until, By } from 'selenium-webdriver';
+
+import driver from '../../../common/tests/chromeDriver';
+import { inputElementIsFocusable } from '../../../common/tests/conditions';
+
+const DEFAULT_WAIT_TIMEOUT = 9000; // A bit less than mocha's timeout to get explicit errors from selenium
+
+export default async (nextpathname) => {
+    await driver.get(`http://localhost:3100${nextpathname}`);
+
+    await driver.wait(until.elementLocated(By.css('form')));
+    const form = await driver.findElement(By.css('form'));
+    const username = await driver.findElement(By.css('input[name=username]'));
+    const password = await driver.findElement(By.css('input[name=password]'));
+    await driver.wait(inputElementIsFocusable(username, true), DEFAULT_WAIT_TIMEOUT);
+    await driver.wait(inputElementIsFocusable(password, true), DEFAULT_WAIT_TIMEOUT);
+
+    await username.sendKeys('user');
+    await password.sendKeys('secret');
+    await form.submit();
+    await driver.wait(until.urlMatches(new RegExp(nextpathname)));
+};
diff --git a/src/app/e2e/admin/publication.spec.js b/src/app/e2e/admin/publication.spec.js
@@ -13,7 +13,7 @@ import {
 import driver from '../../../common/tests/chromeDriver';
 import { clear } from '../../../common/tests/fixtures';
 import { inputElementIsFocusable } from '../../../common/tests/conditions';
-import loginAsJulia from '../loginAsJulia';
+import loginAsJulia from './loginAsJulia';
 import waitForPreviewComputing from './waitForPreviewComputing';
 
 describe('Admin', () => {
@@ -27,7 +27,7 @@ describe('Admin', () => {
             await driver.get('http://localhost:3100/admin');
             await driver.executeScript('return localStorage.clear();');
             await driver.executeScript('return sessionStorage.clear();');
-            await loginAsJulia('/admin', '/');
+            await loginAsJulia('/admin');
         });
 
         describe('Uploading', () => {

diff --git a/src/app/e2e/admin/removedResources.spec.js b/src/app/e2e/admin/removedResources.spec.js
@@ -5,7 +5,7 @@ import { elementIsClicked } from 'selenium-smart-wait';
 import driver from '../../../common/tests/chromeDriver';
 import { clear, loadFixtures } from '../../../common/tests/fixtures';
 import fixtures from './removedResources.json';
-import loginAsJulia from '../loginAsJulia';
+import loginAsJulia from './loginAsJulia';
 
 describe('Admin', () => {
     describe('Removed Resource management', function homePublishedDataTests() {
@@ -20,7 +20,7 @@ describe('Admin', () => {
             await driver.executeScript('return localStorage.clear();');
             await driver.executeScript('return sessionStorage.clear();');
 
-            await loginAsJulia('/admin', '/');
+            await loginAsJulia('/admin');
         });
 
         it('should activate removed-resources tab', async () => {

diff --git a/src/app/e2e/home_published.json b/src/app/e2e/home_published.json
@@ -177,47 +177,47 @@
     ],
     "publishedDataset": [
         {
-            "uri" : "1",
+            "uri" : "uid:/1",
             "versions": [{
                 "firstname" : "PEREGRIN",
                 "name" : "TOOK",
                 "email" : "peregrin.took@shire.net",
-                "best_friend_of": "5"
+                "best_friend_of": "uid:/5"
             }]
         },
         {
-            "uri" : "2",
+            "uri" : "uid:/2",
             "versions": [{
                 "firstname" : "SAMSAGET",
                 "name" : "GAMGIE",
                 "email" : "samsaget.gamgie@shire.net",
-                "best_friend_of": "4"
+                "best_friend_of": "uid:/4"
             }]
         },
         {
-            "uri" : "3",
+            "uri" : "uid:/3",
             "versions": [{
                 "firstname" : "BILBON",
                 "name" : "BAGGINS",
                 "email" : "bilbon.saquet@shire.net"
             }]
         },
         {
-            "uri" : "4",
+            "uri" : "uid:/4",
             "versions": [{
                 "firstname": "FRODO",
                 "name" : "BAGGINS",
                 "email" : "frodo.saquet@shire.net",
-                "best_friend_of": "2"
+                "best_friend_of": "uid:/2"
             }]
         },
         {
-            "uri" : "5",
+            "uri" : "uid:/5",
             "versions": [{
                 "firstname" : "MERIADOC",
                 "name" : "BRANDYBUCK",
                 "email" : "meriadoc.brandybuck@shire.net",
-                "best_friend_of": "1"
+                "best_friend_of": "uid:/1"
             }]
         }
     ],