Commit Graph

262 Commits

Author SHA1 Message Date
mike12345567 8cffe5c9ff Fixing a collection of issues, specifically users being exported/imported and issues with database import causing weirdness (metadata doc being wrong). 2021-06-08 18:06:16 +01:00
mike12345567 ef057910e1 Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-06-07 13:22:27 +01:00
mike12345567 132f084ca5 Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-06-02 10:08:57 +01:00
Martin McKeaveney 0166c48d40 removing superfluous controllers 2021-06-01 20:22:56 +01:00
Martin McKeaveney fe65313eed update functionality complete 2021-06-01 20:17:06 +01:00
Martin McKeaveney 7a0bbfdb84 Merge branch 'master' of https://github.com/Budibase/budibase into lab-day-2705 2021-06-01 19:24:24 +01:00
mike12345567 2057985631 Fixing issue with roles not being added correctly to global users and cleaning up roles when an app is deleted. 2021-06-01 15:58:40 +01:00
Martin McKeaveney a453f6cac2 adding watchtower to docker config 2021-05-28 10:09:32 +01:00
mike12345567 be7736afb7 Fixing app cypress test cases. 2021-05-25 13:25:42 +01:00
mike12345567 d89c750761 Updating system to allow setting builder/admin as a toggle during the invitation phase of a user. 2021-05-24 18:45:43 +01:00
mike12345567 2abe543cb1 Linting and fixing an issue with the dev pass through. 2021-05-24 16:20:02 +01:00
mike12345567 428a9e5ba3 Formatting. 2021-05-24 14:56:23 +01:00
mike12345567 292d520b30 Adding some changes for to redis library, allowing reconnection. 2021-05-24 14:54:47 +01:00
mike12345567 a39b633c90 Formatting and adding routing checks to push the user out of admin menus when they are not an admin. 2021-05-21 17:12:25 +01:00
mike12345567 3c650fad56 Merge branch 'master' of github.com:Budibase/budibase into fix/lockdown-admin 2021-05-21 16:54:52 +01:00
mike12345567 18cbb02bf9 Updating administration middleware so that internal requests allowed through automatically. 2021-05-21 16:43:01 +01:00
Michael Drury 8ee874055e
Merge pull request #1537 from Budibase/feature/app-updated-at
Mike fixes + application updated at timestamps
2021-05-21 16:10:29 +01:00
mike12345567 2da319e960 Merge branch 'master' of github.com:Budibase/budibase into feature/app-updated-at 2021-05-21 14:57:41 +01:00
mike12345567 b71d751243 Making sure roles object is always present, issue #1529. 2021-05-21 14:56:06 +01:00
Martin McKeaveney 2636c9450b simpler check using checklist 2021-05-21 14:55:11 +01:00
Keviin Åberg Kultalahti 093e52a4b7 Merge branch 'master' into fixes/user-management 2021-05-21 13:32:55 +02:00
Keviin Åberg Kultalahti 3593073c00 change forceReset bool name 2021-05-21 12:10:02 +02:00
mike12345567 a8ab7858b7 Formatting. 2021-05-20 20:48:46 +01:00
mike12345567 fba63134d1 Fixing some issues found when testing. 2021-05-20 20:48:24 +01:00
Keviin Åberg Kultalahti 81726501ee Merge branch 'next' into fixes/user-management 2021-05-20 11:02:15 +02:00
mike12345567 584f7c2403 Fixing worker test cases. 2021-05-19 16:39:17 +01:00
mike12345567 8c68f1c134 Fixing issues with the user table within the apps. 2021-05-19 15:55:00 +01:00
mike12345567 6d6eee2a93 Adding the ability to get all apps, with the status attached. 2021-05-19 15:09:57 +01:00
mike12345567 af531241c4 Adding a get self endpoint in the global users. 2021-05-19 13:37:59 +01:00
mike12345567 31d3566626 Allowing null for global user endpoint properties. 2021-05-19 13:30:55 +01:00
mike12345567 14b62b8aed Removing admin middleware applying to everything. 2021-05-19 13:22:05 +01:00
mike12345567 8e10b42f9c Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:18:38 +01:00
mike12345567 1956d9765e 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
Keviin Åberg Kultalahti 06af8e70e6 add forcePasswordReset bool to user object validation 2021-05-19 13:24:14 +02:00
mike12345567 298e5c7e4d Updating reset link to match that of the builder. 2021-05-18 15:48:28 +01:00
mike12345567 d9439abe86 Building up the API interactions for the forgotten password flow. 2021-05-18 15:26:09 +01:00
Keviin Åberg Kultalahti e838950777 Merge branch 'next' into admin/user-management-ui 2021-05-18 12:27:46 +02:00
Keviin Åberg Kultalahti a3f5e1af8c lint:fix 2021-05-18 12:21:57 +02:00
Martin McKeaveney d5fb542589 lint 2021-05-17 21:43:50 +01:00
Keviin Åberg Kultalahti 447a592ddb Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:53:32 +02:00
mike12345567 df7828d3af don't use the _id prop of the app metadata. 2021-05-17 14:52:49 +01:00
Keviin Åberg Kultalahti b8870ed8c4 erge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:29:33 +02:00
mike12345567 cbc2066d91 Updating roles API further so find API works too. 2021-05-17 14:28:41 +01:00
mike12345567 19b1310c60 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 5a7ac2287b Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:21:48 +02:00
mike12345567 dd4a963c3e Updating role system to never think about the dev app. 2021-05-17 14:20:19 +01:00
Martin McKeaveney 6dc288fcc3 merge 2021-05-16 21:29:07 +01:00
Martin McKeaveney 0ed0550e73 revert functionality working 2021-05-16 21:25:37 +01:00
Keviin Åberg Kultalahti 771467fba1 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:49:09 +02:00
mike12345567 0234d11110 Making sure routes are included. 2021-05-14 16:47:47 +01:00
mike12345567 ac0f620b38 Formatting. 2021-05-14 16:32:51 +01:00
Keviin Åberg Kultalahti 8392a4ba38 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:32:08 +02:00
mike12345567 c45fdefb48 Adding administration roles API. 2021-05-14 16:31:07 +01:00
mike12345567 d7dc133e43 Updating valid to optionals. 2021-05-12 15:44:16 +01:00
mike12345567 86f7e76180 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 b58ed6dd4b Fixing an issue with the upload URL not being inserted in correct location. 2021-05-12 14:27:33 +01:00
Martin McKeaveney 56d117c819 fixes from PR 2021-05-12 12:38:49 +01:00
mike12345567 5230dcd3ac Formatting. 2021-05-11 15:24:17 +01:00
mike12345567 147d67cd26 Merge branch 'smtp-configuration' of github.com:Budibase/budibase into smtp-configuration 2021-05-11 15:09:22 +01:00
mike12345567 8faa9554ed 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 c8b1adb135 merge 2021-05-11 14:58:55 +01:00
Martin McKeaveney 3bf3fc5e02 email template E2E, adding preview 2021-05-11 14:44:43 +01:00
mike12345567 339554b163 Adding link to the real email test. 2021-05-11 12:04:07 +01:00
Martin McKeaveney b415fb2089 pull template type from body instead of params 2021-05-10 14:41:52 +01:00
mike12345567 902119c39c Updating with a tested and functional API for uploading files for configs. 2021-05-07 13:55:30 +01:00
Martin McKeaveney cb2b1037ba SMTP and template management E2E 2021-05-06 18:02:44 +01:00
Martin McKeaveney 361db5e96f update scoped config imports 2021-05-06 12:09:35 +01:00
Martin McKeaveney 23cb160a69 merge with next 2021-05-06 11:56:53 +01:00
Martin McKeaveney 2fe2d521cf lint 2021-05-06 10:57:24 +01:00
Martin McKeaveney efacbe861a unit tests 2021-05-06 10:54:01 +01:00
mike12345567 02a270a24d Making some changes to how configs are scoped. 2021-05-06 10:51:21 +01:00
Martin McKeaveney 399c463f52 do not allow users to initialise again once an admin has been created 2021-05-05 22:06:31 +01:00
Martin McKeaveney 1aedba80bd first time setup E2E 2021-05-05 21:56:43 +01:00
Martin McKeaveney 4bc1a7dc3c renable worker protection 2021-05-05 20:59:16 +01:00
Martin McKeaveney 4377b41f40 endpoint for budibase configuration checklist 2021-05-05 20:58:31 +01:00
mike12345567 c37f41fbd5 Making the code a query string parameter for invite/reset urls. 2021-05-05 18:13:59 +01:00
mike12345567 2f0c3562ac Merge branch 'next' of github.com:Budibase/budibase into feature/password-reset 2021-05-05 18:00:22 +01:00
mike12345567 44db8cf9ec Formatting. 2021-05-05 17:49:53 +01:00
mike12345567 96f036b720 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 1a2556b6fd Formatting. 2021-05-05 16:00:15 +01:00
mike12345567 4d49fd4da0 Updating configs API based on some feedback during the development of the settings frontend. 2021-05-05 15:59:24 +01:00
mike12345567 3812a31a22 Formatting. 2021-05-05 15:19:44 +01:00
mike12345567 7b92046052 Finishing invite send email. 2021-05-05 15:17:15 +01:00
mike12345567 f1650105f4 Finalising the usage of redis in the password reset and invitation systems. 2021-05-05 15:10:28 +01:00
mike12345567 f781e8b350 Formatting. 2021-05-05 12:11:31 +01:00
mike12345567 e31eb5d3d2 Fleshed out fully all redis interactions for invitations and password resets. 2021-05-05 12:11:06 +01:00
Martin McKeaveney 88a5660bc3 google oauth UI 2021-05-04 17:31:06 +01:00
mike12345567 89310c0879 Merge branch 'next' of github.com:Budibase/budibase into feature/password-reset 2021-05-04 15:21:53 +01:00
Andrew Kingston 556236ebce Add explicit prettier options 2021-05-04 11:32:22 +01:00
Keviin Åberg Kultalahti 4ec2e7d01f lint:fix 2021-05-03 09:31:09 +02:00
mike12345567 3e2da63822 Updating auth middleware to accomodate public endpoints for the server properly and some refactoring. 2021-04-28 18:13:21 +01:00
mike12345567 6a0f80f25e Fixing login issue. 2021-04-28 14:28:25 +01:00
mike12345567 01a9db76c8 Formatting. 2021-04-27 17:30:19 +01:00
mike12345567 129b827d9f 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 caa62cba1c Adding auth endpoints to no auth list. 2021-04-26 15:44:28 +01:00
mike12345567 02031ce8c9 Formatting, linting and handling year copyright properly. 2021-04-26 14:24:07 +01:00
mike12345567 5de2b26335 Formatting. 2021-04-26 14:16:05 +01:00
mike12345567 84e66f826b 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 73ad093a50 Major update, fixing email test case. 2021-04-23 18:54:12 +01:00
mike12345567 d985d338ec Updating test cases and some re-work of the email system. 2021-04-23 18:07:39 +01:00
mike12345567 6564c85a30 continuing work on smtp testing. 2021-04-23 15:14:28 +01:00
mike12345567 46c9df6245 Adding testing to worker, still WIP. 2021-04-23 14:58:06 +01:00
mike12345567 61ed6cf2bc 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 fcd57cfcb5 putting together the bulk of the email sending/config options. 2021-04-23 13:10:37 +01:00
mike12345567 e2d29f0562 Formatting. 2021-04-22 17:58:14 +01:00
mike12345567 737dd356c3 Fleshing out the main work behind the email generation. 2021-04-22 17:57:38 +01:00
mike12345567 27846e1bee Formatting. 2021-04-22 16:06:29 +01:00
Michael Drury 0e1a6b14db
Merge branch 'feature/smtp-templates' into configuration-management 2021-04-22 15:39:54 +01:00
Martin McKeaveney 83f9e00aff fix imports 2021-04-22 15:27:09 +01:00
mike12345567 70c2c7c727 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 9a12239e62 scoped configuration management 2021-04-22 13:46:54 +01:00
Martin McKeaveney caa4f0dfb7 lint 2021-04-22 11:48:37 +01:00
Martin McKeaveney 737e9dba47 config specificity 2021-04-22 11:45:22 +01:00
Martin McKeaveney 1c7689e694 google login reading from couch 2021-04-21 21:08:04 +01:00
Martin McKeaveney 1da29900c7 merge 2021-04-21 18:43:20 +01:00
Martin McKeaveney 1f831f1281 custom google middleware 2021-04-21 18:40:32 +01:00
mike12345567 e057217b48 Initial CRUD interface for templates. 2021-04-21 18:15:57 +01:00
mike12345567 ec099a9e6f Formatting and linting. 2021-04-21 16:46:51 +01:00
mike12345567 bb5dbf27aa 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 b61a29f2ff google auth E2E 2021-04-21 12:12:22 +01:00
Martin McKeaveney 1b54845c5e config creation and management APIs 2021-04-20 18:14:36 +01:00
mike12345567 7612b5ed16 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 9b477c6f70 lint 2021-04-20 13:13:15 +01:00
Martin McKeaveney 657ae2b554 group CRUD 2021-04-19 16:16:46 +01:00
Martin McKeaveney 07ac411b12 merge 2021-04-19 11:38:54 +01:00
Martin McKeaveney 95b768c073 basic group apis 2021-04-19 11:34:07 +01:00
mike12345567 9cc640ac0e Changing user db to be called global db. 2021-04-16 18:09:34 +01:00
Martin McKeaveney 212a1217c5 merge 2021-04-15 16:49:35 +01:00
mike12345567 cfbd75b36d 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 3697a270ec Linting. 2021-04-14 16:44:10 +01:00
Martin McKeaveney eef989f375 joi syntax, adding db user builder key to cookie 2021-04-14 13:22:57 +01:00
mike12345567 8b20fcb573 Getting most of the test auth working, adding in global builder configuration. 2021-04-13 18:12:35 +01:00
mike12345567 a8f7977510 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 d0bdd113e1 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 06f3b1fbad ensuring public users can log in after being assigned a roleId 2021-04-13 16:56:45 +01:00
Martin McKeaveney bd48b02ab1 logout button 2021-04-13 13:56:28 +01:00
Martin McKeaveney 0548fdc863 self endpoint, simple auth 2021-04-12 11:20:01 +01:00
Martin McKeaveney 6499213f90 merge 2021-04-12 10:48:27 +01:00
Martin McKeaveney d7e187d8f2 builder login 2021-04-12 10:47:48 +01:00
Martin McKeaveney b5a5df7f60 login page 2021-04-11 11:35:55 +01:00
mike12345567 ac1f391383 Formatting. 2021-04-09 16:56:42 +01:00
mike12345567 dc62087dad 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 164ef9a22e Global users now working through the server, all requests proxied. 2021-04-09 15:11:49 +01:00
mike12345567 76346d082d 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 792114ef46 First pass of global user configuration through existing user API with role mappings. 2021-04-08 16:58:33 +01:00
Martin McKeaveney 1306f4cd68 move auth controller into it's own dir 2021-04-08 11:57:23 +01:00
Martin McKeaveney 4390bc5c0c encapsulate db ID generation functions 2021-04-08 11:26:08 +01:00
Martin McKeaveney 73dfad3001 encapsulate more auth functionality into shared module and use in worker 2021-04-08 11:20:37 +01:00
Martin McKeaveney 46ddcdce2c JWT auth on admin endpoints 2021-04-07 15:15:05 +01:00
Martin McKeaveney 87b1924470 groundwork for budibase auth lib 2021-04-07 11:33:16 +01:00