Commit Graph

1423 Commits

Author SHA1 Message Date
mike12345567 58f40da036 Fixing an issue with checkAuth function not checking response status before attempting to get JSON. 2021-05-20 12:39:33 +01:00
mike12345567 3437f620d6 Fixing automation test case. 2021-05-20 12:07:07 +01:00
Martin McKeaveney 7ab24fed2b merge with master 2021-05-20 10:40:15 +01:00
Andrew Kingston 112ef65043 Merge pull request #1505 from Budibase/user-app-list
User home screen + tidy ups
2021-05-20 08:41:44 +01:00
Martin McKeaveney 6cb1380770 postgres connection pooling 2021-05-19 20:58:59 +01:00
Martin McKeaveney 638a43efb8 Merge pull request #1503 from Budibase/cron
Cron Automation trigger
2021-05-19 19:33:49 +01:00
mike12345567 7d3169e5e1 Formatting. 2021-05-19 16:24:50 +01:00
mike12345567 4e9097862d Updating user test cases. 2021-05-19 16:24:20 +01:00
mike12345567 d62280ae83 Merge branch 'next' of github.com:Budibase/budibase into user-app-list 2021-05-19 15:58:17 +01:00
mike12345567 c6f7f115b5 Fixing issues with the user table within the apps. 2021-05-19 15:55:00 +01:00
mike12345567 0bbd45b413 Adding the ability to get all apps, with the status attached. 2021-05-19 15:09:57 +01:00
mike12345567 91ed6679c4 Adding a get self endpoint in the global users. 2021-05-19 13:37:59 +01:00
mike12345567 db3497c83a Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:18:38 +01:00
mike12345567 f08b894e55 Adding admin only endpoint, removing the ability to create/delete global users from the app server and adding a global self user update. 2021-05-19 13:17:50 +01:00
mike12345567 31f16090ee Fixing test cases. 2021-05-19 11:27:19 +01:00
Andrew Kingston 550ea1a70d Add missing properties to first name and last name user schema 2021-05-19 11:06:57 +01:00
Martin McKeaveney 72e18cd8d3 remove outputs from cron 2021-05-19 10:57:02 +01:00
Martin McKeaveney 8ceba79a12 activations 2021-05-19 10:46:47 +01:00
Martin McKeaveney a781239632 Adding cron presets to automations 2021-05-18 22:20:41 +01:00
mike12345567 d40fb215f9 Adding the ability to create options based on CSV, this will use the import data to create options. 2021-05-18 22:14:27 +01:00
Martin McKeaveney c3dc5bae76 cron automation trigger end to end 2021-05-18 21:03:26 +01:00
mmckeaveney 025616d7cc groundwork for cron automation trigger 2021-05-18 15:37:54 +00:00
Keviin Åberg Kultalahti 39d5e4ef45 Merge branch 'next' into admin/user-management-ui 2021-05-18 12:27:46 +02:00
Martin McKeaveney d9ed0686ab Merge pull request #1496 from Budibase/feature/draft-apps
Feature/draft apps
2021-05-18 11:25:51 +01:00
Keviin Åberg Kultalahti 9f5e891b72 lint:fix 2021-05-18 12:21:57 +02:00
Martin McKeaveney ee9a097979 lint 2021-05-17 21:43:50 +01:00
Keviin Åberg Kultalahti 7fa617a543 erge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:29:33 +02:00
mike12345567 c6e9dd7a68 Merge branch 'feature/draft-apps' of github.com:Budibase/budibase into feature/draft-apps 2021-05-17 14:28:56 +01:00
Keviin Åberg Kultalahti 116ae6eeea Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:28:52 +02:00
Martin McKeaveney f1cd6d01e9 tidy up 2021-05-17 14:24:37 +01:00
mike12345567 17504443df Merge branch 'feature/draft-apps' of github.com:Budibase/budibase into feature/draft-apps 2021-05-17 14:24:36 +01:00
Keviin Åberg Kultalahti 56e09c9b7b Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:21:48 +02:00
mike12345567 277ceb3ad1 Updating role system to never think about the dev app. 2021-05-17 14:20:19 +01:00
Keviin Åberg Kultalahti 341b632736 Merge branch 'next' into admin/user-management-ui 2021-05-17 10:11:25 +02:00
Andrew Kingston 1e8c485ad3 Use POST requests with JSON bodies for searching instead of GETs with query string params 2021-05-17 08:16:04 +01:00
Martin McKeaveney fc7ddbe540 merge 2021-05-16 21:29:07 +01:00
Martin McKeaveney 0f2bcf581d revert functionality working 2021-05-16 21:25:37 +01:00
mike12345567 a61edd8124 Formatting. 2021-05-14 16:32:51 +01:00
mike12345567 c947199558 Adding administration roles API. 2021-05-14 16:31:07 +01:00
Andrew Kingston 5d89f8915e Add missing tableId setting to search params 2021-05-14 15:46:46 +01:00
mike12345567 cea82f9335 A general re-work of some parts of the auth lib, as well as moving roles/permissions around to make it possible to build an admin API which has role knowledge. 2021-05-14 15:43:41 +01:00
Andrew Kingston b402254b2c Lint 2021-05-14 15:41:58 +01:00
Andrew Kingston f6babcbe8d Refactor server side search to use objects for params to tidy things up 2021-05-14 15:41:26 +01:00
mike12345567 332f0555a3 Merge branch 'feature/draft-apps' of github.com:Budibase/budibase into feature/draft-apps 2021-05-13 18:10:20 +01:00
mike12345567 74e6fdddb0 Fixing two issues which were blocking previews, one the user was no longer being updated as an admin (when first building/creating an app) and two, role was not being carried across from global user properly. 2021-05-13 18:10:09 +01:00
Martin McKeaveney 48006408f1 publish button 2021-05-13 17:33:31 +01:00
Martin McKeaveney 95c80f2b4a set up live replication between prod and dev instances 2021-05-13 17:24:32 +01:00
Andrew Kingston e4ce428ef1 Remove debug logging 2021-05-13 15:37:06 +01:00
Andrew Kingston 1a729aca91 Remove sorting by auto ID when output processing rows 2021-05-13 15:35:54 +01:00
mike12345567 fa0544054b Fixing an issue with portal calls causing the app to be re-locked. 2021-05-13 15:32:03 +01:00
mike12345567 6056b8bb61 Fixing issues with redis keys, however still not removing lock. 2021-05-13 14:34:04 +01:00
mike12345567 b5d23b19ff Fixing forgotten id access. 2021-05-13 14:24:55 +01:00
mike12345567 9f09c76cce Fixing userId storage to redis and making sure lockedBy property never stored. 2021-05-13 14:17:04 +01:00
Martin McKeaveney 4a4c96f76d merge, UI for managing your own app locks 2021-05-13 14:04:03 +01:00
mike12345567 81c5ed5554 Altering object store so that all writes/reads to the object store have the dev app prefix replaced with standard app. 2021-05-13 13:29:53 +01:00
Andrew Kingston 8d46cc60fe Add jsdoc to search utils 2021-05-13 13:11:16 +01:00
Andrew Kingston 960a2925ca Fix bug with determing whether another page exists when performing paginated searches 2021-05-13 12:38:12 +01:00
Andrew Kingston e09440f077 Allow multipage searches and implement optional pagination to data providers 2021-05-13 12:26:18 +01:00
mike12345567 5df453d2a3 Updating locks to store the whole global user as well as implementing the locks on dev apps fetch. 2021-05-13 12:16:09 +01:00
Martin McKeaveney c3e7548255 dev mode E2E 2021-05-13 11:06:08 +01:00
mike12345567 3ad1e9a5b2 Formatting. 2021-05-12 17:43:29 +01:00
mike12345567 3f75ebf853 Adding dev endpoint to clear lock. 2021-05-12 17:43:01 +01:00
mike12345567 2021c59dd9 Putting together redis lock system. 2021-05-12 17:37:09 +01:00
mike12345567 e4aaf69792 Updating search endpoint to have egress processing. 2021-05-12 14:44:47 +01:00
Andrew Kingston 3a747de207 Merge branch 'next' of github.com:Budibase/budibase into lab-day-search 2021-05-12 14:35:00 +01:00
mike12345567 75f9335a44 Fixing an issue found with queries, if an optional property isn't set then problems could arise before. 2021-05-12 12:52:34 +01:00
mike12345567 13b1e78ee2 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 12:49:42 +01:00
Andrew Kingston 4db2ee1843 Allow data provider filtering using dates and date ranges, and allow filtering using a value or binding for any type 2021-05-11 18:33:25 +01:00
mike12345567 2f5ecf6e5f Removing more useless deployment code. 2021-05-11 17:53:54 +01:00
mike12345567 4827ee1484 Formatting. 2021-05-11 17:50:26 +01:00
mike12345567 2ec6b15e56 General cleanup, doing away with the concept of hosting in the builder and the generally confusing difference between cloud, self hosting and running locally - server is simply always a server now. 2021-05-11 17:49:26 +01:00
mike12345567 8e1f18e456 Changing INTERNAL_KEY to INTERNAL_API_KEY. 2021-05-11 15:23:03 +01:00
mike12345567 0aabcf5a47 Merge branch 'smtp-configuration' of github.com:Budibase/budibase into smtp-configuration 2021-05-11 15:09:22 +01:00
mike12345567 92cc0bc7cd Updating to support SMTP email automation action, as well as some general work around from and subject which previously we'ren't fully implemented. 2021-05-11 15:08:59 +01:00
Martin McKeaveney 6a688c7aad merge 2021-05-11 14:58:55 +01:00
mike12345567 7736869148 Some updates, working towards supporting automation send smtp email also removing the styling template, adding to base. 2021-05-11 12:02:29 +01:00
Andrew Kingston 1a2e17ff17 Add support for numerical sorting 2021-05-11 11:24:16 +01:00
Andrew Kingston e661fe8cf2 Merge branch 'next' of github.com:Budibase/budibase into lab-day-search 2021-05-11 10:47:52 +01:00
mike12345567 6db30045ad Some cleanup. 2021-05-10 18:07:57 +01:00
mike12345567 77b4b206f7 Other minor fixes after doing some initial setup testing. 2021-05-10 13:18:05 +01:00
mike12345567 d517ca1ac9 Fixing issue with object store functions not being mockable in the server. 2021-05-07 14:27:46 +01:00
mike12345567 ac89e5c713 Formatting. 2021-05-07 13:55:57 +01:00
mike12345567 4e3bc326b4 Updating with a tested and functional API for uploading files for configs. 2021-05-07 13:55:30 +01:00
mike12345567 1d435013b8 Fixing issues with bullboard and integrating the express app with our koa app (if prefix matches). 2021-05-07 12:24:51 +01:00
Michael Drury 5006ca90c4 Some general backend cleanup. moving packages around, removing some traces of electron, and prepping for standardised object store library. 2021-05-06 19:27:24 +01:00
Michael Drury a7b6dbe303 Merge pull request #1449 from Budibase/feature/password-reset
Password reset and invitations backend
2021-05-06 11:04:15 +01:00
mike12345567 83c16a9f14 Formatting. 2021-05-05 17:49:53 +01:00
mike12345567 2ee4fd21e4 Updating testing system across the board after playing around with it, having the worker tests run when top level test is ran, fixing environment in worker when testing, removing the use of redis (replacing with ioredis-mock) when in test. 2021-05-05 17:49:34 +01:00
Keviin Åberg Kultalahti ae43bbe008 add analytics toggling 2021-05-05 18:39:36 +02:00
mike12345567 1cf778845a Fixing issues with Redis/Bull and the integration with new redis module. 2021-05-04 18:13:44 +01:00
mike12345567 b01da0aad5 Merge branch 'next' of github.com:Budibase/budibase into feature/password-reset 2021-05-04 15:21:53 +01:00
mike12345567 e5f3b3956c Merge branch 'next' of github.com:Budibase/budibase into labday/mike-formulas 2021-05-04 13:24:14 +01:00
Martin McKeaveney 4086d39535 merge with next 2021-05-04 11:49:34 +01:00
Martin McKeaveney 8ecb70a8f7 merge with next 2021-05-04 11:40:59 +01:00
Andrew Kingston 797e8a8b67 Add explicit prettier options 2021-05-04 11:32:22 +01:00
Andrew Kingston c010eeb314 Fix prettier and fix crash when using certain views as data sources 2021-05-04 11:04:42 +01:00
mike12345567 dcf69b2181 Merge branch 'next' of github.com:Budibase/budibase into labday/mike-formulas 2021-05-04 10:34:30 +01:00
Martin McKeaveney 72ed644803 merge 2021-05-04 09:55:14 +01:00
Keviin Åberg Kultalahti 0afbf1649e lint:fix 2021-05-03 09:31:09 +02:00
Andrew Kingston 6f6770cef7 Add server-side searching and pagination to data providers using internal tables 2021-04-30 16:29:53 +01:00
Martin McKeaveney 6d32d5f8b1 tidy up 2021-04-30 15:44:37 +01:00
Martin McKeaveney 784ac20dd8 external data connector block 2021-04-29 21:35:16 +01:00
mike12345567 a14c80bf6c Adding handlebars formulas to the system, it is now possible to set a formula at a column level which will always be applied on the way out with a relationship depth of one. 2021-04-29 19:06:58 +01:00
Andrew Kingston 3a601d76ce Support NOT lucene queries and escape whitespace 2021-04-29 14:55:51 +01:00
Andrew Kingston 35f9dcf3f6 Expose search API endpoint 2021-04-29 14:55:33 +01:00
Martin McKeaveney b876e91ae6 merge with next 2021-04-29 11:45:47 +01:00
mike12345567 58ca0d4224 Updating auth middleware to accomodate public endpoints for the server properly and some refactoring. 2021-04-28 18:13:21 +01:00
Andrew Kingston 9c903feed0 Merge branch 'next' of github.com:Budibase/budibase into spectrum-bbui 2021-04-28 15:53:07 +01:00
mike12345567 102f4bf1d4 Stripping out conjunction in view filter if its the first one. 2021-04-28 14:57:52 +01:00
mike12345567 08c158c121 Adding a redis client to the auth system, as part of work towards the reset password flow. 2021-04-27 17:29:05 +01:00
mike12345567 819d6e79f5 Updates after finding a better template to use and adding some real email testing with Ethereal platform. 2021-04-26 14:14:51 +01:00
mike12345567 0dd46d12fa Updating test cases and some re-work of the email system. 2021-04-23 18:07:39 +01:00
mike12345567 ea8e3b7d3f Adding testing to worker, still WIP. 2021-04-23 14:58:06 +01:00
Martin McKeaveney 6462848191 config specificity 2021-04-22 11:45:22 +01:00
mike12345567 e85b7682e0 Initial CRUD interface for templates. 2021-04-21 18:15:57 +01:00
mike12345567 76ceb6a951 Some re-work of the auth package, making it a bit easier to use/less likely to make a mistake. 2021-04-21 16:42:44 +01:00
mike12345567 89fef34401 Updating cypress tests to work with the new user ID system. 2021-04-21 11:33:12 +01:00
mike12345567 de19e986c6 Linting and formatting. 2021-04-20 17:33:44 +01:00
mike12345567 ec3a9db383 Updating test cases now that login has changed a bit. 2021-04-20 17:27:23 +01:00
mike12345567 b4c8bf81f7 Swapping over everything to use the new user ID and updating everything after some end to end testing. 2021-04-20 17:17:44 +01:00
mike12345567 2ef1586d4d Adding cleanup operation to dynamo client. 2021-04-19 22:36:14 +01:00
mike12345567 806bd4e06b Fixing an issue with the DynamoDB integration, didn't specify the correct terms for the AWS credentials. 2021-04-19 22:24:13 +01:00
mike12345567 eaa89c824e Updating the server to remove use of the email in the user ID. 2021-04-19 16:26:33 +01:00
mike12345567 3a6cc28df0 Merge branch 'master' of github.com:Budibase/budibase into next 2021-04-16 17:01:35 +01:00
Martin McKeaveney d27609de40 default user 2021-04-15 23:14:10 +01:00
Martin McKeaveney 201b26059c account for empty user id in automations 2021-04-15 21:34:03 +01:00
mike12345567 af53ed2109 Fixing some issues with auth module. 2021-04-15 16:57:01 +01:00
mike12345567 9e1315c535 Updating auth lib so that it takes in a pouch instance rather than creating its own. 2021-04-15 16:45:21 +01:00
mike12345567 aacfb6adba Updating worker/server to run in cypress properly. 2021-04-15 16:25:48 +01:00
mike12345567 9af9761753 Some changes to initial login form, improvements based on testing and attempts to fix cypress test failures. 2021-04-15 15:57:55 +01:00
mike12345567 3dfe255eb4 Removing test case that isn't valid anymore. 2021-04-14 17:27:58 +01:00
Martin McKeaveney 6cd43f545a Merge branch 'feature/global-user-management' of https://github.com/Budibase/budibase into feature/global-user-management 2021-04-14 17:02:18 +01:00
Martin McKeaveney 0f6bfb53fc removing initial user creation 2021-04-14 17:02:12 +01:00
mike12345567 c7171d0303 Linting. 2021-04-14 16:44:10 +01:00
mike12345567 dc20151c19 Some more server-side fixes, updating it so that builders have permissions to do anything for now (means that a builder user doesn't have to be present in app database to work. 2021-04-14 16:00:58 +01:00
mike12345567 56552d02ef Removing server 403. 2021-04-14 15:44:18 +01:00
mike12345567 6c58c90a7a Adding some controls around cookies, expiring them when a 403 is hit. 2021-04-14 15:43:34 +01:00
Keviin Åberg Kultalahti 255512e309 adds focus action to first input field of modals 2021-04-14 10:22:45 +02:00
mike12345567 e8383653c1 Formatting. 2021-04-13 20:26:26 +01:00
mike12345567 c7c158dd84 Fixing up tests, need to mock most of the worker functionality so that worker doesn't need to run during tests. 2021-04-13 20:25:43 +01:00
mike12345567 105e1cc16f Getting most of the test auth working, adding in global builder configuration. 2021-04-13 18:12:35 +01:00
mike12345567 f1e37a501c Fixing an issue with save row, changing how pre existing was handled caused an issue. 2021-04-13 17:41:32 +01:00
mike12345567 b9381e04a2 Merge branch 'next' of github.com:Budibase/budibase into feature/global-user-management 2021-04-13 17:12:56 +01:00
mike12345567 ad626d3e47 Merge branch 'feature/global-user-management' of github.com:Budibase/budibase into feature/global-user-management 2021-04-13 17:12:09 +01:00
mike12345567 a1227c5819 Removing the lookup of _id in usage quota when in dev/self host for performance reasons as part of usage quota, re-writing some bits of fetch self for cleaner implementation, fixing some issues with updating/saving users from within app. 2021-04-13 17:11:55 +01:00
Michael Shanks a61c54f07e lint fix + remove electron.js 2021-04-13 16:57:22 +01:00
Martin McKeaveney a68227735c ensuring public users can log in after being assigned a roleId 2021-04-13 16:56:45 +01:00
mike12345567 56b4b1583c Fixing some issues with the ctx.user, this was previously filled in by the old auth middleware. 2021-04-13 15:27:47 +01:00
mike12345567 02c9f69143 Updating current app to set up role in middleware. 2021-04-13 14:35:00 +01:00
Martin McKeaveney d82516d949 remove buildertoken refs 2021-04-13 14:00:09 +01:00