Bill Burke
5017d71383
exportimport and timer and events
2016-01-15 19:07:17 -05:00
Bill Burke
b93d55cb63
remove model-api, add server-spi
2016-01-15 18:44:17 -05:00
Stian Thorgersen
b21bf21043
Merge pull request #2028 from stianst/JACKSON2
...
KEYCLOAK-1809
2016-01-15 16:29:01 +01:00
Stian Thorgersen
33565ff8d9
Added jax-rs response filter to commit transaction
2016-01-15 15:50:38 +01:00
Bill Burke
5a74c72452
Merge remote-tracking branch 'upstream/master'
2016-01-14 18:33:22 -05:00
Bill Burke
67ef3e7a45
client installation formats
2016-01-14 16:50:17 -05:00
Stian Thorgersen
435980d776
KEYCLOAK-1809
...
Upgrade jackson to version 2.x
2016-01-14 16:34:30 +01:00
Bill Burke
0bad78c53b
Merge pull request #2025 from thomasdarimont/issue/KEYCLOAK-2311-white-list-role-for-conditional-otp
...
KEYCLOAK-2311 - Allow to specify role to skip conditional OTP authentication.
2016-01-14 09:05:58 -05:00
Stian Thorgersen
eb10d6bfd6
Merge pull request #2024 from stianst/FIX-CLIENT-INSTALLATION-TEST
...
Fix client installation test
2016-01-14 12:33:26 +01:00
Thomas Darimont
d6b10aa911
KEYCLOAK-2311 - Polishing.
...
Aligned constant names, but keep constant values to stay compatible with previous version.
2016-01-14 12:05:19 +01:00
Stian Thorgersen
a6da6e48f9
Fix client installation test
2016-01-14 11:54:39 +01:00
Thomas Darimont
92c2ec366d
KEYCLOAK-2311 - Allow to specify role to skip conditional OTP authentication.
...
We now allow specify a role to skip OTP.
Previously it was not possible to specify that OTP authentication should be skipped via a role but the
ConditionalOtpAuthenticator allowed to specify to show/skip OTP via a user attribute or HTTP request header pattern.
Having the "skip role" aligns the role based configuration options with the user attribute and HTTP request header configuration.
2016-01-14 11:47:30 +01:00
Bill Burke
f9c458aa0e
Merge remote-tracking branch 'upstream/master'
2016-01-13 16:18:42 -05:00
Bill Burke
9dc21224bd
clean up most redirects
2016-01-13 16:18:24 -05:00
Stian Thorgersen
30c3a5ed70
Merge pull request #2020 from stianst/master
...
Mark all SPIs as internal
2016-01-13 19:24:43 +01:00
Bill Burke
b3967263d1
Merge remote-tracking branch 'upstream/master'
2016-01-13 10:16:06 -05:00
Bill Burke
b9c9b58727
refactor
2016-01-13 10:15:54 -05:00
Stian Thorgersen
f8841d2365
Mark all SPIs as internal
2016-01-13 15:49:53 +01:00
Stian Thorgersen
ddb41e2c58
Merge pull request #2017 from mposolda/master
...
KEYCLOAK-2270 Use sub instead of iss for clientId in JWTClientAuthent…
2016-01-13 11:10:09 +01:00
mposolda
4642876323
KEYCLOAK-2270 Use sub instead of iss for clientId in JWTClientAuthenticator
2016-01-13 10:12:20 +01:00
Stian Thorgersen
0193c696ab
Version bump
2016-01-13 09:20:38 +01:00
Stian Thorgersen
2f88868e20
Merge pull request #2014 from ssilvert/KEYCLOAK-2294-pi-testrealm
...
KEYCLOAK-2294 Partial import can fail with 'Removing a detached insta…
2016-01-13 08:37:49 +01:00
Stan Silvert
b0de77013c
KEYCLOAK-2294 Partial import can fail with 'Removing a detached instance'
2016-01-12 15:46:48 -05:00
Stian Thorgersen
ee3a880a55
Merge pull request #1999 from pedroigor/KEYCLOAK-2266
...
[KEYCLOAK-2266] - OAuth2 Token Introspection.
2016-01-12 15:37:41 +01:00
Pedro Igor
c9f9ee9799
[KEYCLOAK-2266] - OAuth2 Token Introspection.
2016-01-12 11:16:42 -02:00
Bill Burke
43dc250bf2
Merge pull request #2006 from thomasdarimont/issue/KEYCLOAK-2040-Conditional-OTP-Authentication
...
KEYCLOAK-2040 - Add support for Conditional OTP auth.
2016-01-11 14:56:48 -05:00
mposolda
e761d6ce10
Fix DB tests. Cleanup after AddUserTest
2016-01-11 18:00:56 +01:00
Thomas Darimont
46991764d4
KEYCLOAK-2040 - Add support for Conditional OTP auth.
...
Previously it was not possible to conditionally show a OTP authentication
form. This PR adds support to conditionally require OTP authentication
based on a custom user attribute, a role, a request header pattern
(with black- and whitelisting) as well as a configurable default in
case no condition matches.
2016-01-11 17:39:42 +01:00
mposolda
c3f69fdc54
Fix MySQL - fixing transactions during bootstrap
2016-01-11 15:31:45 +01:00
Stian Thorgersen
e2b889d727
KEYCLOAK-2284
...
Setup of background tasks doesn't close KeycloakSession
2016-01-11 11:41:36 +01:00
Stian Thorgersen
a6c852603e
Merge pull request #2000 from mstruk/truststore
...
KEYCLOAK-1717 Truststore SPI and file provider
2016-01-11 09:24:53 +01:00
Stian Thorgersen
f1602b3b8d
Merge pull request #1998 from ssilvert/partial-import
...
KEYCLOAK-1979: Partial import
2016-01-11 09:22:09 +01:00
Stian Thorgersen
7c8bc5814e
Merge pull request #1990 from raehalme/KEYCLOAK-2257
...
KEYCLOAK-2257: Store user attribute when accepting terms and conditions
2016-01-11 09:03:58 +01:00
Marko Strukelj
80e2b8eb39
KEYCLOAK-1717 Truststore SPI and file provider
2016-01-10 12:39:30 +01:00
Stan Silvert
fbff61bfba
For overwrite, do all deletes, then all adds.
...
Minor UI enhancements.
Fix 2 JPA bugs.
General cleanup.
Documentation.
2016-01-08 13:45:22 -05:00
Bill Burke
dc337d684a
improve client creation when template
2016-01-08 11:40:46 -05:00
Stian Thorgersen
ddd99c2411
KEYCLOAK-2259
...
Redirect URIs and token domains are matched case-sensitively
2016-01-08 15:38:00 +01:00
Thomas Raehalme
c4544e8caf
Like other timestamps attribute value is now seconds since 1970.
2016-01-08 14:21:43 +02:00
Thomas Raehalme
bca3893070
Required action TermsAndConditions now stores user attribute indicating acceptance of terms and conditions.
2016-01-08 13:14:04 +02:00
Bill Burke
2892b093ab
Merge remote-tracking branch 'upstream/master'
2016-01-07 17:25:58 -05:00
Bill Burke
78fe064cf0
2213
2016-01-07 17:25:47 -05:00
Stian Thorgersen
77962ec896
Merge pull request #1984 from mstruk/providers-init
...
Prevent ProviderFactories being loaded twice
2016-01-07 11:57:12 +01:00
Bill Burke
71b6ed80ae
Merge remote-tracking branch 'upstream/master'
2016-01-06 16:51:24 -05:00
Bill Burke
4a4bbf26f4
installation provider
2016-01-06 16:51:02 -05:00
Bill Burke
64de96d34b
installation provider
2016-01-06 16:49:58 -05:00
Stian Thorgersen
a5c159eeff
KEYCLOAK-2247
...
Upgrade to WildFly 10.0.0.CR5
2016-01-06 16:15:00 +01:00
Marko Strukelj
aca00dd42c
Prevent ProviderFactories being loaded twice
2016-01-05 23:07:13 +01:00
Stan Silvert
979205c827
Cleanup
2016-01-05 15:33:45 -05:00
Stan Silvert
55e36acfc0
For overwrite, delete then create.
...
Do all prepares to check for errors, then call doImport on each type.
Combine Realm Role and Client Role processing (RolesPartialImport).
2016-01-05 15:33:45 -05:00
Stan Silvert
2d878805c1
Fix resource path for partial import events.
2016-01-05 15:33:43 -05:00