CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-10-04 03:54:37 +13:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2880 from Budibase/fix/2835

Browse source 
Fix for shorthand app URL not re-directing if the user isn't logged in
This commit is contained in:
Michael Drury 2021-10-04 14:09:48 +01:00 committed by GitHub
commit d4877ef9db
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/server/src/api/controllers/application.js
View file

@ -82,7 +82,7 @@ async function getAppUrlIfNotInUse(ctx) {
if (!env.SELF_HOSTED) { if (!env.SELF_HOSTED) {
return url return url
} }
const deployedApps = await getDeployedApps(ctx) const deployedApps = await getDeployedApps()
if ( if (
url && url &&
deployedApps[url] != null && deployedApps[url] != null &&

2
packages/server/src/api/controllers/hosting.js
View file

@ -18,5 +18,5 @@ exports.fetchUrls = async ctx => {
} }
exports.getDeployedApps = async ctx => { exports.getDeployedApps = async ctx => {
ctx.body = await getDeployedApps(ctx) ctx.body = await getDeployedApps()
} }

2
packages/server/src/api/controllers/static/index.js
View file

@ -40,7 +40,7 @@ async function prepareUpload({ s3Key, bucket, metadata, file }) {
async function checkForSelfHostedURL(ctx) { async function checkForSelfHostedURL(ctx) {
// the "appId" component of the URL may actually be a specific self hosted URL // the "appId" component of the URL may actually be a specific self hosted URL
let possibleAppUrl = `/${encodeURI(ctx.params.appId).toLowerCase()}` let possibleAppUrl = `/${encodeURI(ctx.params.appId).toLowerCase()}`
const apps = await getDeployedApps(ctx) const apps = await getDeployedApps()
if (apps[possibleAppUrl] && apps[possibleAppUrl].appId) { if (apps[possibleAppUrl] && apps[possibleAppUrl].appId) {
return apps[possibleAppUrl].appId return apps[possibleAppUrl].appId
} else { } else {

4
packages/server/src/utilities/workerRequests.js
View file

@ -58,11 +58,11 @@ exports.sendSmtpEmail = async (to, from, subject, contents, automation) => {
return response.json() return response.json()
} }
exports.getDeployedApps = async ctx => { exports.getDeployedApps = async () => {
try { try {
const response = await fetch( const response = await fetch(
checkSlashesInUrl(env.WORKER_URL + `/api/apps`), checkSlashesInUrl(env.WORKER_URL + `/api/apps`),
request(ctx, { request(null, {
method: "GET", method: "GET",
}) })
) )