Is730/serve studies

.vscode-template/settings.json

@@ -15,7 +15,7 @@
   "files.trimFinalNewlines": true,
   "files.trimTrailingWhitespace": true,
   "python.formatting.autopep8Args": [
-    "-max-line-length", "140"
+    "--max-line-length 140"
   ],
   "python.linting.pylintEnabled": true,
   "python.linting.enabled": true,
@@ -26,5 +26,6 @@
   "[makefile]": {
     "editor.insertSpaces": false
   },
+  "python.testing.pyTestEnabled": true,
   "autoDocstring.docstringFormat": "sphinx"
 }

scripts/openapi/oas_resolver/Dockerfile

@@ -12,7 +12,7 @@ WORKDIR /src
 
 # update pip
 RUN pip install --no-cache-dir --upgrade \
-      pip \
+      pip~=19.1.1  \
       wheel \
       setuptools
 

services/director/Dockerfile

@@ -48,7 +48,7 @@ RUN apk add --no-cache \
     git
 
 RUN $SC_PIP install --upgrade \
-      pip \
+      pip~=19.1.1  \
       wheel \
       setuptools
 

services/dy-3dvis/simcoreparaviewweb/Dockerfile

@@ -47,7 +47,7 @@ COPY scripts/docker/healthcheck_curl_host.py /healthcheck/healthcheck_curl_host.
 # set up oSparc env variables
 ENV SIMCORE_NODE_UUID="-1" \
     SIMCORE_USER_ID="-1" \
-    STORAGE_ENDPOINT="=1" \    
+    STORAGE_ENDPOINT="=1" \
     S3_ENDPOINT="=1" \
     S3_ACCESS_KEY="-1" \
     S3_SECRET_KEY="-1" \
@@ -101,4 +101,4 @@ RUN export PATH="${PYENV_ROOT}/bin:$PATH" && \
     pip install /home/root/services/storage/client-sdk/python
 # copy script to get the inputs inside the local file system
 COPY services/dy-3dvis/simcoreparaviewweb/cgi_scripts /home/root/cgi_scripts
-ENTRYPOINT [ "/bin/bash", "docker/boot.sh" ]
+ENTRYPOINT [ "/bin/bash", "docker/boot.sh" ]

services/dy-modeling/server/Dockerfile

@@ -90,4 +90,4 @@ COPY services/dy-modeling/server/source /home/node/source
 COPY services/dy-modeling/server/docker /home/node/docker
 RUN npm install -y
 
-ENTRYPOINT [ "/bin/bash", "/home/node/docker/boot.sh" ]
+ENTRYPOINT [ "/bin/bash", "/home/node/docker/boot.sh" ]

services/sidecar/Dockerfile

@@ -44,7 +44,7 @@ RUN apk add --no-cache \
       libc-dev
 
 RUN $SC_PIP install --upgrade \
-      pip \
+      pip~=19.1.1  \
       wheel \
       setuptools
 

services/sidecar/src/sidecar/core.py

@@ -370,7 +370,7 @@ def postprocess(self):
 
     def inspect(self, celery_task, user_id, project_id, node_id):
         log.debug("ENTERING inspect pipeline:node %s: %s", project_id, node_id)
-        # import pdb; pdb.set_trace()
+
         next_task_nodes = []
         do_run = False
 

services/storage/Dockerfile

@@ -44,7 +44,7 @@ RUN apk add --no-cache \
       linux-headers
 
 RUN $SC_PIP install --upgrade \
-      pip \
+      pip~=19.1.1  \
       wheel \
       setuptools
 

services/storage/tests/test_dsm.py

@@ -9,7 +9,6 @@
 import io
 import json
 import os
-import pdb
 import urllib
 import uuid
 from pathlib import Path

services/web/Dockerfile

@@ -49,7 +49,7 @@ RUN apk add --no-cache \
       libffi-dev
 
 RUN $SC_PIP install --upgrade \
-      pip \
+      pip~=19.1.1 \
       wheel \
       setuptools
 

services/web/client/.eslintrc.json

@@ -24,5 +24,8 @@
       }
     ],
     "no-warning-comments": "off"
