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

more auth bugfixes

This commit is contained in:
Martin McKeaveney 2020-10-15 14:26:33 +01:00
parent f0f9015819
commit f163027ca8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/render/getAppId.js
View File

@ -3,6 +3,8 @@ export const parseAppIdFromCookie = docCookie => {
docCookie.split(";").find(c => c.trim().startsWith("budibase:token")) || docCookie.split(";").find(c => c.trim().startsWith("budibase:token")) ||
docCookie.split(";").find(c => c.trim().startsWith("builder:token")) docCookie.split(";").find(c => c.trim().startsWith("builder:token"))
if (!cookie) return location.pathname.replace("/")
const base64Token = cookie.substring(lengthOfKey) const base64Token = cookie.substring(lengthOfKey)
const user = JSON.parse(atob(base64Token.split(".")[1])) const user = JSON.parse(atob(base64Token.split(".")[1]))

8
packages/server/src/middleware/authenticated.js
View File

@ -34,12 +34,14 @@ module.exports = async (ctx, next) => {
let appId = process.env.CLOUD ? ctx.subdomains[1] : ctx.params.appId let appId = process.env.CLOUD ? ctx.subdomains[1] : ctx.params.appId
if (!appId) { // if appId can't be determined from path param or subdomain
appId = ctx.referer && ctx.referer.split("/").pop() if (!appId && ctx.request.headers.referer) {
const url = new URL(ctx.request.headers.referer)
// remove leading and trailing slashes from appId
appId = url.pathname.replace(/\//g, "")
} }
ctx.user = { ctx.user = {
// if appId can't be determined from path param or subdomain
appId, appId,
} }
await next() await next()