Redirect to account portal login page in the cloud

hosting/docker-compose.yaml

@@ -51,6 +51,7 @@ services:
       INTERNAL_API_KEY: ${INTERNAL_API_KEY}
       REDIS_URL: redis-service:6379
       REDIS_PASSWORD: ${REDIS_PASSWORD}
+      ACCOUNT_PORTAL_URL: https://portal.budi.live
     volumes:
       - ./logs:/logs
     depends_on:

hosting/kubernetes/budibase/templates/worker-service-deployment.yaml

@@ -87,6 +87,8 @@ spec:
           {{ end }}
         - name: SELF_HOSTED
           value: {{ .Values.globals.selfHosted | quote }}
+        - name: ACCOUNT_PORTAL_URL
+          value: {{ .Values.globals.accountPortalUrl | quote }}
         image: budibase/worker
         imagePullPolicy: Always
         name: bbworker

hosting/kubernetes/budibase/values.yaml

@@ -89,6 +89,7 @@ globals:
   sentryDSN: "" 
   logLevel: info
   selfHosted: 1
+  accountPortalUrL: ""
   createSecrets: true # creates an internal API key, JWT secrets and redis password for you
 
   # if createSecrets is set to false, you can hard-code your secrets here

packages/builder/src/pages/builder/auth/login.svelte

@@ -51,6 +51,12 @@
 
   onMount(async () => {
     await organisation.init()
+
+    // redirect to account portal for login in the cloud
+    if ($admin.cloud && $admin.accountPortalUrl) {
+      window.location.href = $admin.accountPortalUrl
+    }
+
     loaded = true
   })
 </script>

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

@@ -7,6 +7,7 @@ export function createAdminStore() {
     loaded: false,
     multiTenancy: false,
     cloud: false,
+    accountPortalUrl: "",
     onboardingProgress: 0,
     checklist: {
       apps: { checked: false },
@@ -28,7 +29,7 @@ export function createAdminStore() {
       const totalSteps = Object.keys(json).length
       const completedSteps = Object.values(json).filter(x => x?.checked).length
 
-      await getFlags()
+      await getEnvironment()
       admin.update(store => {
         store.loaded = true
         store.checklist = json
@@ -43,20 +44,23 @@ export function createAdminStore() {
     }
   }
 
-  async function getFlags() {
+  async function getEnvironment() {
     let multiTenancyEnabled = false
     let cloud = false
+    let accountPortalUrl = ""
     try {
-      const response = await api.get(`/api/system/flags`)
+      const response = await api.get(`/api/system/environment`)
       const json = await response.json()
       multiTenancyEnabled = json.multiTenancy
       cloud = json.cloud
+      accountPortalUrl = json.accountPortalUrl
     } catch (err) {
       // just let it stay disabled
     }
     admin.update(store => {
       store.multiTenancy = multiTenancyEnabled
       store.cloud = cloud
+      store.accountPortalUrl = accountPortalUrl
       return store
     })
   }

packages/worker/scripts/dev/manage.js

@@ -21,6 +21,7 @@ async function init() {
       COUCH_DB_PASSWORD: "budibase",
       // empty string is false
       MULTI_TENANCY: "",
+      ACCOUNT_PORTAL_URL: "http://localhost:3001",
     }
     let envFile = ""
     Object.keys(envFileJson).forEach(key => {

packages/worker/src/api/controllers/system/environment.js

@@ -3,6 +3,7 @@ const env = require("../../../environment")
 exports.fetch = async ctx => {
   ctx.body = {
     multiTenancy: !!env.MULTI_TENANCY,
-    cloud: !!env.SELF_HOSTED,
+    cloud: !(env.SELF_HOSTED === "1"),
+    accountPortalUrl: env.ACCOUNT_PORTAL_URL,
   }
 }

packages/worker/src/api/index.js

@@ -44,7 +44,7 @@ const PUBLIC_ENDPOINTS = [
     method: "POST",
   },
   {
-    route: "api/system/flags",
+    route: "api/system/environment",
     method: "GET",
   },
   {

packages/worker/src/api/routes/index.js

@@ -6,7 +6,7 @@ const emailRoutes = require("./global/email")
 const authRoutes = require("./global/auth")
 const roleRoutes = require("./global/roles")
 const sessionRoutes = require("./global/sessions")
-const flagRoutes = require("./system/flags")
+const environmentRoutes = require("./system/environment")
 const tenantsRoutes = require("./system/tenants")
 const appRoutes = require("./app")
 
@@ -21,5 +21,5 @@ exports.routes = [
   emailRoutes,
   sessionRoutes,
   roleRoutes,
-  flagRoutes,
+  environmentRoutes,
 ]

packages/worker/src/api/routes/system/environment.js

@@ -0,0 +1,8 @@
+const Router = require("@koa/router")
+const controller = require("../../controllers/system/environment")
+
+const router = Router()
+
+router.get("/api/system/environment", controller.fetch)
+
+module.exports = router

packages/worker/src/api/routes/system/flags.js

@@ -1,8 +0,0 @@
-const Router = require("@koa/router")
-const controller = require("../../controllers/system/flags")
-
-const router = Router()
-
-router.get("/api/system/flags", controller.fetch)
-
-module.exports = router

packages/worker/src/environment.js

@@ -32,6 +32,7 @@ module.exports = {
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
   MULTI_TENANCY: process.env.MULTI_TENANCY,
+  ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
   _set(key, value) {
     process.env[key] = value
     module.exports[key] = value