Commit Graph

338 Commits

Author SHA1 Message Date
Martin McKeaveney 0f2bcf581d revert functionality working 2021-05-16 21:25:37 +01:00
Keviin Åberg Kultalahti 9329644cf5 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:49:09 +02:00
mike12345567 b416207292 Making sure routes are included. 2021-05-14 16:47:47 +01:00
mike12345567 a61edd8124 Formatting. 2021-05-14 16:32:51 +01:00
Keviin Åberg Kultalahti 4df56ce457 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:32:08 +02:00
mike12345567 c947199558 Adding administration roles API. 2021-05-14 16:31:07 +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
Mike Shanks 04a159986e v0.8.18 2021-05-13 11:17:08 +01:00
mike12345567 5d387870d2 Updating valid to optionals. 2021-05-12 15:44:16 +01:00
mike12345567 2ba2e2e3e6 Merge branch 'admin/user-management-ui' of github.com:Budibase/budibase into admin/user-management-ui 2021-05-12 14:27:48 +01:00
mike12345567 a289493224 Fixing an issue with the upload URL not being inserted in correct location. 2021-05-12 14:27:33 +01:00
mike12345567 abeb78d914 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 13:59:59 +01:00
Keviin Åberg Kultalahti 17eca8c30b Merge branch 'next' into admin/user-management-ui 2021-05-12 14:08:58 +02:00
mike12345567 13b1e78ee2 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 12:49:42 +01:00
Martin McKeaveney 022f501dee fixes from PR 2021-05-12 12:38:49 +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 c70d4444a9 Formatting. 2021-05-11 15:24:17 +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
Martin McKeaveney b1d60cc6b6 email template E2E, adding preview 2021-05-11 14:44:43 +01:00
mike12345567 3e63c616d3 Merge branch 'admin/user-management-ui' of github.com:Budibase/budibase into admin/user-management-ui 2021-05-11 12:51:25 +01:00
mike12345567 9b12de9162 Fixing an issue with platformUrl being required in settings. 2021-05-11 12:51:14 +01:00
mike12345567 1d643b6315 Adding link to the real email test. 2021-05-11 12:04:07 +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
mike12345567 075b00b534 Renaming registration to invite URL. 2021-05-10 15:05:06 +01:00
Martin McKeaveney 8174f44d40 pull template type from body instead of params 2021-05-10 14:41:52 +01:00
mike12345567 0d38d50878 Making sure relative logo URL is converted to a full path in templates. 2021-05-07 14:30:37 +01:00
mike12345567 4e3bc326b4 Updating with a tested and functional API for uploading files for configs. 2021-05-07 13:55:30 +01:00
Keviin Åberg Kultalahti ad7e892226 Merge branch 'next' into admin/user-management-ui 2021-05-07 09:47:45 +02:00
Martin McKeaveney 062d8323f4 pulling app list, re-adding code for automation blocks and external data source block lost in merge 2021-05-06 18:31:03 +01:00
Martin McKeaveney 7588030780 SMTP and template management E2E 2021-05-06 18:02:44 +01:00
Andrew Kingston 5a642071d6 Configure vite with a base URL so proxy works 2021-05-06 17:22:09 +01:00
Keviin Åberg Kultalahti 555cdcd5c4 wip: skeleton for users page 2021-05-06 14:34:41 +02:00
Martin McKeaveney 6b9a223094 update scoped config imports 2021-05-06 12:09:35 +01:00
Martin McKeaveney 559b8789f6 merge with next 2021-05-06 11:56:53 +01:00
Martin McKeaveney 42e0b3c1f9 lint 2021-05-06 10:57:24 +01:00
Martin McKeaveney 7d09bd8d70 unit tests 2021-05-06 10:54:01 +01:00
mike12345567 8c1f274fbb Making some changes to how configs are scoped. 2021-05-06 10:51:21 +01:00
Martin McKeaveney e8a5b0863c do not allow users to initialise again once an admin has been created 2021-05-05 22:06:31 +01:00
Martin McKeaveney fd2e2c0415 first time setup E2E 2021-05-05 21:56:43 +01:00
Martin McKeaveney ba2d72b205 renable worker protection 2021-05-05 20:59:16 +01:00
Martin McKeaveney 39b293aa9d endpoint for budibase configuration checklist 2021-05-05 20:58:31 +01:00
mike12345567 b3292e991a Making the code a query string parameter for invite/reset urls. 2021-05-05 18:13:59 +01:00
mike12345567 82687bad26 Merge branch 'next' of github.com:Budibase/budibase into feature/password-reset 2021-05-05 18:00:22 +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
mike12345567 48236b2c2f Formatting. 2021-05-05 16:00:15 +01:00
mike12345567 5d2c1c23aa Updating configs API based on some feedback during the development of the settings frontend. 2021-05-05 15:59:24 +01:00
mike12345567 403ee4a870 Formatting. 2021-05-05 15:19:44 +01:00
mike12345567 b4beb4d8da Finishing invite send email. 2021-05-05 15:17:15 +01:00
mike12345567 7bc3514fc1 Finalising the usage of redis in the password reset and invitation systems. 2021-05-05 15:10:28 +01:00
mike12345567 fc01bdaac9 Formatting. 2021-05-05 12:11:31 +01:00
mike12345567 b372d2a824 Fleshed out fully all redis interactions for invitations and password resets. 2021-05-05 12:11:06 +01:00
mike12345567 1cf778845a Fixing issues with Redis/Bull and the integration with new redis module. 2021-05-04 18:13:44 +01:00
Martin McKeaveney cb02c9bf58 google oauth UI 2021-05-04 17:31:06 +01:00
mike12345567 b01da0aad5 Merge branch 'next' of github.com:Budibase/budibase into feature/password-reset 2021-05-04 15:21:53 +01:00
Andrew Kingston 797e8a8b67 Add explicit prettier options 2021-05-04 11:32:22 +01:00
Keviin Åberg Kultalahti 0afbf1649e lint:fix 2021-05-03 09:31:09 +02: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 2b58d695af Updating packages so that @budibase/auth doesn't stop installations. 2021-04-28 15:25:49 +01:00
mike12345567 60b61f1322 Fixing login issue. 2021-04-28 14:28:25 +01:00
mike12345567 adce859f98 Formatting. 2021-04-27 17:30:19 +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 cd69c9a883 Adding auth endpoints to no auth list. 2021-04-26 15:44:28 +01:00
mike12345567 9e73a75512 Updating welcome to make it clear no login credentials in it. 2021-04-26 14:53:47 +01:00
mike12345567 65914d7cfa Moving header/footer and presentational tables to the base hbs email template. 2021-04-26 14:39:18 +01:00
mike12345567 b3933103a8 Formatting, linting and handling year copyright properly. 2021-04-26 14:24:07 +01:00
mike12345567 cba2b9a27d Formatting. 2021-04-26 14:16: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 48c1b4b1fe Major update, fixing email test case. 2021-04-23 18:54:12 +01:00
mike12345567 0dd46d12fa Updating test cases and some re-work of the email system. 2021-04-23 18:07:39 +01:00
mike12345567 d0072c28f8 continuing work on smtp testing. 2021-04-23 15:14:28 +01:00
mike12345567 ea8e3b7d3f Adding testing to worker, still WIP. 2021-04-23 14:58:06 +01:00
mike12345567 0a733b7c7a Updating config management for SMTP as well as finalising the work around generating and sending emails. 2021-04-23 13:49:47 +01:00
mike12345567 f6e25c3792 putting together the bulk of the email sending/config options. 2021-04-23 13:10:37 +01:00
mike12345567 163035cac7 Formatting. 2021-04-22 17:58:14 +01:00
mike12345567 85441c6141 Fleshing out the main work behind the email generation. 2021-04-22 17:57:38 +01:00
mike12345567 f445cd4d86 Formatting. 2021-04-22 16:06:29 +01:00
Michael Drury 9080431a06 Merge branch 'feature/smtp-templates' into configuration-management 2021-04-22 15:39:54 +01:00
Martin McKeaveney c273152126 fix imports 2021-04-22 15:27:09 +01:00
mike12345567 086d8f0b14 Adding some base templates which will be returned based on purpose, need to create a list of options that will be exposed/made available via configuration. 2021-04-22 15:26:32 +01:00
Martin McKeaveney 2555d711b2 scoped configuration management 2021-04-22 13:46:54 +01:00
Martin McKeaveney f7085a57c7 lint 2021-04-22 11:48:37 +01:00
Martin McKeaveney 6462848191 config specificity 2021-04-22 11:45:22 +01:00
Martin McKeaveney 8fab374c1f google login reading from couch 2021-04-21 21:08:04 +01:00
Martin McKeaveney d8db863faa merge 2021-04-21 18:43:20 +01:00
Martin McKeaveney 28f8f8b6ef custom google middleware 2021-04-21 18:40:32 +01:00
mike12345567 e85b7682e0 Initial CRUD interface for templates. 2021-04-21 18:15:57 +01:00
mike12345567 15223080d5 Formatting and linting. 2021-04-21 16:46:51 +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
Martin McKeaveney ffe167bbd3 google auth E2E 2021-04-21 12:12:22 +01:00
Martin McKeaveney 301f681c88 config creation and management APIs 2021-04-20 18:14:36 +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
Martin McKeaveney b5e19e4216 lint 2021-04-20 13:13:15 +01:00
Martin McKeaveney 4b5d302819 group CRUD 2021-04-19 16:16:46 +01:00
Martin McKeaveney 390b43c122 merge 2021-04-19 11:38:54 +01:00
Martin McKeaveney 34a12831a6 basic group apis 2021-04-19 11:34:07 +01:00
Martin McKeaveney ef268014c1 v0.8.17 2021-04-19 10:39:27 +01:00
mike12345567 b887fd6b99 Changing user db to be called global db. 2021-04-16 18:09:34 +01:00
mike12345567 3a6cc28df0 Merge branch 'master' of github.com:Budibase/budibase into next 2021-04-16 17:01:35 +01:00
Martin McKeaveney fdfb9dafb2 fix cypress tests, only login if cookie not present 2021-04-15 17:36:58 +01:00
mike12345567 1ab5064ecb Merge branch 'feature/global-user-management' of github.com:Budibase/budibase into feature/global-user-management 2021-04-15 16:57:35 +01:00
mike12345567 af53ed2109 Fixing some issues with auth module. 2021-04-15 16:57:01 +01:00
Martin McKeaveney 9cebd859f8 merge 2021-04-15 16:49:35 +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 c7171d0303 Linting. 2021-04-14 16:44:10 +01:00
Martin McKeaveney 77c98009b8 joi syntax, adding db user builder key to cookie 2021-04-14 13:22:57 +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 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
Martin McKeaveney a68227735c ensuring public users can log in after being assigned a roleId 2021-04-13 16:56:45 +01:00
Martin McKeaveney 509a04d914 logout button 2021-04-13 13:56:28 +01:00
mike12345567 c51dacd0fe Adding test cases for current app middleware as well as removing some old middlewares that were no longer used. 2021-04-13 13:32:09 +01:00
mike12345567 a52f296d78 Merge branch 'next' of github.com:Budibase/budibase into feature/global-user-management 2021-04-13 10:26:40 +01:00
Martin McKeaveney b0ffb8dcb8 v0.8.16 2021-04-12 19:51:11 +01:00
Martin McKeaveney fe5dd7e2ac v0.8.15 2021-04-12 17:10:19 +01:00
Martin McKeaveney c02306e6fb merge 2021-04-12 13:39:53 +01:00
Martin McKeaveney c4a9d8c9f0 self endpoint, simple auth 2021-04-12 11:20:01 +01:00
Martin McKeaveney e2ce7098c5 merge 2021-04-12 10:48:27 +01:00
Martin McKeaveney 468b9b97f9 builder login 2021-04-12 10:47:48 +01:00
Martin McKeaveney 65be3e9ede v0.8.14 2021-04-11 12:58:22 +01:00
Martin McKeaveney c19cc4f3c9 v0.8.13 2021-04-11 12:53:39 +01:00
Martin McKeaveney 98576f586e login page 2021-04-11 11:35:55 +01:00
mike12345567 e275553f60 Formatting. 2021-04-09 16:56:42 +01:00
mike12345567 e34894dd92 Global user management now functioning as expected, there were some errant db.destroy functions from the system previously, this is now cleaned up. 2021-04-09 16:55:56 +01:00
mike12345567 3214abb89a Global users now working through the server, all requests proxied. 2021-04-09 15:11:49 +01:00
mike12345567 15900efc35 Some changes after trying system for first time. 2021-04-08 17:39:46 +01:00
mike12345567 bf25800445 Merge branch 'feature/global-user-management' of github.com:Budibase/budibase into feature/global-user-management 2021-04-08 17:00:17 +01:00
mike12345567 8cde219db9 First pass of global user configuration through existing user API with role mappings. 2021-04-08 16:58:33 +01:00
Martin McKeaveney 2077073986 move auth controller into it's own dir 2021-04-08 11:57:23 +01:00
Martin McKeaveney 4abe6192dc further simplification of jwt auth 2021-04-08 11:53:40 +01:00
Martin McKeaveney fb2fda4055 encapsulate db ID generation functions 2021-04-08 11:26:08 +01:00
Martin McKeaveney 6aa7a38442 flip auth boolean 2021-04-08 11:21:52 +01:00
Martin McKeaveney c7f4070ff5 encapsulate more auth functionality into shared module and use in worker 2021-04-08 11:20:37 +01:00
Martin McKeaveney f135aa9db4 JWT auth on admin endpoints 2021-04-07 15:15:05 +01:00
Martin McKeaveney cf073a1e55 groundwork for budibase auth lib 2021-04-07 11:33:16 +01:00
Martin McKeaveney 3f1c18e7dd basic couchDB authentication using passport 2021-04-01 20:34:43 +01:00
mike12345567 9423128369 Updating worker package with the various parts of server that needed moved over. 2021-03-29 17:31:41 +01:00
mike12345567 76f330fc36 Replacing deprecated symbols. 2021-03-29 15:06:00 +01:00
mike12345567 3f21a6ba6f Starting worker instance as part of the stack, some changes to how environment handled for worker. 2021-03-29 15:00:40 +01:00
Martin McKeaveney 637d115534 v0.8.12 2021-03-25 10:40:08 +00:00
Martin McKeaveney c74205e4c8 v0.8.11 2021-03-24 18:48:26 +00:00
Martin McKeaveney 306d29d870 redis, tidy ups 2021-03-22 16:18:29 +00:00
Martin McKeaveney 0bc150fc7c v0.8.10 2021-03-15 21:26:50 +00:00
Martin McKeaveney bd6389851a v0.8.9 2021-03-14 18:13:13 +00:00
Martin McKeaveney 7b8c9b1686 v0.8.8 2021-03-12 14:20:18 +00:00
Martin McKeaveney 435bc20077 v0.8.7 2021-03-12 11:45:42 +00:00
Martin McKeaveney 1b53b7da58 v0.8.6 2021-03-12 09:33:12 +00:00
Martin McKeaveney 7f38415967 v0.8.5 2021-03-03 17:46:36 +00:00
Martin McKeaveney a9ab12b999 v0.8.4 2021-03-03 17:05:18 +00:00
Martin McKeaveney a0456e86bd v0.8.3 2021-02-25 17:18:36 +00:00
Martin McKeaveney 779deddc5a v0.8.2 2021-02-25 16:39:52 +00:00
Martin McKeaveney e72057499a v0.8.1 2021-02-25 13:50:33 +00:00
Martin McKeaveney b4996ccb4d v0.8.0 2021-02-25 12:49:03 +00:00
Martin McKeaveney 26377700bb v0.7.8 2021-02-15 14:07:27 +00:00
Martin McKeaveney 8d92692593 v0.7.7 2021-02-12 11:15:38 +00:00
Martin McKeaveney d3e44268ed v0.7.6 2021-02-06 22:59:28 +00:00
Martin McKeaveney 67371ab25f v0.7.5 2021-02-06 12:43:01 +00:00
Martin McKeaveney dd1419f2eb v0.7.4 2021-02-05 10:59:29 +00:00
Martin McKeaveney 8d8cdcd732 app export with space in name 2021-02-05 10:55:54 +00:00
Martin McKeaveney 28e2ce28ba v0.7.3 2021-02-05 09:43:45 +00:00
Martin McKeaveney 02a2c60797 v0.7.2 2021-02-04 14:25:15 +00:00
Martin McKeaveney e283dc0bb1 v0.7.1 2021-02-03 10:30:22 +00:00
Martin McKeaveney 7a386ac1b5 v0.7.0 2021-02-02 18:52:05 +00:00
Martin McKeaveney 79277f0ee0 v0.6.2 2021-01-27 17:43:38 +00:00
Martin McKeaveney 23899840d3 v0.6.1 2021-01-27 16:47:44 +00:00
Martin McKeaveney b1a76ad74d v0.6.0 2021-01-27 15:04:13 +00:00
mike12345567 3dd985cfb6 Merge branch 'master' of github.com:Budibase/budibase into feature/handlebars-migration 2021-01-21 10:57:41 +00:00
mike12345567 419c6b9393 Adding the handlebars library, still need to add testcases to this. 2021-01-18 17:40:19 +00:00
mike12345567 6be84b81b9 Review comments. 2021-01-18 12:36:49 +00:00
mike12345567 7fc0122689 Merge branch 'master' of github.com:Budibase/budibase into feature/self-host-pretty-url 2021-01-14 17:03:05 +00:00
mike12345567 0e9d831e73 Linting. 2021-01-14 17:02:05 +00:00
mike12345567 16a25a7cff When self hosting it is now possible to use a pretty URL to access the app rather than the normal appId. 2021-01-14 17:01:31 +00:00
Martin McKeaveney b96518458e v0.5.3 2021-01-14 15:24:01 +00:00
Martin McKeaveney 836092ec82 v0.5.2 2021-01-14 15:03:58 +00:00
Martin McKeaveney 951808e535 v0.5.1 2021-01-14 14:46:40 +00:00
Martin McKeaveney 3ea31ba383 v0.5.0 2021-01-14 14:37:53 +00:00
mike12345567 e98f9a9e94 Linting. 2021-01-06 17:28:22 +00:00
mike12345567 882cfa700b Updating worker to support using a self host key, a basic level of security, stopping builder from asking for API key if currently configured for self hosting, made the default values for self hosting make sense for a basic local installation, this should be final. 2021-01-06 16:58:29 +00:00
mike12345567 5444af9400 Quick fixes. 2020-12-18 16:48:14 +00:00
mike12345567 cce92f5ab3 Linting. 2020-12-18 12:55:01 +00:00
mike12345567 31bc45985f Update after testing, it is now possible to make a deployment to a self hosted environment. Some work still required, better authentication around MINIO deployment, currently the bucket is set to public read and there is no signing/verification to the upload process, also right now four different URLs are needed for the builder to connect correctly, ideally this shouldn't be the case. 2020-12-18 12:54:20 +00:00
Michael Drury 84a16e2dfb Renaming deployment service to worker service for its expansion plans. 2020-12-17 12:39:55 +00:00