libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions
6451 commits 4 branches 5 tags 483 MiB
Commit graph

6451 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stian Thorgersen
747c0f9869 Merge pull request #2004 from stianst/master 
KEYCLOAK-2288
 2016-01-11 17:32:38 +01:00
Marek Posolda
5424cd80a8 Merge pull request #2005 from mposolda/master 
Fix MySQL - fixing transactions during bootstrap
 2016-01-11 17:02:08 +01:00
Stian Thorgersen
8d2becf681 Fix import of com.mongodb.util.MyAsserts.assertFalse 2016-01-11 15:47:09 +01:00
mposolda
c3f69fdc54 Fix MySQL - fixing transactions during bootstrap 2016-01-11 15:31:45 +01:00
Stian Thorgersen
45215f361f KEYCLOAK-2288 
Upgrade Mongo driver version to 3.2.0
 2016-01-11 15:10:00 +01:00
Stian Thorgersen
802488cea0 Merge pull request #2003 from mposolda/master 
Fix mongo model
 2016-01-11 13:58:06 +01:00
Stian Thorgersen
3ac3d79e30 Merge pull request #2002 from stianst/master 
KEYCLOAK-2284
 2016-01-11 13:22:44 +01:00
mposolda
fe8755d4a4 Fix mongo model 2016-01-11 13:00:56 +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
2ec4cb82cc Merge pull request #2001 from stianst/master 
KEYCLOAK-2278
 2016-01-11 11:41:15 +01:00
Stian Thorgersen
bc14cade62 KEYCLOAK-2278 
NoSuchMethodError org.infinispan.Cache.entrySet() in EAP6 server overlay
 2016-01-11 10:07:04 +01:00
Vlasta Ramik
554da73398 Merge remote-tracking branch 'upstream/master' into prod 2016-01-11 09:43:52 +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
Stian Thorgersen
33f83689d5 Merge pull request #1995 from stianst/master 
Add test to create user, set password and login using admin endpoints
 2016-01-11 09:01:44 +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
ba1a17e668 Merge pull request #1997 from patriot1burke/master 
KEYCLOAK-2189
 2016-01-08 12:05:50 -05:00
Bill Burke
7bc7510d1b KEYCLOAK-2189 2016-01-08 12:05:43 -05:00
Bill Burke
dc337d684a improve client creation when template 2016-01-08 11:40:46 -05:00
Bill Burke
0f9d50924c Merge pull request #1996 from patriot1burke/master 
improve client creation when template
 2016-01-08 11:40:45 -05:00
Stian Thorgersen
cf0eb1184a Add test to create user, set password and login using admin endpoints 2016-01-08 16:37:01 +01:00
Stian Thorgersen
ecd31010fe Merge pull request #1994 from stianst/KEYCLOAK-2259 
KEYCLOAK-2259
 2016-01-08 16:36:12 +01:00
Stian Thorgersen
0985d3c88a Merge pull request #1993 from stianst/master 
KEYCLOAK-2276
 2016-01-08 16:35:56 +01:00
Vlasta Ramik
1cde40f556 fixed some compile warnings 2016-01-08 16:28:36 +01:00
Vlasta Ramik
df590bfc3f fixed some compile warnings 2016-01-08 16:27:25 +01:00
Vlasta Ramik
bce5c49cbc fixed some compile warnings 2016-01-08 16:27:06 +01:00
Vlasta Ramik
bd8e662f88 fixed copy-admin-user-json-file 2016-01-08 16:13:15 +01:00
Stian Thorgersen
ddd99c2411 KEYCLOAK-2259 
Redirect URIs and token domains are matched case-sensitively
 2016-01-08 15:38:00 +01:00
Stian Thorgersen
7834637749 KEYCLOAK-2276 
Login page doesn't render properly when window height is less than 550px
 2016-01-08 15:19:59 +01:00
Stian Thorgersen
a90d7e54d4 Merge pull request #1992 from stianst/master 
KEYCLOAK-2275
 2016-01-08 15:19:38 +01:00
mhajas
f9f1e36df6 Ignore DemoServletAdapterTest on EAP6 2016-01-08 14:49:48 +01:00
Stian Thorgersen
bae2b62200 KEYCLOAK-2275 
No Content-Security-Policy meta tag found on Cordova 5.x
 2016-01-08 14:34:52 +01:00
Stian Thorgersen
71bcf697cc Merge pull request #1991 from stianst/master 
KEYCLOAK-2272
 2016-01-08 14:34:31 +01:00
mhajas
27f6390d00 Fix grantServerBasedApp test 2016-01-08 14:09:06 +01:00
Stian Thorgersen
9acb4b86aa Add note that JDK8 is required to build and to run the server 2016-01-08 13:56:07 +01:00
Stian Thorgersen
dee0be4237 KEYCLOAK-2272 
Update keycloak-datasources.xml and keycloak-infinispan.xml
 2016-01-08 13:39:49 +01:00
mhajas
8c4f071003 Merge remote-tracking branch 'upstream/master' into eap64 2016-01-08 13:28:35 +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
Vlasta Ramik
c5fc4c0805 Merge remote-tracking branch 'upstream/master' into prod 2016-01-08 11:36:46 +01:00
vramik
48be6070d0 add support for prod bits 2016-01-08 11:13:59 +01:00
Bill Burke
280725a2ae Merge pull request #1985 from patriot1burke/master 
KEYCLOAK-1990 KEYCLOAK-1991
 2016-01-07 18:24:31 -05: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
vramik
448a15b2ca install adapter via cli script from java code after start 2016-01-07 18:58:32 +01:00
Stian Thorgersen
30aaea73e4 Merge pull request #1989 from stianst/master 
KEYCLOAK-2127 Re-enable set admin user with welcome page
 2016-01-07 16:20:28 +01:00
Stian Thorgersen
4b1b697aa3 KEYCLOAK-2127 Re-enable set admin user with welcome page 2016-01-07 16:19:59 +01:00