Stian Thorgersen
53fcc1bec2
Merge pull request #3359 from stianst/KEYCLOAK-3737
...
KEYCLOAK-3737
2016-10-19 12:06:12 +02:00
gil
490b7f6ba4
KEYCLOAK-3519 port to apache-ldap-api-1.0.0-M33
2016-10-19 11:29:31 +02:00
Cherian Mathew
2bba6af6d9
Include programmatically created resources in the resource cache
2016-10-19 11:04:22 +02:00
mhajas
218065a349
KEYCLOAK-3654 Fix jwks-url in integration-arquillian
2016-10-19 10:27:53 +02:00
Vlasta Ramik
98aa516d74
KEYCLOAK-3619 minor fix
2016-10-19 09:59:30 +02:00
emilienbondu
0d3a50411e
Move licence at the top of the file.
2016-10-19 09:57:07 +02:00
Stian Thorgersen
24715eabec
KEYCLOAK-3737
...
Migration problem from version 1.9.8 to 2.2.1
2016-10-19 09:06:55 +02:00
Stian Thorgersen
f2f508ac2e
Merge pull request #3357 from stianst/KEYCLOAK-3107
...
KEYCLOAK-3017 Expose Location header in cors request to admin endpoint
2016-10-19 08:45:18 +02:00
Stian Thorgersen
13220e1d38
Merge pull request #3355 from stianst/KEYCLOAK-2699
...
KEYCLOAK-2699 Potential for NPE in DirImportProvider.getRealmsToImport
2016-10-19 07:35:54 +02:00
Stian Thorgersen
116027bd7b
Merge pull request #3354 from stianst/KEYCLOAK-2488
...
KEYCLOAK-2488 Token introspection returns wrong response for invalid …
2016-10-19 07:33:25 +02:00
Stian Thorgersen
14a51e589d
Merge pull request #3325 from mstruk/cli-reg
...
KEYCLOAK-2084 Client Registration CLI
2016-10-19 06:33:45 +02:00
Stian Thorgersen
36433bb8ff
Merge pull request #3310 from ramunask/lt-translations-for-2.3
...
KEYCLOAK-3695 Lithuanian locale update for 2.3 version
2016-10-19 06:31:46 +02:00
Stian Thorgersen
edb66d6fd3
Tweak travis
2016-10-19 06:22:12 +02:00
Stian Thorgersen
a0bbb1e7a2
Merge pull request #3356 from stianst/KEYCLOAK-3707
...
KEYCLOAK-3707 Test retrieving missing client with registration access…
2016-10-19 06:18:43 +02:00
Stian Thorgersen
a33997976f
KEYCLOAK-3017 Expose Location header in cors request to admin endpoint
2016-10-18 21:27:46 +02:00
Stian Thorgersen
3250562d28
KEYCLOAK-3707 Test retrieving missing client with registration access token
2016-10-18 20:56:40 +02:00
Stian Thorgersen
0a8d1e28f1
KEYCLOAK-2699 Potential for NPE in DirImportProvider.getRealmsToImport
2016-10-18 20:31:51 +02:00
Stian Thorgersen
29538332d9
KEYCLOAK-2488 Token introspection returns wrong response for invalid token
2016-10-18 20:28:14 +02:00
Bill Burke
d941e07169
Merge pull request #3350 from patriot1burke/master
...
federated import/export to json
2016-10-18 14:15:25 -04:00
Pavel Drozd
ba1fa34c56
Merge pull request #3330 from mhajas/KEYCLOAK-3268
...
KEYCLOAK-3268 KEYCLOAK-3100 Validate SAML Idp and SP metadata
2016-10-18 20:08:13 +02:00
Stan Silvert
5cef34d61a
KEYCLOAK-2918: Confirm before custom auth flow deletion
2016-10-18 13:44:13 -04:00
Stian Thorgersen
a87c08416d
Merge pull request #3346 from hmlnarik/KEYCLOAK-3588
...
KEYCLOAK-3698 Make manual update scripts play nicely with custom JpaEntityProviders
2016-10-18 19:41:02 +02:00
Stian Thorgersen
4f695cfe76
Merge pull request #3347 from vramik/KEYCLOAK-3619
...
KEYCLOAK-3619 Update default datasource definition to non-XA
2016-10-18 19:40:34 +02:00
Stian Thorgersen
e41d11877f
Merge pull request #3349 from stianst/KEYCLOAK-2741
...
KEYCLOAK-2741
2016-10-18 19:39:54 +02:00
Stian Thorgersen
3c08153e33
Merge pull request #3348 from stianst/KEYCLOAK-3358
...
KEYCLOAK-3358
2016-10-18 19:39:32 +02:00
Marek Posolda
c9507aa5c7
Merge pull request #3351 from mposolda/master
...
KEYCLOAK-3653 CORS headers not sent in certs endpoint
2016-10-18 19:12:01 +02:00
mposolda
b62e6e2751
KEYCLOAK-3653 CORS headers not sent in certs endpoint
2016-10-18 16:57:06 +02:00
Stian Thorgersen
74dad004e3
KEYCLOAK-2741
...
Don't remove KEYCLOAK_REMEMBERME cookie when sso session expires.
2016-10-18 16:14:36 +02:00
Bill Burke
2199df71bf
Merge remote-tracking branch 'upstream/master'
2016-10-18 10:14:00 -04:00
Bill Burke
4182e4d92a
federated import/export
2016-10-18 10:13:51 -04:00
Stian Thorgersen
1583937295
KEYCLOAK-3358
...
Welcome page hardcoded to incorrect URL & references incorrect script
2016-10-18 16:07:44 +02:00
Marek Posolda
940237ee78
Merge pull request #3304 from hmlnarik/KEYCLOAK-2964
...
KEYCLOAK-2964 - Fix groups not applied for authentication of admin operations
2016-10-18 14:50:12 +02:00
Marek Posolda
3986ce2ce0
Merge pull request #3345 from mposolda/master
...
KEYCLOAK-3499 Fixes in OIDCProtocolMapper support for includeInUserInfo
2016-10-18 14:28:29 +02:00
Stian Thorgersen
4b56743788
Merge pull request #3343 from stianst/KEYCLOAK-2884
...
KEYCLOAK-2884 Remove ClientTemplateResource.getKeycloakApplication()
2016-10-18 14:08:50 +02:00
Hynek Mlnarik
658988ccd0
KEYCLOAK-3588 Make manual update scripts play nicely with custom JpaEntityProviders
2016-10-18 13:59:24 +02:00
mposolda
a7287aad36
KEYCLOAK-3499 More fixes for IncludeInUserInfo. Fixing tests and migration
2016-10-18 13:09:30 +02:00
Thomas Darimont
c3b577de11
KEYCLOAK-3499 Revise OIDCProtocolMapper support
...
Moved methods `transformUserInfoToken`, `transformAccessToken`,
`transformIDToken` to the `AbstractOIDCProtocolMapper` base class
in order to reduce code duplication.
Previously every mapper implemented at least one or two of those
methods with exactly the same code.
Having those methods in the base class ensures that the code is the
same for all mappers. Since the mentioned methods are declared
on the `OIDCIDTokenMapper`, `OIDCAccessTokenMapper` and `UserInfoTokenMapper`
interfaces `AbstractOIDCProtocolMapper` implementations can now choose
how they should be handled by the `TokenManager`
by implementing the desired set of interfaces `*TokenMapper`-interfaces.
I think this provides a good balance between ease of use, reduced code duplication
and ensured backwards compatiblity.
Existing protocol mapper implementations will still work since they just implement
their own logic for `transformUserInfoToken`, `transformAccessToken`,
`transformIDToken`.
The "claim" information provided by a `ProtocolMapper` to a `*Token` can now
be provided by overriding the `AbstractOIDCProtocolMapper.setClaim` method.
Adapted all eligible ProtocolMapper implementations within the
`org.keycloak.protocol.oidc.mappers` package accordingly.
2016-10-18 13:09:30 +02:00
Marko Strukelj
c912f941e7
KEYCLOAK-2084 Client Registration CLI
2016-10-18 12:33:02 +02:00
Vlasta Ramik
041413d8de
KEYCLOAK-3619 Update default datasource definition to non-XA
2016-10-18 12:12:41 +02:00
Marek Posolda
386bf8d39e
Merge pull request #3344 from hmlnarik/KEYCLOAK-3732
...
KEYCLOAK-3732 Include 2.3.0 DB changelog for DB2
2016-10-18 10:29:01 +02:00
Hynek Mlnarik
2ea93b8a8b
KEYCLOAK-3732 Include 2.3.0 DB changelog for DB2
2016-10-18 09:53:27 +02:00
Stian Thorgersen
dfcd598912
Merge pull request #3341 from stianst/KEYCLOAK-3727
...
KEYCLOAK-3727 Fix link on logo in admin console
2016-10-18 09:49:55 +02:00
Stian Thorgersen
e157a60a23
KEYCLOAK-2884 Remove ClientTemplateResource.getKeycloakApplication()
2016-10-18 09:01:24 +02:00
Marek Posolda
2fd680092a
Merge pull request #3336 from mposolda/master
...
KEYCLOAK-3719 Add 'options' to ProviderConfigProperty and use it for …
2016-10-18 08:33:26 +02:00
Stian Thorgersen
37affb1e9c
Merge pull request #3342 from hmlnarik/KEYCLOAK-3588
...
KEYCLOAK-3588 Update comment with related KC issue
2016-10-18 08:27:40 +02:00
Hynek Mlnarik
9df3091b22
KEYCLOAK-3588 Update comment with related KC issue
2016-10-18 08:17:18 +02:00
Stian Thorgersen
728e68ede5
KEYCLOAK-3727 Fix link on logo in admin console
2016-10-18 07:43:52 +02:00
Pavel Drozd
4cbc665592
Merge pull request #3340 from vramik/migration
...
KEYCLOAK-3589 Add support for manual upgrade of database schema to te…
2016-10-18 07:39:42 +02:00
Pavel Drozd
d295ec709b
Merge pull request #3293 from zschwarz/oidc-filter
...
KEYLOAK-3663 OIDC servlet filter
2016-10-18 07:35:17 +02:00
Pavel Drozd
90097e9aea
Merge pull request #3318 from mhajas/KEYCLOAK-3654
...
KEYCLOAK-3654 Fix jwks-url in integration-arquillian
2016-10-18 07:32:50 +02:00