Merge branch 'develop' of github.com:Budibase/budibase into responsive-preview

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.9.123-alpha.0",
+  "version": "0.9.123-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.123-alpha.0",
+  "version": "0.9.123-alpha.1",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.123-alpha.0",
+  "version": "0.9.123-alpha.1",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.123-alpha.0",
+  "version": "0.9.123-alpha.1",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.123-alpha.0",
-    "@budibase/client": "^0.9.123-alpha.0",
+    "@budibase/bbui": "^0.9.123-alpha.1",
+    "@budibase/client": "^0.9.123-alpha.1",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.123-alpha.0",
+    "@budibase/string-templates": "^0.9.123-alpha.1",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.123-alpha.0",
+  "version": "0.9.123-alpha.1",
   "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": "0.9.123-alpha.0",
+  "version": "0.9.123-alpha.1",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,8 +19,8 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.123-alpha.0",
-    "@budibase/string-templates": "^0.9.123-alpha.0",
+    "@budibase/bbui": "^0.9.123-alpha.1",
+    "@budibase/string-templates": "^0.9.123-alpha.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.123-alpha.0",
+  "version": "0.9.123-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -62,9 +62,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.123-alpha.0",
-    "@budibase/client": "^0.9.123-alpha.0",
-    "@budibase/string-templates": "^0.9.123-alpha.0",
+    "@budibase/auth": "^0.9.123-alpha.1",
+    "@budibase/client": "^0.9.123-alpha.1",
+    "@budibase/string-templates": "^0.9.123-alpha.1",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -117,7 +117,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/client": "^0.9.123-alpha.0",
+    "@budibase/client": "^0.9.123-alpha.1",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",

packages/string-templates/package.json

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

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.123-alpha.0",
+  "version": "0.9.123-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -23,8 +23,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.123-alpha.0",
-    "@budibase/string-templates": "^0.9.123-alpha.0",
+    "@budibase/auth": "^0.9.123-alpha.1",
+    "@budibase/string-templates": "^0.9.123-alpha.1",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

packages/worker/src/api/index.js

@@ -35,6 +35,7 @@ const PUBLIC_ENDPOINTS = [
     method: "GET",
   },
   {
+    // TODO: Add an provisioning API key to this endpoint in the cloud
     route: "/api/global/users/init",
     method: "POST",
   },
@@ -46,6 +47,10 @@ const PUBLIC_ENDPOINTS = [
     route: "api/system/flags",
     method: "GET",
   },
+  {
+    route: "/api/global/users/tenant/:id",
+    method: "GET",
+  },
 ]
 
 const NO_TENANCY_ENDPOINTS = [

packages/worker/src/api/routes/global/users.js

@@ -94,7 +94,7 @@ router
     controller.adminUser
   )
   .get("/api/global/users/self", controller.getSelf)
-  .get("/api/global/users/tenant/:id", adminOnly, controller.tenantLookup)
+  .get("/api/global/users/tenant/:id", controller.tenantLookup)
   // global endpoint but needs to come at end (blocks other endpoints otherwise)
   .get("/api/global/users/:id", adminOnly, controller.find)