merge with develop

5 years ago · 2bc54baee1
21 changed files with 109 additions and 20 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -4,6 +4,12 @@ on:
 push:
    branches:
      - master
+ workflow_dispatch:
+    inputs:
+      release_self_host:
+        description: 'Release to self hosters? (Y/N)'     
+        required: true
+        default: 'N'

 env:
  POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }}
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "0.9.125-alpha.18",
+  "version": "0.9.125-alpha.20",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/package.json
+++ b/package.json
@ -42,7 +42,8 @@
    "lint:fix": "yarn run lint:fix:ts && yarn run lint:fix:prettier && yarn run lint:fix:eslint",
    "test:e2e": "lerna run cy:test",
    "test:e2e:ci": "lerna run cy:ci",
-    "build:docker": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION release && cd -",
+    "build:docker": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -",
+    "build:docker:production": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION release && cd -",
    "build:docker:develop": "node scripts/pinVersions && lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -",
    "release:helm": "./scripts/release_helm_chart.sh",
    "multi:enable": "lerna run multi:enable",
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/auth",
-  "version": "0.9.125-alpha.18",
+  "version": "0.9.125-alpha.20",
  "description": "Authentication middlewares for budibase builder and apps",
  "main": "src/index.js",
  "author": "Budibase",
--- a/packages/auth/scripts/jestSetup.js
+++ b/packages/auth/scripts/jestSetup.js
@ -1,5 +1,6 @@
 const env = require("../src/environment")

+env._set("SELF_HOSTED", "1")
 env._set("NODE_ENV", "jest")
 env._set("JWT_SECRET", "test-jwtsecret")
 env._set("LOG_LEVEL", "silent")
--- a/packages/auth/src/cache/user.js
+++ b/packages/auth/src/cache/user.js
@ -1,5 +1,7 @@
 const redis = require("../redis/authRedis")
 const { getTenantId, lookupTenantId, getGlobalDB } = require("../tenancy")
+const env = require("../environment")
+const accounts = require("../cloud/accounts")

 const EXPIRY_SECONDS = 3600

@ -9,6 +11,15 @@ const EXPIRY_SECONDS = 3600
 const populateFromDB = async (userId, tenantId) => {
  const user = await getGlobalDB(tenantId).get(userId)
  user.budibaseAccess = true
+
+  if (!env.SELF_HOSTED) {
+    const account = await accounts.getAccount(user.email)
+    if (account) {
+      user.account = account
+      user.accountPortalAccess = true
+    }
+  }
+
  return user
 }

