Commit Graph

612 Commits

Author SHA1 Message Date
mike12345567 3080ab78a1 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-08-04 15:25:14 +01:00
Budibase Release Bot d94d3c05b1 v0.9.96 2021-08-04 14:06:11 +00:00
Budibase Staging Release Bot 014cc22f2f v0.9.96-alpha.0 2021-08-04 12:28:24 +00:00
Martin McKeaveney d9ad54d939 merge with master 2021-08-04 13:20:11 +01:00
Budibase Staging Release Bot 9ccefa08df v0.9.87-alpha.9 2021-08-04 11:17:18 +00:00
Budibase Staging Release Bot 480889352f v0.9.87-alpha.8 2021-08-04 10:59:07 +00:00
Budibase Release Bot e3361b6944 v0.9.95 2021-08-04 09:46:58 +00:00
Budibase Release Bot 6ffdb68be8 v0.9.94 2021-08-04 09:10:05 +00:00
Michael Drury 655bfe1a0c
Merge branch 'develop' into feature/multi-tenants 2021-08-04 10:07:31 +01:00
Michael Drury f37946d47e
Revert "Multi-tenancy/organisations" 2021-08-04 10:02:24 +01:00
Michael Drury 1beca4ee96
Merge pull request #2076 from Budibase/feature/multi-tenants
Multi-tenancy/organisations
2021-08-04 10:01:22 +01:00
Budibase Staging Release Bot 97cf8c53df v0.9.87-alpha.7 2021-08-04 08:58:12 +00:00
Budibase Staging Release Bot 20a08f2696 v0.9.87-alpha.6 2021-08-03 21:01:15 +00:00
mike12345567 5dc7b4b09e Fixing some issues highlighted by worker test cases. 2021-08-03 17:14:17 +01:00
Budibase Release Bot cc38b0af0f v0.9.93 2021-08-03 16:02:29 +00:00
mike12345567 55ff798803 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
Budibase Staging Release Bot b8d94c7cb5 v0.9.87-alpha.5 2021-08-03 12:48:30 +00:00
Budibase Release Bot c059926da6 v0.9.92 2021-08-03 09:21:53 +00:00
Budibase Release Bot 55c14935a7 v0.9.91 2021-08-03 09:12:12 +00:00
mike12345567 75ae7ac8d6 Linting. 2021-08-02 18:36:32 +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
Budibase Release Bot 0b50867dd6 v0.9.90 2021-08-02 14:49:04 +00:00
Budibase Release Bot 8d2040cae4 v0.9.89 2021-08-02 14:36:56 +00:00
Budibase Staging Release Bot 9b66b6090f v0.9.87-alpha.4 2021-08-02 13:02:24 +00: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
Budibase Release Bot 758833a191 v0.9.88 2021-07-30 18:07:23 +00:00
Budibase Release Bot 9dbd67b57f v0.9.87 2021-07-30 17:25:31 +00:00
mike12345567 6c6ca18f98 Fixing worker dev script to not overwrite env file everytime. 2021-07-30 15:40:39 +01:00
mike12345567 ca880c4549 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
Budibase Staging Release Bot 0cb528489c v0.9.87-alpha.3 2021-07-30 11:04:41 +00:00
Budibase Staging Release Bot 0df305205e v0.9.87-alpha.2 2021-07-30 10:33:02 +00:00
Rory Powell be241bc1cc
Merge pull request #2182 from Budibase/feature/watchtower-hooks
Add watchtower hooks
2021-07-30 11:25:38 +01:00
Budibase Staging Release Bot 110a39e7f4 v0.9.87-alpha.1 2021-07-29 21:44:52 +00:00
Rory Powell 25a737ac74 Add watchtower hooks 2021-07-29 20:32:18 +01:00
Budibase Staging Release Bot 7a42898ef8 v0.9.87-alpha.0 2021-07-29 10:20:04 +00:00
Rory Powell 079e78b557 Merge master -> develop version bump 0.9.86 2021-07-29 10:55:31 +01:00
Budibase Staging Release Bot b90435756d v0.9.86-alpha.0 2021-07-29 09:19:25 +00:00
Budibase Release Bot 6f190345de v0.9.86 2021-07-29 09:17:21 +00:00
Budibase Release Bot 3b3211b978 v0.9.85 2021-07-28 21:57:53 +00:00
Budibase Release Bot a804cabbe8 v0.9.84 2021-07-28 09:34:03 +00: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
Budibase Release Bot fa307c9a59 v0.9.83 2021-07-27 16:13:27 +00:00
mike12345567 fb562908ee Fixing some issues with public endpoints causing logout loop. 2021-07-27 16:17:02 +01:00
Budibase Staging Release Bot 01a1fce0f8 v0.9.83-alpha.0 2021-07-27 14:50:45 +00:00
mike12345567 1df08ffe35 Fixing some issues with org not being correctly detected. 2021-07-27 15:35:26 +01:00
Martin McKeaveney 30be2a00fa Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-27 12:03:20 +01:00
Budibase Release Bot 10180ba277 v0.9.82 2021-07-27 11:01:29 +00:00
Martin McKeaveney e7153277fb merge 2021-07-27 11:58:41 +01:00
mike12345567 e2e796cd9d Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-27 10:32:18 +01:00
Budibase Release Bot 03acad2d89 v0.9.81 2021-07-27 09:20:57 +00:00
Budibase Staging Release Bot 2ecb2de1d2 v0.9.80-alpha.9 2021-07-27 09:11:15 +00:00
Budibase Release Bot 805464b474 v0.9.80 2021-07-27 09:07:05 +00:00
Budibase Staging Release Bot 0dbec1f1a4 v0.9.80-alpha.8 2021-07-26 21:20:37 +00:00
mike12345567 2f225a4448 Adding ability to disable/enable multi-tenancy flags easily. 2021-07-26 16:17:56 +01:00
mike12345567 61c8f2935b 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 5c58630ed7 Fixing up everything found when testing with Cypress. 2021-07-26 13:19:47 +01:00
Budibase Staging Release Bot eaf656a85d v0.9.80-alpha.7 2021-07-26 09:34:02 +00:00
Budibase Staging Release Bot 9b0daf925c v0.9.80-alpha.6 2021-07-26 08:23:08 +00:00
Budibase Staging Release Bot ef396a1a48 v0.9.80-alpha.5 2021-07-26 07:42:30 +00:00
Budibase Staging Release Bot 3b3b90c721 v0.9.80-alpha.4 2021-07-25 11:22:12 +00:00
Michael Drury 4875488ccd
Merge pull request #2086 from Budibase/fix/edit-roles-modal
Fixes for issue #2077
2021-07-25 12:14:31 +01:00
Budibase Staging Release Bot ef3ee02885 v0.9.80-alpha.3 2021-07-25 10:58:35 +00:00
Michael Drury 72e392608d Adding checks around the edit roles modal. 2021-07-25 11:46:40 +01:00
Budibase Staging Release Bot 88dbb17af0 v0.9.80-alpha.2 2021-07-24 11:22:42 +00:00
mike12345567 cfea184633 Linting. 2021-07-23 20:03:11 +01:00
mike12345567 a384cc059d Changing how apps are retrieved to be more efficient. 2021-07-23 20:01:53 +01:00
mike12345567 19ad28a491 Adding mechanism for lookup of userId/email to tenantId. 2021-07-23 19:22:04 +01:00
Budibase Staging Release Bot 88b53b34a0 v0.9.80-alpha.1 2021-07-23 17:41:06 +00:00
Rory Powell 51a1cd5f43 Fix staging version 2021-07-23 18:31:45 +01:00
Budibase Staging Release Bot dcec1accc2 v0.9.79-alpha.5 2021-07-23 16:55:34 +00:00
mike12345567 7fe7ca9411 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-23 17:52:30 +01:00
mike12345567 f86aa0ac78 Removing accidental symbols. 2021-07-23 17:26:54 +01:00
mike12345567 e4eb2d34b2 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-23 17:20:41 +01:00
Budibase Staging Release Bot c2cd7f639c v0.9.79-alpha.4 2021-07-23 16:13:42 +00:00
Budibase Release Bot 7ec521c0e9 v0.9.79 2021-07-23 16:08:58 +00: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
Budibase Staging Release Bot 91fe930b7e v0.9.79-alpha.3 2021-07-23 15:46:11 +00:00
Rory Powell d7bbae9196 Require https callback in production, allow for http otherwise 2021-07-23 15:47:48 +01:00
Budibase Staging Release Bot e45a6f6778 v0.9.79-alpha.2 2021-07-23 14:05:23 +00:00
Rory Powell 0073b554d4
Merge pull request #2073 from Budibase/fix/google-button
Mark google activated by default for old configs
2021-07-23 14:56:44 +01:00
Rory Powell 8a77947a01 Linting 2021-07-23 14:42:28 +01:00
Rory Powell b5c12e6265 Mark google activated by default for old configs 2021-07-23 14:40:22 +01:00
Budibase Staging Release Bot 5ef00cd2a4 v0.9.79-alpha.1 2021-07-23 11:08:21 +00:00
Rory Powell af28a7ed6b Mark google activated by default for old configs 2021-07-23 11:38:17 +01:00
Budibase Staging Release Bot c71d8a4f42 v0.9.79-alpha.0 2021-07-23 09:37:21 +00:00
mike12345567 1153001af8 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 8bf275ca44 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 f2e713f5af Adding fallbacks for oidc and google. 2021-07-22 15:26:14 +01:00
mike12345567 853b7b6fdc Linting. 2021-07-22 14:29:30 +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 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 e3744c0b20 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
Peter Clement 32b2093cff Merge remote-tracking branch 'origin/develop' into oidc-config-management 2021-07-20 12:57:58 +01:00
Peter Clement 6dce0a88a4 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 99fe16d169 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-19 17:35:48 +01:00
mike12345567 63dba7b574 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-19 16:24:19 +01:00
Budibase Release Bot f518890ae0 v0.9.78 2021-07-19 14:23:03 +00:00
mike12345567 8241df2581 Fixing some tenancy issues. 2021-07-19 12:57:52 +01:00
Budibase Release Bot 49f1c20f17 v0.9.77 2021-07-16 18:52:46 +00:00
mike12345567 c248844a24 Adding organisation page. 2021-07-16 18:24:32 +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 f0f9736c0b Updating auth to utilise the tenant system. 2021-07-16 15:08:58 +01:00
Budibase Release Bot 5b2c463ebf v0.9.76 2021-07-15 23:23:00 +00:00
mike12345567 5ffe3c7935 First version of multi-tenancy, work still to be done. 2021-07-15 17:57:02 +01:00
Rory Powell 25fdde6d21 Default public config.config when missing 2021-07-15 16:50:57 +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 70601b7cc5 Store OIDC config in cookie instead of URL 2021-07-15 16:20:31 +01:00
Peter Clement 4e75b7f4c9 add new logic to support oauth and oidc buttons 2021-07-15 15:49:10 +01:00
Rory Powell 90c0e7b2c1 Merge branch 'develop' into feature/oidc-support 2021-07-15 14:05:30 +01:00
Budibase Release Bot fb334c6f15 v0.9.75 2021-07-15 10:12:28 +00:00
Michael Drury 4101c45c4b
Merge pull request #1989 from Budibase/fix/email-explanation
Email template descriptions/information
2021-07-15 11:04:36 +01:00
mike12345567 ccb0e1b354 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-14 13:54:39 +01:00
mike12345567 cb1514cb1a Merge branch 'master' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-14 13:53:57 +01:00
mike12345567 1fa0b3f204 Rewording email template descriptions. 2021-07-14 13:24:46 +01:00
mike12345567 da5024633b Linting. 2021-07-14 13:18:27 +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 ab1a10dd1b Fix config form saving bugs 2021-07-13 21:47:36 +01:00
Budibase Release Bot be0559606a v0.9.74 2021-07-13 16:53:42 +00:00
Rory Powell fef63a1b8e Update config checklist to handle multiple sso sources 2021-07-13 17:30:17 +01:00
mike12345567 d17456bacf Linting. 2021-07-13 17:28:05 +01:00
mike12345567 e296a67b50 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
Peter Clement 2900743545 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
Rory Powell 1a7619367b Refactor auth controller tests to reuse common behaviour 2021-07-13 10:28:15 +01:00
Martin McKeaveney 742402f4c7 merge with master 2021-07-11 18:07:46 +01:00
Rory Powell e1bea33d9a Unit test auth controller oidc functions 2021-07-11 17:54:18 +01:00
Budibase Release Bot 3b07d3143b v0.9.73 2021-07-09 17:29:06 +00:00
Kyle Harrison b4afda7b09 apply fixes for common spelling mistakes 2021-07-09 17:54:49 +01:00
Peter Clement de075a7549 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 4ae29f6b54 Fix bug where OIDC icon was not being displayed due to misconfiguration 2021-07-09 14:18:03 +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 63b13fc360 Merge branch 'develop' into feature/oidc-support 2021-07-08 20:15:16 +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 db9078cebe Linting 2021-07-08 13:12:25 +01:00
Rory Powell aa601f3701 Integrate with configuration ui / support for email usernames 2021-07-08 13:04:04 +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 5ec79acabf Merge google/oidc user authentication and surface user relevant error messages during authentication 2021-07-08 11:12:34 +01:00
mike12345567 2bee348721 Fixing test cases. 2021-07-08 00:30:55 +01:00
mike12345567 2fc606f5b5 Linting. 2021-07-07 23:30:14 +01:00
mike12345567 cc67e2caa6 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