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

Merge pull request #751 from Budibase/auth-fix 

auth - standard-components not loading, windows
This commit is contained in:
Michael Shanks 2020-10-18 21:59:35 +01:00 committed by GitHub
parent 31ec8322ae 158240bc3b
commit ea85f351ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/index.js
View File

@ -21,7 +21,7 @@ export const loadBudibase = async opts => {
for (let library of libraries) {
// fetch the JavaScript for the component libraries from the server
componentLibraryModules[library] = await import(
`/componentlibrary?library=${encodeURI(library)}`
`/componentlibrary?library=${encodeURI(library)}&appId=${appId}`
)
}

4
packages/server/src/api/controllers/static.js
View File

@ -198,7 +198,7 @@ exports.serveComponentLibrary = async function(ctx) {
// default to homedir
let componentLibraryPath = resolve(
budibaseAppsDir(),
ctx.user.appId,
ctx.query.appId,
"node_modules",
decodeURI(ctx.query.library),
"package",
@ -215,7 +215,7 @@ exports.serveComponentLibrary = async function(ctx) {
// TODO: component libs should be versioned based on app version
if (process.env.CLOUD) {
const appId = ctx.user.appId
const appId = ctx.query.appId
const S3_URL = encodeURI(
`https://${appId}.app.budi.live/assets/componentlibrary/${ctx.query.library}/dist/index.js`
)