--- a/packages/auth/src/cloud/accounts.js
+++ b/packages/auth/src/cloud/accounts.js
@ -0,0 +1,22 @@
+const API = require("./api")
+const env = require("../environment")
+
+const api = new API(env.ACCOUNT_PORTAL_URL)
+
+// TODO: Authorization
+
+exports.getAccount = async email => {
+  const payload = {
+    email,
+  }
+  const response = await api.post(`/api/accounts/search`, {
+    body: payload,
+  })
+  const json = await response.json()
+
+  if (response.status !== 200) {
+    throw Error(`Error getting account by email ${email}`, json)
+  }
+
+  return json[0]
+}
--- a/packages/auth/src/cloud/api.js
+++ b/packages/auth/src/cloud/api.js
@ -0,0 +1,44 @@
+const fetch = require("node-fetch")
+class API {
+  constructor(host) {
+    this.host = host
+  }
+
+  apiCall =
+    method =>
+    async (url = "", options = {}) => {
+      if (!options.headers) {
+        options.headers = {}
+      }
+
+      if (!options.headers["Content-Type"]) {
+        options.headers = {
+          "Content-Type": "application/json",
+          Accept: "application/json",
+          ...options.headers,
+        }
+      }
+
+      let json = options.headers["Content-Type"] === "application/json"
+
+      const requestOptions = {
+        method: method,
+        body: json ? JSON.stringify(options.body) : options.body,
+        headers: options.headers,
+        // TODO: See if this is necessary
+        credentials: "include",
+      }
+
+      const resp = await fetch(`${this.host}${url}`, requestOptions)
+
+      return resp
+    }
+
+  post = this.apiCall("POST")
+  get = this.apiCall("GET")
+  patch = this.apiCall("PATCH")
+  del = this.apiCall("DELETE")
+  put = this.apiCall("PUT")
+}
+
+module.exports = API
--- a/packages/auth/src/environment.js
+++ b/packages/auth/src/environment.js
@ -19,6 +19,8 @@ module.exports = {
  MINIO_URL: process.env.MINIO_URL,
  INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
  MULTI_TENANCY: process.env.MULTI_TENANCY,
+  ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
+  SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
  isTest,
  _set(key, value) {
    process.env[key] = value
--- 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.125-alpha.18",
+  "version": "0.9.125-alpha.20",
  "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.125-alpha.18",
+  "version": "0.9.125-alpha.20",
  "license": "AGPL-3.0",
  "private": true,
  "scripts": {
@ -65,10 +65,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^0.9.125-alpha.18",
-    "@budibase/client": "^0.9.125-alpha.18",
+    "@budibase/bbui": "^0.9.125-alpha.20",
+    "@budibase/client": "^0.9.125-alpha.20",
    "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.125-alpha.18",
+    "@budibase/string-templates": "^0.9.125-alpha.20",
    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/cli",
-  "version": "0.9.125-alpha.18",
+  "version": "0.9.125-alpha.20",
  "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.125-alpha.18",
+  "version": "0.9.125-alpha.20",
  "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.125-alpha.18",
-    "@budibase/string-templates": "^0.9.125-alpha.18",
+    "@budibase/bbui": "^0.9.125-alpha.20",
+    "@budibase/string-templates": "^0.9.125-alpha.20",
    "regexparam": "^1.3.0",
    "shortid": "^2.2.15",
    "svelte-spa-router": "^3.0.5"
--- a/packages/server/scripts/jestSetup.js
+++ b/packages/server/scripts/jestSetup.js
@ -1,6 +1,7 @@
 const { tmpdir } = require("os")
 const env = require("../src/environment")

+env._set("SELF_HOSTED", "1")
 env._set("NODE_ENV", "jest")
 env._set("JWT_SECRET", "test-jwtsecret")
 env._set("CLIENT_ID", "test-client-id")
--- a/packages/server/src/environment.js
+++ b/packages/server/src/environment.js
@ -26,7 +26,7 @@ module.exports = {
  COUCH_DB_URL: process.env.COUCH_DB_URL,
  MINIO_URL: process.env.MINIO_URL,
  WORKER_URL: process.env.WORKER_URL,
-  SELF_HOSTED: process.env.SELF_HOSTED,
+  SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
  AWS_REGION: process.env.AWS_REGION,
  ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
  MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "0.9.125-alpha.18",
+  "version": "0.9.125-alpha.20",
  "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.125-alpha.18",
+  "version": "0.9.125-alpha.20",
  "description": "Budibase background service",
  "main": "src/index.js",
  "repository": {
@ -25,8 +25,8 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.9.125-alpha.18",
-    "@budibase/string-templates": "^0.9.125-alpha.18",
+    "@budibase/auth": "^0.9.125-alpha.20",
+    "@budibase/string-templates": "^0.9.125-alpha.20",
    "@koa/router": "^8.0.0",
    "@techpass/passport-openidconnect": "^0.3.0",
    "aws-sdk": "^2.811.0",
--- a/packages/worker/scripts/dev/manage.js
+++ b/packages/worker/scripts/dev/manage.js
@ -21,7 +21,7 @@ async function init() {
      COUCH_DB_PASSWORD: "budibase",
      // empty string is false
      MULTI_TENANCY: "",
-      ACCOUNT_PORTAL_URL: "http://localhost:3001",
+      ACCOUNT_PORTAL_URL: "http://localhost:10001",
    }
    let envFile = ""
    Object.keys(envFileJson).forEach(key => {
--- a/packages/worker/scripts/jestSetup.js
+++ b/packages/worker/scripts/jestSetup.js
@ -1,5 +1,6 @@
 const env = require("../src/environment")

+env._set("SELF_HOSTED", "1")
 env._set("NODE_ENV", "jest")
 env._set("JWT_SECRET", "test-jwtsecret")
 env._set("LOG_LEVEL", "silent")
--- a/packages/worker/src/api/controllers/system/environment.js
+++ b/packages/worker/src/api/controllers/system/environment.js
@ -3,7 +3,7 @@ const env = require("../../../environment")
 exports.fetch = async ctx => {
  ctx.body = {
    multiTenancy: !!env.MULTI_TENANCY,
-    cloud: !(env.SELF_HOSTED === "1"),
+    cloud: !env.SELF_HOSTED,
    accountPortalUrl: env.ACCOUNT_PORTAL_URL,
  }
 }
--- a/packages/worker/src/environment.js
+++ b/packages/worker/src/environment.js
@ -18,7 +18,7 @@ if (!LOADED && isDev() && !isTest()) {

 module.exports = {
  NODE_ENV: process.env.NODE_ENV,
-  SELF_HOSTED: process.env.SELF_HOSTED,
+  SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
  PORT: process.env.PORT,
  CLUSTER_PORT: process.env.CLUSTER_PORT,
  MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,