Merge branch 'develop' of github.com:Budibase/budibase into conditional-ui

5 years ago · bbcc350b14
38 changed files with 293 additions and 108 deletions
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@ -42,15 +42,3 @@ jobs:
        name: codecov-umbrella
        verbose: true 
    - run: yarn test:e2e:ci
-
-    - name: Build and Push Development Docker Image
-      # Only run on push
-      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
-      run: |
-        docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-        yarn build
-        yarn build:docker:develop
-      env:
-        DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
-
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@ -0,0 +1,52 @@
+name: Budibase Release Staging
+
+on: 
+ push:
+    branches:
+      - develop
+
+env:
+  POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }}
+  POSTHOG_URL: ${{ secrets.POSTHOG_URL }}
+  SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+      
+jobs:
+  release:
+    runs-on: ubuntu-latest 
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+      - run: yarn 
+      - run: yarn bootstrap 
+      - run: yarn lint 
+      - run: yarn build 
+      - run: yarn test
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-1
+
+      - name: Publish budibase packages to NPM
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: | 
+          # setup the username and email. I tend to use 'GitHub Actions Bot' with no email by default
+          git config user.name "Budibase Staging Release Bot"
+          git config user.email "<>"
+          echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc 
+          yarn release:develop
+
+      - name: Build/release Docker images
+        run: | 
+          docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+          yarn build
+          yarn build:docker:develop
+        env:
+          DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "0.9.78",
+  "version": "0.9.80-alpha.7",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/package.json
+++ b/package.json
@ -23,6 +23,7 @@
    "publishdev": "lerna run publishdev",
    "publishnpm": "yarn build && lerna publish --force-publish",
    "release": "yarn build && lerna publish patch --yes --force-publish",
+    "release:develop": "yarn build && lerna publish prerelease --yes --force-publish --dist-tag develop",
    "restore": "yarn run clean && yarn run bootstrap && yarn run build",
    "nuke": "yarn run nuke:packages && yarn run nuke:docker",
    "nuke:packages": "yarn run restore",
--- a/packages/auth/constants.js
+++ b/packages/auth/constants.js
@ -0,0 +1 @@
+module.exports = require("./src/constants")
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/auth",
-  "version": "0.9.78",
+  "version": "0.9.80-alpha.7",
  "description": "Authentication middlewares for budibase builder and apps",
  "main": "src/index.js",
  "author": "Budibase",
@ -10,6 +10,7 @@
    "test:watch": "jest --watchAll"
  },
  "dependencies": {
+    "@techpass/passport-openidconnect": "^0.3.0",
    "aws-sdk": "^2.901.0",
    "bcryptjs": "^2.4.3",
    "ioredis": "^4.27.1",
@ -17,7 +18,6 @@
    "koa-passport": "^4.1.4",
    "lodash": "^4.17.21",
    "node-fetch": "^2.6.1",
-    "@techpass/passport-openidconnect": "^0.3.0",
    "passport-google-auth": "^1.0.2",
    "passport-google-oauth": "^2.0.0",
    "passport-jwt": "^4.0.0",
@ -35,8 +35,8 @@
  "devDependencies": {
    "ioredis-mock": "^5.5.5",
    "jest": "^26.6.3",
-    "pouchdb-adapter-memory": "^7.2.2",
    "pouchdb": "^7.2.1",
+    "pouchdb-adapter-memory": "^7.2.2",
    "pouchdb-all-dbs": "^1.0.2"
  },
  "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
--- a/packages/auth/src/constants.js
+++ b/packages/auth/src/constants.js
@ -9,6 +9,13 @@ exports.Cookies = {
  OIDC_CONFIG: "budibase:oidc:config",
 }

+exports.Headers = {
+  API_KEY: "x-budibase-api-key",
+  API_VER: "x-budibase-api-version",
+  APP_ID: "x-budibase-app-id",
+  TYPE: "x-budibase-type",
+}
+
 exports.GlobalRoles = {
  OWNER: "owner",
  ADMIN: "admin",
--- a/packages/auth/src/middleware/authenticated.js
+++ b/packages/auth/src/middleware/authenticated.js
@ -1,4 +1,4 @@
-const { Cookies } = require("../constants")
+const { Cookies, Headers } = require("../constants")
 const { getCookie, clearCookie } = require("../utils")
 const { getUser } = require("../cache/user")
 const { getSession, updateSessionTTL } = require("../security/sessions")
@ -22,15 +22,17 @@ function buildNoAuthRegex(patterns) {
  })
 }

