Merge conflicts

Author: RobinLallier

etapes

@@ -0,0 +1,2 @@
+modifier etc host
+ajouter reverse proxy en local

reverse-proxy/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "reverse-proxy",
+  "version": "1.0.0",
+  "description": "",
+  "main": "server.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "node server.js"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "cors": "^2.8.5",
+    "express": "^4.17.1",
+    "express-http-proxy": "^1.5.1",
+    "http-proxy": "^1.17.0"
+  }
+}

reverse-proxy/server.js

@@ -0,0 +1,21 @@
+var express = require('express')
+var cors = require('cors')
+const proxy = require('express-http-proxy');
+
+var app = express()
+
+var corsOptions = {
+  origin: true,
+  optionsSuccessStatus: 200,
+  credentials: true
+}
+
+app.use(cors(corsOptions));
+app.use(proxy('argos2.test.hypertopic.org'));
+
+
+
+ 
+app.listen(80, function () {
+  console.log('CORS-enabled web server listening on port 80')
+})

src/components/Duplication/Duplicator.jsx

@@ -21,6 +21,7 @@ class Duplicator extends Component {
         this.handleConfirm = this.handleConfirm.bind(this);
         this.onChangeCheckBox = this.onChangeCheckBox.bind(this);
         this.closeToast = this.closeToast.bind(this)
+        this.addUserToEntity = this.addUserToEntity.bind(this)
       }
 
     handleClose() {
@@ -41,40 +42,43 @@ class Duplicator extends Component {
         }
     }
 
-    handleConfirm() {
-        let db = hypertopic([
-            "http://argos2.test.hypertopic.org",
-            "http://steatite.hypertopic.org"
-        ]);
-
-        const _error = (x) => console.error(x.message);
+    async handleConfirm() {
+        this.setState({ showModalConfirmation: false, showToast: true });
 
+        var ids = this.state.viewpoints.concat(this.state.corpora)
         let that = this
 
+        await Promise.all(ids.map(id => that.addUserToEntity(id)))
+        //refresh page
+        this.setState({showToast: false });
+        window.location.replace("http://" + this.nameDuplicatedPortfolio + ".local:3000");
 
-        this.state.viewpoints.forEach(function(viewpoint) {
-            db.getView('/viewpoint/' + viewpoint)
-            .then( (x) => {
-                x[viewpoint].user.push(that.nameDuplicatedPortfolio)
-                return x
-            })
-            .then(db.post)
-            .catch(_error);
-        });
+    }
 
-        this.state.corpora.forEach(function(corpus) {
-            db.getView('/corpus/' + corpus)
-            .then( (x) => {
-                x[corpus].user.push(that.nameDuplicatedPortfolio)
-                return x
-            })
-            .then(db.post)
-            .catch(_error);
-        });
+    addUserToEntity(user){
+        let db = hypertopic([
+            "http://localhost",
+            "http://steatite.hypertopic.org"
+        ]);
+
+        const _error = (x) => {
+            console.error(x.message)
+            return x
+        };
 
-        this.setState({ showModalConfirmation: false, showToast: true});
-        document.location = 'http://'+ this.nameDuplicatedPortfolio +'.porphyry.org/'
+        return db.get({_id:user})
+        .then( (x) => {
+            if(!x.users.includes(this.nameDuplicatedPortfolio))
+                 x.users.push(this.nameDuplicatedPortfolio)
+            return x
+        })
+        .then(db.post)
+        .then((x) => {
+            console.log(x)
+        })
+        .catch(_error);
     }
+
     closeToast() {
         this.setState(() => {
           return {

src/components/Duplication/Toast.jsx

@@ -1,7 +1,6 @@
 {
-  "user": "vitraux",
   "services": [
-    "http://argos2.test.hypertopic.org",
+    "http://localhost",
     "http://steatite.hypertopic.org"
   ]
 }