1
0
Fork 0
mirror of synced 2024-06-29 11:31:06 +12:00
Commit graph

1082 commits

Author SHA1 Message Date
Martin McKeaveney 4b79045dac adding check on backend 2021-11-26 15:27:37 +01:00
Martin McKeaveney 717861d2c7 adding check on backend 2021-11-26 15:27:37 +01:00
Rory Powell 4235aba7a2 Merge pull request #3354 from Budibase/rory/fixes-platform-url
Fixes for google sso, cloud email url and cloud logo updates
2021-11-16 13:46:06 +00:00
Rory Powell 851850dc03
Merge pull request #3354 from Budibase/rory/fixes-platform-url
Fixes for google sso, cloud email url and cloud logo updates
2021-11-16 13:46:06 +00:00
Michael Drury 5470b77fb3 Fixing issue presented by test, passing Couch instance around for when it is being used in memory. 2021-11-15 19:34:08 +00:00
Michael Drury 0f37562ab6 Fixing issue presented by test, passing Couch instance around for when it is being used in memory. 2021-11-15 19:34:08 +00:00
Rory Powell 6af8ab2dc0 Fixes for google sso, cloud email url and cloud logo updates 2021-11-12 13:31:55 +00:00
Rory Powell cf13853f09 Fixes for google sso, cloud email url and cloud logo updates 2021-11-12 13:31:55 +00:00
Michael Drury 100311fb93 Merge pull request #3251 from Budibase/fix/user-metadata
Syncing user metadata - allow builder to interact with user metadata in app
2021-11-10 13:41:57 +00:00
Michael Drury de2029588b
Merge pull request #3251 from Budibase/fix/user-metadata
Syncing user metadata - allow builder to interact with user metadata in app
2021-11-10 13:41:57 +00:00
mike12345567 18b98a158a Fixing issue found by test case. 2021-11-10 12:52:23 +00:00
mike12345567 1453e8810b Fixing issue found by test case. 2021-11-10 12:52:23 +00:00
mike12345567 47122f76fd Updating per review comments. 2021-11-10 12:03:43 +00:00
mike12345567 c8e02a20a0 Updating per review comments. 2021-11-10 12:03:43 +00:00
mike12345567 99c47ab264 Merge branch 'develop' of github.com:Budibase/budibase into fix/user-metadata 2021-11-08 17:28:32 +00:00
mike12345567 a0ebe7537d Merge branch 'develop' of github.com:Budibase/budibase into fix/user-metadata 2021-11-08 17:28:32 +00:00
mike12345567 b310918ec4 Fixing #3182 so that sorting is disabled for certain column types that we cannot use, as well as fixing some issues with MS-SQL plus tables. 2021-11-08 17:25:05 +00:00
mike12345567 15907280b2 Fixing #3182 so that sorting is disabled for certain column types that we cannot use, as well as fixing some issues with MS-SQL plus tables. 2021-11-08 17:25:05 +00:00
mike12345567 6e76a7dd1a Adding a check to disable user sync in test when server not available. 2021-11-04 20:28:26 +00:00
mike12345567 c0ff805816 Adding a check to disable user sync in test when server not available. 2021-11-04 20:28:26 +00:00
mike12345567 94ee13ffc4 Adding the sync call from the worker for creation, updating and deletion of users. Making sure that production and development apps are always up to date with user metadata. 2021-11-04 14:53:03 +00:00
mike12345567 9aa708588a Adding the sync call from the worker for creation, updating and deletion of users. Making sure that production and development apps are always up to date with user metadata. 2021-11-04 14:53:03 +00:00
Martin McKeaveney cb5df8fe1e Merge pull request #3159 from Budibase/feature/template-urls
allow opening a template directly from a URL
2021-11-04 14:46:18 +01:00
Martin McKeaveney e9fe1edfc6
Merge pull request #3159 from Budibase/feature/template-urls
allow opening a template directly from a URL
2021-11-04 14:46:18 +01:00
Martin McKeaveney b80a93d6d5 cookie based approach 2021-11-04 14:03:18 +01:00
Martin McKeaveney 7cead2d8f4 cookie based approach 2021-11-04 14:03:18 +01:00
Rory Powell 081e38e5ea Merge branch 'develop' into prevent-dev-app-access 2021-10-26 14:55:59 +01:00
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
mike12345567 bef1ce0426 Fixing an issue with list of app URLs not loading correctly. 2021-08-31 13:42:04 +01:00
Martin McKeaveney af4c1b23de simplify couchDB configuration 2021-08-18 11:23:28 +01:00
Martin McKeaveney acff289940 simplify couchDB configuration 2021-08-18 11:23:28 +01:00
Martin McKeaveney 87bf640a5d conditionally apply username and password to couchdb auth 2021-08-17 16:48:02 +01:00
Martin McKeaveney bcbd40764f conditionally apply username and password to couchdb auth 2021-08-17 16:48:02 +01:00
Martin McKeaveney f4232bd7d7 couchDB auth options 2021-08-17 14:11:03 +01:00
Martin McKeaveney c66f5ab6ff couchDB auth options 2021-08-17 14:11:03 +01:00
Peter Clement 48c40446f0 Add link to account portal 2021-08-12 12:09:53 +01:00
Peter Clement adecf1897a Add link to account portal 2021-08-12 12:09:53 +01:00
Peter Clement b2bc9a5e20 Add self-hosting upgrade button to builder pane 2021-08-12 11:51:08 +01:00
Peter Clement 66e593a6b3 Add self-hosting upgrade button to builder pane 2021-08-12 11:51:08 +01:00
mike12345567 a8eb067de3 Merge branch 'fix/apps-2195-2282-2283' of github.com:Budibase/budibase into develop 2021-08-06 17:14:31 +01:00
mike12345567 88396b77ed Merge branch 'fix/apps-2195-2282-2283' of github.com:Budibase/budibase into develop 2021-08-06 17:14:31 +01:00
mike12345567 506ff7dcd3 Linting. 2021-08-06 16:39:30 +01:00
mike12345567 5f997ab836 Linting. 2021-08-06 16:39:30 +01:00
mike12345567 be48677490 Fixes for a lot of issues generated by the use of the pouchdb allDbs call, which is not designed for multi-client DB setups like ours, using CouchDB method instead. 2021-08-06 16:38:07 +01:00
mike12345567 c4f8d17a6e Fixes for a lot of issues generated by the use of the pouchdb allDbs call, which is not designed for multi-client DB setups like ours, using CouchDB method instead. 2021-08-06 16:38:07 +01:00
mike12345567 105dfb5eb9 Fixing an issue with OIDC URL for preauth. 2021-08-05 14:36:10 +01:00
mike12345567 be73ff2c32 Fixing an issue with OIDC URL for preauth. 2021-08-05 14:36:10 +01:00
mike12345567 9197a6e124 Making old google/oidc callback endpoints public. 2021-08-05 12:00:33 +01:00
mike12345567 d2d13fe06e Making old google/oidc callback endpoints public. 2021-08-05 12:00:33 +01:00
mike12345567 78a3a1cd09 Fixing issue with google callback URL not being used when it was previously set. 2021-08-05 11:27:51 +01:00
mike12345567 938f94e68f Fixing issue with google callback URL not being used when it was previously set. 2021-08-05 11:27:51 +01:00
mike12345567 46ea3f3e9e Revert "Merge pull request #2253 from Budibase/revert-2076-feature/multi-tenants"
This reverts commit 4834b765be, reversing
changes made to 2456e69483.
2021-08-05 09:59:08 +01:00
mike12345567 42f08f97cc Revert "Merge pull request #2253 from Budibase/revert-2076-feature/multi-tenants"
This reverts commit 0d2e2314d4, reversing
changes made to 1beca4ee96.
2021-08-05 09:59:08 +01:00
Michael Drury b86a6fddc9 Revert "Multi-tenancy/organisations" 2021-08-04 10:02:24 +01:00
Michael Drury f37946d47e
Revert "Multi-tenancy/organisations" 2021-08-04 10:02:24 +01:00
mike12345567 4e13dde657 Fixing some issues highlighted by worker test cases. 2021-08-03 17:14:17 +01:00
mike12345567 5dc7b4b09e Fixing some issues highlighted by worker test cases. 2021-08-03 17:14:17 +01:00
mike12345567 88c07d28eb Linting. 2021-08-03 15:41:51 +01:00
mike12345567 55ff798803 Linting. 2021-08-03 15:41:51 +01:00
mike12345567 e7974f7e86 Implementing some changes to how context gets set for tenancy, after testing, as well as updating server. 2021-08-03 15:32:25 +01:00
mike12345567 54e765a182 Implementing some changes to how context gets set for tenancy, after testing, as well as updating server. 2021-08-03 15:32:25 +01:00
mike12345567 f3ce979230 Linting. 2021-08-02 18:36:32 +01:00
mike12345567 75ae7ac8d6 Linting. 2021-08-02 18:36:32 +01:00
mike12345567 7743384f77 re-write, to use the ideas that Rory put in place, still WIP, un-tested but all implemented. 2021-08-02 18:34:43 +01:00
mike12345567 7a69dcef78 re-write, to use the ideas that Rory put in place, still WIP, un-tested but all implemented. 2021-08-02 18:34:43 +01:00
mike12345567 f6d0db4c4b Updating API endpoints, to include the new system one, updating hosting envoy yaml to cover these. 2021-08-02 12:09:03 +01:00
mike12345567 f7d58c889d Updating API endpoints, to include the new system one, updating hosting envoy yaml to cover these. 2021-08-02 12:09:03 +01:00
mike12345567 8bcce17cd7 Removing unused mock. 2021-07-30 14:25:38 +01:00
mike12345567 ca880c4549 Removing unused mock. 2021-07-30 14:25:38 +01:00
mike12345567 79c5f01267 Fixing config test case. 2021-07-30 14:23:40 +01:00
mike12345567 4dbec64801 Fixing config test case. 2021-07-30 14:23:40 +01:00
mike12345567 5dfeb9b3ca Limiting use of query string to a few select endpoints for determining tenant ID. 2021-07-27 18:02:59 +01:00
mike12345567 a21fd3e0ee Limiting use of query string to a few select endpoints for determining tenant ID. 2021-07-27 18:02:59 +01:00
mike12345567 adf6d18cb1 Fixing some issues with public endpoints causing logout loop. 2021-07-27 16:17:02 +01:00
mike12345567 fb562908ee Fixing some issues with public endpoints causing logout loop. 2021-07-27 16:17:02 +01:00
mike12345567 615053f201 Fixing some issues with org not being correctly detected. 2021-07-27 15:35:26 +01:00
mike12345567 1df08ffe35 Fixing some issues with org not being correctly detected. 2021-07-27 15:35:26 +01:00
mike12345567 dd1f1fec3b Linting. 2021-07-26 13:31:39 +01:00
mike12345567 61c8f2935b Linting. 2021-07-26 13:31:39 +01:00
mike12345567 d03229caba Adding in admin API backwards compat. 2021-07-26 13:23:11 +01:00
mike12345567 c7d4c9793a Adding in admin API backwards compat. 2021-07-26 13:23:11 +01:00
mike12345567 4606248ffd Fixing up everything found when testing with Cypress. 2021-07-26 13:19:47 +01:00
mike12345567 5c58630ed7 Fixing up everything found when testing with Cypress. 2021-07-26 13:19:47 +01:00
mike12345567 c63ee57bbd Linting. 2021-07-23 20:03:11 +01:00
mike12345567 cfea184633 Linting. 2021-07-23 20:03:11 +01:00
mike12345567 4d0faa38e3 Changing how apps are retrieved to be more efficient. 2021-07-23 20:01:53 +01:00
mike12345567 a384cc059d Changing how apps are retrieved to be more efficient. 2021-07-23 20:01:53 +01:00
mike12345567 9a9c552629 Adding mechanism for lookup of userId/email to tenantId. 2021-07-23 19:22:04 +01:00
mike12345567 19ad28a491 Adding mechanism for lookup of userId/email to tenantId. 2021-07-23 19:22:04 +01:00
mike12345567 82e43e0008 Removing accidental symbols. 2021-07-23 17:26:54 +01:00
mike12345567 f86aa0ac78 Removing accidental symbols. 2021-07-23 17:26:54 +01:00
mike12345567 9377c7b0f3 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-23 17:20:41 +01:00
mike12345567 e4eb2d34b2 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-23 17:20:41 +01:00
mike12345567 7588bfde39 Adjusting how redis modules are loaded, making sure client is always set, before init. 2021-07-23 16:53:22 +01:00
mike12345567 68a2f9835e Adjusting how redis modules are loaded, making sure client is always set, before init. 2021-07-23 16:53:22 +01:00
Rory Powell eb8d857864 Require https callback in production, allow for http otherwise 2021-07-23 15:47:48 +01:00
Rory Powell d7bbae9196 Require https callback in production, allow for http otherwise 2021-07-23 15:47:48 +01:00
Rory Powell 418637cb6b Linting 2021-07-23 14:42:28 +01:00
Rory Powell 8a77947a01 Linting 2021-07-23 14:42:28 +01:00
Rory Powell f95b550b15 Mark google activated by default for old configs 2021-07-23 14:40:22 +01:00
Rory Powell b5c12e6265 Mark google activated by default for old configs 2021-07-23 14:40:22 +01:00
Rory Powell 249df46770 Mark google activated by default for old configs 2021-07-23 11:38:17 +01:00
Rory Powell af28a7ed6b Mark google activated by default for old configs 2021-07-23 11:38:17 +01:00
mike12345567 3f7bafe23d Linting. 2021-07-22 22:37:20 +01:00
mike12345567 1153001af8 Linting. 2021-07-22 22:37:20 +01:00
mike12345567 313302cae2 Fixing test cases and bugs that they raised. 2021-07-22 22:36:16 +01:00
mike12345567 155e30965f Fixing test cases and bugs that they raised. 2021-07-22 22:36:16 +01:00
mike12345567 24012c2fba Linting. 2021-07-22 16:37:50 +01:00
mike12345567 8bf275ca44 Linting. 2021-07-22 16:37:50 +01:00
mike12345567 1d6a350311 Changing how flags are handled. 2021-07-22 16:36:21 +01:00
mike12345567 0473c295d3 Changing how flags are handled. 2021-07-22 16:36:21 +01:00
mike12345567 b21fe320c5 Adding fallbacks for oidc and google. 2021-07-22 15:26:14 +01:00
mike12345567 f2e713f5af Adding fallbacks for oidc and google. 2021-07-22 15:26:14 +01:00
mike12345567 1b6a73c250 Linting. 2021-07-22 14:29:30 +01:00
mike12345567 853b7b6fdc Linting. 2021-07-22 14:29:30 +01:00
mike12345567 27b2a13817 Swapping admin -> global in worker to reduce confusion in API url naming. 2021-07-22 12:56:47 +01:00
mike12345567 190798d4ee Swapping admin -> global in worker to reduce confusion in API url naming. 2021-07-22 12:56:47 +01:00
mike12345567 3305400c83 Fixing saving of oidc and google auth, neither should require the callbackURL property with the tenancy update. 2021-07-21 11:10:26 +01:00
mike12345567 f99f077cdc Fixing saving of oidc and google auth, neither should require the callbackURL property with the tenancy update. 2021-07-21 11:10:26 +01:00
mike12345567 b09c2d45f9 Linting and adding tenancy API. 2021-07-20 18:03:16 +01:00
mike12345567 e3744c0b20 Linting and adding tenancy API. 2021-07-20 18:03:16 +01:00
mike12345567 129ff3fef2 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-20 15:56:12 +01:00
mike12345567 2182645339 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-20 15:56:12 +01:00
Peter Clement 3f42ed74b9 Merge remote-tracking branch 'origin/develop' into oidc-config-management 2021-07-20 12:57:58 +01:00
Peter Clement 32b2093cff Merge remote-tracking branch 'origin/develop' into oidc-config-management 2021-07-20 12:57:58 +01:00
Peter Clement 0fa68a2d50 Add activated toggle and login functionality to support this 2021-07-20 09:27:12 +01:00
Peter Clement 6dce0a88a4 Add activated toggle and login functionality to support this 2021-07-20 09:27:12 +01:00
mike12345567 83db31f899 A lot of general fixes around getting logged in, setting up users etc. 2021-07-19 19:00:53 +01:00
mike12345567 07dd7d68d4 A lot of general fixes around getting logged in, setting up users etc. 2021-07-19 19:00:53 +01:00
mike12345567 358b2aef89 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-19 17:35:48 +01:00
mike12345567 99fe16d169 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-19 17:35:48 +01:00
mike12345567 e026375f50 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-19 16:24:19 +01:00
mike12345567 63dba7b574 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-19 16:24:19 +01:00
mike12345567 e56a0f5aa3 Fixing some tenancy issues. 2021-07-19 12:57:52 +01:00
mike12345567 8241df2581 Fixing some tenancy issues. 2021-07-19 12:57:52 +01:00
mike12345567 d157285918 Adding organisation page. 2021-07-16 18:24:32 +01:00
mike12345567 c248844a24 Adding organisation page. 2021-07-16 18:24:32 +01:00
mike12345567 f3156fca06 Further work, tenancy now working but some more work to be done. 2021-07-16 18:04:49 +01:00
mike12345567 037dce5016 Further work, tenancy now working but some more work to be done. 2021-07-16 18:04:49 +01:00
mike12345567 b7995dd61d Updating auth to utilise the tenant system. 2021-07-16 15:08:58 +01:00
mike12345567 f0f9736c0b Updating auth to utilise the tenant system. 2021-07-16 15:08:58 +01:00
mike12345567 912659a8ad First version of multi-tenancy, work still to be done. 2021-07-15 17:57:02 +01:00
mike12345567 5ffe3c7935 First version of multi-tenancy, work still to be done. 2021-07-15 17:57:02 +01:00
Rory Powell 5f51de257f Default public config.config when missing 2021-07-15 16:50:57 +01:00
Rory Powell 25fdde6d21 Default public config.config when missing 2021-07-15 16:50:57 +01:00
Rory Powell 806957e462 Merge branch 'feature/oidc-support' of github.com:Budibase/budibase into feature/oidc-support 2021-07-15 16:21:03 +01:00
Rory Powell 833e3cb3bf Merge branch 'feature/oidc-support' of github.com:Budibase/budibase into feature/oidc-support 2021-07-15 16:21:03 +01:00
Rory Powell 33b352c3ef Store OIDC config in cookie instead of URL 2021-07-15 16:20:31 +01:00
Rory Powell 70601b7cc5 Store OIDC config in cookie instead of URL 2021-07-15 16:20:31 +01:00
Peter Clement 70ab4e4dc5 add new logic to support oauth and oidc buttons 2021-07-15 15:49:10 +01:00
Peter Clement 4e75b7f4c9 add new logic to support oauth and oidc buttons 2021-07-15 15:49:10 +01:00
Rory Powell 239e39e5ed Merge branch 'develop' into feature/oidc-support 2021-07-15 14:05:30 +01:00
Rory Powell 90c0e7b2c1 Merge branch 'develop' into feature/oidc-support 2021-07-15 14:05:30 +01:00
mike12345567 a9160f5914 Rewording email template descriptions. 2021-07-14 13:24:46 +01:00
mike12345567 1fa0b3f204 Rewording email template descriptions. 2021-07-14 13:24:46 +01:00
mike12345567 a31cce0ff9 Linting. 2021-07-14 13:18:27 +01:00
mike12345567 da5024633b Linting. 2021-07-14 13:18:27 +01:00
mike12345567 c20fde41ee Some quick fixes after a user had some confusion over how the email templating works, just adding some detail that should help explain. 2021-07-14 11:23:24 +01:00
mike12345567 3f56a316c5 Some quick fixes after a user had some confusion over how the email templating works, just adding some detail that should help explain. 2021-07-14 11:23:24 +01:00
Peter Clement 283698f8c5 Fix config form saving bugs 2021-07-13 21:47:36 +01:00
Peter Clement ab1a10dd1b Fix config form saving bugs 2021-07-13 21:47:36 +01:00
Rory Powell 0973394208 Update config checklist to handle multiple sso sources 2021-07-13 17:30:17 +01:00
Rory Powell fef63a1b8e Update config checklist to handle multiple sso sources 2021-07-13 17:30:17 +01:00
mike12345567 cc08b4fc4e Linting. 2021-07-13 17:28:05 +01:00
mike12345567 d17456bacf Linting. 2021-07-13 17:28:05 +01:00
mike12345567 004f719dde Renaming groups to workspaces. 2021-07-13 17:27:04 +01:00
mike12345567 e296a67b50 Renaming groups to workspaces. 2021-07-13 17:27:04 +01:00
Rory Powell dd306d59c5 Load oidc config by id 2021-07-13 17:07:48 +01:00
Rory Powell 40013d45c3 Load oidc config by id 2021-07-13 17:07:48 +01:00
Peter Clement 9dd05ec96e Add UUID to each oidc config to distinguish each provider 2021-07-13 15:52:21 +01:00
Peter Clement 2900743545 Add UUID to each oidc config to distinguish each provider 2021-07-13 15:52:21 +01:00
Peter Clement af792cc09e improve structure of OIDC config 2021-07-13 14:55:14 +01:00
Peter Clement ca0f74eee8 improve structure of OIDC config 2021-07-13 14:55:14 +01:00
Rory Powell 5f5fe92807 Refactor auth controller tests to reuse common behaviour 2021-07-13 10:28:15 +01:00
Rory Powell 1a7619367b Refactor auth controller tests to reuse common behaviour 2021-07-13 10:28:15 +01:00
Martin McKeaveney bebfe4c6e1 merge with master 2021-07-11 18:07:46 +01:00
Martin McKeaveney 742402f4c7 merge with master 2021-07-11 18:07:46 +01:00
Rory Powell 4d3f44f982 Unit test auth controller oidc functions 2021-07-11 17:54:18 +01:00
Rory Powell e1bea33d9a Unit test auth controller oidc functions 2021-07-11 17:54:18 +01:00
Kyle Harrison 2d451bb3a9 apply fixes for common spelling mistakes 2021-07-09 17:54:49 +01:00
Kyle Harrison b4afda7b09 apply fixes for common spelling mistakes 2021-07-09 17:54:49 +01:00
Peter Clement b94348dddc Fix OIDC logo conditional display 2021-07-09 15:50:46 +01:00
Peter Clement de075a7549 Fix OIDC logo conditional display 2021-07-09 15:50:46 +01:00
Peter Clement 5a86d6bb6d Linting and Optimisation 2021-07-09 15:05:39 +01:00
Peter Clement 90e6db2be1 Linting and Optimisation 2021-07-09 15:05:39 +01:00
Peter Clement 7138070e4c Fix bug where OIDC icon was not being displayed due to misconfiguration 2021-07-09 14:18:03 +01:00
Peter Clement 4ae29f6b54 Fix bug where OIDC icon was not being displayed due to misconfiguration 2021-07-09 14:18:03 +01:00
Peter Clement bcfbca0f08 Add oidc icon and name to public api for login page 2021-07-09 09:49:16 +01:00
Peter Clement 80a35d6ef0 Add oidc icon and name to public api for login page 2021-07-09 09:49:16 +01:00
Rory Powell 73c8dcf71b Merge branch 'develop' into feature/oidc-support 2021-07-08 20:15:16 +01:00
Rory Powell 63b13fc360 Merge branch 'develop' into feature/oidc-support 2021-07-08 20:15:16 +01:00
Rory Powell 1c18b4c6ac remove duplicate scope definition
scope can be defined both within the strategy declaration or when invoking passport
2021-07-08 15:21:54 +01:00
Rory Powell 7db8658518 remove duplicate scope definition
scope can be defined both within the strategy declaration or when invoking passport
2021-07-08 15:21:54 +01:00
Rory Powell c16cfc328f Linting 2021-07-08 13:12:25 +01:00
Rory Powell db9078cebe Linting 2021-07-08 13:12:25 +01:00
Rory Powell ec93d15462 Integrate with configuration ui / support for email usernames 2021-07-08 13:04:04 +01:00
Rory Powell aa601f3701 Integrate with configuration ui / support for email usernames 2021-07-08 13:04:04 +01:00
Rory Powell f0016f4bde Merge branch 'feature/oidc-support' of github.com:Budibase/budibase into feature/oidc-support 2021-07-08 11:12:45 +01:00
Rory Powell 238d31e922 Merge branch 'feature/oidc-support' of github.com:Budibase/budibase into feature/oidc-support 2021-07-08 11:12:45 +01:00
Rory Powell 25f1368227 Merge google/oidc user authentication and surface user relevant error messages during authentication 2021-07-08 11:12:34 +01:00
Rory Powell 5ec79acabf Merge google/oidc user authentication and surface user relevant error messages during authentication 2021-07-08 11:12:34 +01:00