mike12345567
19ad28a491
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
f86aa0ac78
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
e4eb2d34b2
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
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
eb8d857864
Require https callback in production, allow for http otherwise
2021-07-23 15:47:48 +01:00
Rory Powell
d7bbae9196
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
8a77947a01
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
b5c12e6265
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
Rory Powell
af28a7ed6b
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
1153001af8
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
155e30965f
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
8bf275ca44
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
0473c295d3
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
f2e713f5af
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
853b7b6fdc
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
190798d4ee
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
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
b09c2d45f9
Linting and adding tenancy API.
2021-07-20 18:03:16 +01:00
mike12345567
e3744c0b20
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
mike12345567
2182645339
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
32b2093cff
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
Peter Clement
6dce0a88a4
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
07dd7d68d4
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
99fe16d169
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
63dba7b574
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
8241df2581
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
c248844a24
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
037dce5016
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
f0f9736c0b
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
mike12345567
5ffe3c7935
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
25fdde6d21
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
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
33b352c3ef
Store OIDC config in cookie instead of URL
2021-07-15 16:20:31 +01:00
Rory Powell
70601b7cc5
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
Peter Clement
4e75b7f4c9
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
Rory Powell
90c0e7b2c1
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
1fa0b3f204
Rewording email template descriptions.
2021-07-14 13:24:46 +01:00
mike12345567
a31cce0ff9
Linting.
2021-07-14 13:18:27 +01:00
mike12345567
da5024633b
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
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
283698f8c5
Fix config form saving bugs
2021-07-13 21:47:36 +01:00
Peter Clement
ab1a10dd1b
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
Rory Powell
fef63a1b8e
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
d17456bacf
Linting.
2021-07-13 17:28:05 +01:00
mike12345567
004f719dde
Renaming groups to workspaces.
2021-07-13 17:27:04 +01:00
mike12345567
e296a67b50
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
Rory Powell
40013d45c3
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
2900743545
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
ca0f74eee8
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
Rory Powell
1a7619367b
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
Martin McKeaveney
742402f4c7
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
Rory Powell
e1bea33d9a
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
Kyle Harrison
b4afda7b09
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
de075a7549
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
90e6db2be1
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
4ae29f6b54
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
Peter Clement
80a35d6ef0
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
63b13fc360
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
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
c16cfc328f
Linting
2021-07-08 13:12:25 +01:00
Rory Powell
db9078cebe
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
aa601f3701
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
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
25f1368227
Merge google/oidc user authentication and surface user relevant error messages during authentication
2021-07-08 11:12:34 +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
b0fb7ae991
Fixing test cases.
2021-07-08 00:30:55 +01:00
mike12345567
2bee348721
Fixing test cases.
2021-07-08 00:30:55 +01:00
mike12345567
93302cb667
Linting.
2021-07-07 23:30:14 +01:00
mike12345567
2fc606f5b5
Linting.
2021-07-07 23:30:14 +01:00
mike12345567
4916ff7eb8
Adding sessions API.
2021-07-07 23:29:19 +01:00
mike12345567
cc67e2caa6
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
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
7a51eba93c
Add OIDC icon to login page
2021-07-07 17:39:26 +01:00
Peter Clement
02df5960c2
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
Peter Clement
b5f398da4d
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
Rory Powell
42c8526ac2
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
mike12345567
36c0e45761
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
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
baab7141c0
Proof of concept OIDC implementation
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
0e6fb73b9e
Add validation to backend for OIDC configuration
2021-07-05 14:27:19 +01:00
Peter Clement
f61c5b8143
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
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
f4757aeee1
Fixing issues discovered by cypress tests.
2021-06-21 18:37:14 +01:00
mike12345567
44c6b77c55
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
14d4ee13f0
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
f244b7b075
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
fc9e48e8e7
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
mike12345567
60de9ccb28
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
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
32a3c2bbb6
Lint with prettier
2021-06-15 19:39:40 +01:00
Andrew Kingston
abb1d33948
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
386c8890a5
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
db393f05be
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
mike12345567
eb3222a0bc
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
Michael Drury
7bd07031e4
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
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
1e9ce62261
Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes
2021-06-07 13:22:27 +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
1da4b31890
Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes
2021-06-02 10:08:57 +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
e927f44c12
removing superfluous controllers
2021-06-01 20:22:56 +01:00
Martin McKeaveney
0166c48d40
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
fe65313eed
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
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
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
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
0c90f9ffc5
adding watchtower to docker config
2021-05-28 10:09:32 +01:00
Martin McKeaveney
a453f6cac2
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
be7736afb7
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
39545358f2
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
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
7e6f215598
Linting and fixing an issue with the dev pass through.
2021-05-24 16:20:02 +01:00
mike12345567
2abe543cb1
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
428a9e5ba3
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
292d520b30
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
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
348c61a8c5
Merge branch 'master' of github.com:Budibase/budibase into fix/lockdown-admin
2021-05-21 16:54:52 +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
c6a6d49cd7
Updating administration middleware so that internal requests allowed through automatically.
2021-05-21 16:43:01 +01:00
mike12345567
18cbb02bf9
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
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
ede7e38442
Merge branch 'master' of github.com:Budibase/budibase into feature/app-updated-at
2021-05-21 14:57:41 +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
a6e196a351
Making sure roles object is always present, issue #1529 .
2021-05-21 14:56:06 +01:00
mike12345567
b71d751243
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
Martin McKeaveney
2636c9450b
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
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
a4de6d49c8
Merge branch 'master' into fixes/user-management
2021-05-21 13:32:55 +02:00
Keviin Åberg Kultalahti
093e52a4b7
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
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
8735ef088f
change forceReset bool name
2021-05-21 12:10:02 +02:00
Keviin Åberg Kultalahti
3593073c00
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
Martin McKeaveney
fe5df57935
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
a8ab7858b7
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
mike12345567
fba63134d1
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
Keviin Åberg Kultalahti
81726501ee
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
584f7c2403
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
8c68f1c134
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
6d6eee2a93
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
af531241c4
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
31d3566626
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
14b62b8aed
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
8e10b42f9c
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
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
dc0fb8fbfe
add forcePasswordReset bool to user object validation
2021-05-19 13:24:14 +02:00
Keviin Åberg Kultalahti
06af8e70e6
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
298e5c7e4d
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
mike12345567
d9439abe86
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
e838950777
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
a3f5e1af8c
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
Keviin Åberg Kultalahti
7fa0666cae
updates invite url
2021-05-18 12:18:06 +02:00
Martin McKeaveney
ee9a097979
lint ✨
2021-05-17 21:43:50 +01:00
Martin McKeaveney
d5fb542589
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
Keviin Åberg Kultalahti
71929dadd1
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
mike12345567
eb4a430a7c
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
Keviin Åberg Kultalahti
447a592ddb
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
mike12345567
df7828d3af
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
Keviin Åberg Kultalahti
b8870ed8c4
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
cbc2066d91
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
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
56e09c9b7b
Merge branch 'feature/draft-apps' into admin/user-management-ui
2021-05-17 15:21:48 +02:00
Keviin Åberg Kultalahti
5a7ac2287b
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
mike12345567
dd4a963c3e
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
6dc288fcc3
merge
2021-05-16 21:29:07 +01:00
Martin McKeaveney
0f2bcf581d
revert functionality working
2021-05-16 21:25:37 +01:00
Martin McKeaveney
0ed0550e73
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
Keviin Åberg Kultalahti
771467fba1
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
0234d11110
Making sure routes are included.
2021-05-14 16:47:47 +01:00
mike12345567
a61edd8124
Formatting.
2021-05-14 16:32:51 +01:00
mike12345567
ac0f620b38
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
Keviin Åberg Kultalahti
8392a4ba38
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
c45fdefb48
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
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
5d387870d2
Updating valid to optionals.
2021-05-12 15:44:16 +01:00
mike12345567
d7dc133e43
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
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
a289493224
Fixing an issue with the upload URL not being inserted in correct location.
2021-05-12 14:27:33 +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
abeb78d914
Merge branch 'next' of github.com:Budibase/budibase into feature/draft-apps
2021-05-12 13:59:59 +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
17eca8c30b
Merge branch 'next' into admin/user-management-ui
2021-05-12 14:08:58 +02:00
Keviin Åberg Kultalahti
0da5247a03
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
mike12345567
fed94bea70
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
Martin McKeaveney
56d117c819
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
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
c70d4444a9
Formatting.
2021-05-11 15:24:17 +01:00
mike12345567
5230dcd3ac
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
2ea05c44b4
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
147d67cd26
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
mike12345567
8faa9554ed
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
c8b1adb135
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
Martin McKeaveney
3bf3fc5e02
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
638e2f5c8e
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
ec751b59a4
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
339554b163
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
7d78d7b15a
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
mike12345567
85030491b2
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
Martin McKeaveney
b415fb2089
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
2081dd96e0
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
mike12345567
902119c39c
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
cb2b1037ba
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
361db5e96f
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
23cb160a69
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
2fe2d521cf
lint ✨
2021-05-06 10:57:24 +01:00
Martin McKeaveney
7d09bd8d70
unit tests
2021-05-06 10:54:01 +01:00
Martin McKeaveney
efacbe861a
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
mike12345567
02a270a24d
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
399c463f52
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
1aedba80bd
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
4bc1a7dc3c
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
Martin McKeaveney
4377b41f40
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
c37f41fbd5
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
2f0c3562ac
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