1
0
Fork 0
mirror of synced 2024-09-11 06:56:23 +12:00
Commit graph

1048 commits

Author SHA1 Message Date
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
mike12345567
cb5f513881 Adding important to some email color properties. 2021-09-29 10:32:14 +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
c25bd48616 SMTP config fallback logic 2021-09-27 15:10:06 +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
d2c5197fa0 Merge pull request #2574 from Budibase/feature/onboarding-backend
Add new redis key for email verification & pre-hashed password option
2021-09-14 11:17:54 +01:00
Martin McKeaveney
b83452f47c merge with master 2021-09-10 14:43:03 +01:00
mike12345567
dbf830f12b Fixing issue #2579. 2021-09-09 17:59:44 +01:00
Rory Powell
d919c44185 Add pre-hased password option to admin creation 2021-09-09 17:08:27 +01:00
Martin McKeaveney
5e268dce18 Merge pull request #2556 from mslourens/checklist_item_navigation
add link to checklist items for direct navigation (and lint issues)
2021-09-09 11:16:38 +01:00
Rory Powell
bc50bf56db Remove cors configuration 2021-09-08 12:13:57 +01:00
Rory Powell
fcf5aac7e6 Add configurable cors options to worker 2021-09-08 10:05:39 +01:00
Rory Powell
3d15db2223 Account portal cors and auth changes 2021-09-07 11:22:11 +01:00
Maurits Lourens
9338043133 fix test 2021-09-06 20:23:33 +02:00
Maurits Lourens
0b7bb885cc fix unit test 2021-09-06 15:49:38 +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
Martin McKeaveney
af4c1b23de simplify couchDB configuration 2021-08-18 11:23:28 +01:00
Martin McKeaveney
87bf640a5d conditionally apply username and password to couchdb auth 2021-08-17 16:48:02 +01:00
Martin McKeaveney
f4232bd7d7 couchDB auth options 2021-08-17 14:11:03 +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
105dfb5eb9 Fixing an issue with OIDC URL for preauth. 2021-08-05 14:36:10 +01:00
mike12345567
9197a6e124 Making old google/oidc callback endpoints public. 2021-08-05 12:00:33 +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
8bcce17cd7 Removing unused mock. 2021-07-30 14:25:38 +01:00
mike12345567
79c5f01267 Fixing config test case. 2021-07-30 14:23:40 +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
adf6d18cb1 Fixing some issues with public endpoints causing logout loop. 2021-07-27 16:17:02 +01:00
mike12345567
615053f201 Fixing some issues with org not being correctly detected. 2021-07-27 15:35:26 +01:00
mike12345567
dd1f1fec3b Linting. 2021-07-26 13:31:39 +01:00
mike12345567
d03229caba Adding in admin API backwards compat. 2021-07-26 13:23:11 +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
mike12345567
7588bfde39 Adjusting how redis modules are loaded, making sure client is always set, before init. 2021-07-23 16:53:22 +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
3f7bafe23d Linting. 2021-07-22 22:37:20 +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
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
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
cd69c9a883 Adding auth endpoints to no auth list. 2021-04-26 15:44:28 +01:00
mike12345567
9e73a75512 Updating welcome to make it clear no login credentials in it. 2021-04-26 14:53:47 +01:00
mike12345567
65914d7cfa Moving header/footer and presentational tables to the base hbs email template. 2021-04-26 14:39:18 +01:00
mike12345567
b3933103a8 Formatting, linting and handling year copyright properly. 2021-04-26 14:24:07 +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
d0072c28f8 continuing work on smtp testing. 2021-04-23 15:14:28 +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
fdfb9dafb2 fix cypress tests, only login if cookie not present 2021-04-15 17:36:58 +01:00
mike12345567
1ab5064ecb Merge branch 'feature/global-user-management' of github.com:Budibase/budibase into feature/global-user-management 2021-04-15 16:57:35 +01:00
mike12345567
af53ed2109 Fixing some issues with auth module. 2021-04-15 16:57:01 +01:00
Martin McKeaveney
9cebd859f8 merge 2021-04-15 16:49:35 +01:00
mike12345567
9e1315c535 Updating auth lib so that it takes in a pouch instance rather than creating its own. 2021-04-15 16:45:21 +01:00
mike12345567
aacfb6adba Updating worker/server to run in cypress properly. 2021-04-15 16:25:48 +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
77c98009b8 joi syntax, adding db user builder key to cookie 2021-04-14 13:22:57 +01:00
mike12345567
105e1cc16f Getting most of the test auth working, adding in global builder configuration. 2021-04-13 18:12:35 +01:00
mike12345567
ad626d3e47 Merge branch 'feature/global-user-management' of github.com:Budibase/budibase into feature/global-user-management 2021-04-13 17:12:09 +01:00
mike12345567
a1227c5819 Removing the lookup of _id in usage quota when in dev/self host for performance reasons as part of usage quota, re-writing some bits of fetch self for cleaner implementation, fixing some issues with updating/saving users from within app. 2021-04-13 17:11:55 +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
mike12345567
c51dacd0fe Adding test cases for current app middleware as well as removing some old middlewares that were no longer used. 2021-04-13 13:32:09 +01:00
Martin McKeaveney
c4a9d8c9f0 self endpoint, simple auth 2021-04-12 11:20:01 +01:00
Martin McKeaveney
e2ce7098c5 merge 2021-04-12 10:48:27 +01:00
Martin McKeaveney
468b9b97f9 builder login 2021-04-12 10:47:48 +01:00
Martin McKeaveney
98576f586e login page 2021-04-11 11:35:55 +01:00
mike12345567
e275553f60 Formatting. 2021-04-09 16:56:42 +01:00
mike12345567
e34894dd92 Global user management now functioning as expected, there were some errant db.destroy functions from the system previously, this is now cleaned up. 2021-04-09 16:55:56 +01:00
mike12345567
3214abb89a Global users now working through the server, all requests proxied. 2021-04-09 15:11:49 +01:00
mike12345567
15900efc35 Some changes after trying system for first time. 2021-04-08 17:39:46 +01:00
mike12345567
bf25800445 Merge branch 'feature/global-user-management' of github.com:Budibase/budibase into feature/global-user-management 2021-04-08 17:00:17 +01:00
mike12345567
8cde219db9 First pass of global user configuration through existing user API with role mappings. 2021-04-08 16:58:33 +01:00
Martin McKeaveney
2077073986 move auth controller into it's own dir 2021-04-08 11:57:23 +01:00
Martin McKeaveney
4abe6192dc further simplification of jwt auth 2021-04-08 11:53:40 +01:00
Martin McKeaveney
fb2fda4055 encapsulate db ID generation functions 2021-04-08 11:26:08 +01:00
Martin McKeaveney
6aa7a38442 flip auth boolean 2021-04-08 11:21:52 +01:00
Martin McKeaveney
c7f4070ff5 encapsulate more auth functionality into shared module and use in worker 2021-04-08 11:20:37 +01:00
Martin McKeaveney
f135aa9db4 JWT auth on admin endpoints 2021-04-07 15:15:05 +01:00
Martin McKeaveney
cf073a1e55 groundwork for budibase auth lib 2021-04-07 11:33:16 +01:00
Martin McKeaveney
3f1c18e7dd basic couchDB authentication using passport 2021-04-01 20:34:43 +01:00
mike12345567
9423128369 Updating worker package with the various parts of server that needed moved over. 2021-03-29 17:31:41 +01:00
mike12345567
76f330fc36 Replacing deprecated symbols. 2021-03-29 15:06:00 +01:00
mike12345567
3f21a6ba6f Starting worker instance as part of the stack, some changes to how environment handled for worker. 2021-03-29 15:00:40 +01:00
Martin McKeaveney
306d29d870 redis, tidy ups 2021-03-22 16:18:29 +00:00
mike12345567
6be84b81b9 Review comments. 2021-01-18 12:36:49 +00:00
mike12345567
0e9d831e73 Linting. 2021-01-14 17:02:05 +00:00
mike12345567
16a25a7cff When self hosting it is now possible to use a pretty URL to access the app rather than the normal appId. 2021-01-14 17:01:31 +00:00
mike12345567
e98f9a9e94 Linting. 2021-01-06 17:28:22 +00:00
mike12345567
882cfa700b Updating worker to support using a self host key, a basic level of security, stopping builder from asking for API key if currently configured for self hosting, made the default values for self hosting make sense for a basic local installation, this should be final. 2021-01-06 16:58:29 +00:00
mike12345567
5444af9400 Quick fixes. 2020-12-18 16:48:14 +00:00
mike12345567
cce92f5ab3 Linting. 2020-12-18 12:55:01 +00:00
mike12345567
31bc45985f Update after testing, it is now possible to make a deployment to a self hosted environment. Some work still required, better authentication around MINIO deployment, currently the bucket is set to public read and there is no signing/verification to the upload process, also right now four different URLs are needed for the builder to connect correctly, ideally this shouldn't be the case. 2020-12-18 12:54:20 +00:00
Michael Drury
84a16e2dfb Renaming deployment service to worker service for its expansion plans. 2020-12-17 12:39:55 +00:00