Merge branch 'master' of github.com:Budibase/budibase into qol-updates

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.2.4",
+  "version": "0.2.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,7 +64,7 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.44.1",
-    "@budibase/client": "^0.2.4",
+    "@budibase/client": "^0.2.5",
     "@budibase/colorpicker": "^1.0.1",
     "@fortawesome/fontawesome-free": "^5.14.0",
     "@sentry/browser": "5.19.1",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "budibase",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Budibase CLI",
   "repository": "https://github.com/Budibase/Budibase",
   "homepage": "https://www.budibase.com",
@@ -17,7 +17,7 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/server": "^0.2.4",
+    "@budibase/server": "^0.2.5",
     "@inquirer/password": "^0.0.6-alpha.0",
     "chalk": "^2.4.2",
     "dotenv": "^8.2.0",

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.esm.mjs",

packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/server",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -42,7 +42,7 @@
   "author": "Michael Shanks",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.2.4",
+    "@budibase/client": "^0.2.5",
     "@koa/router": "^8.0.0",
     "@sendgrid/mail": "^7.1.1",
     "@sentry/node": "^5.19.2",

packages/server/src/api/controllers/deploy/index.js

@@ -24,7 +24,7 @@ function replicate(local, remote) {
   })
 }
 
-async function replicateCouch({ instanceId, clientId, credentials }) {
+async function replicateCouch({ instanceId, clientId, session }) {
   const databases = [`client_${clientId}`, "client_app_lookup", instanceId]
 
   const replications = databases.map(localDbName => {
@@ -32,8 +32,9 @@ async function replicateCouch({ instanceId, clientId, credentials }) {
     const remoteDb = new CouchDB(
       `${process.env.DEPLOYMENT_DB_URL}/${localDbName}`,
       {
-        auth: {
-          ...credentials,
+        fetch: function(url, opts) {
+          opts.headers.set("Cookie", `${session};`)
+          return CouchDB.fetch(url, opts)
         },
       }
     )
@@ -118,7 +119,7 @@ async function deployApp({ instanceId, appId, clientId, deploymentId }) {
     await replicateCouch({
       instanceId,
       clientId,
-      credentials: credentials.couchDbCreds,
+      session: credentials.couchDbSession,
     })
 
     await updateDeploymentQuota(credentials.quota)

packages/standard-components/package.json

@@ -13,7 +13,7 @@
     "dev:builder": "rollup -cw"
   },
   "devDependencies": {
-    "@budibase/client": "^0.2.4",
+    "@budibase/client": "^0.2.5",
     "@rollup/plugin-commonjs": "^11.1.0",
     "lodash": "^4.17.15",
     "rollup": "^2.11.2",
@@ -31,7 +31,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.2.4",
+  "version": "0.2.5",
   "license": "MIT",
   "gitHead": "284cceb9b703c38566c6e6363c022f79a08d5691",
   "dependencies": {