Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab

charts/budibase/Chart.yaml

@@ -11,8 +11,8 @@ sources:
   - https://github.com/Budibase/budibase
   - https://budibase.com
 type: application
-version: 0.2.10
+version: 0.2.11
-appVersion: 1.0.48
+appVersion: 1.0.214
 dependencies:
   - name: couchdb
     version: 3.6.1

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.212-alpha.15",
+  "version": "1.0.219-alpha.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.212-alpha.15",
+  "version": "1.0.219-alpha.4",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^1.0.212-alpha.15",
+    "@budibase/types": "^1.0.219-alpha.4",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",

packages/backend-core/src/auth.js

@@ -20,6 +20,8 @@ const {
   internalApi,
 } = require("./middleware")
 
+const { invalidateUser } = require("./cache/user")
+
 // Strategies
 passport.use(new LocalStrategy(local.options, local.authenticate))
 passport.use(new JwtStrategy(jwt.options, jwt.authenticate))
@@ -149,6 +151,8 @@ async function updateUserOAuth(userId, oAuthConfig) {
     }
 
     await db.put(dbUser)
+
+    await invalidateUser(userId)
   } catch (e) {
     console.error("Could not update OAuth details for current user", e)
   }

packages/backend-core/src/logging.ts

@@ -1,10 +1,10 @@
 const NonErrors = ["AccountError"]
 
