MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cherry picking moving release url to backend

This commit is contained in:
Martin McKeaveney 2022-06-28 22:45:05 +01:00
parent 385004ca1c
commit b1aab604c7
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release-develop.yml vendored
View File

@ -21,7 +21,7 @@ env:
# Posthog token used by ui at build time # Posthog token used by ui at build time
POSTHOG_TOKEN: phc_uDYOfnFt6wAbBAXkC6STjcrTpAFiWIhqgFcsC1UVO5F POSTHOG_TOKEN: phc_uDYOfnFt6wAbBAXkC6STjcrTpAFiWIhqgFcsC1UVO5F
INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }} INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }}
PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }} PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
jobs: jobs:
release: release:

3
packages/builder/vite.config.js
View File

@ -32,9 +32,6 @@ export default ({ mode }) => {
process.env.INTERCOM_TOKEN process.env.INTERCOM_TOKEN
), ),
"process.env.SENTRY_DSN": JSON.stringify(process.env.SENTRY_DSN), "process.env.SENTRY_DSN": JSON.stringify(process.env.SENTRY_DSN),
"process.env.FEATURE_PREVIEW_URL": JSON.stringify(
process.env.FEATURE_PREVIEW_URL
),
}), }),
], ],
optimizeDeps: { optimizeDeps: {

2
packages/frontend-core/src/api/other.js
View File

@ -60,7 +60,7 @@ export const buildOtherEndpoints = API => ({
*/ */
checkBetaAccess: async email => { checkBetaAccess: async email => {
return await API.get({ return await API.get({
url: `${process.env.FEATURE_PREVIEW_URL}/api/beta/access?email=${email}`, url: `/api/beta/access?email=${email}`,
}) })
}, },
}) })

12
packages/server/src/api/controllers/dev.js
View File

@ -140,6 +140,17 @@ exports.getBudibaseVersion = async ctx => {
// TODO: remove as part of beta program // TODO: remove as part of beta program
exports.checkBetaAccess = async ctx => { 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 userToCheck = ctx.query.email
const BETA_USERS_DB = "app_bb_f9b77d06b9db4e3ca185476ab87a2364" const BETA_USERS_DB = "app_bb_f9b77d06b9db4e3ca185476ab87a2364"
const BETA_USERS_TABLE = "ta_8c2c6df1c03f49cfb6340e85e066dd15" const BETA_USERS_TABLE = "ta_8c2c6df1c03f49cfb6340e85e066dd15"
@ -163,6 +174,7 @@ exports.checkBetaAccess = async ctx => {
} }
ctx.body = { access } ctx.body = { access }
} catch (err) { } catch (err) {
console.error(err)
ctx.body = { access: false } ctx.body = { access: false }
} }
} }

4
packages/server/src/environment.js
View File

@ -67,7 +67,9 @@ module.exports = {
SALT_ROUNDS: process.env.SALT_ROUNDS, SALT_ROUNDS: process.env.SALT_ROUNDS,
LOGGER: process.env.LOGGER, LOGGER: process.env.LOGGER,
LOG_LEVEL: process.env.LOG_LEVEL, LOG_LEVEL: process.env.LOG_LEVEL,
AUTOMATION_MAX_ITERATIONS: process.env.AUTOMATION_MAX_ITERATIONS, 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, SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,
DYNAMO_ENDPOINT: process.env.DYNAMO_ENDPOINT, DYNAMO_ENDPOINT: process.env.DYNAMO_ENDPOINT,
QUERY_THREAD_TIMEOUT: parseIntSafe(process.env.QUERY_THREAD_TIMEOUT), QUERY_THREAD_TIMEOUT: parseIntSafe(process.env.QUERY_THREAD_TIMEOUT),