@budibase/worker 1.2.9 → 1.2.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.2.9",
+  "version": "1.2.12",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -35,10 +35,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.2.9",
-    "@budibase/pro": "1.2.8",
-    "@budibase/string-templates": "^1.2.9",
-    "@budibase/types": "^1.2.9",
+    "@budibase/backend-core": "^1.2.12",
+    "@budibase/pro": "1.2.11",
+    "@budibase/string-templates": "^1.2.12",
+    "@budibase/types": "^1.2.12",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -101,5 +101,5 @@
       "./scripts/jestSetup.js"
     ]
   },
-  "gitHead": "c6e737e509e3e9651e726dbb4569252b8b355a17"
+  "gitHead": "ceb51339d86ba2d5635a86b44d2435668584cce5"
 }

package/src/api/routes/global/roles.js

@@ -1,12 +1,12 @@
 const Router = require("@koa/router")
 const controller = require("../../controllers/global/roles")
-const { adminOnly } = require("@budibase/backend-core/auth")
+const { builderOrAdmin } = require("@budibase/backend-core/auth")
 
 const router = Router()
 
 router
-  .get("/api/global/roles", adminOnly, controller.fetch)
-  .get("/api/global/roles/:appId", adminOnly, controller.find)
-  .delete("/api/global/roles/:appId", adminOnly, controller.removeAppRole)
+  .get("/api/global/roles", builderOrAdmin, controller.fetch)
+  .get("/api/global/roles/:appId", builderOrAdmin, controller.find)
+  .delete("/api/global/roles/:appId", builderOrAdmin, controller.removeAppRole)
 
 module.exports = router

package/src/api/routes/global/self.js

@@ -1,6 +1,6 @@
 const Router = require("@koa/router")
 const controller = require("../../controllers/global/self")
-const builderOnly = require("../../../middleware/builderOnly")
+const { builderOnly } = require("@budibase/backend-core/auth")
 const { users } = require("../validation")
 
 const router = Router()

package/src/api/routes/global/users.js

@@ -6,7 +6,7 @@ const Joi = require("joi")
 const cloudRestricted = require("../../../middleware/cloudRestricted")
 const { users } = require("../validation")
 const selfController = require("../../controllers/global/self")
-const builderOrAdmin = require("../../../middleware/builderOrAdmin")
+const { builderOrAdmin } = require("@budibase/backend-core/auth")
 
 const router = Router()
 

package/src/api/routes/validation/users.ts

@@ -1,4 +1,4 @@
-import joiValidator from "../../../middleware/joi-validator"
+const { joiValidator } = require("@budibase/backend-core/auth")
 import Joi from "joi"
 
 let schema: any = {

package/src/index.ts

@@ -18,7 +18,7 @@ const http = require("http")
 const api = require("./api")
 const redis = require("./utilities/redis")
 const Sentry = require("@sentry/node")
-import { events } from "@budibase/backend-core"
+import { events, pinoSettings } from "@budibase/backend-core"
 
 // this will setup http and https proxies form env variables
 bootstrap()
@@ -30,14 +30,7 @@ app.keys = ["secret", "key"]
 // set up top level koa middleware
 app.use(koaBody({ multipart: true }))
 app.use(koaSession(app))
-app.use(
-  logger({
-    prettyPrint: {
-      levelFirst: true,
-    },
-    level: env.LOG_LEVEL || "error",
-  })
-)
+app.use(logger(pinoSettings()))
 
 // authentication
 app.use(passport.initialize())

package/src/middleware/adminOnly.js

@@ -1,9 +0,0 @@
-module.exports = async (ctx, next) => {
-  if (
-    !ctx.internal &&
-    (!ctx.user || !ctx.user.admin || !ctx.user.admin.global)
-  ) {
-    ctx.throw(403, "Admin user only endpoint.")
-  }
-  return next()
-}

package/src/middleware/builderOnly.js

@@ -1,9 +0,0 @@
-module.exports = async (ctx, next) => {
-  if (
-    !ctx.internal &&
-    (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)
-  ) {
-    ctx.throw(403, "Builder user only endpoint.")
-  }
-  return next()
-}

package/src/middleware/builderOrAdmin.js

@@ -1,10 +0,0 @@
-module.exports = async (ctx, next) => {
-  if (
-    !ctx.internal &&
-    (!ctx.user || !ctx.user.builder || !ctx.user.builder.global) &&
-    (!ctx.user || !ctx.user.admin || !ctx.user.admin.global)
-  ) {
-    ctx.throw(403, "Builder user only endpoint.")
-  }
-  return next()
-}

package/src/middleware/joi-validator.js

@@ -1,28 +0,0 @@
-function validate(schema, property) {
-  // Return a Koa middleware function
-  return (ctx, next) => {
-    if (!schema) {
-      return next()
-    }
-    let params = null
-    if (ctx[property] != null) {
-      params = ctx[property]
-    } else if (ctx.request[property] != null) {
-      params = ctx.request[property]
-    }
-    const { error } = schema.validate(params)
-    if (error) {
-      ctx.throw(400, `Invalid ${property} - ${error.message}`)
-      return
-    }
-    return next()
-  }
-}
-
-module.exports.body = schema => {
-  return validate(schema, "body")
-}
-
-module.exports.params = schema => {
-  return validate(schema, "params")
-}