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

346 commits

Author SHA1 Message Date
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
Rory Powell
239e39e5ed 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
a31cce0ff9 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
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
Peter Clement
9dd05ec96e 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
Rory Powell
5f5fe92807 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
Rory Powell
4d3f44f982 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
Peter Clement
b94348dddc 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
7138070e4c 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
Rory Powell
73c8dcf71b 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
c16cfc328f 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
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
25f1368227 Merge google/oidc user authentication and surface user relevant error messages during authentication 2021-07-08 11:12:34 +01:00
mike12345567
b0fb7ae991 Fixing test cases. 2021-07-08 00:30:55 +01:00
mike12345567
93302cb667 Linting. 2021-07-07 23:30:14 +01:00
mike12345567
4916ff7eb8 Adding sessions API. 2021-07-07 23:29:19 +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
7a51eba93c Add OIDC icon to login page 2021-07-07 17:39:26 +01:00
Peter Clement
37b1200051 Allow user uploaded icons in oidc config 2021-07-07 13:41:09 +01:00
Rory Powell
c15051462e Add info to 403 responses 2021-07-07 13:28:55 +01:00
mike12345567
b847f85d91 WIP - first version of user sessions. 2021-07-06 18:10:04 +01:00
Rory Powell
7803540399 Use configuration url to retrieve oidc endpoints
The /.well-known/openid-configuration endpoint can be used to
retrieve the majority of configuration needed for oidc

Additionally refactor the callback url to be generated on the server
side as this is a fixed endpoint.

