Merge pull request #68 from camicroscope/develop

for 3.4.6

Deps/auth_service/.gitignore

@@ -0,0 +1 @@
+node_modules/

Deps/auth_service/app.js

@@ -12,6 +12,7 @@ var BASE_USER_URL = "http://ca-data:9099/services/caMicroscope/Authorization/que
 var SECRET = process.env.SECRET
 var EXPIRY = process.env.EXPIRY || "1d"
 var JWK_URL = process.env.JWKS
+var KEY_FIELD = process.env.KEY_FIELD || "accessCollection"
 
 var jwks_client = false
 console.log(JWK_URL)
@@ -127,8 +128,9 @@ function token_trade(check_key, sign_key){
               data = {
                 'sub':name,
                 'name':x[0].name,
-                'attrs':attrs
+                'attrs':attrs,
               }
+              data[KEY_FIELD] = x[0][KEY_FIELD] || []
               // sign using the mounted key
               var token = jwt.sign(data, sign_key, {algorithm:"RS256", expiresIn: EXPIRY})
               res.send({'token':token})

caMicroscope.yml

@@ -56,7 +56,7 @@ services:
     volumes:
       - ./images/:/images/
   security:
-    build: "https://github.com/camicroscope/Security.git#v3.2.2"
+    build: "https://github.com/camicroscope/Security.git#v3.4.6"
     container_name: ca-security
     restart: unless-stopped
     ports:

config/login.html

@@ -62,6 +62,8 @@ <h1>Redirecting...</h1>
       window.location = state
     } else {
       console.error("please give me a better failure message/response")
+      window.alert("User not added")
+      window.location = "./apps/signup/signup"
     }
 
   })

config/routes.json

@@ -2,7 +2,8 @@
   "root":"http://ca-front:80/",
   "_root_public": "true",
   "auth":{
-    "permissions_field":"attrs"
+    "permissions_field":"attrs",
+    "key_field": "accessCollection"
   },
   "services":{
     "data":{
@@ -33,7 +34,7 @@
       },
       "Slide": {
         "get":"/Slide/query/get",
-        "find":"/Slide/query/find",
+        "find":{"path":"/Slide/query/find", "key_method": "filter"},
         "post":{"path": "/Slide/submit/json", "attr": "write"},
         "delete":{"path": "/Slide/delete/deleteSlide", "attr": "write"},
         "update":{"path": "/Slide/delete/updateSlide", "attr": "write"}

login.html

@@ -64,7 +64,8 @@
         document.cookie = cookie_name + "=" + x.token;
         window.location = state
       } else {
-        window.alert("no!")
+        window.alert("User not added")
+        window.location = "./apps/signup/signup"
       }
 
     })

quip-pathdb.yml

@@ -39,7 +39,7 @@ services:
     volumes:
       - ./images/:/data/images/
   security:
-    build: "https://github.com/camicroscope/Security.git#v3.2.2"
+    build: "https://github.com/camicroscope/Security.git#v3.4.6"
     container_name: ca-security
     restart: unless-stopped
     ports: ["4010:4010"]
@@ -80,7 +80,7 @@ services:
     volumes:
       - ./data/segmentation_results:/data/segmentation_results
   heatmaploader:
-    build: "https://github.com/SBU-BMI/uploadHeatmaps.git#v1.0.0"
+    build: "https://github.com/SBU-BMI/uploadHeatmaps.git#v1.5.0"
     container_name: quip-hmloader
     ports: ["27017:27017"]
     volumes: