Merge pull request #2669 from Budibase/feature/onboarding-backend

Move all session population to budibase (bug fix)

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")

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
 }
 

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]
+}

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

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

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")

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,

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 => {

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")

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,
   }
 }

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,