-function isSuppressed(e) {
+function isSuppressed(e?: any) {
   return e && e["suppressAlert"]
 }
 
-module.exports.logAlert = (message, e) => {
+export function logAlert(message: string, e?: any) {
   if (e && NonErrors.includes(e.name) && isSuppressed(e)) {
     return
   }
@@ -14,3 +14,7 @@ module.exports.logAlert = (message, e) => {
   }
   console.error(`bb-alert: ${message} ${errorJson}`)
 }
+
+export default {
+  logAlert,
+}

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.212-alpha.15",
+  "version": "1.0.219-alpha.4",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.212-alpha.15",
+    "@budibase/string-templates": "^1.0.219-alpha.4",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",

packages/bbui/src/Table/ArrayRenderer.svelte

@@ -5,7 +5,7 @@
 
   const displayLimit = 5
 
-  $: badges = value?.slice(0, displayLimit) ?? []
+  $: badges = Array.isArray(value) ? value.slice(0, displayLimit) : []
   $: leftover = (value?.length ?? 0) - badges.length
 </script>
 

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.212-alpha.15",
+  "version": "1.0.219-alpha.4",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.212-alpha.15",
+    "@budibase/bbui": "^1.0.219-alpha.4",
-    "@budibase/client": "^1.0.212-alpha.15",
+    "@budibase/client": "^1.0.219-alpha.4",
-    "@budibase/frontend-core": "^1.0.212-alpha.15",
+    "@budibase/frontend-core": "^1.0.219-alpha.4",
-    "@budibase/string-templates": "^1.0.212-alpha.15",
+    "@budibase/string-templates": "^1.0.219-alpha.4",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/builder/src/analytics/IntercomClient.js

@@ -53,7 +53,7 @@ export default class IntercomClient {
    * @returns Intercom global object
    */
   show(user = {}) {
-    if (!this.initialised) return
+    if (!this.initialised || !user?.admin) return
 
     return window.Intercom("boot", {
       app_id: this.token,

packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte

@@ -22,10 +22,8 @@
     RelationshipTypes,
     ALLOWABLE_STRING_OPTIONS,
     ALLOWABLE_NUMBER_OPTIONS,
-    ALLOWABLE_JSON_OPTIONS,
     ALLOWABLE_STRING_TYPES,
     ALLOWABLE_NUMBER_TYPES,
-    ALLOWABLE_JSON_TYPES,
     SWITCHABLE_TYPES,
   } from "constants/backend"
   import { getAutoColumnInformation, buildAutoColumn } from "builderStore/utils"
@@ -255,11 +253,6 @@
       ALLOWABLE_NUMBER_TYPES.indexOf(field.type) !== -1
     ) {
       return ALLOWABLE_NUMBER_OPTIONS
-    } else if (
-      originalName &&
-      ALLOWABLE_JSON_TYPES.indexOf(field.type) !== -1
-    ) {
-      return ALLOWABLE_JSON_OPTIONS
     } else if (!external) {
       return [
         ...Object.values(fieldDefinitions),

packages/builder/src/constants/backend/index.js

@@ -158,13 +158,9 @@ export const ALLOWABLE_NUMBER_TYPES = ALLOWABLE_NUMBER_OPTIONS.map(
   opt => opt.type
 )
 
-export const ALLOWABLE_JSON_OPTIONS = [FIELDS.JSON, FIELDS.ARRAY]
-export const ALLOWABLE_JSON_TYPES = ALLOWABLE_JSON_OPTIONS.map(opt => opt.type)
-
 export const SWITCHABLE_TYPES = [
   ...ALLOWABLE_STRING_TYPES,
   ...ALLOWABLE_NUMBER_TYPES,
-  ...ALLOWABLE_JSON_TYPES,
 ]
 
 export const IntegrationTypes = {

packages/builder/src/stores/portal/auth.js

@@ -64,6 +64,8 @@ export function createAuthStore() {
             name: user.account?.name,
             user_id: user._id,
             tenant: user.tenantId,
+            admin: user?.admin?.global,
+            builder: user?.builder?.global,
             "Company size": user.account?.size,
             "Job role": user.account?.profession,
           })

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.212-alpha.15",
+  "version": "1.0.219-alpha.4",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.212-alpha.15",
+  "version": "1.0.219-alpha.4",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.212-alpha.15",
+    "@budibase/bbui": "^1.0.219-alpha.4",
-    "@budibase/frontend-core": "^1.0.212-alpha.15",
+    "@budibase/frontend-core": "^1.0.219-alpha.4",
-    "@budibase/string-templates": "^1.0.212-alpha.15",
+    "@budibase/string-templates": "^1.0.219-alpha.4",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",

packages/frontend-core/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.212-alpha.15",
+  "version": "1.0.219-alpha.4",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.212-alpha.15",
+    "@budibase/bbui": "^1.0.219-alpha.4",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.212-alpha.15",
+  "version": "1.0.219-alpha.4",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.212-alpha.15",
+    "@budibase/backend-core": "^1.0.219-alpha.4",
-    "@budibase/client": "^1.0.212-alpha.15",
+    "@budibase/client": "^1.0.219-alpha.4",
-    "@budibase/pro": "1.0.212-alpha.15",
+    "@budibase/pro": "1.0.219-alpha.4",
-    "@budibase/string-templates": "^1.0.212-alpha.15",
+    "@budibase/string-templates": "^1.0.219-alpha.4",
-    "@budibase/types": "^1.0.212-alpha.15",
+    "@budibase/types": "^1.0.219-alpha.4",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",

packages/server/src/threads/query.js

@@ -8,6 +8,7 @@ const {
   refreshOAuthToken,
   updateUserOAuth,
 } = require("@budibase/backend-core/auth")
+const { user: userCache } = require("@budibase/backend-core/cache")
 const { getGlobalIDFromUserMetadataID } = require("../db/utils")
 
 const { isSQL } = require("../integrations/utils")
@@ -112,15 +113,9 @@ class QueryRunner {
         info.code === 401 &&
         !this.hasRefreshedOAuth
       ) {
+        await this.refreshOAuth2(this.ctx)
         // Attempt to refresh the access token from the provider
         this.hasRefreshedOAuth = true
-        const authResponse = await this.refreshOAuth2(this.ctx)
-
-        if (!authResponse || authResponse.err) {
-          // In this event the user may have oAuth issues that
-          // could require re-authenticating with their provider.
-          throw new Error("OAuth2 access token could not be refreshed")
-        }
       }
 
       this.hasRerun = true
@@ -174,8 +169,7 @@ class QueryRunner {
     const { configId } = ctx.auth
 
     if (!providerType || !oauth2?.refreshToken) {
-      console.error("No refresh token found for authenticated user")
+      throw new Error("No refresh token found for authenticated user")
-      return
     }
 
     const resp = await refreshOAuthToken(
@@ -186,9 +180,16 @@ class QueryRunner {
 
     // Refresh session flow. Should be in same location as refreshOAuthToken
     // There are several other properties available in 'resp'
-    if (!resp.error) {
+    if (!resp.err) {
       const globalUserId = getGlobalIDFromUserMetadataID(_id)
       await updateUserOAuth(globalUserId, resp)
+      this.ctx.user = await userCache.getUser(globalUserId)
+    } else {
+      // In this event the user may have oAuth issues that
+      // could require re-authenticating with their provider.
+      throw new Error(
+        "OAuth2 access token could not be refreshed: " + resp.err.toString()
+      )
     }
 
     return resp

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.212-alpha.15",
+  "version": "1.0.219-alpha.4",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.0.212-alpha.15",
+  "version": "1.0.219-alpha.4",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.212-alpha.15",
+  "version": "1.0.219-alpha.4",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,10 +34,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.212-alpha.15",
+    "@budibase/backend-core": "^1.0.219-alpha.4",
-    "@budibase/pro": "1.0.212-alpha.15",
+    "@budibase/pro": "1.0.219-alpha.4",
-    "@budibase/string-templates": "^1.0.212-alpha.15",
+    "@budibase/string-templates": "^1.0.219-alpha.4",
-    "@budibase/types": "^1.0.212-alpha.15",
+    "@budibase/types": "^1.0.219-alpha.4",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",