-function finalise(ctx, { authenticated, user, internal } = {}) {
+function finalise(ctx, { authenticated, user, internal, version } = {}) {
  ctx.isAuthenticated = authenticated || false
  ctx.user = user
  ctx.internal = internal || false
+  ctx.version = version
 }

 module.exports = (noAuthPatterns = [], opts) => {
  const noAuthOptions = noAuthPatterns ? buildNoAuthRegex(noAuthPatterns) : []
  return async (ctx, next) => {
+    const version = ctx.request.headers[Headers.API_VER]
    // the path is not authenticated
    const found = noAuthOptions.find(({ regex, method }) => {
      return (
@ -71,7 +73,7 @@ module.exports = (noAuthPatterns = [], opts) => {
          await updateSessionTTL(session)
        }
      }
-      const apiKey = ctx.request.headers["x-budibase-api-key"]
+      const apiKey = ctx.request.headers[Headers.API_KEY]
      // this is an internal request, no user made it
      if (!authenticated && apiKey && apiKey === env.INTERNAL_API_KEY) {
        authenticated = true
@ -82,12 +84,12 @@ module.exports = (noAuthPatterns = [], opts) => {
        authenticated = false
      }
      // isAuthenticated is a function, so use a variable to be able to check authed state
-      finalise(ctx, { authenticated, user, internal })
+      finalise(ctx, { authenticated, user, internal, version })
      return next()
    } catch (err) {
      // allow configuring for public access
      if (opts && opts.publicAllowed) {
-        finalise(ctx, { authenticated: false })
+        finalise(ctx, { authenticated: false, version })
      } else {
        ctx.throw(err.status || 403, err)
      }
--- a/packages/auth/src/utils.js
+++ b/packages/auth/src/utils.js
@ -8,6 +8,7 @@ const jwt = require("jsonwebtoken")
 const { options } = require("./middleware/passport/jwt")
 const { createUserEmailView } = require("./db/views")
 const { getDB } = require("./db")
+const { Headers } = require("./constants")

 const APP_PREFIX = DocumentTypes.APP + SEPARATOR

@ -23,7 +24,7 @@ function confirmAppId(possibleAppId) {
 * @returns {string|undefined} If an appId was found it will be returned.
 */
 exports.getAppId = ctx => {
-  const options = [ctx.headers["x-budibase-app-id"], ctx.params.appId]
+  const options = [ctx.headers[Headers.APP_ID], ctx.params.appId]
  if (ctx.subdomains) {
    options.push(ctx.subdomains[1])
  }
@ -97,7 +98,7 @@ exports.clearCookie = (ctx, name) => {
 * @return {boolean} returns true if the call is from the client lib (a built app rather than the builder).
 */
 exports.isClient = ctx => {
-  return ctx.headers["x-budibase-type"] === "client"
+  return ctx.headers[Headers.TYPE] === "client"
 }

 /**
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/bbui",
  "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.78",
+  "version": "0.9.80-alpha.7",
  "license": "AGPL-3.0",
  "svelte": "src/index.js",
  "module": "dist/bbui.es.js",
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "0.9.78",
+  "version": "0.9.80-alpha.7",
  "license": "AGPL-3.0",
  "private": true,
  "scripts": {
@ -65,10 +65,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^0.9.78",
-    "@budibase/client": "^0.9.78",
+    "@budibase/bbui": "^0.9.80-alpha.7",
+    "@budibase/client": "^0.9.80-alpha.7",
    "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.78",
+    "@budibase/string-templates": "^0.9.80-alpha.7",
    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
--- a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
@ -6,8 +6,10 @@
  import ErrorsBox from "components/common/ErrorsBox.svelte"
  import { roles } from "stores/backend"

+  const BASE_ROLE = { _id: "", inherits: "BASIC", permissionId: "Read/Write" }
+
  let basePermissions = []
-  let selectedRole = {}
+  let selectedRole = BASE_ROLE
  let errors = []
  let builtInRoles = ["Admin", "Power", "Basic", "Public"]
  // Don't allow editing of public role
@ -15,6 +17,11 @@
  $: selectedRoleId = selectedRole._id
  $: otherRoles = editableRoles.filter(role => role._id !== selectedRoleId)
  $: isCreating = selectedRoleId == null || selectedRoleId === ""
+  $: valid =
+    selectedRole.name &&
+    selectedRole.inherits &&
+    selectedRole.permissionId &&
+    !builtInRoles.includes(selectedRole.name)

  const fetchBasePermissions = async () => {
    const permissionsResponse = await api.get("/api/permission/builtin")
@ -32,7 +39,7 @@
        permissionId: role.permissionId ?? "",
      }
    } else {
-      selectedRole = { _id: "", inherits: "", permissionId: "" }
+      selectedRole = BASE_ROLE
    }
    errors = []
  }
@ -88,6 +95,7 @@
  title="Edit Roles"
  confirmText={isCreating ? "Create" : "Save"}
  onConfirm={saveRole}
+  disabled={!valid}
 >
  {#if errors.length}
    <ErrorsBox {errors} />
@ -115,7 +123,7 @@
      options={otherRoles}
      getOptionValue={role => role._id}
      getOptionLabel={role => role.name}
-      placeholder="None"
+      disabled={builtInRoles.includes(selectedRole.name)}
    />
    <Select
      label="Base Permissions"
@ -123,7 +131,7 @@
      options={basePermissions}
      getOptionValue={x => x._id}
      getOptionLabel={x => x.name}
-      placeholder="Choose permissions"
+      disabled={builtInRoles.includes(selectedRole.name)}
    />
  {/if}
  <div slot="footer">
--- a/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte
@ -58,5 +58,6 @@
    align-items: stretch;
    gap: var(--spacing-l);
    background-color: var(--background);
+    overflow-y: auto;
  }
 </style>
--- a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte
@ -217,6 +217,10 @@
      }
      originalGoogleDoc = cloneDeep(googleDoc)
    } else {
+      // default activated to true for older configs
+      if (googleDoc.config.activated === undefined) {
+        googleDoc.config.activated = true
+      }
      originalGoogleDoc = cloneDeep(googleDoc)
      providers.google = googleDoc
    }
--- a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
@ -19,7 +19,8 @@
  import { fetchData } from "helpers"
  import { users, auth } from "stores/portal"

-  import TagsRenderer from "./_components/TagsTableRenderer.svelte"
+  import TagsRenderer from "./_components/RolesTagsTableRenderer.svelte"
+
  import UpdateRolesModal from "./_components/UpdateRolesModal.svelte"
  import ForceResetPasswordModal from "./_components/ForceResetPasswordModal.svelte"

@ -36,7 +37,8 @@
  $: defaultRoleId = $userFetch?.data?.builder?.global ? "ADMIN" : "BASIC"
  // Merge the Apps list and the roles response to get something that makes sense for the table
  $: appList = Object.keys($apps?.data).map(id => {
-    const role = $userFetch?.data?.roles?.[id] || defaultRoleId
+    const roleId = $userFetch?.data?.roles?.[id] || defaultRoleId
+    const role = $apps?.data?.[id].roles.find(role => role._id === roleId)
    return {
      ...$apps?.data?.[id],
      _id: id,
--- a/packages/builder/src/pages/builder/portal/manage/users/_components/RolesTagsTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/_components/RolesTagsTableRenderer.svelte
@ -0,0 +1,8 @@
+<script>
+  import TagsTableRenderer from "./TagsTableRenderer.svelte"
+  export let value
+
+  $: roles = value?.filter(role => role != null).map(role => role.name) ?? []
+</script>
+
+<TagsTableRenderer value={roles} />
--- a/packages/builder/src/pages/builder/portal/manage/users/_components/TagsTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/_components/TagsTableRenderer.svelte
@ -4,9 +4,9 @@

  const displayLimit = 5

-  $: roles = value?.filter(role => role != null) ?? []
-  $: tags = roles.slice(0, displayLimit)
-  $: leftover = roles.length - tags.length
+  $: values = value?.filter(value => value != null) ?? []
+  $: tags = values.slice(0, displayLimit)
+  $: leftover = values.length - tags.length
 </script>

 <div class="tag-renderer">
--- a/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte
@ -10,8 +10,8 @@

  const roles = app.roles
  let options = roles
+    .filter(role => role._id !== "PUBLIC")
    .map(role => ({ value: role._id, label: role.name }))
-    .filter(role => role.value !== "PUBLIC")
  let selectedRole = user?.roles?.[app?._id]

  async function updateUserRoles() {
@ -48,5 +48,7 @@
    on:change
    {options}
    label="Role"
+    getOptionLabel={role => role.name}
+    getOptionValue={role => role._id}
  />
 </ModalContent>
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/cli",
-  "version": "0.9.78",
+  "version": "0.9.80-alpha.7",
  "description": "Budibase CLI, for developers, self hosting and migrations.",
  "main": "src/index.js",
  "bin": {
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/client",
-  "version": "0.9.78",
+  "version": "0.9.80-alpha.7",
  "license": "MPL-2.0",
  "module": "dist/budibase-client.js",
  "main": "dist/budibase-client.js",
@ -18,9 +18,9 @@
    "dev:builder": "rollup -cw"
  },
  "dependencies": {
-    "@budibase/bbui": "^0.9.78",
-    "@budibase/standard-components": "^0.9.78",
-    "@budibase/string-templates": "^0.9.78",
+    "@budibase/bbui": "^0.9.80-alpha.7",
+    "@budibase/standard-components": "^0.9.80-alpha.7",
+    "@budibase/string-templates": "^0.9.80-alpha.7",
    "regexparam": "^1.3.0",
    "shortid": "^2.2.15",
    "svelte-spa-router": "^3.0.5"
--- a/packages/client/src/api/api.js
+++ b/packages/client/src/api/api.js
@ -1,7 +1,9 @@
+import { notificationStore } from "../store"
+import { ApiVersion } from "../constants"
+
 /**
 * API cache for cached request responses.
 */
-import { notificationStore } from "../store"
 let cache = {}

 /**
@ -22,6 +24,7 @@ const makeApiCall = async ({ method, url, body, json = true }) => {
    const headers = {
      Accept: "application/json",
      "x-budibase-app-id": window["##BUDIBASE_APP_ID##"],
+      "x-budibase-api-version": ApiVersion,
      ...(json && { "Content-Type": "application/json" }),
      ...(!inBuilder && { "x-budibase-type": "client" }),
    }
--- a/packages/client/src/constants.js
+++ b/packages/client/src/constants.js
@ -7,3 +7,11 @@ export const ActionTypes = {
  RefreshDatasource: "RefreshDatasource",
  SetDataProviderQuery: "SetDataProviderQuery",
 }
+
+export const ApiVersion = "1"
+
+/**
+ * API Version Changelog
+ * v1:
+ *   - Coerce types for search endpoint
+ */
--- a/packages/client/src/store/app.js
+++ b/packages/client/src/store/app.js
@ -6,8 +6,15 @@ const createAppStore = () => {

  // Fetches the app definition including screens, layouts and theme
  const fetchAppDefinition = async () => {
-    const appDefinition = await API.fetchAppPackage(get(store).appId)
-    store.set(appDefinition)
+    const appId = get(store)?.appId
+    if (!appId) {
+      throw "Cannot fetch app definition without app ID set"
+    }
+    const appDefinition = await API.fetchAppPackage(appId)
+    store.set({
+      ...appDefinition,
+      appId: appDefinition?.application?.appId,
+    })
  }

  // Sets the initial app ID
--- a/packages/client/src/store/auth.js
+++ b/packages/client/src/store/auth.js
@ -10,9 +10,14 @@ const createAuthStore = () => {
    store.set(user)
  }

+  const logOut = async () => {
+    window.document.cookie = `budibase:auth=; budibase:currentapp=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;`
+    window.location = "/builder/auth/login"
+  }
+
  return {
    subscribe: store.subscribe,
-    actions: { fetchUser },
+    actions: { fetchUser, logOut },
  }
 }

--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@ -1,10 +1,15 @@
 import { get } from "svelte/store"
-import { routeStore, builderStore, confirmationStore } from "../store"
+import {
+  routeStore,
+  builderStore,
+  confirmationStore,
+  authStore,
+} from "../store"
 import { saveRow, deleteRow, executeQuery, triggerAutomation } from "../api"
 import { ActionTypes } from "../constants"

 const saveRowHandler = async (action, context) => {
-  const { fields, providerId } = action.parameters
+  const { fields, providerId, tableId } = action.parameters
  if (providerId) {
    let draft = context[providerId]
    if (fields) {
@ -12,6 +17,9 @@ const saveRowHandler = async (action, context) => {
        draft[field] = value
      }
    }
+    if (tableId) {
+      draft.tableId = tableId
+    }
    await saveRow(draft)
  }
 }
@ -74,6 +82,10 @@ const refreshDatasourceHandler = async (action, context) => {
  )
 }

+const logoutHandler = async () => {
+  await authStore.actions.logOut()
+}
+
 const handlerMap = {
  ["Save Row"]: saveRowHandler,
  ["Delete Row"]: deleteRowHandler,
@ -82,6 +94,7 @@ const handlerMap = {
  ["Trigger Automation"]: triggerAutomationHandler,
  ["Validate Form"]: validateFormHandler,
  ["Refresh Datasource"]: refreshDatasourceHandler,
+  ["Log Out"]: logoutHandler,
 }

 const confirmTextMap = {
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/server",
  "email": "hi@budibase.com",
-  "version": "0.9.78",
+  "version": "0.9.80-alpha.7",
  "description": "Budibase Web Server",
  "main": "src/index.js",
  "repository": {
@ -60,9 +60,9 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.9.78",
-    "@budibase/client": "^0.9.78",
-    "@budibase/string-templates": "^0.9.78",
+    "@budibase/auth": "^0.9.80-alpha.7",
+    "@budibase/client": "^0.9.80-alpha.7",
+    "@budibase/string-templates": "^0.9.80-alpha.7",
    "@elastic/elasticsearch": "7.10.0",
    "@koa/router": "8.0.0",
    "@sendgrid/mail": "7.1.1",
@ -115,7 +115,7 @@
  "devDependencies": {
    "@babel/core": "^7.14.3",
    "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.78",
+    "@budibase/standard-components": "^0.9.80-alpha.7",
    "@jest/test-sequencer": "^24.8.0",
    "@types/bull": "^3.15.1",
    "@types/jest": "^26.0.23",
--- a/packages/server/src/api/controllers/row/internal.js
+++ b/packages/server/src/api/controllers/row/internal.js
@ -278,6 +278,7 @@ exports.search = async ctx => {
  const { tableId } = ctx.params
  const db = new CouchDB(appId)
  const { paginate, query, ...params } = ctx.request.body
+  params.version = ctx.version
  params.tableId = tableId

  let response
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@ -2,16 +2,6 @@ const { SearchIndexes } = require("../../../db/utils")
 const env = require("../../../environment")
 const fetch = require("node-fetch")

-/**
- * Escapes any characters in a string which lucene searches require to be
- * escaped.
- * @param value The value to escape
- * @returns {string}
- */
-const luceneEscape = value => {
-  return `${value}`.replace(/[ #+\-&|!(){}\]^"~*?:\\]/g, "\\$&")
-}
-
 /**
 * Class to build lucene query URLs.
 * Optionally takes a base lucene query object.
@ -33,6 +23,12 @@ class QueryBuilder {
    this.sortOrder = "ascending"
    this.sortType = "string"
    this.includeDocs = true
+    this.version = null
+  }
+
+  setVersion(version) {
+    this.version = version
+    return this
  }

  setTable(tableId) {
@ -108,12 +104,43 @@ class QueryBuilder {
    return this
  }

+  /**
+   * Preprocesses a value before going into a lucene search.
+   * Transforms strings to lowercase and wraps strings and bools in quotes.
+   * @param value The value to process
+   * @param options The preprocess options
+   * @returns {string|*}
+   */
+  preprocess(value, { escape, lowercase, wrap } = {}) {
+    const hasVersion = !!this.version
+    // Determine if type needs wrapped
+    const originalType = typeof value
+    // Convert to lowercase
+    if (value && lowercase) {
+      value = value.toLowerCase ? value.toLowerCase() : value
+    }
+    // Escape characters
+    if (escape && originalType === "string") {
+      value = `${value}`.replace(/[ #+\-&|!(){}\]^"~*?:\\]/g, "\\$&")
+    }
+    // Wrap in quotes
+    if (hasVersion && wrap) {
+      value = originalType === "number" ? value : `"${value}"`
+    }
+    return value
+  }
+
  buildSearchQuery() {
+    const builder = this
    let query = "*:*"
+    const allPreProcessingOpts = { escape: true, lowercase: true, wrap: true }

    function build(structure, queryFn) {
      for (let [key, value] of Object.entries(structure)) {
-        const expression = queryFn(luceneEscape(key.replace(/ /, "_")), value)
+        key = builder.preprocess(key.replace(/ /, "_"), {
+          escape: true,
+        })
+        const expression = queryFn(key, value)
        if (expression == null) {
          continue
        }
@ -124,7 +151,14 @@ class QueryBuilder {
    // Construct the actual lucene search query string from JSON structure
    if (this.query.string) {
      build(this.query.string, (key, value) => {
-        return value ? `${key}:${luceneEscape(value.toLowerCase())}*` : null
+        if (!value) {
+          return null
+        }
+        value = builder.preprocess(value, {
+          escape: true,
+          lowercase: true,
+        })
+        return `${key}:${value}*`
      })
    }
    if (this.query.range) {
@ -138,30 +172,37 @@ class QueryBuilder {
        if (value.high == null || value.high === "") {
          return null
        }
-        return `${key}:[${value.low} TO ${value.high}]`
+        const low = builder.preprocess(value.low, allPreProcessingOpts)
+        const high = builder.preprocess(value.high, allPreProcessingOpts)
+        return `${key}:[${low} TO ${high}]`
      })
    }
    if (this.query.fuzzy) {
      build(this.query.fuzzy, (key, value) => {
-        return value ? `${key}:${luceneEscape(value.toLowerCase())}~` : null
+        if (!value) {
+          return null
+        }
+        value = builder.preprocess(value, {
+          escape: true,
+          lowercase: true,
+        })
+        return `${key}:${value}~`
      })
    }
    if (this.query.equal) {
      build(this.query.equal, (key, value) => {
-        const escapedValue = luceneEscape(value.toLowerCase())
-        // have to do the or to manage straight values, or strings
-        return value
-          ? `(${key}:${escapedValue} OR ${key}:"${escapedValue}")`
-          : null
+        if (!value) {
+          return null
+        }
+        return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`
      })
    }
    if (this.query.notEqual) {
      build(this.query.notEqual, (key, value) => {
-        const escapedValue = luceneEscape(value.toLowerCase())
-        // have to do the or to manage straight values, or strings
-        return value
-          ? `(!${key}:${escapedValue} OR !${key}:"${escapedValue}")`
-          : null
+        if (!value) {
+          return null
+        }
+        return `!${key}:${builder.preprocess(value, allPreProcessingOpts)}`
      })
    }
    if (this.query.empty) {
@ -250,6 +291,7 @@ const recursiveSearch = async (appId, query, params) => {
    pageSize = params.limit - rows.length
  }
  const page = await new QueryBuilder(appId, query)
+    .setVersion(params.version)
    .setTable(params.tableId)
    .setBookmark(bookmark)
    .setLimit(pageSize)
@ -294,6 +336,7 @@ exports.paginatedSearch = async (appId, query, params) => {
  }
  limit = Math.min(limit, 200)
  const search = new QueryBuilder(appId, query)
+    .setVersion(params.version)
    .setTable(params.tableId)
    .setSort(params.sort)
    .setSortOrder(params.sortOrder)
--- a/packages/server/src/api/routes/tests/misc.spec.js
+++ b/packages/server/src/api/routes/tests/misc.spec.js
@ -31,7 +31,13 @@ describe("run misc tests", () => {
  describe("/version", () => {
    it("should confirm version", async () => {
      const res = await request.get("/version").expect(200)
-      expect(res.text.split(".").length).toEqual(3)
+      const text = res.text
+      if (text.includes("alpha")) {
+        expect(text.split(".").length).toEqual(4)
+      } else {
+        expect(text.split(".").length).toEqual(3)
+      }
+      
    })
  })

--- a/packages/server/src/middleware/currentapp.js
+++ b/packages/server/src/middleware/currentapp.js
@ -12,7 +12,12 @@ module.exports = async (ctx, next) => {
  // try to get the appID from the request
  const requestAppId = getAppId(ctx)
  // get app cookie if it exists
-  const appCookie = getCookie(ctx, Cookies.CurrentApp)
+  let appCookie = null
+  try {
+    appCookie = getCookie(ctx, Cookies.CurrentApp)
+  } catch (err) {
+    clearCookie(ctx, Cookies.CurrentApp)
+  }
  if (!appCookie && !requestAppId) {
    return next()
  }
--- a/packages/server/src/tests/utilities/TestConfiguration.js
+++ b/packages/server/src/tests/utilities/TestConfiguration.js
@ -14,7 +14,7 @@ const {
 const controllers = require("./controllers")
 const supertest = require("supertest")
 const { cleanup } = require("../../utilities/fileSystem")
-const { Cookies } = require("@budibase/auth").constants
+const { Cookies, Headers } = require("@budibase/auth").constants
 const { jwt } = require("@budibase/auth").auth
 const { StaticDatabases } = require("@budibase/auth/db")
 const { createASession } = require("@budibase/auth/sessions")
@ -122,7 +122,7 @@ class TestConfiguration {
      ],
    }
    if (this.appId) {
-      headers["x-budibase-app-id"] = this.appId
+      headers[Headers.APP_ID] = this.appId
    }
    return headers
  }
@ -132,7 +132,7 @@ class TestConfiguration {
      Accept: "application/json",
    }
    if (this.appId) {
-      headers["x-budibase-app-id"] = this.appId
+      headers[Headers.APP_ID] = this.appId
    }
    return headers
  }
@ -354,7 +354,7 @@ class TestConfiguration {
        `${Cookies.Auth}=${authToken}`,
        `${Cookies.CurrentApp}=${appToken}`,
      ],
-      "x-budibase-app-id": this.appId,
+      [Headers.APP_ID]: this.appId,
    }
  }
 }
--- a/packages/server/src/utilities/workerRequests.js
+++ b/packages/server/src/utilities/workerRequests.js
@ -3,13 +3,14 @@ const env = require("../environment")
 const { checkSlashesInUrl } = require("./index")
 const { getDeployedAppID } = require("@budibase/auth/db")
 const { updateAppRole, getGlobalUser } = require("./global")
+const { Headers } = require("@budibase/auth/constants")

 function request(ctx, request, noApiKey) {
  if (!request.headers) {
    request.headers = {}
  }
  if (!noApiKey) {
-    request.headers["x-budibase-api-key"] = env.INTERNAL_API_KEY
+    request.headers[Headers.API_KEY] = env.INTERNAL_API_KEY
  }
  if (request.body && Object.keys(request.body).length > 0) {
    request.headers["Content-Type"] = "application/json"
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@ -29,12 +29,12 @@
  "keywords": [
    "svelte"
  ],
-  "version": "0.9.78",
+  "version": "0.9.80-alpha.7",
  "license": "MIT",
  "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
  "dependencies": {
+    "@budibase/bbui": "^0.9.80-alpha.7",
    "@spectrum-css/card": "^3.0.3",
-    "@budibase/bbui": "^0.9.78",
    "@spectrum-css/link": "^3.1.3",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/typography": "^3.0.2",
--- a/packages/standard-components/src/lucene.js
+++ b/packages/standard-components/src/lucene.js
@ -15,10 +15,16 @@ export const buildLuceneQuery = filter => {
  if (Array.isArray(filter)) {
    filter.forEach(expression => {
      let { operator, field, type, value } = expression
-      // Ensure date fields are transformed into ISO strings
+      // Parse all values into correct types
      if (type === "datetime" && value) {
        value = new Date(value).toISOString()
      }
+      if (type === "number") {
+        value = parseFloat(value)
+      }
+      if (type === "boolean") {
+        value = value?.toLowerCase() === "true"
+      }
      if (operator.startsWith("range")) {
        if (!query.range[field]) {
          query.range[field] = {
@ -42,10 +48,10 @@ export const buildLuceneQuery = filter => {
          // Transform boolean filters to cope with null.
          // "equals false" needs to be "not equals true"
          // "not equals false" needs to be "equals true"
-          if (operator === "equal" && value === "false") {
-            query.notEqual[field] = "true"
-          } else if (operator === "notEqual" && value === "false") {
-            query.equal[field] = "true"
+          if (operator === "equal" && value === false) {
+            query.notEqual[field] = true
+          } else if (operator === "notEqual" && value === false) {
+            query.equal[field] = true
          } else {
            query[operator][field] = value
          }
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "0.9.78",
+  "version": "0.9.80-alpha.7",
  "description": "Handlebars wrapper for Budibase templating.",
  "main": "src/index.cjs",
  "module": "dist/bundle.mjs",
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/worker",
  "email": "hi@budibase.com",
-  "version": "0.9.78",
+  "version": "0.9.80-alpha.7",
  "description": "Budibase background service",
  "main": "src/index.js",
  "repository": {
@ -21,9 +21,10 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.9.78",
-    "@budibase/string-templates": "^0.9.78",
+    "@budibase/auth": "^0.9.80-alpha.7",
+    "@budibase/string-templates": "^0.9.80-alpha.7",
    "@koa/router": "^8.0.0",
+    "@techpass/passport-openidconnect": "^0.3.0",
    "aws-sdk": "^2.811.0",
    "bcryptjs": "^2.4.3",
    "dotenv": "^8.2.0",
@ -39,7 +40,6 @@
    "koa-static": "^5.0.0",
    "node-fetch": "^2.6.1",
    "nodemailer": "^6.5.0",
-    "@techpass/passport-openidconnect": "^0.3.0",
    "passport-google-oauth": "^2.0.0",
    "passport-jwt": "^4.0.0",
    "passport-local": "^1.0.0",
--- a/packages/worker/src/api/controllers/admin/auth.js
+++ b/packages/worker/src/api/controllers/admin/auth.js
@ -144,7 +144,9 @@ async function oidcStrategyFactory(ctx, configId) {

  const chosenConfig = config.configs.filter(c => c.uuid === configId)[0]

-  const callbackUrl = `${ctx.protocol}://${ctx.host}/api/admin/auth/oidc/callback`
+  // require https callback in production
+  const protocol = process.env.NODE_ENV === "production" ? "https" : "http"
+  const callbackUrl = `${protocol}://${ctx.host}/api/admin/auth/oidc/callback`

  return oidc.strategyFactory(chosenConfig, callbackUrl)
 }
--- a/packages/worker/src/api/controllers/admin/configs.js
+++ b/packages/worker/src/api/controllers/admin/configs.js
@ -149,16 +149,24 @@ exports.publicSettings = async function (ctx) {
      config = publicConfig
    }

-    config.config.google = !googleConfig
-      ? !!googleConfig
-      : !googleConfig.config.activated
-      ? false
-      : true
-    config.config.oidc = !oidcConfig
-      ? !!oidcConfig
-      : !oidcConfig.config.configs[0].activated
-      ? false
-      : true
+    // google button flag
+    if (googleConfig && googleConfig.config) {
+      const googleActivated =
+        googleConfig.config.activated == undefined || // activated by default for configs pre-activated flag
+        googleConfig.config.activated
+      config.config.google = googleActivated
+    } else {
+      config.config.google = false
+    }
+
+    // oidc button flag
+    if (oidcConfig && oidcConfig.config) {
+      const oidcActivated = oidcConfig.config.configs[0].activated
+      config.config.oidc = oidcActivated
+    } else {
+      config.config.oidc = false
+    }
+
    ctx.body = config
  } catch (err) {
    ctx.throw(err.status, err)