1
0
Fork 0
mirror of synced 2024-08-04 04:41:37 +12:00
Commit graph

373 commits

Author SHA1 Message Date
mike12345567
19ad28a491 Adding mechanism for lookup of userId/email to tenantId. 2021-07-23 19:22:04 +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
mike12345567
68a2f9835e Adjusting how redis modules are loaded, making sure client is always set, before init. 2021-07-23 16:53:22 +01:00
Rory Powell
d7bbae9196 Require https callback in production, allow for http otherwise 2021-07-23 15:47:48 +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
Rory Powell
af28a7ed6b Mark google activated by default for old configs 2021-07-23 11:38:17 +01: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
mike12345567
8241df2581 Fixing some tenancy issues. 2021-07-19 12:57:52 +01: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
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
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
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
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
Peter Clement
02df5960c2 Add OIDC icon to login page 2021-07-07 17:39:26 +01:00
Peter Clement
b5f398da4d Allow user uploaded icons in oidc config 2021-07-07 13:41:09 +01:00
Rory Powell
42c8526ac2 Add info to 403 responses 2021-07-07 13:28:55 +01:00
mike12345567
36c0e45761 WIP - first version of user sessions. 2021-07-06 18:10:04 +01:00
Rory Powell
624dd20522 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
65c436145a 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
mike12345567
aef512a108 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
44c6b77c55 Fixing issues discovered by cypress tests. 2021-06-21 18:37:14 +01:00
mike12345567
14d4ee13f0 Linting. 2021-06-21 18:02:09 +01:00
mike12345567
f244b7b075 Implementing feature #1700 and making it possible to remove logo. 2021-06-21 18:01:25 +01:00
mike12345567
fc9e48e8e7 Fixing authentication with API key issue. 2021-06-21 17:13:06 +01:00
mike12345567
60de9ccb28 Fixing issue with 1:N relationships and multiple fields, issue #1753. 2021-06-20 10:53:55 +01:00
Andrew Kingston
cb56d7464b
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
abb1d33948 Lint with prettier 2021-06-15 19:39:40 +01:00
mike12345567
386c8890a5 Adding longer timeout for real email tests. 2021-06-15 13:22:38 +01:00
mike12345567
db393f05be Adding options to SMTP form for configuring TLS/STARTTLS. 2021-06-10 11:25:06 +01:00
mike12345567
eb3222a0bc Updating SMTP config to show better errors. 2021-06-09 15:45:54 +01:00
Michael Drury
7bd07031e4 Linting. 2021-06-08 18:29:34 +01:00
mike12345567
8cffe5c9ff 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
ef057910e1 Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-06-07 13:22:27 +01:00
mike12345567
132f084ca5 Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-06-02 10:08:57 +01:00
Martin McKeaveney
0166c48d40 removing superfluous controllers 2021-06-01 20:22:56 +01:00
Martin McKeaveney
fe65313eed update functionality complete 2021-06-01 20:17:06 +01:00
Martin McKeaveney
7a0bbfdb84 Merge branch 'master' of https://github.com/Budibase/budibase into lab-day-2705 2021-06-01 19:24:24 +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
Martin McKeaveney
a453f6cac2 adding watchtower to docker config 2021-05-28 10:09:32 +01:00
mike12345567
be7736afb7 Fixing app cypress test cases. 2021-05-25 13:25:42 +01:00
mike12345567
39545358f2 Fixing the creation of user in cypress. 2021-05-25 11:06:50 +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
2abe543cb1 Linting and fixing an issue with the dev pass through. 2021-05-24 16:20:02 +01:00
mike12345567
428a9e5ba3 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
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
3c650fad56 Merge branch 'master' of github.com:Budibase/budibase into fix/lockdown-admin 2021-05-21 16:54:52 +01:00
mike12345567
18cbb02bf9 Updating administration middleware so that internal requests allowed through automatically. 2021-05-21 16:43:01 +01:00
Michael Drury
8ee874055e
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
2da319e960 Merge branch 'master' of github.com:Budibase/budibase into feature/app-updated-at 2021-05-21 14:57:41 +01:00
mike12345567
b71d751243 Making sure roles object is always present, issue #1529. 2021-05-21 14:56:06 +01:00
Martin McKeaveney
2636c9450b simpler check using checklist 2021-05-21 14:55:11 +01:00
mike12345567
3b81989250 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
093e52a4b7 Merge branch 'master' into fixes/user-management 2021-05-21 13:32:55 +02:00
Michael Drury
34384e476c
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
3593073c00 change forceReset bool name 2021-05-21 12:10:02 +02:00
Martin McKeaveney
fe5df57935 removing skip_setup as it was preventing init 2021-05-20 21:42:27 +01:00
mike12345567
a8ab7858b7 Formatting. 2021-05-20 20:48:46 +01:00
mike12345567
fba63134d1 Fixing some issues found when testing. 2021-05-20 20:48:24 +01:00
Keviin Åberg Kultalahti
81726501ee 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
8c68f1c134 Fixing issues with the user table within the apps. 2021-05-19 15:55:00 +01:00
mike12345567
6d6eee2a93 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
31d3566626 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
8e10b42f9c Merge branch 'user-app-list' of github.com:Budibase/budibase into user-app-list 2021-05-19 13:18:38 +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
Keviin Åberg Kultalahti
06af8e70e6 add forcePasswordReset bool to user object validation 2021-05-19 13:24:14 +02:00
mike12345567
298e5c7e4d Updating reset link to match that of the builder. 2021-05-18 15:48:28 +01:00
mike12345567
d9439abe86 Building up the API interactions for the forgotten password flow. 2021-05-18 15:26:09 +01:00
Keviin Åberg Kultalahti
e838950777 Merge branch 'next' into admin/user-management-ui 2021-05-18 12:27:46 +02:00
Keviin Åberg Kultalahti
a3f5e1af8c lint:fix 2021-05-18 12:21:57 +02:00
Keviin Åberg Kultalahti
7fa0666cae updates invite url 2021-05-18 12:18:06 +02:00
Martin McKeaveney
d5fb542589 lint 2021-05-17 21:43:50 +01:00
Keviin Åberg Kultalahti
71929dadd1 Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 16:41:46 +02:00
mike12345567
eb4a430a7c Updating templating bindings enumerations. 2021-05-17 15:30:24 +01:00
Keviin Åberg Kultalahti
447a592ddb Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:53:32 +02:00
mike12345567
df7828d3af don't use the _id prop of the app metadata. 2021-05-17 14:52:49 +01:00
Keviin Åberg Kultalahti
b8870ed8c4 erge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:29:33 +02:00
mike12345567
cbc2066d91 Updating roles API further so find API works too. 2021-05-17 14:28:41 +01:00
mike12345567
19b1310c60 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
5a7ac2287b Merge branch 'feature/draft-apps' into admin/user-management-ui 2021-05-17 15:21:48 +02:00
mike12345567
dd4a963c3e Updating role system to never think about the dev app. 2021-05-17 14:20:19 +01:00
Martin McKeaveney
6dc288fcc3 merge 2021-05-16 21:29:07 +01:00
Martin McKeaveney
0ed0550e73 revert functionality working 2021-05-16 21:25:37 +01:00
Keviin Åberg Kultalahti
771467fba1 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
ac0f620b38 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
mike12345567
c45fdefb48 Adding administration roles API. 2021-05-14 16:31:07 +01:00
mike12345567
2d0122f7d6 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
d7dc133e43 Updating valid to optionals. 2021-05-12 15:44:16 +01:00
mike12345567
86f7e76180 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
b58ed6dd4b Fixing an issue with the upload URL not being inserted in correct location. 2021-05-12 14:27:33 +01:00
mike12345567
8f7a3f4d69 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 13:59:59 +01:00
Keviin Åberg Kultalahti
0da5247a03 Merge branch 'next' into admin/user-management-ui 2021-05-12 14:08:58 +02:00
mike12345567
fed94bea70 Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps 2021-05-12 12:49:42 +01:00
Martin McKeaveney
56d117c819 fixes from PR 2021-05-12 12:38:49 +01:00
mike12345567
c9d903a92f 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
5230dcd3ac Formatting. 2021-05-11 15:24:17 +01:00