Browse Source
Merge pull request #2880 from Budibase/fix/2835
Fix for shorthand app URL not re-directing if the user isn't logged in
pull/2883/head
Michael Drury
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
5 additions and
5 deletions
-
packages/server/src/api/controllers/application.js
-
packages/server/src/api/controllers/hosting.js
-
packages/server/src/api/controllers/static/index.js
-
packages/server/src/utilities/workerRequests.js
|
|
|
@ -82,7 +82,7 @@ async function getAppUrlIfNotInUse(ctx) { |
|
|
|
if (!env.SELF_HOSTED) { |
|
|
|
return url |
|
|
|
} |
|
|
|
const deployedApps = await getDeployedApps(ctx) |
|
|
|
const deployedApps = await getDeployedApps() |
|
|
|
if ( |
|
|
|
url && |
|
|
|
deployedApps[url] != null && |
|
|
|
|
|
|
|
@ -18,5 +18,5 @@ exports.fetchUrls = async ctx => { |
|
|
|
} |
|
|
|
|
|
|
|
exports.getDeployedApps = async ctx => { |
|
|
|
ctx.body = await getDeployedApps(ctx) |
|
|
|
ctx.body = await getDeployedApps() |
|
|
|
} |
|
|
|
|
|
|
|
@ -40,7 +40,7 @@ async function prepareUpload({ s3Key, bucket, metadata, file }) { |
|
|
|
async function checkForSelfHostedURL(ctx) { |
|
|
|
// the "appId" component of the URL may actually be a specific self hosted URL
|
|
|
|
let possibleAppUrl = `/${encodeURI(ctx.params.appId).toLowerCase()}` |
|
|
|
const apps = await getDeployedApps(ctx) |
|
|
|
const apps = await getDeployedApps() |
|
|
|
if (apps[possibleAppUrl] && apps[possibleAppUrl].appId) { |
|
|
|
return apps[possibleAppUrl].appId |
|
|
|
} else { |
|
|
|
|
|
|
|
@ -58,11 +58,11 @@ exports.sendSmtpEmail = async (to, from, subject, contents, automation) => { |
|
|
|
return response.json() |
|
|
|
} |
|
|
|
|
|
|
|
exports.getDeployedApps = async ctx => { |
|
|
|
exports.getDeployedApps = async () => { |
|
|
|
try { |
|
|
|
const response = await fetch( |
|
|
|
checkSlashesInUrl(env.WORKER_URL + `/api/apps`), |
|
|
|
request(ctx, { |
|
|
|
request(null, { |
|
|
|
method: "GET", |
|
|
|
}) |
|
|
|
) |
|
|
|
|