+  },
+  "env": {
+    "browser": true
   }
 }

services/web/client/compile.json

@@ -2,16 +2,16 @@
   "targets": [
     {
       "type": "source",
-      "outputPath": "source-output",
+      "outputPath": "source-output"
+    },
+    {
+      "type": "build",
+      "outputPath": "build-output",
       "bundle": {
         "include": [
           "qx.*"
         ]
       }
-    },
-    {
-      "type": "build",
-      "outputPath": "build-output"
     }
   ],
   "defaultTarget": "source",

services/web/client/source/class/qxapp/Application.js

@@ -69,7 +69,19 @@ qx.Class.define("qxapp.Application", {
         this.__restart();
       }, this);
 
-      this.__restart();
+      this.__initRouting();
+    },
+
+    __initRouting: function() {
+      // Route: /#/study/{id}
+      // TODO: PC -> IP consider regex for uuid, i.e. /[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}/ ???
+      let result = /#\/study\/([0-9a-zA-Z\-]+)/.exec(window.location.hash);
+      if (result) {
+        qxapp.utils.Utils.cookie.deleteCookie("user");
+        qxapp.auth.Manager.getInstance().validateToken(() => this.__loadMainPage(result[1]), this.__loadLoginPage, this);
+      } else {
+        this.__restart();
+      }
     },
 
     __restart: function() {
@@ -80,35 +92,37 @@ qx.Class.define("qxapp.Application", {
         isLogged = true;
       }
 
-      let view = null;
-      let options = null;
-
       if (isLogged) {
-        this.__connectWebSocket();
-        view = new qxapp.desktop.LayoutManager();
-        options = {
-          top: 0,
-          bottom: 0,
-          left: 0,
-          right: 0
-        };
-        this.__loadView(view, options);
+        this.__loadMainPage();
       } else {
-        this.__disconnectWebSocket();
-        view = new qxapp.auth.MainView();
-        view.addListener("done", function(msg) {
-          this.__restart();
-        }, this);
-        options = {
-          top: "10%",
-          bottom: 0,
-          left: 0,
-          right: 0
-        };
-        this.__loadView(view, options);
+        qxapp.auth.Manager.getInstance().validateToken(this.__loadMainPage, this.__loadLoginPage, this);
       }
     },
 
+    __loadLoginPage: function() {
+      this.__disconnectWebSocket();
+      const view = new qxapp.auth.LoginPage();
+      view.addListener("done", function(msg) {
+        this.__restart();
+      }, this);
+      this.__loadView(view, {
+        top: "10%",
+        bottom: 0,
+        left: 0,
+        right: 0
+      });
+    },
+
+    __loadMainPage: function(studyId) {
+      this.__connectWebSocket();
+      this.__loadView(new qxapp.desktop.MainPage(studyId), {
+        top: 0,
+        bottom: 0,
+        left: 0,
+        right: 0
+      });
+    },
+
     __loadView: function(view, options) {
       this.assert(view!==null);
       // Update root document and currentness

services/web/client/source/class/qxapp/auth/Data.js

@@ -31,7 +31,7 @@ qx.Class.define("qxapp.auth.Data", {
     auth: {
       init: null,
       nullable: true,
-      check: "qx.io.request.authentication.Basic"
+      check: "qxapp.io.request.authentication.Token"
     },
 
     /**
@@ -48,14 +48,20 @@ qx.Class.define("qxapp.auth.Data", {
 
     setToken: function(token) {
       if (token) {
-        this.setAuth(new qx.io.request.authentication.Basic(token, null));
+        qxapp.utils.Utils.cookie.setCookie("user", token);
+        this.setAuth(new qxapp.io.request.authentication.Token(token));
       }
     },
 
     resetToken: function() {
+      qxapp.utils.Utils.cookie.setCookie("user", "logout");
       this.resetAuth();
     },
 
+    isLogout: function() {
+      return qxapp.utils.Utils.cookie.getCookie("user") === "logout";
+    },
+
     getUserName: function() {
       const email = qxapp.auth.Data.getInstance().getEmail();
       if (email) {