1
0
Fork 0
mirror of synced 2024-08-25 15:01:31 +12:00
Commit graph

808 commits

Author SHA1 Message Date
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