1
0
Fork 0
mirror of synced 2024-07-01 12:30:41 +12:00
Commit graph

428 commits

Author SHA1 Message Date
Rory Powell 47e4ef0704 Account portal cors and auth changes 2021-09-07 11:22:11 +01:00
Rory Powell 3d15db2223 Account portal cors and auth changes 2021-09-07 11:22:11 +01:00
Maurits Lourens de96f7384a fix unit test 2021-09-06 15:49:38 +02:00
Maurits Lourens 0b7bb885cc fix unit test 2021-09-06 15:49:38 +02:00
mike12345567 be73ff2c32 Fixing an issue with OIDC URL for preauth. 2021-08-05 14:36:10 +01:00
mike12345567 105dfb5eb9 Fixing an issue with OIDC URL for preauth. 2021-08-05 14:36:10 +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
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 f37946d47e
Revert "Multi-tenancy/organisations" 2021-08-04 10:02:24 +01:00
Michael Drury b86a6fddc9 Revert "Multi-tenancy/organisations" 2021-08-04 10:02:24 +01:00
mike12345567 5dc7b4b09e Fixing some issues highlighted by worker test cases. 2021-08-03 17:14:17 +01:00
mike12345567 4e13dde657 Fixing some issues highlighted by worker test cases. 2021-08-03 17:14:17 +01:00
mike12345567 55ff798803 Linting. 2021-08-03 15:41:51 +01:00
mike12345567 88c07d28eb Linting. 2021-08-03 15:41:51 +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 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 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 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 ca880c4549 Removing unused mock. 2021-07-30 14:25:38 +01:00
mike12345567 8bcce17cd7 Removing unused mock. 2021-07-30 14:25:38 +01:00
mike12345567 4dbec64801 Fixing config test case. 2021-07-30 14:23:40 +01:00
mike12345567 79c5f01267 Fixing config test case. 2021-07-30 14:23:40 +01:00
mike12345567 61c8f2935b Linting. 2021-07-26 13:31:39 +01:00
mike12345567 dd1f1fec3b Linting. 2021-07-26 13:31:39 +01:00
mike12345567 c7d4c9793a Adding in admin API backwards compat. 2021-07-26 13:23:11 +01:00
mike12345567 d03229caba Adding in admin API backwards compat. 2021-07-26 13:23:11 +01:00
mike12345567 19ad28a491 Adding mechanism for lookup of userId/email to tenantId. 2021-07-23 19:22:04 +01:00
mike12345567 9a9c552629 Adding mechanism for lookup of userId/email to tenantId. 2021-07-23 19:22:04 +01:00
mike12345567 1153001af8 Linting. 2021-07-22 22:37:20 +01:00
mike12345567 3f7bafe23d Linting. 2021-07-22 22:37:20 +01:00
mike12345567 155e30965f Fixing test cases and bugs that they raised. 2021-07-22 22:36:16 +01:00
mike12345567 313302cae2 Fixing test cases and bugs that they raised. 2021-07-22 22:36:16 +01:00
mike12345567 8bf275ca44 Linting. 2021-07-22 16:37:50 +01:00
mike12345567 24012c2fba Linting. 2021-07-22 16:37:50 +01:00
mike12345567 0473c295d3 Changing how flags are handled. 2021-07-22 16:36:21 +01:00
mike12345567 1d6a350311 Changing how flags are handled. 2021-07-22 16:36:21 +01:00
mike12345567 f2e713f5af Adding fallbacks for oidc and google. 2021-07-22 15:26:14 +01:00
mike12345567 b21fe320c5 Adding fallbacks for oidc and google. 2021-07-22 15:26:14 +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 27b2a13817 Swapping admin -> global in worker to reduce confusion in API url naming. 2021-07-22 12:56:47 +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 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 e3744c0b20 Linting and adding tenancy API. 2021-07-20 18:03:16 +01:00
mike12345567 b09c2d45f9 Linting and adding tenancy API. 2021-07-20 18:03:16 +01:00
mike12345567 2182645339 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-20 15:56:12 +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 6dce0a88a4 Add activated toggle and login functionality to support this 2021-07-20 09:27:12 +01:00
Peter Clement 0fa68a2d50 Add activated toggle and login functionality to support this 2021-07-20 09:27:12 +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 83db31f899 A lot of general fixes around getting logged in, setting up users etc. 2021-07-19 19:00:53 +01:00
mike12345567 8241df2581 Fixing some tenancy issues. 2021-07-19 12:57:52 +01:00
mike12345567 e56a0f5aa3 Fixing some tenancy issues. 2021-07-19 12:57:52 +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 f3156fca06 Further work, tenancy now working but some more work to be done. 2021-07-16 18:04:49 +01:00
mike12345567 f0f9736c0b Updating auth to utilise the tenant system. 2021-07-16 15:08:58 +01:00
mike12345567 b7995dd61d Updating auth to utilise the tenant system. 2021-07-16 15:08:58 +01:00
mike12345567 5ffe3c7935 First version of multi-tenancy, work still to be done. 2021-07-15 17:57:02 +01:00
mike12345567 912659a8ad First version of multi-tenancy, work still to be done. 2021-07-15 17:57:02 +01:00
Rory Powell 70601b7cc5 Store OIDC config in cookie instead of URL 2021-07-15 16:20:31 +01:00
Rory Powell 33b352c3ef Store OIDC config in cookie instead of URL 2021-07-15 16:20:31 +01:00
Peter Clement ab1a10dd1b Fix config form saving bugs 2021-07-13 21:47:36 +01:00
Peter Clement 283698f8c5 Fix config form saving bugs 2021-07-13 21:47:36 +01:00
mike12345567 e296a67b50 Renaming groups to workspaces. 2021-07-13 17:27:04 +01:00
mike12345567 004f719dde Renaming groups to workspaces. 2021-07-13 17:27:04 +01:00
Rory Powell 40013d45c3 Load oidc config by id 2021-07-13 17:07:48 +01:00
Rory Powell dd306d59c5 Load oidc config by id 2021-07-13 17:07:48 +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 9dd05ec96e Add UUID to each oidc config to distinguish each provider 2021-07-13 15:52:21 +01:00
Peter Clement ca0f74eee8 improve structure of OIDC config 2021-07-13 14:55:14 +01:00
Peter Clement af792cc09e improve structure of OIDC config 2021-07-13 14:55:14 +01:00
Rory Powell 1a7619367b Refactor auth controller tests to reuse common behaviour 2021-07-13 10:28:15 +01:00
Rory Powell 5f5fe92807 Refactor auth controller tests to reuse common behaviour 2021-07-13 10:28:15 +01:00
Rory Powell e1bea33d9a Unit test auth controller oidc functions 2021-07-11 17:54:18 +01:00
Rory Powell 4d3f44f982 Unit test auth controller oidc functions 2021-07-11 17:54:18 +01:00
Peter Clement de075a7549 Fix OIDC logo conditional display 2021-07-09 15:50:46 +01:00
Peter Clement b94348dddc Fix OIDC logo conditional display 2021-07-09 15:50:46 +01:00
Peter Clement 90e6db2be1 Linting and Optimisation 2021-07-09 15:05:39 +01:00
Peter Clement 5a86d6bb6d Linting and Optimisation 2021-07-09 15:05:39 +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 7138070e4c Fix bug where OIDC icon was not being displayed due to misconfiguration 2021-07-09 14:18:03 +01:00
Rory Powell 63b13fc360 Merge branch 'develop' into feature/oidc-support 2021-07-08 20:15:16 +01:00
Rory Powell 73c8dcf71b Merge branch 'develop' into feature/oidc-support 2021-07-08 20:15:16 +01:00
mike12345567 2bee348721 Fixing test cases. 2021-07-08 00:30:55 +01:00
mike12345567 b0fb7ae991 Fixing test cases. 2021-07-08 00:30:55 +01:00
mike12345567 2fc606f5b5 Linting. 2021-07-07 23:30:14 +01:00
mike12345567 93302cb667 Linting. 2021-07-07 23:30:14 +01:00
mike12345567 cc67e2caa6 Adding sessions API. 2021-07-07 23:29:19 +01:00
mike12345567 4916ff7eb8 Adding sessions API. 2021-07-07 23:29:19 +01:00
Peter Clement 4b518af605 Merge branch 'feature/oidc-support' of https://github.com/Budibase/budibase into oidc-config-management 2021-07-07 17:42:31 +01:00
Peter Clement 2e49686eab Merge branch 'feature/oidc-support' of https://github.com/Budibase/budibase into oidc-config-management 2021-07-07 17:42:31 +01:00
Peter Clement b5f398da4d Allow user uploaded icons in oidc config 2021-07-07 13:41:09 +01:00
Peter Clement 37b1200051 Allow user uploaded icons in oidc config 2021-07-07 13:41:09 +01:00
Bernhard Hayden 65c436145a Proof of concept OIDC implementation 2021-07-06 10:03:40 +01:00
Bernhard Hayden baab7141c0 Proof of concept OIDC implementation 2021-07-06 10:03:40 +01:00
Peter Clement f61c5b8143 Add validation to backend for OIDC configuration 2021-07-05 14:27:19 +01:00
Peter Clement 0e6fb73b9e Add validation to backend for OIDC configuration 2021-07-05 14:27:19 +01:00
mike12345567 f244b7b075 Implementing feature #1700 and making it possible to remove logo. 2021-06-21 18:01:25 +01:00
mike12345567 61d810edfe Implementing feature #1700 and making it possible to remove logo. 2021-06-21 18:01:25 +01:00
mike12345567 60de9ccb28 Fixing issue with 1:N relationships and multiple fields, issue #1753. 2021-06-20 10:53:55 +01:00
mike12345567 052d14ad38 Fixing issue with 1:N relationships and multiple fields, issue #1753. 2021-06-20 10:53:55 +01:00
mike12345567 386c8890a5 Adding longer timeout for real email tests. 2021-06-15 13:22:38 +01:00
mike12345567 290cf98704 Adding longer timeout for real email tests. 2021-06-15 13:22:38 +01:00
mike12345567 eb3222a0bc Updating SMTP config to show better errors. 2021-06-09 15:45:54 +01:00
mike12345567 22431a4ea2 Updating SMTP config to show better errors. 2021-06-09 15:45:54 +01:00
mike12345567 2057985631 Fixing issue with roles not being added correctly to global users and cleaning up roles when an app is deleted. 2021-06-01 15:58:40 +01:00
mike12345567 c81a8ba3ed Fixing issue with roles not being added correctly to global users and cleaning up roles when an app is deleted. 2021-06-01 15:58:40 +01:00
mike12345567 d89c750761 Updating system to allow setting builder/admin as a toggle during the invitation phase of a user. 2021-05-24 18:45:43 +01:00
mike12345567 18dd7322e4 Updating system to allow setting builder/admin as a toggle during the invitation phase of a user. 2021-05-24 18:45:43 +01:00
mike12345567 428a9e5ba3 Formatting. 2021-05-24 14:56:23 +01:00
mike12345567 4b786f51d2 Formatting. 2021-05-24 14:56:23 +01:00
mike12345567 292d520b30 Adding some changes for to redis library, allowing reconnection. 2021-05-24 14:54:47 +01:00
mike12345567 0a4c4f1cc0 Adding some changes for to redis library, allowing reconnection. 2021-05-24 14:54:47 +01:00
mike12345567 a39b633c90 Formatting and adding routing checks to push the user out of admin menus when they are not an admin. 2021-05-21 17:12:25 +01:00
mike12345567 59de40c4ef Formatting and adding routing checks to push the user out of admin menus when they are not an admin. 2021-05-21 17:12:25 +01:00
mike12345567 18cbb02bf9 Updating administration middleware so that internal requests allowed through automatically. 2021-05-21 16:43:01 +01:00
mike12345567 c6a6d49cd7 Updating administration middleware so that internal requests allowed through automatically. 2021-05-21 16:43:01 +01:00
Keviin Åberg Kultalahti 3593073c00 change forceReset bool name 2021-05-21 12:10:02 +02:00
Keviin Åberg Kultalahti 8735ef088f change forceReset bool name 2021-05-21 12:10:02 +02:00
Keviin Åberg Kultalahti 81726501ee Merge branch 'next' into fixes/user-management 2021-05-20 11:02:15 +02:00
Keviin Åberg Kultalahti 0346ef9bb1 Merge branch 'next' into fixes/user-management 2021-05-20 11:02:15 +02:00
mike12345567 584f7c2403 Fixing worker test cases. 2021-05-19 16:39:17 +01:00
mike12345567 12bbe19ed0 Fixing worker test cases. 2021-05-19 16:39:17 +01:00
mike12345567 6d6eee2a93 Adding the ability to get all apps, with the status attached. 2021-05-19 15:09:57 +01:00
mike12345567 0bbd45b413 Adding the ability to get all apps, with the status attached. 2021-05-19 15:09:57 +01:00
mike12345567 af531241c4 Adding a get self endpoint in the global users. 2021-05-19 13:37:59 +01:00
mike12345567 91ed6679c4 Adding a get self endpoint in the global users. 2021-05-19 13:37:59 +01:00
mike12345567 31d3566626 Allowing null for global user endpoint properties. 2021-05-19 13:30:55 +01:00
mike12345567 5e7ca07af7 Allowing null for global user endpoint properties. 2021-05-19 13:30:55 +01:00
mike12345567 14b62b8aed Removing admin middleware applying to everything. 2021-05-19 13:22:05 +01:00
mike12345567 c2cd365e76 Removing admin middleware applying to everything. 2021-05-19 13:22:05 +01:00
mike12345567 1956d9765e Adding admin only endpoint, removing the ability to create/delete global users from the app server and adding a global self user update. 2021-05-19 13:17:50 +01:00
mike12345567 f08b894e55 Adding admin only endpoint, removing the ability to create/delete global users from the app server and adding a global self user update. 2021-05-19 13:17:50 +01:00
Keviin Åberg Kultalahti 06af8e70e6 add forcePasswordReset bool to user object validation 2021-05-19 13:24:14 +02:00
Keviin Åberg Kultalahti dc0fb8fbfe add forcePasswordReset bool to user object validation 2021-05-19 13:24:14 +02:00
Keviin Åberg Kultalahti 771467fba1 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:49:09 +02:00
Keviin Åberg Kultalahti 9329644cf5 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 b416207292 Making sure routes are included. 2021-05-14 16:47:47 +01:00
mike12345567 ac0f620b38 Formatting. 2021-05-14 16:32:51 +01:00
mike12345567 a61edd8124 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
Keviin Åberg Kultalahti 4df56ce457 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 c947199558 Adding administration roles API. 2021-05-14 16:31:07 +01:00
mike12345567 d7dc133e43 Updating valid to optionals. 2021-05-12 15:44:16 +01:00
mike12345567 5d387870d2 Updating valid to optionals. 2021-05-12 15:44:16 +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 0aabcf5a47 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
mike12345567 92cc0bc7cd 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 6a688c7aad 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
Martin McKeaveney b1d60cc6b6 email template E2E, adding preview 2021-05-11 14:44:43 +01:00
mike12345567 339554b163 Adding link to the real email test. 2021-05-11 12:04:07 +01:00
mike12345567 1d643b6315 Adding link to the real email test. 2021-05-11 12:04:07 +01:00
Martin McKeaveney b415fb2089 pull template type from body instead of params 2021-05-10 14:41:52 +01:00
Martin McKeaveney 8174f44d40 pull template type from body instead of params 2021-05-10 14:41:52 +01:00
mike12345567 902119c39c Updating with a tested and functional API for uploading files for configs. 2021-05-07 13:55:30 +01:00
mike12345567 4e3bc326b4 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 7588030780 SMTP and template management E2E 2021-05-06 18:02:44 +01:00
Martin McKeaveney 23cb160a69 merge with next 2021-05-06 11:56:53 +01:00
Martin McKeaveney 559b8789f6 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 42e0b3c1f9 lint 2021-05-06 10:57:24 +01:00
Martin McKeaveney efacbe861a unit tests 2021-05-06 10:54:01 +01:00
Martin McKeaveney 7d09bd8d70 unit tests 2021-05-06 10:54:01 +01:00
Martin McKeaveney 1aedba80bd first time setup E2E 2021-05-05 21:56:43 +01:00
Martin McKeaveney fd2e2c0415 first time setup E2E 2021-05-05 21:56:43 +01:00
Martin McKeaveney 4377b41f40 endpoint for budibase configuration checklist 2021-05-05 20:58:31 +01:00
Martin McKeaveney 39b293aa9d 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 b3292e991a 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 82687bad26 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 83c16a9f14 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 2ee4fd21e4 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 48236b2c2f 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 5d2c1c23aa 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 403ee4a870 Formatting. 2021-05-05 15:19:44 +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 7bc3514fc1 Finalising the usage of redis in the password reset and invitation systems. 2021-05-05 15:10:28 +01:00
Martin McKeaveney 88a5660bc3 google oauth UI 2021-05-04 17:31:06 +01:00
Martin McKeaveney cb02c9bf58 google oauth UI 2021-05-04 17:31:06 +01: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 58ca0d4224 Updating auth middleware to accomodate public endpoints for the server properly and some refactoring. 2021-04-28 18:13:21 +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 08c158c121 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 02031ce8c9 Formatting, linting and handling year copyright properly. 2021-04-26 14:24:07 +01:00
mike12345567 b3933103a8 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 cba2b9a27d 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 819d6e79f5 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