1
0
Fork 0
mirror of synced 2024-08-14 09:31:49 +12:00
Commit graph

272 commits

Author SHA1 Message Date
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
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
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
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
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
Andrew Kingston
32a3c2bbb6 Lint with prettier 2021-06-15 19:39:40 +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
1da4b31890 Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-06-02 10:08:57 +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
1146d508fd Fixing app cypress test cases. 2021-05-25 13:25:42 +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
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
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
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
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
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
Martin McKeaveney
ee9a097979 lint 2021-05-17 21:43:50 +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
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
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
c70d4444a9 Formatting. 2021-05-11 15:24:17 +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
b1d60cc6b6 email template E2E, adding preview 2021-05-11 14:44:43 +01:00
Martin McKeaveney
8174f44d40 pull template type from body instead of params 2021-05-10 14:41:52 +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
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
39b293aa9d endpoint for budibase configuration checklist 2021-05-05 20:58:31 +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
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
48236b2c2f Formatting. 2021-05-05 16:00:15 +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
403ee4a870 Formatting. 2021-05-05 15:19:44 +01:00
mike12345567
b4beb4d8da Finishing invite send email. 2021-05-05 15:17:15 +01:00
mike12345567
7bc3514fc1 Finalising the usage of redis in the password reset and invitation systems. 2021-05-05 15:10:28 +01:00
mike12345567
fc01bdaac9 Formatting. 2021-05-05 12:11:31 +01:00
mike12345567
b372d2a824 Fleshed out fully all redis interactions for invitations and password resets. 2021-05-05 12:11:06 +01:00
Martin McKeaveney
cb02c9bf58 google oauth UI 2021-05-04 17:31:06 +01:00
mike12345567
b01da0aad5 Merge branch 'next' of github.com:Budibase/budibase into feature/password-reset 2021-05-04 15:21:53 +01:00
Andrew Kingston
797e8a8b67 Add explicit prettier options 2021-05-04 11:32:22 +01:00
Keviin Åberg Kultalahti
0afbf1649e lint:fix 2021-05-03 09:31:09 +02: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
60b61f1322 Fixing login issue. 2021-04-28 14:28:25 +01:00
mike12345567
adce859f98 Formatting. 2021-04-27 17:30:19 +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
cba2b9a27d Formatting. 2021-04-26 14:16:05 +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
mike12345567
48c1b4b1fe Major update, fixing email test case. 2021-04-23 18:54:12 +01:00
mike12345567
0dd46d12fa Updating test cases and some re-work of the email system. 2021-04-23 18:07:39 +01:00
mike12345567
ea8e3b7d3f Adding testing to worker, still WIP. 2021-04-23 14:58:06 +01:00
mike12345567
0a733b7c7a Updating config management for SMTP as well as finalising the work around generating and sending emails. 2021-04-23 13:49:47 +01:00
mike12345567
f6e25c3792 putting together the bulk of the email sending/config options. 2021-04-23 13:10:37 +01:00
mike12345567
163035cac7 Formatting. 2021-04-22 17:58:14 +01:00
mike12345567
85441c6141 Fleshing out the main work behind the email generation. 2021-04-22 17:57:38 +01:00
mike12345567
f445cd4d86 Formatting. 2021-04-22 16:06:29 +01:00
Michael Drury
9080431a06 Merge branch 'feature/smtp-templates' into configuration-management 2021-04-22 15:39:54 +01:00
Martin McKeaveney
c273152126 fix imports 2021-04-22 15:27:09 +01:00
mike12345567
086d8f0b14 Adding some base templates which will be returned based on purpose, need to create a list of options that will be exposed/made available via configuration. 2021-04-22 15:26:32 +01:00
Martin McKeaveney
2555d711b2 scoped configuration management 2021-04-22 13:46:54 +01:00
Martin McKeaveney
f7085a57c7 lint 2021-04-22 11:48:37 +01:00
Martin McKeaveney
6462848191 config specificity 2021-04-22 11:45:22 +01:00
Martin McKeaveney
8fab374c1f google login reading from couch 2021-04-21 21:08:04 +01:00
Martin McKeaveney
d8db863faa merge 2021-04-21 18:43:20 +01:00
Martin McKeaveney
28f8f8b6ef custom google middleware 2021-04-21 18:40:32 +01:00
mike12345567
e85b7682e0 Initial CRUD interface for templates. 2021-04-21 18:15:57 +01:00
mike12345567
15223080d5 Formatting and linting. 2021-04-21 16:46:51 +01:00
mike12345567
76ceb6a951 Some re-work of the auth package, making it a bit easier to use/less likely to make a mistake. 2021-04-21 16:42:44 +01:00
Martin McKeaveney
ffe167bbd3 google auth E2E 2021-04-21 12:12:22 +01:00
Martin McKeaveney
301f681c88 config creation and management APIs 2021-04-20 18:14:36 +01:00
mike12345567
b4c8bf81f7 Swapping over everything to use the new user ID and updating everything after some end to end testing. 2021-04-20 17:17:44 +01:00
Martin McKeaveney
b5e19e4216 lint 2021-04-20 13:13:15 +01:00
Martin McKeaveney
4b5d302819 group CRUD 2021-04-19 16:16:46 +01:00
Martin McKeaveney
390b43c122 merge 2021-04-19 11:38:54 +01:00
Martin McKeaveney
34a12831a6 basic group apis 2021-04-19 11:34:07 +01:00
mike12345567
b887fd6b99 Changing user db to be called global db. 2021-04-16 18:09:34 +01:00
Martin McKeaveney
9cebd859f8 merge 2021-04-15 16:49:35 +01:00
mike12345567
9af9761753 Some changes to initial login form, improvements based on testing and attempts to fix cypress test failures. 2021-04-15 15:57:55 +01:00
mike12345567
c7171d0303 Linting. 2021-04-14 16:44:10 +01:00
Martin McKeaveney
a68227735c ensuring public users can log in after being assigned a roleId 2021-04-13 16:56:45 +01:00
Martin McKeaveney
509a04d914 logout button 2021-04-13 13:56:28 +01:00