1
0
Fork 0
mirror of synced 2024-08-14 01:21:41 +12:00
Commit graph

401 commits

Author SHA1 Message Date
Michael Drury
45a965b041 Adding basic endpoints for API keys. 2022-02-09 23:16:24 +00:00
Mitch-Budibase
dd8b39ed06 Merge branch 'develop' into cypress-testing 2022-02-09 13:53:17 +00:00
mike12345567
dbc048b365 Review comments, renaming deployed -> prod in terms of app IDs. 2022-01-31 17:42:51 +00:00
mike12345567
476f34fb93 Merge branch 'develop' of github.com:Budibase/budibase into lab-day/refactor-app-db 2022-01-31 17:16:59 +00:00
mike12345567
e718b18127 Merge branch 'develop' of github.com:Budibase/budibase into lab-day/refactor-app-db 2022-01-31 14:09:07 +00:00
Rory Powell
bdc37b6ff7 Fix CSRF token not present using local auth 2022-01-31 11:07:54 +00:00
Rory Powell
0089fb06d9 Merge branch 'develop' into csrf 2022-01-30 21:20:48 +00:00
mike12345567
91a90e62b2 Fixing some issues discovered by the cypress tests, cleaning up how Couch is used. 2022-01-28 18:52:34 +00:00
mike12345567
d2fe119d90 Main body of work, refactoring most usages. 2022-01-27 18:18:31 +00:00
Martin McKeaveney
19d27c97a4 code review and merge with develop 2022-01-26 17:45:28 +01:00
Rory Powell
ffcf5354eb Add CSRF Token 2022-01-25 22:54:50 +00:00
Rory Powell
81e8ceff1a Merge branch 'develop' into feature/app-urls 2022-01-21 17:35:23 +00:00
Rory Powell
e0dcc7648c Remove server -> worker request to retrieve apps, remove hosting endpoints and store 2022-01-21 17:31:18 +00:00
mike12345567
1dcd3ab3ba Merge branch 'develop' of github.com:Budibase/budibase into cypress-testing 2022-01-21 13:37:05 +00:00
Rory Powell
04386bd1d8 Merge pull request #4000 from Budibase/fix/sync-apps-reset-rows-quotas
App and Row Quota Fixes
2022-01-21 11:20:14 +00:00
mike12345567
47799b8ef3 Adding fix to show the initial create table modal when a new app is created, the same as prod, when testing in cypress. 2022-01-20 12:29:28 +00:00
mike12345567
5638e92ab5 Fixing cypress tests, removing change which was added to try and fix reverted test cases. 2022-01-20 12:26:59 +00:00
Michael Drury
84f7405f02 Merge pull request #4090 from Budibase/fix/3721
Fixing issue with existing SQL relationships and deleting tables externally to Budibase
2022-01-19 15:02:15 +00:00
mike12345567
a46de08d18 Making the worker tell the UI it is in production when running in Cypress. 2022-01-19 13:05:31 +00:00
Andrew Kingston
fa2a958e73 Fix server crash when trying to log out and already logged out 2022-01-19 11:22:44 +00:00
Martin McKeaveney
9663806bfc more flexible datasource auth config 2022-01-17 15:52:10 +01:00
Martin McKeaveney
a70b96a21a gsheets E2E 2022-01-15 19:28:04 +01:00
mike12345567
bca8212d1d Merge branch 'develop' of github.com:Budibase/budibase into fix/sync-apps-reset-rows-quotas 2022-01-12 13:20:22 +00:00
mike12345567
97c6f3298a Removing use of direct package access. 2022-01-12 12:54:25 +00:00
mike12345567
5ee6aa24b2 Refactoring core library usage in monorepo, make it a bit cleaner/easier to search/more standardised. 2022-01-12 11:32:14 +00:00
Rory Powell
e58bd14dcc Merge branch 'develop' into fix/sync-apps-reset-rows-quotas 2022-01-12 09:34:14 +00:00
Rory Powell
979313f966 Enable migration 2022-01-11 18:38:18 +00:00
Rory Powell
726315afde Sync app quota to correct number, reset and disable rows quota 2022-01-11 17:49:42 +00:00
mike12345567
37d0617ace Renaming some variables to core, fixing test cases that referenced auth directly. 2022-01-11 16:18:30 +00:00
mike12345567
1327394784 Switching out @budibase/auth to @budibase/backend-core. 2022-01-10 19:33:00 +00:00
Martin McKeaveney
c2d97b9449 google auth working 2022-01-06 08:08:54 +00:00
mike12345567
efc691f238 Fixing issue #3915 so that when using the short hand URL for apps you will be redirected correctly if not logged in, allows all users to make use of it and updating the builder to send the user to the short form factor URL if not in cloud. 2022-01-05 18:26:39 +00:00
mike12345567
d61cb6c037 Some fixes after testing dynamic variables in rest a bit more. 2021-12-17 14:08:48 +00:00
mike12345567
de72792576 Setting auth cookie to not expire. 2021-12-03 12:39:20 +00:00
Martin McKeaveney
4b79045dac 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
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
Rory Powell
6af8ab2dc0 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
mike12345567
99c47ab264 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
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
Martin McKeaveney
b80a93d6d5 cookie based approach 2021-11-04 14:03:18 +01:00
Peter Clement
63b0938d36 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
74c74d78f2 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
b38704978a 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
Rory Powell
9ea1774bcf Don't perform account deletion check when self hosted 2021-10-11 11:14:44 +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
e6844d7bdf 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
ee10bce48b Don't let user exist in multiple tenants when using custom sso 2021-10-06 15:15:46 +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
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
Rory Powell
3fb83eabad 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
mike12345567
f8562015ac 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
f089c20d60 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
ee7529769f 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
Rory Powell
c74c577ab9 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
9942a2d85c 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
b964813fad 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
Martin McKeaveney
5a56570fdb 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
2da28ecc71 prevent SMTP fallback for automations 2021-09-27 16:28:39 +01:00
Martin McKeaveney
5b4bf74e2c 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
6c7423e52e 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
4a2028c354 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
Michael Drury
f45c780d99 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
87b61b5c54 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
mike12345567
3da8adfe48 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
Rory Powell
1d873d9e11 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
3576ca87be 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
689065d2b8 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
d919c44185 Add pre-hased password option to admin creation 2021-09-09 17:08:27 +01:00
Maurits Lourens
9338043133 fix test 2021-09-06 20:23:33 +02:00
Maurits Lourens
dafd06737c 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
Peter Clement
48c40446f0 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
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
506ff7dcd3 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
78a3a1cd09 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
Michael Drury
b86a6fddc9 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
88c07d28eb 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
f3ce979230 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
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
5dfeb9b3ca Limiting use of query string to a few select endpoints for determining tenant ID. 2021-07-27 18:02:59 +01:00
mike12345567
615053f201 Fixing some issues with org not being correctly detected. 2021-07-27 15:35:26 +01:00
mike12345567
4606248ffd 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
4d0faa38e3 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
82e43e0008 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
Rory Powell
eb8d857864 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
f95b550b15 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
mike12345567
313302cae2 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
1d6a350311 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
1b6a73c250 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
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
b09c2d45f9 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
Peter Clement
3f42ed74b9 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
mike12345567
83db31f899 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
e026375f50 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
d157285918 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
b7995dd61d 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
Rory Powell
5f51de257f 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
33b352c3ef 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
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
Peter Clement
283698f8c5 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
mike12345567
cc08b4fc4e Linting. 2021-07-13 17:28:05 +01:00
mike12345567
004f719dde 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