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
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
Stian Thorgersen
cf0eb1184a
Add test to create user, set password and login using admin endpoints
2016-01-08 16:37:01 +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
mhajas
f9f1e36df6
Ignore DemoServletAdapterTest on EAP6
2016-01-08 14:49:48 +01:00
mhajas
27f6390d00
Fix grantServerBasedApp test
2016-01-08 14:09:06 +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
2892b093ab
Merge remote-tracking branch 'upstream/master'
2016-01-07 17:25:58 -05:00
vramik
448a15b2ca
install adapter via cli script from java code after start
2016-01-07 18:58:32 +01:00
Stian Thorgersen
4b1b697aa3
KEYCLOAK-2127 Re-enable set admin user with welcome page
2016-01-07 16:19:59 +01:00
mhajas
54712e29aa
Use user script for admin user creating
2016-01-07 11:24:51 +01:00
Bill Burke
71b6ed80ae
Merge remote-tracking branch 'upstream/master'
2016-01-06 16:51:24 -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
Bill Burke
4a472b8272
KEYCLOAK-1990 KEYCLOAK-1991
2016-01-06 10:02:56 -05:00
mposolda
7ec02761ef
LDAP testing: added activation
2016-01-05 20:53:25 +01:00
Bill Burke
7b30a6c9c4
Merge pull request #1979 from mposolda/master
...
Docs for LDAP mappers. Fix testsuite to pass with MSAD
2016-01-05 14:19:50 -05:00
mposolda
04401af470
Fix testsuite to pass with MSAD
2016-01-05 17:25:42 +01:00
Bill Burke
39d5a07218
KEYCLOAK-2221
2016-01-05 10:59:13 -05:00
Bill Burke
a65f619c9a
Merge pull request #1977 from mposolda/master
...
KEYCLOAK-2258 Removing leftovers of file model from docs and testsuite
2016-01-05 10:06:07 -05:00
Bill Burke
c3f2ae1cd1
Merge pull request #1973 from thomasdarimont/issue/KEYCLOAK-2253
...
KEYCLOAK-2253 - Add support for ConfiguredProvider based UserFederationProviderFactory.
2016-01-05 10:03:40 -05:00
mposolda
133e4c59e5
KEYCLOAK-2258 Removing leftovers of file model from docs and testsuite
2016-01-05 15:25:22 +01:00
mposolda
b6718b44a1
KEYCLOAK-2178 KEYCLOAK-1744 Added MSADUserAccountControlMapper. Removing enableUserAccountControlAfterPasswordUpdate option
2016-01-05 12:11:48 +01:00
Thomas Darimont
edcc39d906
KEYCLOAK-2253 - Use string representation for boolean properties in GenericUserFederationCtrl.
...
Adapted due to code review.
2016-01-04 23:07:08 +01:00
Thomas Darimont
3ec516d14c
KEYCLOAK-2253 - Add support for ConfiguredProvider based UserFederationProviderFactory.
...
UserFederationProvidersResource is now aware of ConfiguredProvider and allows sophisticated
configuration of configuration properties via ProviderConfigProperty definitions.
See DummyUserFederationProviderFactory. getConfigProperties() for example.
Previously UserFederationProvidersResource did only support simple key-value pairs for expressing
configurable options.
Tested this by launching a standalone KeycloakServer and creating a new Dummy UserFederationProvider.
The default values, labels and help messages are correctly displayed and the values are stored correctly.
2016-01-04 22:23:14 +01:00
Stian Thorgersen
b708cd671e
Merge pull request #1969 from vmuzikar/ui-stability
...
[KEYCLOAK-1865] Enable LdapUserFederationTest#invalidSettingsTest - already fixed
2016-01-04 20:07:52 +01:00
vramik
efa112f820
updated version of xml plugin, fix adapter-libs-provided profile in eap6 adapter
2016-01-04 16:46:47 +01:00
Stian Thorgersen
e7009cac47
KEYCLOAK-2204 Add test to make sure disabled client can't refresh token
2016-01-04 13:15:58 +01:00
Stian Thorgersen
eece3689f2
KEYCLOAK-2228
...
Deleting of realm when using JPA requires server restart
2016-01-04 13:04:33 +01:00
Vaclav Muzikar
f48753f6e1
Enable LdapUserFederationTest#invalidSettingsTest - already fixed
2016-01-04 12:36:38 +01:00
Stian Thorgersen
a9b5d07263
Merge pull request #1964 from stianst/master
...
KEYCLOAK-2242
2015-12-23 14:39:41 +01:00
Stian Thorgersen
eddf3eef17
KEYCLOAK-2242
...
Remove built-in admin account
2015-12-23 13:46:11 +01:00
mposolda
41d22986d5
KEYCLOAK-1899 Added HardcodedLDAPRoleMapper
2015-12-22 16:22:02 +01:00
mposolda
0c293089c3
KEYCLOAK-2154 Group mapper fixes
2015-12-22 12:32:37 +01:00
mposolda
20548b402d
Separate package for LDAP tests
2015-12-22 09:35:53 +01:00
mposolda
1747e0981f
KEYCLOAK-2154 Added Group mapper for LDAP. LDAP mappers improvements and fixes
2015-12-22 08:54:09 +01:00
Bill Burke
b90409c5e4
refactor client create
2015-12-21 16:36:13 -05:00
mhajas
4463f6e1e1
Run adapter tests on EAP 6.4 + test fixes + hot fix of bad arquillian URL provider
2015-12-21 12:36:34 +01:00
Stian Thorgersen
606e6fa479
KEYCLOAK-1934
...
Add display-name and display-name-html to realm
2015-12-21 12:15:13 +01:00
Stian Thorgersen
1afd3d422c
Merge pull request #1952 from vmuzikar/ui-stability
...
KEYCLOAK-1865 Fix stability of some UI arquillian tests
2015-12-21 07:50:11 +00:00
Bill Burke
86a0995f29
fix test
2015-12-18 17:31:53 -05:00
Bill Burke
a7c684b909
oops
2015-12-18 17:19:31 -05:00
Bill Burke
5caf3e0a2d
Merge remote-tracking branch 'upstream/master'
2015-12-18 17:15:40 -05:00
Bill Burke
d939b6a431
template scope
2015-12-18 17:15:27 -05:00
Vaclav Muzikar
42d17577d0
Upstream sync
2015-12-18 17:28:57 +01:00
Vaclav Muzikar
eaf326dd37
Fix Client Mappers tests
...
(cherry picked from commit b9f9db0)
2015-12-18 17:18:59 +01:00
Vaclav Muzikar
53a542d1e2
Enable TokensTest (already fixed by previous commit bf70927)
...
(cherry picked from commit 6783bcb)
2015-12-18 17:15:20 +01:00
Vaclav Muzikar
c51d5e9820
Fix PasswordPolicyTest
...
(cherry picked from commit 87b125e)
2015-12-18 17:15:18 +01:00
Vaclav Muzikar
817127a751
Fix + refactor SecurityDefensesTest
...
(cherry picked from commit a652173)
2015-12-18 17:15:16 +01:00
Vaclav Muzikar
0e6e3d10d8
Fix LoginSettingsTest
...
(cherry picked from commit bf70927)
2015-12-18 17:15:09 +01:00
vramik
c759719e95
added support for set jdk for adapter container
2015-12-18 14:56:49 +01:00
vramik
19471d07b8
added support for set jdk for adapter container
2015-12-18 13:40:00 +01:00
vramik
57ea0a3b42
set default build to community eap6
2015-12-18 10:49:57 +01:00
Bill Burke
0197c69ac3
Merge pull request #1951 from pedroigor/KEYCLOAK-2202
...
[KEYCLOAK-2202] - Initial support for SAML ECP Profile.
2015-12-17 19:04:17 -05:00
vramik
6bb05bf339
fix
2015-12-18 00:23:19 +01:00
vramik
d5950a615a
exclude client tests from adapters
2015-12-18 00:15:03 +01:00
vramik
6af2e1054c
eap6-adapter
2015-12-17 23:20:37 +01:00
vramik
53ca4b9294
integration-arquillian prod: add support for non default firefox
2015-12-17 10:27:42 +01:00
Stian Thorgersen
83eea5036f
Merge pull request #1948 from pdrozd/wf10
...
Arquillian xsl templates - changed namespaces to WF10.
2015-12-17 09:01:14 +00:00
Pedro Igor
1b614a379b
[KEYCLOAK-2202] - Initial support for SAML ECP Profile.
2015-12-16 18:46:52 -02:00
mposolda
0d52e4e6c5
Added sync support to UserFederationMapper
2015-12-16 13:52:11 +01:00
mposolda
2b409b3462
Minor test fix
2015-12-16 13:52:11 +01:00
vramik
aa0d463487
integration-arquillian prod: add jpa profile
2015-12-16 12:22:44 +01:00
Vlasta Ramik
a418e71dc6
Merge branch 'master' of https://github.com/keycloak/keycloak into prod
2015-12-16 10:36:07 +01:00
Pavel Drozd
b4e53b1677
Arquillian xsl templates - changed namespaces to WF10.
2015-12-16 10:26:10 +01:00
Bill Burke
ee79f5e69d
remove default client mappers when templated
2015-12-15 17:37:53 -05:00
vramik
e1de2c0661
integration-arquillian: add support for prod testing
2015-12-15 13:14:30 +01:00
mposolda
06a55419f1
KEYCLOAK-1906 Customized LDAP filter. LDAP conditions improvements
2015-12-14 13:55:11 +01:00
Marek Posolda
82a573a536
Merge pull request #1939 from mhajas/master
...
KEYCLOAK-1667 Added adapter tests of SAML to integration arquillian
2015-12-14 09:26:32 +01:00
Marko Strukelj
32af1bd3a5
KEYCLOAK-2223 Upgrade to WildFly 10.0.0.CR4
2015-12-13 21:26:07 +01:00
Bill Burke
2328e0a6f9
Merge remote-tracking branch 'upstream/master'
2015-12-11 10:31:55 -05:00
Bill Burke
96e1813b34
client templates backend
2015-12-11 10:31:42 -05:00
mhajas
97357d020b
Merge remote-tracking branch 'upstream/master'
2015-12-11 15:43:03 +01:00
Pavel Drozd
b466cec4e5
Merge pull request #1940 from vramik/master
...
arquillian-testsuite: updated screenshooter version
2015-12-11 15:32:51 +01:00
Pavel Drozd
9228c6a16b
Merge pull request #1938 from mhajas/fixDataTable
...
Fix adapter tests errors caused by changed DataTable fragment
2015-12-11 15:29:28 +01:00
vramik
9956f425eb
arquillian-testsuite: updated screenshooter version
2015-12-11 12:15:27 +01:00
mhajas
5464e600ea
Set SAMLServlet test abstract
2015-12-10 17:23:33 +01:00
mhajas
cbdba622a5
Merge remote-tracking branch 'upstream/master'
2015-12-10 15:27:55 +01:00
mhajas
49e9965125
Fix timeouts after logout from servlet
2015-12-10 15:26:33 +01:00
mhajas
dcaf7ea9d5
Fix test errors caused by changed DataTable fragment
2015-12-10 11:46:40 +01:00
Pavel Drozd
3f51f620b7
Support for testing ssl-required.
2015-12-10 07:21:23 +01:00
mposolda
081db0d353
KEYCLOAK-2124 Post-Broker login flow support
2015-12-09 16:36:26 +01:00
mhajas
b82346761c
Merge remote-tracking branch 'upstream/master'
2015-12-09 10:53:50 +01:00
mhajas
595e7a92e2
Added SAML servlets adapter tests to integration-arquillian
2015-12-09 10:50:25 +01:00
mhajas
fee1dea3e6
Added SAML example adapter tests to integration-arqullian
2015-12-09 10:48:53 +01:00
mhajas
9a58e1276a
Added integration-arqullian servlet used in SAML tests
2015-12-09 10:45:56 +01:00
mhajas
1d401767d6
Added integration-arqullian SAML example page objects
2015-12-09 10:42:02 +01:00
mhajas
68e3b6c504
Added integration-arqullian SAML servlets page objects
2015-12-09 10:41:17 +01:00
mhajas
813ddf365e
Added integration-arqullian keycloak-saml resources
2015-12-09 10:39:34 +01:00
mhajas
edf3499662
Added integration-arqullian configuration for SAML adapter tests
2015-12-09 10:36:42 +01:00
Marek Posolda
df26caed07
Merge pull request #1933 from vramik/clients
...
KEYCLOAK-2203, KEYCLOAK-2205
2015-12-09 10:28:56 +01:00
mhajas
4ca3bf530f
Merge remote-tracking branch 'upstream/master' into fixDataTable
2015-12-09 07:41:45 +01:00
Stian Thorgersen
321cac2ab8
KEYCLOAK-1900 Refactoring
2015-12-08 14:06:40 +01:00
tsudot
162dd4051d
KEYCLOAK-1900 Add password hash SPI and provider
...
- Default encoder set to Pbkdf2PasswordEncoder
2015-12-08 13:25:59 +01:00
vramik
cd19c1acdf
fix tests witch fails with phantomjs
2015-12-08 08:40:40 +01:00
vramik
44ed912154
Merge branch 'master' of https://github.com/keycloak/keycloak into clients
...
Conflicts:
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/clients/CreateClientForm.java
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/FlashMessage.java
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/OnOffSwitch.java
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientRolesTest.java
2015-12-07 15:45:02 +01:00
vramik
39856c32d1
Merge branch 'master' of https://github.com/keycloak/keycloak into clients
...
Conflicts:
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/clients/CreateClientForm.java
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/FlashMessage.java
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/OnOffSwitch.java
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientRolesTest.java
2015-12-07 15:44:34 +01:00
vramik
ba861f227e
added UI tests for client's tabs: clustering, installation
2015-12-07 15:09:24 +01:00
Tomas Kyjovsky
87a8e017fa
Disabled crudRole test, unstable. Role tests need rewrite.
2015-12-07 09:10:32 +01:00
Tomas Kyjovsky
b8fe608aaf
Merge upstream-master
2015-12-07 05:59:51 +01:00
mhajas
d3e6b38a8e
Fix xpath for DataTable row and tests
2015-12-04 14:26:24 +01:00
vramik
1b936a1230
added UI tests for client scope
2015-12-04 12:04:39 +01:00
mposolda
45c490b640
KEYCLOAK-2197 Fix broker tests to work with sybase. Added LoggingRule
2015-12-04 11:44:30 +01:00
vramik
1dd3fc537b
added UI tests for client mappers saml
2015-12-03 14:47:13 +01:00
vramik
c16b6e6a43
update ClientSettingsTest due to KEYCLOAK-1129
2015-12-03 12:49:29 +01:00
Stian Thorgersen
8d23422605
KEYCLOAK-2176 Add default roles and actions to users created with add-user script
2015-12-03 11:45:56 +01:00
Stian Thorgersen
34c3ffaae1
Ported AdminApiTest to use admin client
2015-12-03 08:24:23 +01:00
Stian Thorgersen
a218cc3034
KEYCLOAK-2179 Cache fixes
2015-12-03 08:24:16 +01:00
Tomas Kyjovsky
b0e9720f88
Increased arquillian timeouts.
2015-12-02 16:46:15 +01:00
Tomas Kyjovsky
6507f58b49
Merge upstream-master
2015-12-02 16:11:45 +01:00
Tomas Kyjovsky
46e2440d30
Refactoring of arquillian waiting methods.
2015-12-02 15:58:23 +01:00
vramik
9b51b6e43b
Merge upstream/master into clients
2015-12-02 15:18:15 +01:00
vramik
2b25c120d4
added UI tests for client mappers oidc
2015-12-02 13:12:05 +01:00
Stian Thorgersen
09c18306c2
KEYCLOAK-2179
...
Realm and user cache is invalidated when added to other nodes
2015-12-02 11:23:54 +01:00
Stian Thorgersen
ff806eae08
Version bump
2015-12-01 19:54:28 +01:00
Tomas Kyjovsky
e44d6f9888
Merge upstream-master
2015-12-01 17:30:02 +01:00
Tomas Kyjovsky
4e79dde17f
Removed travis profile from arq. testsuite.
2015-12-01 17:29:28 +01:00
Tomas Kyjovsky
29e05ecf0d
Fixed arquillian wait intervals config.
2015-12-01 17:28:28 +01:00
vramik
c4f3bd3dda
Merge upstream/master
2015-12-01 12:51:57 +01:00
mposolda
382161c425
KEYCLOAK-2171 Fix broker test with MySQL and Sybase
2015-12-01 09:20:18 +01:00
mposolda
635310123e
KEYCLOAK-2167 EmailAsUsername not reflected during registration through broker
2015-11-30 22:46:34 +01:00
mposolda
0f3d2bbfb4
KEYCLOAK-2149 DB fixes. firstBrokerLogin migration
2015-11-30 18:57:31 +01:00
Tomas Kyjovsky
ed30c4454a
Increased arquillian timeouts for travis.
2015-11-30 17:09:57 +01:00
Tomas Kyjovsky
0d4771a763
Merge upstream-master
2015-11-30 16:48:25 +01:00
Tomas Kyjovsky
a8317e0cc2
1) Pageload timeout set to 60s. Other timeouts set by arq props in arquillian.xml 2) Refactoring: FlashMessage --> AdminConsoleAlert and AccountManagementAlert
2015-11-30 16:43:18 +01:00
mposolda
5b61a10b55
KEYCLOAK-2061 Direct Access Grants disabled by default
2015-11-30 15:56:21 +01:00
mposolda
ec327c99f4
KEYCLOAK-2152 KEYCLOAK-2061 Client switches changes. Support for response_types and grant_types in OIDC Client registration
2015-11-30 15:31:38 +01:00
vramik
6a7a823fb4
merge upstream/master
2015-11-30 14:59:44 +01:00
Stian Thorgersen
233b1e2553
KEYCLOAK-2063 Fix verify email link from admin endpoint
2015-11-30 12:10:45 +01:00
Stian Thorgersen
54b5a6c41e
Merge pull request #1896 from vramik/authFlows
...
arquillian-testsuite: auth flows tests
2015-11-30 09:52:12 +01:00
Stian Thorgersen
2c5510284d
Merge pull request #1891 from mstruk/wildfly-modules-rename
...
KEYCLOAK-2099 WildFly 10 adapter subsystem
2015-11-30 09:48:15 +01:00
mposolda
57b60797ce
KEYCLOAK-1129 Implicit flow: more work
2015-11-28 00:15:41 +01:00
mposolda
ef80b64d1c
KEYCLOAK-1129 Implicit flow and Hybrid flow support
2015-11-27 22:28:38 +01:00
mposolda
8d2e4c0316
KEYCLOAK-2061 Add switches to enable/disable grant types for clients
2015-11-27 22:28:38 +01:00
Marko Strukelj
373fc23fc0
KEYCLOAK-2099 WildFly 10 adapter subsystem
2015-11-27 20:46:20 +01:00
Stian Thorgersen
c83e3bd2d1
KEYCLOAK-2106 HTTP 500 for unparsable refresh tokens
2015-11-27 08:59:23 +01:00
Stian Thorgersen
5ea880cfff
Merge pull request #1880 from stianst/KEYCLOAK-2129-USRCACHE
...
KEYCLOAK-2139
2015-11-26 21:14:08 +01:00
Stian Thorgersen
7c4c77d70e
KEYCLOAK-2147
2015-11-26 20:24:33 +01:00
Stian Thorgersen
b996e88dbd
KEYCLOAK-2139
...
UserCache invalidation does not work proper
2015-11-26 16:39:06 +01:00
Stian Thorgersen
ee363a4c56
KEYCLOAK-2129
2015-11-26 12:41:55 +01:00
