@budibase/server 1.0.212-alpha.2 → 1.0.212-alpha.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.212-alpha.2",
+  "version": "1.0.212-alpha.5",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.212-alpha.2",
-    "@budibase/client": "^1.0.212-alpha.2",
-    "@budibase/pro": "1.0.212-alpha.1",
-    "@budibase/string-templates": "^1.0.212-alpha.2",
-    "@budibase/types": "^1.0.212-alpha.2",
+    "@budibase/backend-core": "^1.0.212-alpha.5",
+    "@budibase/client": "^1.0.212-alpha.5",
+    "@budibase/pro": "1.0.212-alpha.4",
+    "@budibase/string-templates": "^1.0.212-alpha.5",
+    "@budibase/types": "^1.0.212-alpha.5",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "fd7ab042b5b5525160be8849102b661d8be4cf90"
+  "gitHead": "8567f9037aaa6071f469950e397e8ab393df9b12"
 }

package/src/api/controllers/dev.js

@@ -140,6 +140,17 @@ exports.getBudibaseVersion = async ctx => {
 
 // TODO: remove as part of beta program
 exports.checkBetaAccess = async ctx => {
+  // go to the cloud platform if running self hosted
+  if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
+    const baseUrl = env.ACCOUNT_PORTAL_URL.replace("account.", "")
+    const response = await fetch(
+      `${baseUrl}/api/beta/access?email=${ctx.query.email}`
+    )
+    const json = await response.json()
+    ctx.body = json
+    return
+  }
+
   const userToCheck = ctx.query.email
   const BETA_USERS_DB = "app_bb_f9b77d06b9db4e3ca185476ab87a2364"
   const BETA_USERS_TABLE = "ta_8c2c6df1c03f49cfb6340e85e066dd15"
@@ -163,6 +174,7 @@ exports.checkBetaAccess = async ctx => {
     }
     ctx.body = { access }
   } catch (err) {
+    console.error(err)
     ctx.body = { access: false }
   }
 }

package/src/environment.js

@@ -67,6 +67,7 @@ module.exports = {
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   LOGGER: process.env.LOGGER,
   LOG_LEVEL: process.env.LOG_LEVEL,
+  ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
   AUTOMATION_MAX_ITERATIONS:
     parseIntSafe(process.env.AUTOMATION_MAX_ITERATIONS) || 200,
   SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,