- {#each bindings.filter( binding => binding.label.match(searchRgx) ) as binding}
+ {#each bindings.filter(binding =>
+ binding.label.match(searchRgx)
+ ) as binding}
{
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
index 43f9837232..57c64ca0ed 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
@@ -103,9 +103,8 @@
}
function fetchQueryDefinition(query) {
- const source = $datasources.list.find(
- ds => ds._id === query.datasourceId
- ).source
+ const source = $datasources.list.find(ds => ds._id === query.datasourceId)
+ .source
return $integrations[source].query[query.queryVerb]
}
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
index 44f349a324..8c10b47a4d 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ExecuteQuery.svelte
@@ -18,9 +18,8 @@
)
function fetchQueryDefinition(query) {
- const source = $datasources.list.find(
- ds => ds._id === query.datasourceId
- ).source
+ const source = $datasources.list.find(ds => ds._id === query.datasourceId)
+ .source
return $integrations[source].query[query.queryVerb]
}
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
index cd3ef1f5c5..8084e2ee63 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -1,12 +1,7 @@
@@ -12,14 +10,9 @@
-
- Budibase Internal DB
-
+ Budibase Internal DB
-
- Stuff about the internal table
-
-
-
-
-
\ No newline at end of file
+
+
+
+
diff --git a/packages/builder/src/stores/backend/index.js b/packages/builder/src/stores/backend/index.js
index 9820f55c94..e020baaf4b 100644
--- a/packages/builder/src/stores/backend/index.js
+++ b/packages/builder/src/stores/backend/index.js
@@ -6,4 +6,4 @@ export { permissions } from "./permissions"
export { roles } from "./roles"
export { datasources } from "./datasources"
export { integrations } from "./integrations"
-export { queries } from "./queries"
\ No newline at end of file
+export { queries } from "./queries"
diff --git a/packages/builder/src/stores/backend/tests/fixtures/queries.js b/packages/builder/src/stores/backend/tests/fixtures/queries.js
index f5e595249a..7815d61ea5 100644
--- a/packages/builder/src/stores/backend/tests/fixtures/queries.js
+++ b/packages/builder/src/stores/backend/tests/fixtures/queries.js
@@ -9,7 +9,8 @@ export const SOME_QUERY = {
queryVerb: "read",
schema: {},
name: "Speakers",
- _id: "query_datasource_04b003a7b4a8428eadd3bb2f7eae0255_bcb8ffc6fcbc484e8d63121fc0bf986f",
+ _id:
+ "query_datasource_04b003a7b4a8428eadd3bb2f7eae0255_bcb8ffc6fcbc484e8d63121fc0bf986f",
_rev: "2-941f8699eb0adf995f8bd59c99203b26",
readable: true,
}
@@ -74,7 +75,8 @@ export const SAVE_QUERY_RESPONSE = {
},
},
name: "Speakers",
- _id: "query_datasource_04b003a7b4a8428eadd3bb2f7eae0255_bcb8ffc6fcbc484e8d63121fc0bf986f",
+ _id:
+ "query_datasource_04b003a7b4a8428eadd3bb2f7eae0255_bcb8ffc6fcbc484e8d63121fc0bf986f",
_rev: "3-5a64adef494b1e9c793dc91b51ce73c6",
readable: true,
}
diff --git a/packages/server/src/integrations/elasticsearch.js b/packages/server/src/integrations/elasticsearch.js
index 3a52a0278b..be1b945893 100644
--- a/packages/server/src/integrations/elasticsearch.js
+++ b/packages/server/src/integrations/elasticsearch.js
@@ -2,7 +2,8 @@ const { Client } = require("@elastic/elasticsearch")
const { QUERY_TYPES, FIELD_TYPES } = require("./Integration")
const SCHEMA = {
- docs: "https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
+ docs:
+ "https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
description:
"Elasticsearch is a search engine based on the Lucene library. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.",
friendlyName: "ElasticSearch",
diff --git a/packages/server/src/middleware/authorized.js b/packages/server/src/middleware/authorized.js
index bd064f7e66..8ed4c41db7 100644
--- a/packages/server/src/middleware/authorized.js
+++ b/packages/server/src/middleware/authorized.js
@@ -14,52 +14,50 @@ const WEBHOOK_ENDPOINTS = new RegExp(
["webhooks/trigger", "webhooks/schema"].join("|")
)
-module.exports =
- (permType, permLevel = null) =>
- async (ctx, next) => {
- // webhooks don't need authentication, each webhook unique
- if (WEBHOOK_ENDPOINTS.test(ctx.request.url)) {
- return next()
- }
-
- if (!ctx.user) {
- return ctx.throw(403, "No user info found")
- }
-
- // check general builder stuff, this middleware is a good way
- // to find API endpoints which are builder focused
- await builderMiddleware(ctx, permType)
-
- const isAuthed = ctx.isAuthenticated
- const { basePermissions, permissions } = await getUserPermissions(
- ctx.appId,
- ctx.roleId
- )
-
- // builders for now have permission to do anything
- // TODO: in future should consider separating permissions with an require("@budibase/auth").isClient check
- let isBuilder = ctx.user && ctx.user.builder && ctx.user.builder.global
- const isBuilderApi = permType === PermissionTypes.BUILDER
- if (isBuilder) {
- return next()
- } else if (isBuilderApi && !isBuilder) {
- return ctx.throw(403, "Not Authorized")
- }
-
- if (
- hasResource(ctx) &&
- doesHaveResourcePermission(permissions, permLevel, ctx)
- ) {
- return next()
- }
-
- if (!isAuthed) {
- ctx.throw(403, "Session not authenticated")
- }
-
- if (!doesHaveBasePermission(permType, permLevel, basePermissions)) {
- ctx.throw(403, "User does not have permission")
- }
-
+module.exports = (permType, permLevel = null) => async (ctx, next) => {
+ // webhooks don't need authentication, each webhook unique
+ if (WEBHOOK_ENDPOINTS.test(ctx.request.url)) {
return next()
}
+
+ if (!ctx.user) {
+ return ctx.throw(403, "No user info found")
+ }
+
+ // check general builder stuff, this middleware is a good way
+ // to find API endpoints which are builder focused
+ await builderMiddleware(ctx, permType)
+
+ const isAuthed = ctx.isAuthenticated
+ const { basePermissions, permissions } = await getUserPermissions(
+ ctx.appId,
+ ctx.roleId
+ )
+
+ // builders for now have permission to do anything
+ // TODO: in future should consider separating permissions with an require("@budibase/auth").isClient check
+ let isBuilder = ctx.user && ctx.user.builder && ctx.user.builder.global
+ const isBuilderApi = permType === PermissionTypes.BUILDER
+ if (isBuilder) {
+ return next()
+ } else if (isBuilderApi && !isBuilder) {
+ return ctx.throw(403, "Not Authorized")
+ }
+
+ if (
+ hasResource(ctx) &&
+ doesHaveResourcePermission(permissions, permLevel, ctx)
+ ) {
+ return next()
+ }
+
+ if (!isAuthed) {
+ ctx.throw(403, "Session not authenticated")
+ }
+
+ if (!doesHaveBasePermission(permType, permLevel, basePermissions)) {
+ ctx.throw(403, "User does not have permission")
+ }
+
+ return next()
+}
diff --git a/packages/server/src/middleware/currentapp.js b/packages/server/src/middleware/currentapp.js
index 683b7f8ef3..19d0afd560 100644
--- a/packages/server/src/middleware/currentapp.js
+++ b/packages/server/src/middleware/currentapp.js
@@ -1,5 +1,9 @@
-const { getAppId, setCookie, getCookie, clearCookie } =
- require("@budibase/auth").utils
+const {
+ getAppId,
+ setCookie,
+ getCookie,
+ clearCookie,
+} = require("@budibase/auth").utils
const { Cookies } = require("@budibase/auth").constants
const { getRole } = require("@budibase/auth/roles")
const { getGlobalSelf } = require("../utilities/workerRequests")
diff --git a/packages/standard-components/src/forms/validation.js b/packages/standard-components/src/forms/validation.js
index b1df80509f..ebdb3b3dab 100644
--- a/packages/standard-components/src/forms/validation.js
+++ b/packages/standard-components/src/forms/validation.js
@@ -90,17 +90,15 @@ const numericalConstraint = (constraint, error) => value => {
return null
}
-const inclusionConstraint =
- (options = []) =>
- value => {
- if (value == null || value === "") {
- return null
- }
- if (!options.includes(value)) {
- return "Invalid value"
- }
+const inclusionConstraint = (options = []) => value => {
+ if (value == null || value === "") {
return null
}
+ if (!options.includes(value)) {
+ return "Invalid value"
+ }
+ return null
+}
const dateConstraint = (dateString, isEarliest) => {
const dateLimit = Date.parse(dateString)
diff --git a/packages/worker/src/api/controllers/admin/email.js b/packages/worker/src/api/controllers/admin/email.js
index 6e16fd060c..c4b17ee980 100644
--- a/packages/worker/src/api/controllers/admin/email.js
+++ b/packages/worker/src/api/controllers/admin/email.js
@@ -5,8 +5,15 @@ const authPkg = require("@budibase/auth")
const GLOBAL_DB = authPkg.StaticDatabases.GLOBAL.name
exports.sendEmail = async ctx => {
- const { groupId, email, userId, purpose, contents, from, subject } =
- ctx.request.body
+ const {
+ groupId,
+ email,
+ userId,
+ purpose,
+ contents,
+ from,
+ subject,
+ } = ctx.request.body
let user
if (userId) {
const db = new CouchDB(GLOBAL_DB)
diff --git a/packages/worker/src/api/controllers/admin/groups.js b/packages/worker/src/api/controllers/admin/groups.js
index 330fb38282..8a70721431 100644
--- a/packages/worker/src/api/controllers/admin/groups.js
+++ b/packages/worker/src/api/controllers/admin/groups.js
@@ -1,6 +1,9 @@
const CouchDB = require("../../../db")
-const { getGroupParams, generateGroupID, StaticDatabases } =
- require("@budibase/auth").db
+const {
+ getGroupParams,
+ generateGroupID,
+ StaticDatabases,
+} = require("@budibase/auth").db
const GLOBAL_DB = StaticDatabases.GLOBAL.name
diff --git a/packages/worker/src/api/controllers/admin/users.js b/packages/worker/src/api/controllers/admin/users.js
index 5b95b2808f..6afd4ecbfd 100644
--- a/packages/worker/src/api/controllers/admin/users.js
+++ b/packages/worker/src/api/controllers/admin/users.js
@@ -1,6 +1,9 @@
const CouchDB = require("../../../db")
-const { generateGlobalUserID, getGlobalUserParams, StaticDatabases } =
- require("@budibase/auth").db
+const {
+ generateGlobalUserID,
+ getGlobalUserParams,
+ StaticDatabases,
+} = require("@budibase/auth").db
const { hash, getGlobalUserByEmail } = require("@budibase/auth").utils
const { UserStatus, EmailTemplatePurpose } = require("../../../constants")
const { checkInviteCode } = require("../../../utilities/redis")