Commit Graph

855 Commits

Author SHA1 Message Date
Rory Powell 26bb6cb6b5 Merge branch 'develop' into prevent-dev-app-access 2021-10-26 14:55:59 +01:00
Rory Powell 55599c0a50 Add timeout to node mailer, lower than jest default 2021-10-26 14:31:56 +01:00
Rory Powell 507a58c9c5 Add timeout to node mailer, lower than jest default 2021-10-26 14:31:56 +01:00
Rory Powell ad61f2af3b Prevent non builder from accessing dev apps 2021-10-25 16:59:09 +01:00
Rory Powell 0718f99850 Prevent non builder from accessing dev apps 2021-10-25 16:59:09 +01:00
Rory Powell f3b630ed95 Sentry updates 2021-10-18 14:57:30 +01:00
Rory Powell 2fb2b570d1 Sentry updates 2021-10-18 14:57:30 +01:00
Peter Clement 63b0938d36 Don't show the create datasource popup in dev environments 2021-10-14 16:45:27 +01:00
Peter Clement 259ca7f4cd Don't show the create datasource popup in dev environments 2021-10-14 16:45:27 +01:00
Martin McKeaveney 1c31ed51c8 fixing auto imported path 2021-10-13 16:23:16 +01:00
Martin McKeaveney ad6d50df26 fixing auto imported path 2021-10-13 16:23:16 +01:00
Martin McKeaveney 5457096370 merge 2021-10-13 14:18:56 +01:00
Martin McKeaveney d9bfacf956 merge 2021-10-13 14:18:56 +01:00
Martin McKeaveney 74c74d78f2 encapsulate global logout function 2021-10-13 12:26:26 +01:00
Martin McKeaveney 81f49dcdf1 encapsulate global logout function 2021-10-13 12:26:26 +01:00
Martin McKeaveney af7bddcf22 platform logout function 2021-10-12 19:49:34 +01:00
Martin McKeaveney 3f279d8d0f platform logout function 2021-10-12 19:49:34 +01:00
Martin McKeaveney b38704978a Merge branch 'develop' of github.com:Budibase/budibase into fix/postrelease 2021-10-12 16:50:37 +01:00
Martin McKeaveney 2674f1992f Merge branch 'develop' of github.com:Budibase/budibase into fix/postrelease 2021-10-12 16:50:37 +01:00
Martin McKeaveney ec26d5c738 SSL support for digitalocean, started utility function for BB logout, bunch of minor bug fixes 2021-10-12 16:13:54 +01:00
Martin McKeaveney 14370c81b9 SSL support for digitalocean, started utility function for BB logout, bunch of minor bug fixes 2021-10-12 16:13:54 +01:00
mike12345567 1e4799ce9c Fixing an issue with env variables becoming numbers if they started with one. 2021-10-11 17:59:44 +01:00
mike12345567 7ae840f758 Fixing an issue with env variables becoming numbers if they started with one. 2021-10-11 17:59:44 +01:00
Rory Powell 9ea1774bcf Don't perform account deletion check when self hosted 2021-10-11 11:14:44 +01:00
Rory Powell c0d46262bf Don't perform account deletion check when self hosted 2021-10-11 11:14:44 +01:00
mike12345567 7a26f3769d Fixing some issues with cloud export/import, removing the ability to export and import your users as this was dangerous and didn't really work with passwords/SSO. 2021-10-08 18:21:40 +01:00
mike12345567 a7b5fc2e1b Fixing some issues with cloud export/import, removing the ability to export and import your users as this was dangerous and didn't really work with passwords/SSO. 2021-10-08 18:21:40 +01:00
mike12345567 4d04a3baf4 Adding a check for test environment to not clear app cookie on login as this breaks cypress. 2021-10-07 17:39:44 +01:00
mike12345567 b87559917b Adding a check for test environment to not clear app cookie on login as this breaks cypress. 2021-10-07 17:39:44 +01:00
mike12345567 52b44736c5 Fixing another issue with ethereal test package. 2021-10-07 16:35:11 +01:00
mike12345567 b267698caa Fixing another issue with ethereal test package. 2021-10-07 16:35:11 +01:00
mike12345567 efb09523a7 Fixing a small issue with email test fix. 2021-10-07 16:14:00 +01:00
mike12345567 a4014c5580 Fixing a small issue with email test fix. 2021-10-07 16:14:00 +01:00
mike12345567 fab766adb6 Adding functionality to check if ethereal is down, if it is don't fail the test. 2021-10-07 16:11:33 +01:00
mike12345567 64b98a6d18 Adding functionality to check if ethereal is down, if it is don't fail the test. 2021-10-07 16:11:33 +01:00
mike12345567 e6844d7bdf Fix an issue with current app cookie, get rid of it on login/logout. 2021-10-07 12:19:23 +01:00
mike12345567 245c92482c Fix an issue with current app cookie, get rid of it on login/logout. 2021-10-07 12:19:23 +01:00
Rory Powell 615d0390d5 Honour cookie domain when custom sso is enabled 2021-10-06 16:50:15 +01:00
Rory Powell 322ef42713 Honour cookie domain when custom sso is enabled 2021-10-06 16:50:15 +01:00
Rory Powell ee10bce48b Don't let user exist in multiple tenants when using custom sso 2021-10-06 15:15:46 +01:00
Rory Powell f10297953f Don't let user exist in multiple tenants when using custom sso 2021-10-06 15:15:46 +01:00
mike12345567 1f95c693ac As with the account portal, updating the monorepo to use the users name if it is available for some email templates. 2021-10-04 17:59:25 +01:00
mike12345567 8a9c112388 As with the account portal, updating the monorepo to use the users name if it is available for some email templates. 2021-10-04 17:59:25 +01:00
Rory Powell ec35b81af8 Fix backup SMTP 2021-10-04 15:58:05 +01:00
Rory Powell df0b3cc6de Fix backup SMTP 2021-10-04 15:58:05 +01:00
Rory Powell 2f589a2f42 Add API keys between account portal and budibase 2021-10-04 13:40:50 +01:00
Rory Powell 651947bb49 Add API keys between account portal and budibase 2021-10-04 13:40:50 +01:00
Rory Powell d63186ff8f Fix email link from internal bb onboarding. Prevent account holder from being deleted 2021-10-04 11:30:59 +01:00
Rory Powell 5e6e3cd123 Fix email link from internal bb onboarding. Prevent account holder from being deleted 2021-10-04 11:30:59 +01:00
mike12345567 be09410cae Quick fix for worker, API key was not considered good enough to access worker, updated this and added better error to smtp action. 2021-10-01 13:29:08 +01:00
mike12345567 04acb160a2 Quick fix for worker, API key was not considered good enough to access worker, updated this and added better error to smtp action. 2021-10-01 13:29:08 +01:00
Michael Drury 29b177208c Merge pull request #2815 from Budibase/feature/cloud-export
Cloud export -> self host import
2021-09-30 14:55:37 +01:00
Michael Drury f2534c3ec3
Merge pull request #2815 from Budibase/feature/cloud-export
Cloud export -> self host import
2021-09-30 14:55:37 +01:00
Rory Powell 3fb83eabad Merge branch 'develop' into remove-global-info-users-on-deletion 2021-09-30 13:38:12 +01:00
Rory Powell db6ae6567e Merge branch 'develop' into remove-global-info-users-on-deletion 2021-09-30 13:38:12 +01:00
Rory Powell 6e10c1fa73 Remove global info users on user deletion 2021-09-30 13:08:07 +01:00
Rory Powell 0e4bdb73a4 Remove global info users on user deletion 2021-09-30 13:08:07 +01:00
mike12345567 f8562015ac Merge branch 'develop' of github.com:Budibase/budibase into feature/cloud-export 2021-09-30 12:22:28 +01:00
mike12345567 7de9ed2fdf Merge branch 'develop' of github.com:Budibase/budibase into feature/cloud-export 2021-09-30 12:22:28 +01:00
Rory Powell b64f1aa322 Fix saveUser by adding same tenant check 2021-09-30 10:27:35 +01:00
Rory Powell 4ee2d23749 Fix saveUser by adding same tenant check 2021-09-30 10:27:35 +01:00
Rory Powell f089c20d60 replace ?. with && 2021-09-29 17:55:08 +01:00
Rory Powell 0734eb0ce7 replace ?. with && 2021-09-29 17:55:08 +01:00
Rory Powell 93d4ee4aad Update existing user in account portal check to only check verified users - fix provision flow 2021-09-29 17:46:13 +01:00
Rory Powell e90d947e38 Update existing user in account portal check to only check verified users - fix provision flow 2021-09-29 17:46:13 +01:00
Rory Powell ee7529769f Merge pull request #2789 from Budibase/feature/deprovisioning
Tenant deprovisioning
2021-09-29 17:17:26 +01:00
Rory Powell e2bf53b957
Merge pull request #2789 from Budibase/feature/deprovisioning
Tenant deprovisioning
2021-09-29 17:17:26 +01:00
mike12345567 a0f69251c8 Adding the ability to run the monorepo in cloud mode without the connected account portal (login, org setting and admin creation are all available again) as well as re-working how the redirects work to massively reduce the chance of cycles which I was experiencing constantly. 2021-09-29 16:55:59 +01:00
mike12345567 f69469ea4f Adding the ability to run the monorepo in cloud mode without the connected account portal (login, org setting and admin creation are all available again) as well as re-working how the redirects work to massively reduce the chance of cycles which I was experiencing constantly. 2021-09-29 16:55:59 +01:00
Rory Powell c74c577ab9 Deprovision complete 2021-09-29 12:25:01 +01:00
Rory Powell 5835716e9d Deprovision complete 2021-09-29 12:25:01 +01:00
Rory Powell 591203f5cd Deprovisioning working minus apps 2021-09-29 11:36:24 +01:00
Rory Powell 5be2a8489d Deprovisioning working minus apps 2021-09-29 11:36:24 +01:00
mike12345567 cb5f513881 Adding important to some email color properties. 2021-09-29 10:32:14 +01:00
mike12345567 17b7a468d6 Adding important to some email color properties. 2021-09-29 10:32:14 +01:00
Rory Powell 9942a2d85c Merge branch 'develop' into feature/deprovisioning 2021-09-28 17:13:04 +01:00
Rory Powell 05f237dd26 Merge branch 'develop' into feature/deprovisioning 2021-09-28 17:13:04 +01:00
Rory Powell 4b30a4e7ef Prevent duplicate internal budibase users across tenants 2021-09-28 15:49:03 +01:00
Rory Powell 5e286d8de2 Prevent duplicate internal budibase users across tenants 2021-09-28 15:49:03 +01:00
Rory Powell b964813fad Prevent root account users being re-created as internal budibase users 2021-09-28 15:22:19 +01:00
Rory Powell 96698f7e07 Prevent root account users being re-created as internal budibase users 2021-09-28 15:22:19 +01:00
Rory Powell 8642868c5e Deprovisioning WIP 2021-09-28 09:48:00 +01:00
Rory Powell 4813a63439 Deprovisioning WIP 2021-09-28 09:48:00 +01:00
Martin McKeaveney 5a56570fdb merge master 2021-09-27 22:31:13 +01:00
Martin McKeaveney 55c6d0d159 merge master 2021-09-27 22:31:13 +01:00
Martin McKeaveney 1e3fca15c5 abstract usagedoc creation into auth, create the doc if it doesn't exist 2021-09-27 17:35:22 +01:00
Martin McKeaveney f877244571 abstract usagedoc creation into auth, create the doc if it doesn't exist 2021-09-27 17:35:22 +01:00
Martin McKeaveney 2da28ecc71 prevent SMTP fallback for automations 2021-09-27 16:28:39 +01:00
Martin McKeaveney 30f60d9bae prevent SMTP fallback for automations 2021-09-27 16:28:39 +01:00
Martin McKeaveney c25bd48616 SMTP config fallback logic 2021-09-27 15:10:06 +01:00
Martin McKeaveney 0b4d6d6052 SMTP config fallback logic 2021-09-27 15:10:06 +01:00
Martin McKeaveney 5b4bf74e2c re-adding env var controls for cloud limit functionality 2021-09-27 15:03:48 +01:00
Martin McKeaveney 757fbbc19c re-adding env var controls for cloud limit functionality 2021-09-27 15:03:48 +01:00
Martin McKeaveney 35d4eac78a fallback SMTP configuration for cloud 2021-09-27 14:57:22 +01:00
Martin McKeaveney 5b1ae778da fallback SMTP configuration for cloud 2021-09-27 14:57:22 +01:00
Martin McKeaveney 6c7423e52e ensure automation quotas are not incremented for test runs 2021-09-27 10:32:39 +01:00
Martin McKeaveney 9cb20bcda2 ensure automation quotas are not incremented for test runs 2021-09-27 10:32:39 +01:00
Martin McKeaveney c49b88b57a automation runs quotas 2021-09-23 23:25:25 +01:00
Martin McKeaveney b161be85ae automation runs quotas 2021-09-23 23:25:25 +01:00
Martin McKeaveney 4a2028c354 usageQuota middleware writing to couch 2021-09-23 22:40:14 +01:00
Martin McKeaveney 85c6fac8f5 usageQuota middleware writing to couch 2021-09-23 22:40:14 +01:00
Martin McKeaveney 9b98985040 point logo upload to S3 bucket when not self hosted 2021-09-23 16:22:12 +01:00
Martin McKeaveney fb7a700542 point logo upload to S3 bucket when not self hosted 2021-09-23 16:22:12 +01:00
Michael Drury f45c780d99 Merge pull request #2698 from Budibase/feature/view-cloud-replacement
Cloud View replacement
2021-09-22 18:21:38 +01:00
Michael Drury 53aaea9e31
Merge pull request #2698 from Budibase/feature/view-cloud-replacement
Cloud View replacement
2021-09-22 18:21:38 +01:00
Martin McKeaveney 68a72384c8 Merge pull request #2703 from Budibase/feature/analytics
Feature/analytics
2021-09-22 15:53:34 +01:00
Martin McKeaveney 4e9d123a9e
Merge pull request #2703 from Budibase/feature/analytics
Feature/analytics
2021-09-22 15:53:34 +01:00
Martin McKeaveney 87b61b5c54 added user created at timestamp 2021-09-22 09:29:51 +01:00
Martin McKeaveney 1790d13bb5 added user created at timestamp 2021-09-22 09:29:51 +01:00
Rory Powell 9282b08890 Cloud SSO flow and auto login on verification 2021-09-21 18:20:26 +01:00
Rory Powell ee2732fd51 Cloud SSO flow and auto login on verification 2021-09-21 18:20:26 +01:00
mike12345567 3da8adfe48 Merge branch 'develop' of github.com:Budibase/budibase into feature/view-cloud-replacement 2021-09-21 17:27:47 +01:00
mike12345567 e0ae992a46 Merge branch 'develop' of github.com:Budibase/budibase into feature/view-cloud-replacement 2021-09-21 17:27:47 +01:00
mike12345567 e8e331e578 Removing use of db.post as its dangerous to allow the possibility of _id being auto-generated, these docs would be lost as we couldn't query them out by the usual id mechanism. 2021-09-21 16:07:04 +01:00
mike12345567 efdd78c7fe Removing use of db.post as its dangerous to allow the possibility of _id being auto-generated, these docs would be lost as we couldn't query them out by the usual id mechanism. 2021-09-21 16:07:04 +01:00
Rory Powell 1d873d9e11 Move all session population to budibase (bug fix) 2021-09-20 11:26:19 +01:00
Rory Powell 12a5428a6e Move all session population to budibase (bug fix) 2021-09-20 11:26:19 +01:00
Rory Powell 91b9a98247 Password reset for budibase users 2021-09-17 13:41:22 +01:00
Rory Powell 72a0203829 Password reset for budibase users 2021-09-17 13:41:22 +01:00
Rory Powell 3576ca87be Access controls for cloud, self, and regular budibase users 2021-09-15 15:45:43 +01:00
Rory Powell 626b166346 Access controls for cloud, self, and regular budibase users 2021-09-15 15:45:43 +01:00
Rory Powell 011193a3dc Navigate between budibase and account portal 2021-09-14 15:49:59 +01:00
Rory Powell 8e9c1aa204 Navigate between budibase and account portal 2021-09-14 15:49:59 +01:00
Rory Powell 689065d2b8 Redirect to account portal login page in the cloud 2021-09-14 14:18:13 +01:00
Rory Powell 9433a1e360 Redirect to account portal login page in the cloud 2021-09-14 14:18:13 +01:00
Rory Powell 73981680ba Replace 'sandbox' with 'cloud' in builder, reuse 'SELF_HOSTED' flag 2021-09-14 13:03:38 +01:00
Rory Powell 3ab39d1a1b Replace 'sandbox' with 'cloud' in builder, reuse 'SELF_HOSTED' flag 2021-09-14 13:03:38 +01:00
Rory Powell d2c5197fa0 Merge pull request #2574 from Budibase/feature/onboarding-backend
Add new redis key for email verification & pre-hashed password option
2021-09-14 11:17:54 +01:00
Rory Powell 0af538816d
Merge pull request #2574 from Budibase/feature/onboarding-backend
Add new redis key for email verification & pre-hashed password option
2021-09-14 11:17:54 +01:00
Martin McKeaveney b83452f47c merge with master 2021-09-10 14:43:03 +01:00
Martin McKeaveney ca361e0efd merge with master 2021-09-10 14:43:03 +01:00
mike12345567 dbf830f12b Fixing issue #2579. 2021-09-09 17:59:44 +01:00
mike12345567 8ecfe2f223 Fixing issue #2579. 2021-09-09 17:59:44 +01:00
Rory Powell d919c44185 Add pre-hased password option to admin creation 2021-09-09 17:08:27 +01:00
Rory Powell 93dcc64131 Add pre-hased password option to admin creation 2021-09-09 17:08:27 +01:00
Martin McKeaveney 5e268dce18 Merge pull request #2556 from mslourens/checklist_item_navigation
add link to checklist items for direct navigation (and lint issues)
2021-09-09 11:16:38 +01:00
Martin McKeaveney 1b1675747c
Merge pull request #2556 from mslourens/checklist_item_navigation
add link to checklist items for direct navigation (and lint issues)
2021-09-09 11:16:38 +01:00
Rory Powell bc50bf56db Remove cors configuration 2021-09-08 12:13:57 +01:00
Rory Powell c4c5a507c2 Remove cors configuration 2021-09-08 12:13:57 +01:00
Rory Powell fcf5aac7e6 Add configurable cors options to worker 2021-09-08 10:05:39 +01:00
Rory Powell 832127d5c8 Add configurable cors options to worker 2021-09-08 10:05:39 +01:00
Rory Powell 3d15db2223 Account portal cors and auth changes 2021-09-07 11:22:11 +01:00
Rory Powell 47e4ef0704 Account portal cors and auth changes 2021-09-07 11:22:11 +01:00
Maurits Lourens 9338043133 fix test 2021-09-06 20:23:33 +02:00
Maurits Lourens 33104fb1d1 fix test 2021-09-06 20:23:33 +02:00
Maurits Lourens 0b7bb885cc fix unit test 2021-09-06 15:49:38 +02:00
Maurits Lourens de96f7384a fix unit test 2021-09-06 15:49:38 +02:00
Maurits Lourens dafd06737c add link to checklist items for direct navigation (and lint issues) 2021-09-06 15:16:21 +02:00
Maurits Lourens 01f3851c9a add link to checklist items for direct navigation (and lint issues) 2021-09-06 15:16:21 +02:00
mike12345567 90f6dffc44 Fixing an issue with list of app URLs not loading correctly. 2021-08-31 13:42:04 +01:00