Merge pull request #390 from FAIMS/notebook-admin-user

Notebook Creator Role
FAIMS · Dec 14, 2023 · 430afe2 · 430afe2
2 parents d305afb + a3c11c5
commit 430afe2
Show file tree

Hide file tree

Showing 16 changed files with 775 additions and 405 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,14 +25,15 @@
     "csv-stringify": "^6.4.4",
     "express": "4.18.2",
     "express-handlebars": "7.1.2",
-    "express-rate-limit": "^6.7.0",
+    "express-rate-limit": "^7.1.5",
     "express-validator": "7.0.1",
-    "faims3-datamodel": "github:FAIMS/faims3-data-model#v1.0.6",
+    "faims3-datamodel": "github:FAIMS/faims3-data-model#v1.1.0",
     "fast-check": "2.25.0",
     "gts": "3.1.1",
     "handlebars": "4.7.7.",
     "istanbul": "^0.4.5",
     "jose": "4.15.2",
+    "markdown-it": "^14.0.0",
     "morgan": "^1.10.0",
     "multer": "^1.4.5-lts.1",
     "nodemailer": "^6.9.7",
@@ -59,6 +60,7 @@
     "@types/express": "4.17.18",
     "@types/express-handlebars": "5.3.1",
     "@types/express-session": "1.17.9",
+    "@types/markdown-it": "^13.0.7",
     "@types/mocha": "^10.0.3",
     "@types/morgan": "^1.9.5",
     "@types/multer": "^1.4.7",

diff --git a/public/swagger.json b/public/swagger.json
@@ -369,7 +369,8 @@
                                 "type": "object",
                                 "properties": {
                                     "username": {"type": "string"},
-                                    "addrole": {"type": "boolean"}
+                                    "addrole": {"type": "boolean"},
+                                    "role": {"type": "string", "enum": ["cluster-admin", "notebook-creator"]},
                                 }
                             }
                         }