From 910030e92903b89e47cda87b49826700fe6e82cf Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 6 May 2020 20:29:47 +0100 Subject: [PATCH] Auth working --- packages/builder/src/builderStore/api.js | 3 + .../builder/src/builderStore/store/index.js | 1 - .../ModelDataTable/ModelDataTable.svelte | 3 - .../modals/CreateEditModel.old.svelte | 231 ------------------ .../modals/CreateEditRecord.svelte | 1 - .../AppPreview/CurrentItemPreview.svelte | 2 +- .../userInterface/pagesParsing/createProps.js | 5 - .../src/scripts/publishDev.js | 86 ------- packages/server/api/controllers/auth.js | 6 +- packages/server/api/index.js | 34 +-- packages/server/api/routes/static.js | 2 +- packages/server/initialise/buildAppContext.js | 11 - packages/server/middleware/authenticated.js | 10 +- .../routeHandlers/aggregatesPost.js | 12 - .../middleware/routeHandlers/appDefault.js | 21 -- .../middleware/routeHandlers/authenticate.js | 15 -- .../routeHandlers/changeMyPassword.js | 9 - .../routeHandlers/createTemporaryAccess.js | 17 -- .../middleware/routeHandlers/createUser.js | 10 - .../middleware/routeHandlers/deleteRecord.js | 9 - .../middleware/routeHandlers/disableUser.js | 11 - .../middleware/routeHandlers/enableUser.js | 6 - .../middleware/routeHandlers/executeAction.js | 9 - .../routeHandlers/getAccessLevels.js | 6 - .../middleware/routeHandlers/getRecord.js | 15 -- .../middleware/routeHandlers/getUsers.js | 6 - .../middleware/routeHandlers/helpers.js | 15 -- .../server/middleware/routeHandlers/index.js | 45 ---- .../routeHandlers/listRecordsGet.js | 8 - .../routeHandlers/listRecordsPost.js | 12 - .../middleware/routeHandlers/lookupField.js | 14 -- .../middleware/routeHandlers/postFiles.js | 13 - .../routeHandlers/saveAppHierarchy.js | 6 - .../middleware/routeHandlers/saveRecord.js | 6 - .../setPasswordFromTemporaryCode.js | 20 -- .../middleware/routeHandlers/upgradeData.js | 11 - packages/standard-components/components.json | 4 +- .../standard-components/src/DataTable.svelte | 15 +- packages/standard-components/src/Login.svelte | 2 +- 39 files changed, 40 insertions(+), 672 deletions(-) delete mode 100644 packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel.old.svelte delete mode 100644 packages/materialdesign-components/src/scripts/publishDev.js delete mode 100644 packages/server/initialise/buildAppContext.js delete mode 100644 packages/server/middleware/routeHandlers/aggregatesPost.js delete mode 100644 packages/server/middleware/routeHandlers/appDefault.js delete mode 100644 packages/server/middleware/routeHandlers/authenticate.js delete mode 100644 packages/server/middleware/routeHandlers/changeMyPassword.js delete mode 100644 packages/server/middleware/routeHandlers/createTemporaryAccess.js delete mode 100644 packages/server/middleware/routeHandlers/createUser.js delete mode 100644 packages/server/middleware/routeHandlers/deleteRecord.js delete mode 100644 packages/server/middleware/routeHandlers/disableUser.js delete mode 100644 packages/server/middleware/routeHandlers/enableUser.js delete mode 100644 packages/server/middleware/routeHandlers/executeAction.js delete mode 100644 packages/server/middleware/routeHandlers/getAccessLevels.js delete mode 100644 packages/server/middleware/routeHandlers/getRecord.js delete mode 100644 packages/server/middleware/routeHandlers/getUsers.js delete mode 100644 packages/server/middleware/routeHandlers/helpers.js delete mode 100644 packages/server/middleware/routeHandlers/index.js delete mode 100644 packages/server/middleware/routeHandlers/listRecordsGet.js delete mode 100644 packages/server/middleware/routeHandlers/listRecordsPost.js delete mode 100644 packages/server/middleware/routeHandlers/lookupField.js delete mode 100644 packages/server/middleware/routeHandlers/postFiles.js delete mode 100644 packages/server/middleware/routeHandlers/saveAppHierarchy.js delete mode 100644 packages/server/middleware/routeHandlers/saveRecord.js delete mode 100644 packages/server/middleware/routeHandlers/setPasswordFromTemporaryCode.js delete mode 100644 packages/server/middleware/routeHandlers/upgradeData.js diff --git a/packages/builder/src/builderStore/api.js b/packages/builder/src/builderStore/api.js index 46345fd213..820c3d5fa4 100644 --- a/packages/builder/src/builderStore/api.js +++ b/packages/builder/src/builderStore/api.js @@ -1,8 +1,11 @@ const apiCall = method => async (url, body) => { + const jwt = localStorage.getItem("budibase:token"); + const response = await fetch(url, { method: method, headers: { "Content-Type": "application/json", + "Authorization": `Bearer ${jwt}` }, body: body && JSON.stringify(body), }) diff --git a/packages/builder/src/builderStore/store/index.js b/packages/builder/src/builderStore/store/index.js index 9d06ca9010..5bcfcab1fa 100644 --- a/packages/builder/src/builderStore/store/index.js +++ b/packages/builder/src/builderStore/store/index.js @@ -167,7 +167,6 @@ const _saveScreenApi = (screen, s) => const createScreen = store => (screenName, route, layoutComponentName) => { store.update(state => { - console.log(layoutComponentName); const rootComponent = state.components[layoutComponentName] const newScreen = { diff --git a/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte b/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte index d69ce61437..da46a648f7 100644 --- a/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte +++ b/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte @@ -118,9 +118,6 @@
    -
  • -
    drillIntoRecord(row)}>View
    -
  • { editRecord(row) diff --git a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel.old.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel.old.svelte deleted file mode 100644 index b0255858f8..0000000000 --- a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel.old.svelte +++ /dev/null @@ -1,231 +0,0 @@ - - - - {#if !editingField} - -

    Create / Edit Model

    - {:else} - -

    Create / Edit Field

    - {/if} -     -{#if !editingField} -
    -

    Settings

    - - {#if $store.errors && $store.errors.length > 0} - - {/if} - -
    - - - {#if isChildModel} -
    - -
    {parent.name}
    -
    - {/if} - - -
    - Fields -

    Add new field

    -
    - - - - - - - - - - - - {#each model ? model.fields : [] as field} - - - - - - - - {/each} - -
    EditNameTypeValues -
    - editField(field)} /> - -
    {field.name}
    -     		{field.type}{field.typeOptions.values || ''} - deleteField(field)} /> -
    -
    - - Save - - {#if modelExistsInHierarchy} - - Create Child Model on {model.name} - - { - backendUiStore.actions.modals.show('VIEW') - await tick() - store.newChildIndex() - }}> - Create Child View on {model.name} - - - Delete - - {/if} -
    -
    -{:else} - -{/if} - - diff --git a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte index 2a09b68efe..d25fa53c28 100644 --- a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte +++ b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte @@ -29,7 +29,6 @@ : [] function closed() { - // editingRecord = null onClosed() } diff --git a/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte b/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte index 194e4eb8d8..d3c730d270 100644 --- a/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte +++ b/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte @@ -76,7 +76,7 @@ ] } }], - appRootPath: `/`, + appRootPath: "" } $: selectedComponentId = $store.currentComponentInfo ? $store.currentComponentInfo._id : "" diff --git a/packages/builder/src/components/userInterface/pagesParsing/createProps.js b/packages/builder/src/components/userInterface/pagesParsing/createProps.js index 5f3634f42a..d32dbed43b 100644 --- a/packages/builder/src/components/userInterface/pagesParsing/createProps.js +++ b/packages/builder/src/components/userInterface/pagesParsing/createProps.js @@ -88,11 +88,6 @@ const parsePropDef = propDef => { const type = TYPE_MAP[propDef.type] if (!type) return error(`Type ${propDef.type} is not recognised.`) - // if (isUndefined(propDef.default)) return type.default(propDef) - - // if (!type.isOfType(propDef.default)) - // return error(`${propDef.default} is not of type ${type}`) - return propDef.default } diff --git a/packages/materialdesign-components/src/scripts/publishDev.js b/packages/materialdesign-components/src/scripts/publishDev.js deleted file mode 100644 index 85f97ec476..0000000000 --- a/packages/materialdesign-components/src/scripts/publishDev.js +++ /dev/null @@ -1,86 +0,0 @@ -const { readdir, stat, copyFile } = require("fs-extra") -const { constants } = require("fs") -const { join, basename } = require("path") -const serverConfig = require("../../../server/config")() - -const packagesFolder = ".." - -const jsFile = dir => join(dir, "index.js") -const jsMapFile = dir => join(dir, "index.js.map") -const sourceJs = jsFile("dist") -const sourceJsMap = jsMapFile("dist") -const componentsFile = "components.json" - -const appPackages = join( - packagesFolder, - "server", - serverConfig.latestPackagesFolder -) - -const publicMain = appName => - join( - appPackages, - appName, - "public", - "main", - "lib", - "node_modules", - "@budibase", - "standard-components" - ) -const publicUnauth = appName => - join( - appPackages, - appName, - "public", - "unauthenticated", - "lib", - "node_modules", - "@budibase", - "standard-components" - ) -const nodeModulesDist = appName => - join( - appPackages, - appName, - "node_modules", - "@budibase", - "standard-components", - "dist" - ) -const nodeModules = appName => - join(appPackages, appName, "node_modules", "@budibase", "standard-components") - -;(async () => { - const apps = await readdir(appPackages) - - const copySource = file => async toDir => { - const dest = join(toDir, basename(file)) - try { - await copyFile(file, dest, constants.COPYFILE_FICLONE) - console.log(`COPIED ${file} to ${dest}`) - } catch (e) { - console.log(`COPY FAILED ${file} to ${dest}: ${e}`) - } - } - - const copySourceJs = copySource(sourceJs) - const copySourceJsMap = copySource(sourceJsMap) - const copyComponentsJson = copySource(componentsFile) - - for (let app of apps) { - if (app === ".data") continue - if (!(await stat(join(appPackages, app))).isDirectory()) continue - - await copySourceJs(nodeModulesDist(app)) - await copySourceJsMap(nodeModulesDist(app)) - - await copyComponentsJson(nodeModules(app)) - - await copySourceJs(join(publicMain(app), "dist")) - await copySourceJsMap(join(publicMain(app), "dist")) - - await copySourceJs(join(publicUnauth(app), "dist")) - await copySourceJsMap(join(publicUnauth(app), "dist")) - } -})() diff --git a/packages/server/api/controllers/auth.js b/packages/server/api/controllers/auth.js index c05d2b1fc8..13ebbcfa5f 100644 --- a/packages/server/api/controllers/auth.js +++ b/packages/server/api/controllers/auth.js @@ -37,10 +37,14 @@ exports.authenticate = async ctx => { accessLevel: "", instanceId: instanceId }; - const token = jwt.sign(payload, ctx.config.secret, { + + + const token = jwt.sign(payload, ctx.config.jwtSecret, { expiresIn: "1 day" }); + ctx.cookies.set('budibase:token', token); + ctx.body = { token, ...dbUser diff --git a/packages/server/api/index.js b/packages/server/api/index.js index a56062e771..a140526ef3 100644 --- a/packages/server/api/index.js +++ b/packages/server/api/index.js @@ -31,18 +31,16 @@ module.exports = app => { flush: zlib.Z_SYNC_FLUSH, } })) - .use(authenticated) .use(async (ctx, next) => { // TODO: temp dev middleware - // ctx.sessionId = ctx.session._sessCtx.externalKey - // ctx.session.accessed = true ctx.config = { latestPackagesFolder: resolve(homedir(), ".budibase"), - secret: "foo" + jwtSecret: "foo" } ctx.isDev = process.env.NODE_ENV !== "production"; await next(); - }); + }) + .use(authenticated); // error handling middleware router.use(async (ctx, next) => { @@ -61,15 +59,26 @@ module.exports = app => { router.use(authRoutes.routes()); router.use(authRoutes.allowedMethods()); - router.use(pageRoutes.routes()); - router.use(pageRoutes.allowedMethods()); - + // authenticated routes router.use(viewRoutes.routes()); router.use(viewRoutes.allowedMethods()); router.use(modelRoutes.routes()); router.use(modelRoutes.allowedMethods()); + router.use(userRoutes.routes()); + router.use(userRoutes.allowedMethods()); + + router.use(recordRoutes.routes()); + router.use(recordRoutes.allowedMethods()); + + router.use(instanceRoutes.routes()); + router.use(instanceRoutes.allowedMethods()); + // end auth routes + + router.use(pageRoutes.routes()); + router.use(pageRoutes.allowedMethods()); + router.use(applicationRoutes.routes()); router.use(applicationRoutes.allowedMethods()); @@ -79,15 +88,6 @@ module.exports = app => { router.use(clientRoutes.routes()); router.use(clientRoutes.allowedMethods()); - router.use(userRoutes.routes()); - router.use(userRoutes.allowedMethods()); - - router.use(recordRoutes.routes()); - router.use(recordRoutes.allowedMethods()); - - router.use(instanceRoutes.routes()); - router.use(instanceRoutes.allowedMethods()); - router.use(staticRoutes.routes()); router.use(staticRoutes.allowedMethods()); diff --git a/packages/server/api/routes/static.js b/packages/server/api/routes/static.js index 20e5a07dc3..e8792ba17b 100644 --- a/packages/server/api/routes/static.js +++ b/packages/server/api/routes/static.js @@ -7,7 +7,7 @@ router .param("file", async (file, ctx, next) => { ctx.file = file && file.includes(".") ? file : "index.html"; - // Serving the latest client library in dev + // Serving the client library from your local dir in dev if (ctx.isDev && ctx.file.startsWith("budibase-client")) { ctx.devPath = "/tmp/.budibase"; } diff --git a/packages/server/initialise/buildAppContext.js b/packages/server/initialise/buildAppContext.js deleted file mode 100644 index 194cef9570..0000000000 --- a/packages/server/initialise/buildAppContext.js +++ /dev/null @@ -1,11 +0,0 @@ -const getMasterAppInternal = require("../utilities/masterAppInternal") - -module.exports = async (config, masterIsCreated) => { - const context = { config } - - if (!masterIsCreated) return context - - const master = await getMasterAppInternal(context) - context.master = master - return context -} diff --git a/packages/server/middleware/authenticated.js b/packages/server/middleware/authenticated.js index 2adad08f40..7b2a7802fb 100644 --- a/packages/server/middleware/authenticated.js +++ b/packages/server/middleware/authenticated.js @@ -1,17 +1,17 @@ const jwt = require("jsonwebtoken"); module.exports = async (ctx, next) => { - if (!ctx.headers.authorization) { + const token = ctx.cookies.get("budibase:token"); + console.log("TOKEN", token); + + if (!token) { ctx.isAuthenticated = false await next(); return; }; - // if (!ctx.headers.authorization) ctx.throw(403, "No token provided"); - - const [_, token] = ctx.headers.authorization.split(" "); try { - ctx.request.jwtPayload = jwt.verify(token, ctx.config.jwtSecret); + ctx.jwtPayload = jwt.verify(token, ctx.config.jwtSecret); ctx.isAuthenticated = true; } catch (err) { ctx.throw(err.status || 403, err.text); diff --git a/packages/server/middleware/routeHandlers/aggregatesPost.js b/packages/server/middleware/routeHandlers/aggregatesPost.js deleted file mode 100644 index 8b2af0c84f..0000000000 --- a/packages/server/middleware/routeHandlers/aggregatesPost.js +++ /dev/null @@ -1,12 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") -const { getRecordKey } = require("./helpers") - -module.exports = async ctx => { - const indexkey = getRecordKey(ctx.params.appname, ctx.request.path) - ctx.body = await ctx.instance.indexApi.aggregates(indexkey, { - rangeStartParams: ctx.request.body.rangeStartParams, - rangeEndParams: ctx.request.body.rangeEndParams, - searchPhrase: ctx.request.body.searchPhrase, - }) - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/appDefault.js b/packages/server/middleware/routeHandlers/appDefault.js deleted file mode 100644 index 6bbb352abf..0000000000 --- a/packages/server/middleware/routeHandlers/appDefault.js +++ /dev/null @@ -1,21 +0,0 @@ -const { getAppRelativePath } = require("./helpers") - -const send = require("koa-send") - -module.exports = async (ctx, next) => { - const path = getAppRelativePath(ctx.params.appname, ctx.path) - - if (path.startsWith("/api/")) { - await next() - } else if (path.startsWith("/_shared/")) { - await send(ctx, path.replace(`/_shared/`, ""), { root: ctx.sharedPath }) - } else if ( - path.endsWith(".js") || - path.endsWith(".map") || - path.endsWith(".css") - ) { - await send(ctx, path, { root: ctx.publicPath }) - } else { - await send(ctx, "/index.html", { root: ctx.publicPath }) - } -} diff --git a/packages/server/middleware/routeHandlers/authenticate.js b/packages/server/middleware/routeHandlers/authenticate.js deleted file mode 100644 index 263c545907..0000000000 --- a/packages/server/middleware/routeHandlers/authenticate.js +++ /dev/null @@ -1,15 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") - -module.exports = async ctx => { - const user = await ctx.master.authenticate( - ctx.sessionId, - ctx.params.appname, - ctx.request.body.username, - ctx.request.body.password - ) - if (!user) { - ctx.throw(StatusCodes.UNAUTHORIZED, "invalid username or password") - } - ctx.body = user.user_json - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/changeMyPassword.js b/packages/server/middleware/routeHandlers/changeMyPassword.js deleted file mode 100644 index 5f7d63979c..0000000000 --- a/packages/server/middleware/routeHandlers/changeMyPassword.js +++ /dev/null @@ -1,9 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") - -module.exports = async ctx => { - await ctx.instance.authApi.changeMyPassword( - ctx.request.body.currentPassword, - ctx.request.body.newPassword - ) - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/createTemporaryAccess.js b/packages/server/middleware/routeHandlers/createTemporaryAccess.js deleted file mode 100644 index 8189e3027a..0000000000 --- a/packages/server/middleware/routeHandlers/createTemporaryAccess.js +++ /dev/null @@ -1,17 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") - -module.exports = async ctx => { - const instanceApi = await ctx.master.getFullAccessInstanceApiForUsername( - ctx.params.appname, - ctx.request.body.username - ) - - if (!instanceApi) { - ctx.request.status = StatusCodes.OK - return - } - - await instanceApi.authApi.createTemporaryAccess(ctx.request.body.username) - - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/createUser.js b/packages/server/middleware/routeHandlers/createUser.js deleted file mode 100644 index 9e630ff6d4..0000000000 --- a/packages/server/middleware/routeHandlers/createUser.js +++ /dev/null @@ -1,10 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") - -module.exports = async ctx => { - await ctx.instance.authApi.createUser( - ctx.request.body.user, - ctx.request.body.password - ) - - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/deleteRecord.js b/packages/server/middleware/routeHandlers/deleteRecord.js deleted file mode 100644 index fb08046096..0000000000 --- a/packages/server/middleware/routeHandlers/deleteRecord.js +++ /dev/null @@ -1,9 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") -const { getRecordKey } = require("./helpers") - -module.exports = async ctx => { - await ctx.instance.recordApi.delete( - getRecordKey(ctx.params.appname, ctx.request.path) - ) - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/disableUser.js b/packages/server/middleware/routeHandlers/disableUser.js deleted file mode 100644 index b1be4d587e..0000000000 --- a/packages/server/middleware/routeHandlers/disableUser.js +++ /dev/null @@ -1,11 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") - -module.exports = async ctx => { - await ctx.instance.authApi.disableUser(ctx.request.body.username) - - await ctx.master.removeSessionsForUser( - ctx.params.appname, - ctx.request.body.username - ) - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/enableUser.js b/packages/server/middleware/routeHandlers/enableUser.js deleted file mode 100644 index fd86c24c4b..0000000000 --- a/packages/server/middleware/routeHandlers/enableUser.js +++ /dev/null @@ -1,6 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") - -module.exports = async ctx => { - await ctx.instance.authApi.enableUser(ctx.request.body.username) - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/executeAction.js b/packages/server/middleware/routeHandlers/executeAction.js deleted file mode 100644 index a6b3b3a310..0000000000 --- a/packages/server/middleware/routeHandlers/executeAction.js +++ /dev/null @@ -1,9 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") - -module.exports = async ctx => { - ctx.body = await ctx.instance.actionApi.execute( - ctx.request.body.actionname, - ctx.request.body.parameters - ) - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/getAccessLevels.js b/packages/server/middleware/routeHandlers/getAccessLevels.js deleted file mode 100644 index 75dd865982..0000000000 --- a/packages/server/middleware/routeHandlers/getAccessLevels.js +++ /dev/null @@ -1,6 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") - -module.exports = async ctx => { - ctx.body = await ctx.instance.authApi.getAccessLevels() - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/getRecord.js b/packages/server/middleware/routeHandlers/getRecord.js deleted file mode 100644 index 177e56ffee..0000000000 --- a/packages/server/middleware/routeHandlers/getRecord.js +++ /dev/null @@ -1,15 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") -const { getRecordKey } = require("./helpers") - -module.exports = async ctx => { - try { - ctx.body = await ctx.instance.recordApi.load( - getRecordKey(ctx.params.appname, ctx.request.path) - ) - ctx.response.status = StatusCodes.OK - } catch (e) { - // need to be catching for 404s here - ctx.response.status = StatusCodes.INTERAL_ERROR - ctx.response.body = e.message - } -} diff --git a/packages/server/middleware/routeHandlers/getUsers.js b/packages/server/middleware/routeHandlers/getUsers.js deleted file mode 100644 index cd661b95df..0000000000 --- a/packages/server/middleware/routeHandlers/getUsers.js +++ /dev/null @@ -1,6 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") - -module.exports = async ctx => { - ctx.body = await ctx.instance.authApi.getUsers() - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/helpers.js b/packages/server/middleware/routeHandlers/helpers.js deleted file mode 100644 index 92995fb7e6..0000000000 --- a/packages/server/middleware/routeHandlers/helpers.js +++ /dev/null @@ -1,15 +0,0 @@ -exports.getRecordKey = (appname, wholePath) => - this.getAppRelativePath(appname, wholePath) - .replace(`/api/files/`, "/") - .replace(`/api/lookup_field/`, "/") - .replace(`/api/record/`, "/") - .replace(`/api/listRecords/`, "/") - .replace(`/api/aggregates/`, "/") - -exports.getAppRelativePath = (appname, wholePath) => { - const builderInstanceRegex = new RegExp( - `\\/_builder\\/instance\\/[^\\/]*\\/[^\\/]*\\/` - ) - - return wholePath.replace(builderInstanceRegex, "/").replace(`/${appname}`, "") -} diff --git a/packages/server/middleware/routeHandlers/index.js b/packages/server/middleware/routeHandlers/index.js deleted file mode 100644 index b8e7fa5624..0000000000 --- a/packages/server/middleware/routeHandlers/index.js +++ /dev/null @@ -1,45 +0,0 @@ -const authenticate = require("./authenticate") -const setPasswordFromTemporaryCode = require("./setPasswordFromTemporaryCode") -const createTemporaryAccess = require("./createTemporaryAccess") -const appDefault = require("./appDefault") -const changeMyPassword = require("./changeMyPassword") -const executeAction = require("./executeAction") -const createUser = require("./createUser") -const enableUser = require("./enableUser") -const disableUser = require("./disableUser") -const getUsers = require("./getUsers") -const getAccessLevels = require("./getAccessLevels") -const listRecordsGet = require("./listRecordsGet") -const listRecordsPost = require("./listRecordsPost") -const aggregatesPost = require("./aggregatesPost") -const postFiles = require("./postFiles") -const saveRecord = require("./saveRecord") -const lookupField = require("./lookupField") -const getRecord = require("./getRecord") -const deleteRecord = require("./deleteRecord") -const saveAppHierarchy = require("./saveAppHierarchy") -const upgradeData = require("./upgradeData") - -module.exports = { - authenticate, - setPasswordFromTemporaryCode, - createTemporaryAccess, - appDefault, - changeMyPassword, - executeAction, - createUser, - enableUser, - disableUser, - getUsers, - getAccessLevels, - listRecordsGet, - listRecordsPost, - aggregatesPost, - postFiles, - saveRecord, - lookupField, - getRecord, - deleteRecord, - saveAppHierarchy, - upgradeData, -} diff --git a/packages/server/middleware/routeHandlers/listRecordsGet.js b/packages/server/middleware/routeHandlers/listRecordsGet.js deleted file mode 100644 index b456016451..0000000000 --- a/packages/server/middleware/routeHandlers/listRecordsGet.js +++ /dev/null @@ -1,8 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") -const { getRecordKey } = require("./helpers") - -module.exports = async ctx => { - const indexkey = getRecordKey(ctx.params.appname, ctx.request.path) - ctx.body = await ctx.instance.indexApi.listItems(indexkey) - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/listRecordsPost.js b/packages/server/middleware/routeHandlers/listRecordsPost.js deleted file mode 100644 index c1856ba925..0000000000 --- a/packages/server/middleware/routeHandlers/listRecordsPost.js +++ /dev/null @@ -1,12 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") -const { getRecordKey } = require("./helpers") - -module.exports = async ctx => { - const indexkey = getRecordKey(ctx.params.appname, ctx.request.path) - ctx.body = await ctx.instance.indexApi.listItems(indexkey, { - rangeStartParams: ctx.request.body.rangeStartParams, - rangeEndParams: ctx.request.body.rangeEndParams, - searchPhrase: ctx.request.body.searchPhrase, - }) - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/lookupField.js b/packages/server/middleware/routeHandlers/lookupField.js deleted file mode 100644 index fec2d4e39e..0000000000 --- a/packages/server/middleware/routeHandlers/lookupField.js +++ /dev/null @@ -1,14 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") -const { getRecordKey } = require("./helpers") - -module.exports = async ctx => { - const recordKey = getRecordKey(ctx.params.appname, ctx.request.path) - const fields = ctx.query.fields.split(",") - const recordContext = await ctx.instance.recordApi.getContext(recordKey) - const allContext = [] - for (let field of fields) { - allContext.push(await recordContext.referenceOptions(field)) - } - ctx.body = allContext - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/postFiles.js b/packages/server/middleware/routeHandlers/postFiles.js deleted file mode 100644 index 7b63e8eccd..0000000000 --- a/packages/server/middleware/routeHandlers/postFiles.js +++ /dev/null @@ -1,13 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") -const { getRecordKey } = require("./helpers") -const fs = require("fs") - -module.exports = async ctx => { - const file = ctx.request.files.file - ctx.body = await ctx.instance.recordApi.uploadFile( - getRecordKey(ctx.params.appname, ctx.request.path), - fs.createReadStream(file.path), - file.name - ) - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/saveAppHierarchy.js b/packages/server/middleware/routeHandlers/saveAppHierarchy.js deleted file mode 100644 index 3537fa35f6..0000000000 --- a/packages/server/middleware/routeHandlers/saveAppHierarchy.js +++ /dev/null @@ -1,6 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") - -module.exports = async ctx => { - ctx.body = await ctx.instance.templateApi.saveApplicationHierarchy(ctx.body) - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/saveRecord.js b/packages/server/middleware/routeHandlers/saveRecord.js deleted file mode 100644 index 53ec9d94ff..0000000000 --- a/packages/server/middleware/routeHandlers/saveRecord.js +++ /dev/null @@ -1,6 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") - -module.exports = async ctx => { - ctx.body = await ctx.instance.recordApi.save(ctx.request.body) - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/setPasswordFromTemporaryCode.js b/packages/server/middleware/routeHandlers/setPasswordFromTemporaryCode.js deleted file mode 100644 index 69d0652450..0000000000 --- a/packages/server/middleware/routeHandlers/setPasswordFromTemporaryCode.js +++ /dev/null @@ -1,20 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") - -module.exports = async ctx => { - const instanceApi = await ctx.master.getFullAccessInstanceApiForUsername( - ctx.params.appname, - ctx.request.body.username - ) - - if (!instanceApi) { - ctx.request.status = StatusCodes.OK - return - } - - await instanceApi.authApi.setPasswordFromTemporaryCode( - ctx.request.body.tempCode, - ctx.request.body.newPassword - ) - - ctx.response.status = StatusCodes.OK -} diff --git a/packages/server/middleware/routeHandlers/upgradeData.js b/packages/server/middleware/routeHandlers/upgradeData.js deleted file mode 100644 index a9f2fcf349..0000000000 --- a/packages/server/middleware/routeHandlers/upgradeData.js +++ /dev/null @@ -1,11 +0,0 @@ -const StatusCodes = require("../../utilities/statusCodes") - -module.exports = async ctx => { - const existingAccessLevels = await ctx.instance.authApi.loadAccessLevels() - const accessLevels = ctx.request.body.accessLevels - accessLevels.version = existingAccessLevels.version - await ctx.instance.authApi.saveAccessLevels(accessLevels) - await ctx.instance.templateApi.upgradeData(ctx.request.body.newHierarchy) - await ctx.master.clearAllSessions(ctx.params.appname) - ctx.response.status = StatusCodes.OK -} diff --git a/packages/standard-components/components.json b/packages/standard-components/components.json index 05221aac9d..3da502e9fc 100644 --- a/packages/standard-components/components.json +++ b/packages/standard-components/components.json @@ -265,13 +265,13 @@ "datatable": { "description": "an HTML table that fetches data from a model or view and displays it.", "props": { - "_viewName": "string", "_instanceId": "string", "model": { "type": "options", "default": "", "options": [ - "all_6dc86335-83b7-462c-90ca-1fe7feb08942" + "all_6dc86335-83b7-462c-90ca-1fe7feb08942", + "all_fcd00735-01f0-451c-819e-902a3ea53c26" ] } } diff --git a/packages/standard-components/src/DataTable.svelte b/packages/standard-components/src/DataTable.svelte index 5b8149364b..963f487f46 100644 --- a/packages/standard-components/src/DataTable.svelte +++ b/packages/standard-components/src/DataTable.svelte @@ -5,28 +5,23 @@ export let _bb export let onLoad - export let _viewName export let _instanceId + export let model let cssVariables let headers = [] let data = [] async function fetchData() { - const FETCH_RECORDS_URL = `/api/${_instanceId}/${_viewName}/records`; + const FETCH_RECORDS_URL = `/api/${_instanceId}/${model}/records`; const response = await _bb.api.get(FETCH_RECORDS_URL); if (response.status === 200) { const json = await response.json(); - if (json.length > 0) { - data = json; - headers = Object.keys(data[0]); - } else { - console.log("NO DATA"); - } + data = json; + headers = Object.keys(data[0]).filter(key => !key.startsWith("_")); } else { - throw new Error("Failed to fetch records.."); - console.log("FAILED"); + throw new Error("Failed to fetch records.", response); } } diff --git a/packages/standard-components/src/Login.svelte b/packages/standard-components/src/Login.svelte index 0320a7b314..61e50ad605 100644 --- a/packages/standard-components/src/Login.svelte +++ b/packages/standard-components/src/Login.svelte @@ -26,7 +26,7 @@ const login = async () => { loading = true - const response = _bb.api.post("/api/authenticate", { username, password }); + const response = await _bb.api.post("/api/authenticate", { username, password }); if (response.status === 200) { const json = await response.json();