From c329063f61d0dd0d53d410a825cdb8e02b9d467f Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 14 Oct 2020 17:30:00 +0100 Subject: [PATCH] fix for appid referer split --- packages/server/src/middleware/authenticated.js | 8 ++++++-- .../src/DataGrid/AttachmentCell/Button.svelte | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/server/src/middleware/authenticated.js b/packages/server/src/middleware/authenticated.js index 53ee65aa08..33cafca17a 100644 --- a/packages/server/src/middleware/authenticated.js +++ b/packages/server/src/middleware/authenticated.js @@ -32,11 +32,15 @@ module.exports = async (ctx, next) => { if (!token) { ctx.auth.authenticated = false - const appId = process.env.CLOUD ? ctx.subdomains[1] : ctx.params.appId + let appId = process.env.CLOUD ? ctx.subdomains[1] : ctx.params.appId + + if (!appId) { + appId = ctx.referer && ctx.referer.split("/").pop() + } ctx.user = { // if appId can't be determined from path param or subdomain - appId: appId || ctx.referer.split("/").pop(), + appId: appId, } await next() return diff --git a/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte b/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte index b32e8e0294..1c7a24ea4f 100644 --- a/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte +++ b/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte @@ -27,4 +27,4 @@ on:newRow={() => dispatch('newRow')} /> --> - +