diff --git a/packages/server/src/api/controllers/deploy/aws.js b/packages/server/src/api/controllers/deploy/aws.js index 5c788a9dcc..626a768964 100644 --- a/packages/server/src/api/controllers/deploy/aws.js +++ b/packages/server/src/api/controllers/deploy/aws.js @@ -7,6 +7,8 @@ const { budibaseAppsDir } = require("../../../utilities/budibaseDir") const PouchDB = require("../../../db") const env = require("../../../environment") +const EXCLUDED_DIRECTORIES = ["css"] + /** * Finalises the deployment, updating the quota for the user API key * The verification process returns the levels to update to. @@ -140,10 +142,17 @@ exports.uploadAppAssets = async function({ appId, bucket, accountId }) { // Upload HTML, CSS and JS of the web app walkDir(appAssetsPath, function(filePath) { + const filePathParts = filePath.split("/") + const publicIndex = filePathParts.indexOf("public") + const directory = filePathParts[publicIndex + 1] + // don't include these top level directories + if (EXCLUDED_DIRECTORIES.indexOf(directory) !== -1) { + return + } const appAssetUpload = prepareUploadForS3({ file: { path: filePath, - name: [...filePath.split("/")].pop(), + name: filePathParts.pop(), }, s3Key: filePath.replace(appAssetsPath, `assets/${appId}`), s3, diff --git a/packages/server/src/constants/screens.js b/packages/server/src/constants/screens.js index 88a87c2aec..6d11351415 100644 --- a/packages/server/src/constants/screens.js +++ b/packages/server/src/constants/screens.js @@ -123,7 +123,7 @@ exports.LOGIN_SCREEN = { }, routing: { route: "/", - accessLevelId: BUILTIN_LEVEL_IDS.PUBLIC, + accessLevelId: BUILTIN_ROLE_IDS.PUBLIC, }, name: "login-screen", }