Add linting fixes
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
0e6fb73b9e Add validation to backend for OIDC configuration 2021-07-05 14:27:19 +01:00
mike12345567
ae84345d27 Fixing issue with full list of apps not appearing in user administration, meaning couldn't update roles. 2021-07-01 11:29:27 +01:00
mike12345567
f4757aeee1 Fixing issues discovered by cypress tests. 2021-06-21 18:37:14 +01:00
mike12345567
7039b8d7eb Linting. 2021-06-21 18:02:09 +01:00
mike12345567
61d810edfe Implementing feature #1700 and making it possible to remove logo. 2021-06-21 18:01:25 +01:00
mike12345567
ed5dd08c66 Fixing authentication with API key issue. 2021-06-21 17:13:06 +01:00
mike12345567
052d14ad38 Fixing issue with 1:N relationships and multiple fields, issue #1753. 2021-06-20 10:53:55 +01:00
Andrew Kingston
ab6e31811b Merge pull request #1712 from Budibase/fix/eslint-prettier
Fix eslint, update eslint and prettier versions and update package scripts
2021-06-16 09:22:07 +01:00
Andrew Kingston
32a3c2bbb6 Lint with prettier 2021-06-15 19:39:40 +01:00
mike12345567
290cf98704 Adding longer timeout for real email tests. 2021-06-15 13:22:38 +01:00
mike12345567
86f13557ca Adding options to SMTP form for configuring TLS/STARTTLS. 2021-06-10 11:25:06 +01:00
mike12345567
22431a4ea2 Updating SMTP config to show better errors. 2021-06-09 15:45:54 +01:00
Michael Drury
b48342c55c Linting. 2021-06-08 18:29:34 +01:00
mike12345567
fe66c3535c Fixing a collection of issues, specifically users being exported/imported and issues with database import causing weirdness (metadata doc being wrong). 2021-06-08 18:06:16 +01:00
mike12345567
1e9ce62261 Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-06-07 13:22:27 +01:00
mike12345567
1da4b31890 Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-06-02 10:08:57 +01:00
Martin McKeaveney
e927f44c12 removing superfluous controllers 2021-06-01 20:22:56 +01:00
Martin McKeaveney
aacaca3d4e update functionality complete 2021-06-01 20:17:06 +01:00
Martin McKeaveney
edfc23454d Merge branch 'master' of https://github.com/Budibase/budibase into lab-day-2705 2021-06-01 19:24:24 +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
Martin McKeaveney
0c90f9ffc5 adding watchtower to docker config 2021-05-28 10:09:32 +01:00
mike12345567
1146d508fd Fixing app cypress test cases. 2021-05-25 13:25:42 +01:00
mike12345567
921eb39227 Fixing the creation of user in cypress. 2021-05-25 11:06:50 +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
7e6f215598 Linting and fixing an issue with the dev pass through. 2021-05-24 16:20:02 +01:00
mike12345567
4b786f51d2 Formatting. 2021-05-24 14:56:23 +01:00
mike12345567
0a4c4f1cc0 Adding some changes for to redis library, allowing reconnection. 2021-05-24 14:54:47 +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
348c61a8c5 Merge branch 'master' of github.com:Budibase/budibase into fix/lockdown-admin 2021-05-21 16:54:52 +01:00
mike12345567
c6a6d49cd7 Updating administration middleware so that internal requests allowed through automatically. 2021-05-21 16:43:01 +01:00
Michael Drury
7fb9673217 Merge pull request #1537 from Budibase/feature/app-updated-at
Mike fixes + application updated at timestamps
2021-05-21 16:10:29 +01:00
mike12345567
ede7e38442 Merge branch 'master' of github.com:Budibase/budibase into feature/app-updated-at 2021-05-21 14:57:41 +01:00
mike12345567
a6e196a351 Making sure roles object is always present, issue #1529. 2021-05-21 14:56:06 +01:00
Martin McKeaveney
bef216527d simpler check using checklist 2021-05-21 14:55:11 +01:00
mike12345567
06353409bc Making sure the email sends out the write port if no platform URL is set. 2021-05-21 14:38:46 +01:00
Keviin Åberg Kultalahti
a4de6d49c8 Merge branch 'master' into fixes/user-management 2021-05-21 13:32:55 +02:00
Michael Drury
f76c7d9684 Merge pull request #1514 from Budibase/fix/per-app-login
Removing per app login screens
2021-05-21 11:11:21 +01:00
Keviin Åberg Kultalahti
8735ef088f change forceReset bool name 2021-05-21 12:10:02 +02:00
Martin McKeaveney
e83f600b9e removing skip_setup as it was preventing init 2021-05-20 21:42:27 +01:00
mike12345567
0b924908fd Formatting. 2021-05-20 20:48:46 +01:00
mike12345567
4d6e4475d3 Fixing some issues found when testing. 2021-05-20 20:48:24 +01:00
Keviin Åberg Kultalahti
0346ef9bb1 Merge branch 'next' into fixes/user-management 2021-05-20 11:02:15 +02:00
mike12345567
12bbe19ed0 Fixing worker test cases. 2021-05-19 16:39:17 +01:00
mike12345567
c6f7f115b5 Fixing issues with the user table within the apps. 2021-05-19 15:55:00 +01:00
mike12345567
0bbd45b413 Adding the ability to get all apps, with the status attached. 2021-05-19 15:09:57 +01:00
mike12345567
91ed6679c4 Adding a get self endpoint in the global users. 2021-05-19 13:37:59 +01:00
mike12345567
5e7ca07af7 Allowing null for global user endpoint properties. 2021-05-19 13:30:55 +01:00
mike12345567
c2cd365e76 Removing admin middleware applying to everything. 2021-05-19 13:22:05 +01:00
mike12345567
db3497c83a Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:18:38 +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
dc0fb8fbfe add forcePasswordReset bool to user object validation 2021-05-19 13:24:14 +02:00
mike12345567
14cd1744ff Updating reset link to match that of the builder. 2021-05-18 15:48:28 +01:00
mike12345567
e9b9ada128 Building up the API interactions for the forgotten password flow. 2021-05-18 15:26:09 +01:00
Keviin Åberg Kultalahti
39d5e4ef45 Merge branch 'next' into admin/user-management-ui 2021-05-18 12:27:46 +02:00
Keviin Åberg Kultalahti
9f5e891b72 lint:fix 2021-05-18 12:21:57 +02:00
Keviin Åberg Kultalahti
7c3e7ab7aa updates invite url 2021-05-18 12:18:06 +02:00
Martin McKeaveney
ee9a097979 lint 2021-05-17 21:43:50 +01:00
Keviin Åberg Kultalahti
9eaabda8a5 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 16:41:46 +02:00
mike12345567
cf056ade04 Updating templating bindings enumerations. 2021-05-17 15:30:24 +01:00
Keviin Åberg Kultalahti
7082a1aaa2 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:53:32 +02:00
mike12345567
30f6238d45 don't use the _id prop of the app metadata. 2021-05-17 14:52:49 +01:00
Keviin Åberg Kultalahti
7fa617a543 erge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:29:33 +02:00
mike12345567
e51afc7451 Updating roles API further so find API works too. 2021-05-17 14:28:41 +01:00
mike12345567
17504443df Merge branch 'feature/draft-apps' of github.com:Budibase/budibase into feature/draft-apps 2021-05-17 14:24:36 +01:00
Keviin Åberg Kultalahti
56e09c9b7b Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:21:48 +02:00
mike12345567
277ceb3ad1 Updating role system to never think about the dev app. 2021-05-17 14:20:19 +01:00
Martin McKeaveney
fc7ddbe540 merge 2021-05-16 21:29:07 +01:00
Martin McKeaveney
0f2bcf581d revert functionality working 2021-05-16 21:25:37 +01:00
Keviin Åberg Kultalahti
9329644cf5 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:49:09 +02:00
mike12345567
b416207292 Making sure routes are included. 2021-05-14 16:47:47 +01:00
mike12345567
a61edd8124 Formatting. 2021-05-14 16:32:51 +01:00
Keviin Åberg Kultalahti
4df56ce457 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-14 17:32:08 +02:00
mike12345567
c947199558 Adding administration roles API. 2021-05-14 16:31:07 +01:00
mike12345567
cea82f9335 A general re-work of some parts of the auth lib, as well as moving roles/permissions around to make it possible to build an admin API which has role knowledge. 2021-05-14 15:43:41 +01:00
mike12345567
5d387870d2 Updating valid to optionals. 2021-05-12 15:44:16 +01:00
mike12345567
2ba2e2e3e6 Merge branch 'admin/user-management-ui' of github.com:Budibase/budibase into admin/user-management-ui 2021-05-12 14:27:48 +01:00
mike12345567
a289493224 Fixing an issue with the upload URL not being inserted in correct location. 2021-05-12 14:27:33 +01:00
mike12345567
abeb78d914 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 13:59:59 +01:00
Keviin Åberg Kultalahti
17eca8c30b Merge branch 'next' into admin/user-management-ui 2021-05-12 14:08:58 +02:00
mike12345567
13b1e78ee2 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 12:49:42 +01:00
Martin McKeaveney
022f501dee fixes from PR 2021-05-12 12:38:49 +01:00
mike12345567
2ec6b15e56 General cleanup, doing away with the concept of hosting in the builder and the generally confusing difference between cloud, self hosting and running locally - server is simply always a server now. 2021-05-11 17:49:26 +01:00
mike12345567
c70d4444a9 Formatting. 2021-05-11 15:24:17 +01:00
mike12345567
8e1f18e456 Changing INTERNAL_KEY to INTERNAL_API_KEY. 2021-05-11 15:23:03 +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
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
6a688c7aad merge 2021-05-11 14:58:55 +01:00
Martin McKeaveney
b1d60cc6b6 email template E2E, adding preview 2021-05-11 14:44:43 +01:00
mike12345567
3e63c616d3 Merge branch 'admin/user-management-ui' of github.com:Budibase/budibase into admin/user-management-ui 2021-05-11 12:51:25 +01:00
mike12345567
9b12de9162 Fixing an issue with platformUrl being required in settings. 2021-05-11 12:51:14 +01:00
mike12345567
1d643b6315 Adding link to the real email test. 2021-05-11 12:04:07 +01:00
mike12345567
7736869148 Some updates, working towards supporting automation send smtp email also removing the styling template, adding to base. 2021-05-11 12:02:29 +01:00
mike12345567
075b00b534 Renaming registration to invite URL. 2021-05-10 15:05:06 +01:00
Martin McKeaveney
8174f44d40 pull template type from body instead of params 2021-05-10 14:41:52 +01:00
mike12345567
0d38d50878 Making sure relative logo URL is converted to a full path in templates. 2021-05-07 14:30:37 +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
7588030780 SMTP and template management E2E 2021-05-06 18:02:44 +01:00
Martin McKeaveney
6b9a223094 update scoped config imports 2021-05-06 12:09:35 +01:00
Martin McKeaveney
559b8789f6 merge with next 2021-05-06 11:56:53 +01:00
Martin McKeaveney
42e0b3c1f9 lint 2021-05-06 10:57:24 +01:00
Martin McKeaveney
7d09bd8d70 unit tests 2021-05-06 10:54:01 +01:00
mike12345567
8c1f274fbb Making some changes to how configs are scoped. 2021-05-06 10:51:21 +01:00
Martin McKeaveney
e8a5b0863c do not allow users to initialise again once an admin has been created 2021-05-05 22:06:31 +01:00
Martin McKeaveney
fd2e2c0415 first time setup E2E 2021-05-05 21:56:43 +01:00
Martin McKeaveney
ba2d72b205 renable worker protection 2021-05-05 20:59:16 +01:00
Martin McKeaveney
39b293aa9d endpoint for budibase configuration checklist 2021-05-05 20:58:31 +01:00
mike12345567
b3292e991a Making the code a query string parameter for invite/reset urls. 2021-05-05 18:13:59 +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
83c16a9f14 Formatting. 2021-05-05 17:49:53 +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