Commit Graph

194 Commits

Author SHA1 Message Date
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 2d0122f7d6 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
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
mike12345567 8f7a3f4d69 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 13:59:59 +01:00
Keviin Åberg Kultalahti 0da5247a03 Merge branch 'next' into admin/user-management-ui 2021-05-12 14:08:58 +02:00
mike12345567 fed94bea70 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 12:49:42 +01:00
Martin McKeaveney 56d117c819 fixes from PR 2021-05-12 12:38:49 +01:00
mike12345567 c9d903a92f 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 5230dcd3ac Formatting. 2021-05-11 15:24:17 +01:00
mike12345567 2ea05c44b4 Changing INTERNAL_KEY to INTERNAL_API_KEY. 2021-05-11 15:23:03 +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 638e2f5c8e 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 ec751b59a4 Fixing an issue with platformUrl being required in settings. 2021-05-11 12:51:14 +01:00
mike12345567 339554b163 Adding link to the real email test. 2021-05-11 12:04:07 +01:00
mike12345567 7d78d7b15a 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 85030491b2 Renaming registration to invite URL. 2021-05-10 15:05:06 +01:00
Martin McKeaveney b415fb2089 pull template type from body instead of params 2021-05-10 14:41:52 +01:00
mike12345567 2081dd96e0 Making sure relative logo URL is converted to a full path in templates. 2021-05-07 14:30:37 +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 3468c942f9 Updating welcome to make it clear no login credentials in it. 2021-04-26 14:53:47 +01:00
mike12345567 02dafebe38 Moving header/footer and presentational tables to the base hbs email template. 2021-04-26 14:39:18 +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 191c085f17 fix cypress tests, only login if cookie not present 2021-04-15 17:36:58 +01:00
mike12345567 3545634d53 Merge branch 'feature/global-user-management' of github.com:Budibase/budibase into feature/global-user-management 2021-04-15 16:57:35 +01:00