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

2802 commits

Author SHA1 Message Date
Stian Thorgersen
f1156a49cf Merge pull request #3273 from vramik/KEYCLOAK-3619 
KEYCLOAK-3619 Update default datasource definition to XA
 2016-10-03 13:54:20 +02:00
Bill Burke
d4c3fae546 merge conflicts 2016-09-30 19:19:12 -04:00
Bill Burke
6a4e413bf4 final mongo fixes 2016-09-30 19:08:34 -04:00
Bill Burke
110f6ad549 mongo fed 2016-09-30 16:48:59 -04:00
mposolda
f9a0abcfc4 KEYCLOAK-3493 KEYCLOAK-3532 Added KeyStorageProvider. Support key rotation for OIDC clients and identity providers with JWKS url. 2016-09-30 21:28:23 +02:00
Pavel Drozd
6e00587468 Merge pull request #3264 from vmuzikar/KEYCLOAK-3616 
KEYCLOAK-3616 Add integration tests for Node.js adapter
 2016-09-30 14:33:07 +02:00
Vlasta Ramik
550ec2ff51 Update default datasource definition to XA 2016-09-30 12:50:17 +02:00
Pavel Drozd
bcf5ac56cd Merge pull request #3266 from mhajas/KEYCLOAK-3586 
KEYCLOAK-3586 Adding tests for updateToken and timeSkew
 2016-09-29 11:13:26 +02:00
Pavel Drozd
aa1ad029bb Merge pull request #3252 from mhajas/KEYCLOAK-3604 
KEYCLOAK-3604 Compile servlets and filters under JDK7
 2016-09-29 11:06:21 +02:00
Stian Thorgersen
5d34b7e682 Merge pull request #3189 from thomasdarimont/issue/KEYCLOAK-3491-revise-scripting-support 
KEYCLOAK-3491 Revise Scripting Support
 2016-09-29 10:12:15 +02:00
mhajas
69f66edb5f KEYCLOAK-3604 Compile servlets and filters under JDK7 2016-09-29 09:51:12 +02:00
Bill Burke
8967ca4066 refactor mongo entities, optimize imports 2016-09-28 15:25:39 -04:00
Bruno Oliveira
a5b5e78eba
Inclusion of test to check the federation provider list when SSSD is enabled 2016-09-28 14:16:41 -03:00
Stian Thorgersen
a58c985934 Merge pull request #3268 from stianst/REVIEW 
KEYCLOAK-2438
 2016-09-28 13:27:26 +02:00
Stian Thorgersen
34f62eb31d Fixes to [KEYCLOAK-2438] PR 2016-09-28 10:25:37 +02:00
Bill Burke
afee7d7403 Merge pull request #3267 from patriot1burke/master 
mongo fixes
 2016-09-27 21:17:24 -04:00
Bill Burke
d0eb26b8bb Merge remote-tracking branch 'upstream/master' 2016-09-27 17:08:24 -04:00
Bill Burke
d65cc830eb mongo fixes 2016-09-27 17:07:16 -04:00
mhajas
6c3479665c KEYCLOAK-3586 2016-09-27 14:00:52 +02:00
Vaclav Muzikar
ee2daeb364 KEYCLOAK-3616 Add integration tests for Node.js adapter 2016-09-27 10:32:35 +02:00
Pavel Drozd
fc6d6ff7f7 Merge pull request #3261 from vramik/KEYCLOAK-3609 
KEYCLOAK-3609 Export/Import migration testing
 2016-09-27 07:39:00 +02:00
Bruno Oliveira
98d2fe15e8 [KEYCLOAK-2438] - Add display name to social login buttons 
[KEYCLOAK-3291] - Names of social identity providers are wrongly capitalized (eg GitHub vs Github)
 2016-09-26 13:36:28 -03:00
Bill Burke
ecc104719d bump pom version 2016-09-26 11:01:18 -04:00
Pavel Drozd
9ee58909ab Merge pull request #3248 from pdrozd/patches 
KEYCLOAK-3597 - Arquillian testuite - server preparation (overlay & p…
 2016-09-26 10:26:13 +02:00
Pavel Drozd
6f5dadedd5 Merge pull request #3247 from vramik/KEYCLOAK-3596 
KEYCLOAK-3596 Remove duplicate declaration of maven-resources-plugin
 2016-09-26 10:25:07 +02:00
Bill Burke
27e86e36c4 Merge remote-tracking branch 'upstream/master' 2016-09-23 16:50:16 -04:00
Bill Burke
ff1326fe35 authenticator example updated 2016-09-23 16:50:08 -04:00
Marek Posolda
5fc7149aac Merge pull request #3257 from mposolda/pairwise 
KEYCLOAK-3422 Pairwise subjects : few fixes and bit of refactoring
 2016-09-23 20:58:51 +02:00
Bill Burke
a1bcd0651d fixes 2016-09-23 10:38:49 -04:00
Marek Posolda
22aaa4cb52 Merge pull request #3237 from brat000012001/kc-iss-3505 
KEYCLOAK-3505: updated the oidc user attribute mapper used to map oid…
 2016-09-23 15:38:20 +02:00
mposolda
04f05c0cd1 KEYCLOAK-3422 Pairwise subjects : few fixes and bit of refactoring 2016-09-23 15:29:13 +02:00
Bill Burke
8e65356891 creds 2016-09-22 19:57:39 -04:00
Vlasta Ramik
f91c517a9c Export/Import migration testing 2016-09-22 15:16:20 +02:00
Bill Burke
7209a95dce credential refactoring 2016-09-22 08:34:45 -04:00
didiez
98bf095471 Keep setSingleAttribute from deleting all other attributes of the user being updated. 2016-09-22 10:42:24 +02:00
Thomas Darimont
8e113384aa KEYCLOAK-3491 Revise Scripting Support 
Refactored the scripting infrastructure and added documentation.
Added tests and an authenticator template in JavaScript for a quickstart.
Increased height of ace code editor to 600px to avoid scrolling.
 2016-09-20 14:33:39 +02:00
Pavel Drozd
59eec8d5b4 KEYCLOAK-3597 - Arquillian testuite - server preparation (overlay & patches installation) 2016-09-20 13:00:54 +02:00
Vlasta Ramik
0ab53c5d88 Remove duplicate declaration of maven-resources-plugin 2016-09-20 12:51:27 +02:00
Stian Thorgersen
4977527f60 Merge pull request #3239 from stianst/SERVER-PROFILE 
KEYCLOAK-3579 Add ability to define profiles
 2016-09-20 10:39:05 +02:00
Stian Thorgersen
c6a6848483 Merge pull request #3245 from mhajas/KEYCLOAK-3590 
KEYCLOAK-3590 Fix includes
 2016-09-20 08:52:37 +02:00
Stian Thorgersen
9d0c9046ad Merge pull request #3227 from mhajas/KEYCLOAK-3553 
KEYCLOAK-3553 Move all functionality tests to servlets
 2016-09-20 08:51:59 +02:00
Stian Thorgersen
992268a8e6 KEYCLOAK-3579 Add ability to define profiles 2016-09-20 08:41:23 +02:00
Pedro Igor
df1995636a Merge pull request #3244 from mhajas/KEYCLOAK-3561 
KEYCLOAK-3561 Hardcoded artifact version
 2016-09-19 12:29:57 -03:00
mhajas
ba0d71704d KEYCLOAK-3590 Fix includes 2016-09-19 15:19:41 +02:00
mhajas
f69eb5503b KEYCLOAK-3561 Hardcoded artifact version 2016-09-19 14:26:47 +02:00
Bruno Oliveira
c26471faa8 Tests cases for: user disabled, password and profile changes 2016-09-16 18:25:47 -03:00
wyvie
6bdc9dc133 [KEYCLOAK-3036] Added sssd integration test 2016-09-16 18:19:17 -03:00
mhajas
12919223cf KEYCLOAK-3553 All functionality tests to servlets 2016-09-16 09:59:05 +02:00
Stian Thorgersen
b32b222b02 Merge pull request #3224 from mhajas/KEYCLOAK-3551 
KEYCLOAK-3551 Remove example-dist dependency from testsuite
 2016-09-16 09:46:42 +02:00
Stian Thorgersen
44c47431a1 Merge pull request #3233 from betovieirasilva/master-KEYCLOAK-LoginUsername 
[PULL-REQUEST-3181 & PULL-REQUEST-3233] Username is not displayed on the login screen with that email
 2016-09-16 09:23:26 +02:00
Stian Thorgersen
b2fd429749 Merge pull request #3234 from vramik/KEYCLOAK-3549 
KEYCLOAK-3549 fix xsl locator to work with ibmjdk
 2016-09-16 09:22:23 +02:00
Peter Nalyvayko
0348e427de KEYCLOAK-3505: cosmetic coding style changes 2016-09-15 15:42:09 -04:00
Peter Nalyvayko
b97908fb02 KEYCLOAK-3505: updated the oidc user attribute mapper used to map oidc broker claims to map the claims from userinfo claim set 2016-09-15 11:11:58 -04:00
Marek Posolda
5afe93552a Merge pull request #3231 from TeliaSoneraNorge/pr/KEYCLOAK-3422 
KEYCLOAK-3422 support pairwise subject identifier in oidc
 2016-09-14 21:51:48 +02:00
Marek Posolda
036b24378f Merge pull request #3225 from vmuzikar/KEYCLOAK-3552 
KEYCLOAK-3552 Add some missing tests for OIDC Dynamic Profile
 2016-09-14 18:30:44 +02:00
Vlasta Ramik
bde45eaa07 fix xsl locator to work with ibmjdk 2016-09-14 14:43:14 +02:00
Gilberto Vieira da Silva
8c518a8d38 Include test case for PULL-REQ-3181 2016-09-13 18:57:07 -03:00
Gilberto Vieira da Silva
868f8b166f Reverted to appli to branch master-KEYCLOAK-LoginUsername 2016-09-13 18:52:05 -03:00
Gilberto Vieira da Silva
4b3d3bf55b Include test case for PULL-REQ-3181 2016-09-13 18:21:48 -03:00
Martin Hardselius
04d03452bd KEYCLOAK-3422 support pairwise subject identifier in oidc 2016-09-13 09:18:45 +02:00
mposolda
bf6246f5c1 KEYCLOAK-905 Realm keys rotation support on adapters 2016-09-12 21:24:04 +02:00
Vaclav Muzikar
fa02277e6e KEYCLOAK-3552 Add some missing tests for OIDC Dynamic Profile 2016-09-09 12:23:08 +02:00
mhajas
4780a3453a Remove example-dist dependency 2016-09-09 12:04:24 +02:00
Stian Thorgersen
1630b9a20c Merge pull request #3220 from abstractj/KEYCLOAK-3535 
KEYCLOAK-3535 - Check if SSSD is available via DBUS
 2016-09-09 08:15:11 +02:00
Stian Thorgersen
e8f99a2109 Merge pull request #3221 from patriot1burke/master 
KEYCLOAK-3423
 2016-09-09 07:45:53 +02:00
Bill Burke
84f5c0926b KEYCLOAK-3423 2016-09-08 16:47:06 -04:00
Bruno Oliveira
11245701d2 Check if SSSD is available via DBUS 2016-09-08 16:01:45 -03:00
Vlasta Ramik
fa8f60a5f0 remove jta=false from default datasource definition 2016-09-08 15:25:17 +02:00
Stian Thorgersen
36bb94afb8 Environment dependent provider 2016-09-08 07:40:19 -03:00
mposolda
4fd0238ca9 KEYCLOAK-3542 Not possible to enable bruteForceProtection for realm 2016-09-08 12:30:38 +02:00
Marek Posolda
76e1160b36 Merge pull request #3210 from mposolda/master 
KEYCLOAK-3537 Username not shown when validation error on Account pro…
 2016-09-08 10:04:38 +02:00
Stian Thorgersen
348e0b6226 Merge pull request #3200 from mbaluch/master 
RHSSO-423 - Added default value for 'log-dir'. Set to ${project.build…
 2016-09-08 08:42:54 +02:00
Stian Thorgersen
44b7210af7 Merge pull request #3203 from mhajas/eap6fix 
KEYCLOAK-3533 Fix forbidden page on eap6
 2016-09-08 08:41:52 +02:00
Stian Thorgersen
f726caea9b Merge pull request #3205 from stianst/KEYCLOAK-3342 
KEYCLOAK-3342 Add Identity Provider authenticator
 2016-09-08 08:40:32 +02:00
mposolda
16282aeb7b KEYCLOAK-3537 Username not shown when validation error on Account profile page 2016-09-08 08:36:39 +02:00
Stian Thorgersen
d2c546bdc2 Merge pull request #3201 from pedroigor/KEYCLOAK-3129 
[KEYCLOAK-3129] - Add authorization services endpoints to PermissionsTest
 2016-09-08 08:03:40 +02:00
Stian Thorgersen
1f27fc9e4b Merge pull request #3153 from cargosoft/KEYCLOAK-3327 
KEYCLOAK-3327 Make realm attributes accessible via the RealmModel
 2016-09-08 08:00:14 +02:00
Stian Thorgersen
7c292b1213 KEYCLOAK-3342 Add Identity Provider authenticator 2016-09-08 07:20:35 +02:00
mposolda
5a015a6518 KEYCLOAK-3494 Input elements backed by user attributes fail to update in themes 2016-09-07 20:08:09 +02:00
mhajas
c860d03a60 Fix forbidden page on eap6 2016-09-07 09:02:46 +02:00
Bruno Oliveira
1b2a5eda32
Initial FreeIPA Integration 
- Provide username/password authentication with PAM
  - Obtain user data from SSSD
  - Feature packs for dbus-java, libpam4j and SSSD API
  - Provisioning script
 2016-09-06 18:04:43 -03:00
Pedro Igor
517413d38e [KEYCLOAK-3129] - Add authorization services endpoints to PermissionsTest 2016-09-06 17:32:37 -03:00
Marek Baluch
fd25dbcb5c RHSSO-423 - Added default value for 'log-dir'. Set to ${project.build.dir}/surefire-reports 2016-09-06 18:16:15 +02:00
mposolda
03c05bd72b KEYCLOAK-2957 IdpEmailVerificationAuthenticator should setEmailVerified to true after successfuly link user by email verification 2016-09-05 18:04:24 +02:00
Stian Thorgersen
22e85b11eb Merge pull request #3190 from vramik/KEYCLOAK-3489 
KEYCLOAK-3489 Database migration testing
 2016-09-05 15:19:24 +02:00
Vlasta Ramik
39fe439573 Database migration testing 2016-09-05 13:39:21 +02:00
Stian Thorgersen
7a77055e58 Merge pull request #3180 from mbaluch/master 
A class to generate a single jUnit XML file. This file will be co…
 2016-09-05 09:37:33 +02:00
mposolda
a24a43c4be KEYCLOAK-3349 Support for 'request' and 'request_uri' parameters 2016-09-02 20:20:38 +02:00
mposolda
892d5fd1b7 TestingExportImport in separate resource 2016-09-02 20:20:38 +02:00
Pedro Igor
43d23835d0 Merge pull request #3179 from pedroigor/KEYCLOAK-3472 
[KEYCLOAK-3472] - Multiple paths with the same name and tests
 2016-09-01 10:00:33 -03:00
Marek Baluch
c874f96228 A class which generates a single junit xml file. This file will be consumed by Polarion 2016-09-01 10:18:06 +02:00
Pedro Igor
ce78cc1d1c [KEYCLOAK-3472] - Multiple paths with the same name and tests 2016-08-31 21:04:36 -03:00
Vaclav Muzikar
1b085d3e13 KEYCLOAK-3421 Validation for URI fragments in redirect_uri 2016-08-31 13:07:33 +02:00
mposolda
02f28a7e8e KEYCLOAK-3416 Add support for signed Userinfo requests 2016-08-30 20:21:04 +02:00
Stian Thorgersen
5a4bb5f3f0 Merge pull request #3168 from stianst/master 
KEYCLOAK-3462 Fix exception not displayed in init from KeycloakServer
 2016-08-30 09:47:31 +02:00
mposolda
f4aee129e4 KEYCLOAK-3424 Issuer or token-endpoint as audience in signed JWT 2016-08-29 14:43:35 +02:00
mposolda
a7f9a6e095 KEYCLOAK-3424 Support for import from public key 2016-08-29 14:43:29 +02:00
Stian Thorgersen
4f51b7b34c KEYCLOAK-3462 Fix exception not displayed in init from KeycloakServer 2016-08-29 09:21:22 +02:00
Stian Thorgersen
2a29f2a9c6 Merge pull request #3151 from ssilvert/dmr-server-config 
KEYCLOAK-3196: Use WildFly management model for server configuration.
 2016-08-26 13:44:45 +02:00
Stian Thorgersen
9ffd6548ce Merge pull request #3146 from mhajas/KEYCLOAK-3161 
KEYCLOAK-3161 Migrate SAML adapter tests
 2016-08-26 13:40:58 +02:00
Stan Silvert
a0054bd77f Merge pull request #1 from vramik/KEYCLOAK-3459 
KEYCLOAK-3459 Adapt testsuite according to server configuration insid…
 2016-08-25 07:21:34 -04:00
Vlasta Ramik
099de9e6e3 KEYCLOAK-3459 Adapt testsuite according to server configuration inside standalone.xml instead of keycloak-server.json 2016-08-25 12:36:39 +02:00
Marek Posolda
d138b19adb Merge pull request #3142 from vmuzikar/KEYCLOAK-3429 
KEYCLOAK-3429 Fix behaviour of redirect_uri parameter with query components
 2016-08-24 09:53:29 +02:00
Stian Thorgersen
e28a3750cd Merge pull request #3149 from vmuzikar/KEYCLOAK-3437 
KEYCLOAK-3437 Add User Federation Console UI test
 2016-08-23 12:57:02 +02:00
Stian Thorgersen
014c8e068f Merge pull request #3156 from vmuzikar/KEYCLOAK-3448 
KEYCLOAK-3448 Stabilize Internationalization UI Test
 2016-08-23 12:55:53 +02:00
Stian Thorgersen
3890867383 Merge pull request #3133 from fkiss/master-email-ibmjdk 
KEYCLOAK-3351 TrustStoreEmailTest fix for ibmjdk
 2016-08-23 12:54:12 +02:00
Stian Thorgersen
c522a20ab9 KEYCLOAK-3447 Manual upgrade of database schema 2016-08-22 10:22:08 +02:00
Vaclav Muzikar
365a1b66c8 KEYCLOAK-3448 Stabilize Internationalization UI Test 2016-08-19 11:40:01 +02:00
Dimitri Teleguin
b109ce14b0 KEYCLOAK-3327 Make realm attributes accessible via the RealmModel 2016-08-18 23:28:32 +03:00
Vaclav Muzikar
be83e2fb6b KEYCLOAK-3437 Add User Federation Console UI test 2016-08-16 15:47:02 +02:00
Pedro Igor
a8d2b810cf [KEYCLOAK-3144] - Add authorization settings when exporting/importing a realm. 2016-08-15 10:35:28 -03:00
mhajas
285a99d903 Migrate SAML adapter tests 2016-08-13 11:09:48 +02:00
mposolda
2cba13db9c KEYCLOAK-3424 Possibility to import JWK key through admin console 2016-08-12 15:51:14 +02:00
mposolda
3eb9134e02 KEYCLOAK-3424 Support for save JWKS in OIDC ClientRegistration endpoint 2016-08-12 15:51:14 +02:00
Vaclav Muzikar
b7f2e0b5ff KEYCLOAK-3429 Fix behaviour of redirect_uri parameter with query components 2016-08-12 14:02:17 +02:00
mposolda
0520d465c1 KEYCLOAK-3414 Support for client registration from trusted hosts 2016-08-11 15:55:32 +02:00
mposolda
a8fb988e31 KEYCLOAK-3406 OIDC dynamic client registrations specs fixes 2016-08-11 15:54:51 +02:00
mposolda
9c7442c75b Fix ExportImportTest 2016-08-11 15:51:56 +02:00
fkiss
de888fc8a1 KEYCLOAK-3351 TrustStoreEmailTest fix for ibmjdk 2016-08-11 10:52:29 +02:00
mposolda
d52e043322 Set version to 2.2.0-SNAPSHOT 2016-08-10 08:57:18 +02:00
Bill Burke
7f6fc170dc Merge pull request #3119 from fkiss/master-exportimport 
KEYCLOAK-3211 - ExportImportTest fix for Wildfly
 2016-08-09 20:59:04 -04:00
Bill Burke
530870f05e realm components import/export 2016-08-09 15:06:29 -04:00
fkiss
4974079794 KEYCLOAK-3211 - ExportImportTest fix for Wildfly 2016-08-09 15:20:40 +02:00
Bill Burke
d94515cdae Merge pull request #3117 from patriot1burke/master 
deployer, jta lookup, merge user fed/storage
 2016-08-08 17:46:35 -04:00
Bill Burke
f838c697d1 Merge remote-tracking branch 'upstream/master' 2016-08-08 16:04:16 -04:00
Bill Burke
83306963e8 jta transaction abstraction 2016-08-08 12:32:36 -04:00
mposolda
65e2f127c9 KEYCLOAK-3400 OIDC request with missing response_type should respond with error 2016-08-08 16:11:50 +02:00
mposolda
9be6777685 KEYCLOAK-2169 KEYCLOAK-3286 Support for at_hash and c_hash 2016-08-08 10:57:44 +02:00
Bill Burke
f14f303dfe Merge remote-tracking branch 'upstream/master' 2016-08-07 11:50:44 -04:00
Bill Burke
33d7d89ad9 provider hot deployment 2016-08-07 11:41:52 -04:00
Marek Posolda
65c49c39f4 Merge pull request #3114 from mposolda/master 
KEYCLOAK-3321 OIDC requests without 'nonce' claim should be rejected …
 2016-08-05 16:45:56 +02:00
Marek Posolda
6c0f685c39 Merge pull request #2948 from thomasdarimont/issue/KEYCLOAK-3142-Add-ResourceType-to-AdminEvents 
KEYCLOAK-3142 - Capture ResourceType that triggers an AdminEvent
 2016-08-05 15:07:56 +02:00
mposolda
e0a59baaf2 KEYCLOAK-3321 OIDC requests without 'nonce' claim should be rejected unless using the code flow. Started responseType tests 2016-08-05 15:05:26 +02:00
Thomas Darimont
e49afb2d83 KEYCLOAK-3142 - Revised according to codereview 
Liquibase Moved schema evolution configuration from jpa-changelog-2.1.0
to jpa-changelog-2.2.0.
Corrected wrong ResourceType references in tests.
Adapted AdminEvents copy-routines to be aware of resourceType attribute.
Added ResourceType enum to exposed ENUMS of ServerInfoAdminResource.

Signed-off-by: Thomas Darimont <thomas.darimont@gmail.com>
 2016-08-05 00:01:03 +02:00
Vaclav Muzikar
0d225f44de KEYCLOAK-3367 Improve stability of Adapters Tests 2016-08-04 14:43:49 +02:00
Thomas Darimont
586f6eeece KEYCLOAK-3142 - Capture ResourceType that triggers an AdminEvent 
Introduced new ResourceType enum for AdminEvents which lists
the current supported ResourceTypes for which AdminEvents
can be fired.

Previously it was difficult for custom EventListeners to figure
out which ResourceType triggered an AdminEvent in order
to handle it appropriately, effectively forcing users to parse
the representation.
Having dedicated resource types as a marker on an AdminEvent helps
to ease custom EventListener code.

We now also allow filtering of admin events by ResourceType in the
admin-console.

Signed-off-by: Thomas Darimont <thomas.darimont@gmail.com>
 2016-08-04 11:30:02 +02:00
Bill Burke
a3ffb32532 Merge pull request #3060 from fkiss/master-ldaps 
KEYCLOAK-2281 added ldap tests over ssl
 2016-08-03 21:31:12 -04:00
Bill Burke
534ee2e50c Merge remote-tracking branch 'upstream/master' 2016-08-03 19:16:45 -04:00
Bill Burke
70722d0d3d user storage provider jpa example 2016-08-03 19:16:11 -04:00
Bill Burke
7f08717dfb Merge pull request #3105 from patriot1burke/master 
component model
 2016-08-02 09:28:55 -04:00
Bill Burke
9365a40426 Merge pull request #3104 from zschwarz/exclude-test 
KEYCLOAK-3389 Added general exclude for tests
 2016-08-02 07:19:42 -04:00
Bill Burke
ae58d64741 Merge pull request #3092 from vmuzikar/KEYCLOAK-3381 
KEYCLOAK-3381 Fix and stabilize some Console UI tests
 2016-08-02 07:19:28 -04:00
Bill Burke
4a8b4bcdec Merge pull request #3087 from zschwarz/password-policy 
KEYCLOAK-3379 Password policy tests refactoring
 2016-08-02 07:15:58 -04:00
Bill Burke
17e75950fe more fixes 2016-08-02 06:56:22 -04:00
Bill Burke
1c75b03e59 props 2016-08-02 06:50:13 -04:00
mposolda
b3a55df1e7 Fixing mongo 2016-08-02 10:58:44 +02:00
Bill Burke
09693eb108 component model 2016-08-02 05:48:57 +02:00
Pedro Igor
ae1a7542d8 [KEYCLOAK-3385] - Improvements to evaluation tool UI and result 2016-08-01 18:01:24 -03:00
mposolda
aa177dd9f9 Ignore KcSamlBrokerTest and KcSamlSignedBrokerTest again 2016-08-01 19:03:07 +02:00
Bill Burke
5facec73e4 Merge remote-tracking branch 'upstream/master' 2016-08-01 11:19:09 -04:00
Bill Burke
91a267a0d8 component model 2016-08-01 11:18:58 -04:00
Vaclav Muzikar
0147fbe489 KEYCLOAK-3381 Fix and stabilize some Console UI tests 2016-08-01 15:10:18 +02:00
zschwarz
e04ad9d7b6 Added general exclude for tests 2016-08-01 13:17:24 +02:00
Marek Posolda
0d99b797b6 Merge pull request #3068 from mstruk/KEYCLOAK-2981-m 
KEYCLOAK-2981 Upload-certificate admin endpoint does not nullify private keys
 2016-08-01 11:20:55 +02:00
Marek Posolda
b0c7746eeb Merge pull request #3084 from mhajas/KEYCLOAK-3165 
KEYCLOAK-3165 Migrate SAML Filter tests to integration arquillian testsuite
 2016-08-01 09:07:19 +02:00
Marek Posolda
a8eb3ca65a Merge pull request #3065 from wyvie/samltest 
[KEYCLOAK-3035] Fixed broker tests, should not randomly fail anymore
 2016-08-01 08:39:22 +02:00
wyvie
cd94778dec [KEYCLOAK-3035] Fixed broker tests, should not randomly fail anymore 2016-07-31 18:57:15 +02:00
Pedro Igor
7983ed064f [KEYCLOAK-3372] - More tests and code cleanup 2016-07-29 15:25:36 -03:00
Pedro Igor
607b305c2f [KEYCLOAK-3372] - Adding tests for servlet authorization 2016-07-29 12:42:53 -03:00
mhajas
824890323d Migrate SAML Filter tests to integration arquillian tests 2016-07-29 11:06:09 +02:00
zschwarz
5011960cac Password policy tests refactoring 2016-07-29 10:24:13 +02:00
Pedro Igor
3c8ed8e3d8 [KEYCLOAK-3372] - Code cleanup 2016-07-29 05:18:38 -03:00
Pedro Igor
8cfa50f134 [KEYCLOAK-3338] More testing and improvements when importing role policies 2016-07-28 12:31:46 -03:00
Bill Burke
5d9fe09599 Merge pull request #3070 from mstruk/KEYCLOAK-2571 
KEYCLOAK-2571 RESET_PASSWORD_ERROR and UPDATE_PASSWORD_ERROR events not fired
 2016-07-28 07:23:32 -04:00
Bill Burke
2219cd363e Merge pull request #3079 from patriot1burke/master 
KEYCLOAK-3268
 2016-07-28 07:22:45 -04:00
Pedro Igor
7e1b97888a [KEYCLOAK-3338] - Adding client roles to role policy and UX improvements 2016-07-27 15:15:14 -03:00
Bill Burke
bd499e1c55 fix pom 2016-07-27 10:37:16 -04:00
Bill Burke
46b4bb0909 KEYCLOAK-3268 2016-07-27 09:28:48 -04:00
Marko Strukelj
59e0570cdf KEYCLOAK-2571 RESET_PASSWORD_ERROR and UPDATE_PASSWORD_ERROR events not fired 2016-07-26 21:32:57 +02:00
Bill Burke
c925033944 Merge remote-tracking branch 'upstream/master' 2016-07-26 11:31:22 -04:00
Marko Strukelj
94f583e935 KEYCLOAK-2981 Upload-certificate admin endpoint does not nullify private keys 2016-07-25 11:13:21 +02:00
Bill Burke
69f051fb0a test user fed registration spi 2016-07-23 08:55:06 -04:00
Bill Burke
73d3db6d00 Merge pull request #3063 from patriot1burke/master 
user fed spi query fixes and tests.
 2016-07-22 17:51:20 -04:00
Bill Burke
b6811b96b9 fix test 2016-07-22 14:42:17 -04:00
mposolda
01830fd7f3 KEYCLOAK-3319 More OIDC tests. Minor refactoring 2016-07-22 18:16:58 +02:00
Bill Burke
00d439b6f0 log level oops 2016-07-22 12:09:22 -04:00
Bill Burke
06fca9c897 Merge remote-tracking branch 'upstream/master' 2016-07-22 11:42:14 -04:00
Bill Burke
72d134748c user fed spi querying tests 2016-07-22 11:42:07 -04:00
fkiss
e2ad7608c8 KEYCLOAK-2281 added ldap tests over ssl 2016-07-22 16:29:58 +02:00
mposolda
9169bcd88d KEYCLOAK-3354 request and request_uri not supported 2016-07-22 13:44:45 +02:00
mposolda
56e011dce4 KEYCLOAK-3318 Adapter support for prompt and max_age. Refactoring to not hardcode OIDC specifics to CookieAuthenticator 2016-07-21 18:19:53 +02:00
Bill Burke
0315bd0b87 Merge remote-tracking branch 'upstream/master' 2016-07-20 17:26:15 -04:00
Bill Burke
2a05f00d0c user fed tests 2016-07-20 17:26:00 -04:00
mposolda
f4ddfe4a52 KEYCLOAK-3318 Support for prompt=login. More tests for prompt parameter 2016-07-20 21:27:38 +02:00
Bill Burke
76c4fbb241 Merge pull request #3051 from patriot1burke/master 
user fed spi fixes and simple test
 2016-07-20 12:51:42 -04:00
Bill Burke
3b0fd71155 Merge pull request #3048 from pedroigor/KEYCLOAK-3320 
[KEYCLOAK-3320] - Enable authorization services to WF8 adapter
 2016-07-20 11:29:23 -04:00
Bill Burke
8b535c5da6 log level 2016-07-20 11:16:20 -04:00
Bill Burke
e719722e32 Merge remote-tracking branch 'upstream/master' 2016-07-20 11:01:01 -04:00
Bill Burke
c709598fdd user fed spi simple test 2016-07-20 10:59:45 -04:00
Stian Thorgersen
3ef0527a91 Merge pull request #3046 from pdrozd/KEYCLOAK-3336 
KEYCLOAK-3336 Arquillian testuite: Added possibility to install serve…
 2016-07-20 14:58:29 +02:00
Pedro Igor
f36a68308d [KEYCLOAK-3320] - Enable authorization services to WF8 adapter 2016-07-20 08:16:37 -03:00
Marek Posolda
e03bf6eef6 Merge pull request #2990 from trex667/feat/keycloak-1733 
[KEYCLOAK-1733]: introduce token as query paramter
 2016-07-20 10:46:11 +02:00
Pavel Drozd
0e470d75e9 KEYCLOAK-3336 Arquillian testuite: Added possibility to install server patch 2016-07-19 14:22:49 +02:00
Stian Thorgersen
0a5e061ca6 Merge pull request #3045 from mhajas/KEYCLOAK-3326 
KEYCLOAK-3326 Fix invalidRequesterMessage in tests
 2016-07-19 09:29:15 +02:00
Stian Thorgersen
1b517a461e Merge pull request #3041 from stianst/KEYCLOAK-3302 
KEYCLOAK-3302 Allow logout with expired refresh token
 2016-07-19 08:03:52 +02:00
mhajas
a913b8a158 Fix invalidRequesterMessage in tests 2016-07-18 14:21:28 +02:00
Marek Posolda
a6bdf81e6d Merge pull request #3040 from mposolda/master 
KEYCLOAK-3220 Added test for missing response_type
 2016-07-15 22:19:52 +02:00
Stian Thorgersen
0632bc8939 Ignore unstable tests 2016-07-15 12:59:15 +02:00
Stian Thorgersen
e708c53730 KEYCLOAK-3302 Allow logout with expired refresh token 2016-07-15 12:56:31 +02:00
Stian Thorgersen
1ce17c459d Merge pull request #3039 from stianst/KEYCLOAK-3192 
KEYCLOAK-3192 Ignore disabled required action
 2016-07-15 10:38:49 +02:00
mposolda
fda0a79e27 KEYCLOAK-3237 Add scopes_supported to OIDC WellKnown endpoint 2016-07-15 09:47:09 +02:00
mposolda
021c2ec701 KEYCLOAK-3220 Added test for missing response_type 2016-07-15 09:15:09 +02:00
Stian Thorgersen
fbf00ba1cd Added umlats test to registration test 2016-07-15 09:05:41 +02:00
Marek Posolda
a2ead8743f Merge pull request #3035 from mposolda/master 
OIDC fixes
 2016-07-15 09:03:31 +02:00
Stian Thorgersen
970c89dd6a KEYCLOAK-3192 Ignore disabled required action 2016-07-15 09:01:44 +02:00
Stian Thorgersen
f384c2340e KEYCLOAK-3266 password policy NotUsername breaks new user registration 2016-07-15 07:34:13 +02:00
Stian Thorgersen
fe367d207a Merge pull request #3022 from vmuzikar/KEYCLOAK-3212 
KEYCLOAK-3212 Improve Console UI tests stability in FF, Chrome and IE
 2016-07-15 06:03:32 +02:00
mposolda
dcc4ea3aea KEYCLOAK-3237 Change OIDC adapters to use scope=openid as required per specs 2016-07-14 23:56:46 +02:00
mposolda
ee3ac3fdaf KEYCLOAK-3223 Basic support for acr claim 2016-07-14 12:36:12 +02:00
Stian Thorgersen
4f1d83b9dc Merge pull request #3030 from stianst/KEYCLOAK-2824-2 
KEYCLOAK-2824 Password Policy SPI
 2016-07-14 10:12:25 +02:00
Stian Thorgersen
ea44b5888b KEYCLOAK-2824 Password Policy SPI 2016-07-14 07:20:30 +02:00
mposolda
abde62f369 KEYCLOAK-3220 redirect to client with error if possible 2016-07-13 20:57:43 +02:00
mposolda
38f89b93ff KEYCLOAK-3281 OIDC 'state' parameter is url-encoded twice when responseMode=form_post 2016-07-13 18:07:57 +02:00
mposolda
d5199501c7 KEYCLOAK-3219 Added claims info to OIDCWellKnownProvider. More tests 2016-07-13 10:17:45 +02:00
Stian Thorgersen
d7649c2547 Merge pull request #3024 from stianst/KEYCLOAK-3267 
KEYCLOAK-3267 Fix identity broker login with brute force enabled
 2016-07-13 07:37:52 +02:00
Pedro Igor
02896768f5 [KEYCLOAK-3305] - Cache is not properly handling failures when importing configuration 2016-07-12 13:57:49 -03:00
Stian Thorgersen
5b0980172d KEYCLOAK-3267 Fix identity broker login with brute force enabled 2016-07-12 15:21:00 +02:00
Vaclav Muzikar
7dbdb023a0 KEYCLOAK-3212 Improve Console UI tests stability in FF, Chrome and IE 2016-07-12 11:39:27 +02:00
Stian Thorgersen
19e5ddeba5 Merge pull request #3015 from martin-kanis/master 
KEYCLOAK-3096 Remove leading/trailing spaces from username/email
 2016-07-12 10:03:55 +02:00
mposolda
6e94931023 KEYCLOAK-3296 same user logging twice at the same time causes lock issue - HQL deletion patch 2016-07-11 19:40:24 +02:00
mposolda
039bb103c2 KEYCLOAK-3295 Kerberos authenticator changed during userFederationProvider update just if it was DISABLED 2016-07-11 15:52:49 +02:00
Martin Kanis
c67d834d39 KEYCLOAK-3096 Remove leading/trailing spaces from login 2016-07-09 18:35:51 +02:00
mposolda
629390dd4a KEYCLOAK-2986 Require either expiration or issuedAt for client authentication with signed JWT 2016-07-08 16:16:38 +02:00
mposolda
3bfd999590 KEYCLOAK-3222 extend WellKnown to return supported types of client authentications. More tests 2016-07-08 15:39:13 +02:00
mposolda
c10a005997 KEYCLOAK-3290 UserInfoEndpoint error responses don't have correct statuses 2016-07-08 12:15:07 +02:00
mposolda
4dd28c0adf KEYCLOAK-3221 Tokens should be invalidated if an attempt to reuse code is made 2016-07-08 11:04:08 +02:00
Bill Burke
bd2887aa77 Merge pull request #2982 from ahus1/jetty_9_3 
KEYCLOAK-2684: jetty 9.3 implementation (oidc/saml)
 2016-07-07 14:59:29 -04:00
Bill Burke
bdc57d57c1 Merge pull request #3008 from patriot1burke/master 
new User Fed SPI initial iteration
 2016-07-07 14:56:38 -04:00
Bill Burke
bf2ca4008e log level info 2016-07-07 12:06:57 -04:00
mposolda
a7c9e71490 KEYCLOAK-3218 Support for max_age OIDC authRequest parameter and support for auth_time in IDToken 2016-07-07 17:04:32 +02:00
Bill Burke
0040d3fc3b Merge remote-tracking branch 'upstream/master' 2016-07-07 10:35:45 -04:00
Bill Burke
7e5a5f79cf fixes for new user fed spi 2016-07-07 10:35:35 -04:00
Marek Posolda
7a161cc8bb Merge pull request #3005 from mposolda/KEYCLOAK-3217 
KEYCLOAK-3217 UserInfo endpoint wasn't accessible by POST request sec…
 2016-07-07 13:49:43 +02:00
Marek Posolda
c5e8a010dc Merge pull request #3004 from mposolda/KEYCLOAK-3147 
KEYCLOAK-3147 Don't allow authRequest without redirect_uri parameter
 2016-07-07 13:49:34 +02:00
mposolda
56e09bf189 KEYCLOAK-3147 Don't allow authRequest without redirect_uri parameter 2016-07-07 12:46:36 +02:00
mposolda
7aafbcd5d9 KEYCLOAK-3217 UserInfo endpoint wasn't accessible by POST request secured with Bearer header 2016-07-07 12:28:25 +02:00
Stian Thorgersen
78fbf45b80 Merge pull request #2991 from ssilvert/RHSSO-296 
KEYCLOAK-3244: Required Action "Configure Totp" should be "Configure OTP"
 2016-07-07 11:43:50 +02:00
Stian Thorgersen
2591dd862b Merge pull request #2976 from vramik/KEYCLOAK-3151 
KEYCLOAK-3151 removed adapter libs mode from testsuite
 2016-07-06 14:21:07 +02:00
awpwb
159b371973 [KEYCLOAK-1733]: introduce token as query paramter 
add functional tests for access token as query paramter
 2016-07-06 14:12:23 +02:00
Stan Silvert
a231c1b31b RHSSO-296: Required Action "Configure Totp" should be "Configure OTP" 2016-07-05 15:07:52 -04:00
Stian Thorgersen
7cfee80e58 KEYCLOAK-3189 KEYCLOAK-3190 Add kid and typ to JWT header 2016-07-05 08:26:26 +02:00
Stian Thorgersen
fe856d3fa7 Merge pull request #2992 from ssilvert/RHSSO-274 
KEYCLOAK-3243: "Undefined" as auth flow execution
 2016-07-04 19:24:30 +02:00
Stian Thorgersen
98923d0ea4 Merge pull request #2971 from mhajas/fixRelative 
KEYCLOAK-3195 Fix example adapter tests on relative scenario
 2016-07-04 19:22:06 +02:00
Stian Thorgersen
c9bbfc3b0b KEYCLOAK-2660 Test updating user without including username with brute force enabled 2016-07-04 12:37:26 +02:00
Stan Silvert
8b8ebfc7e1 Fix failing test. 2016-07-01 12:24:13 -04:00
Stan Silvert
d90a708ceb RHSSO-274: "Undefined" as auth flow execution 2016-07-01 10:25:14 -04:00
Alexander Schwartz
9384aa1398 KEYCLOAK-2684: jetty 9.3 implementation 2016-07-01 12:26:59 +02:00
Bill Burke
a19469aba5 Merge remote-tracking branch 'upstream/master' 2016-06-30 17:18:17 -04:00
Bill Burke
b224917fc5 bump version 2016-06-30 17:17:53 -04:00
Bill Burke
3f1eecc4be Merge remote-tracking branch 'upstream/master' 2016-06-30 16:47:55 -04:00
Bill Burke
3ba3be877e fixes 2016-06-30 16:47:49 -04:00
Pedro Igor
46d02f15fe [KEYCLOAK-2999] - Authorization arquillian tests 2016-06-30 10:26:05 -03:00
Pedro Igor
afa9471c7c [KEYCLOAK-3128] - Admin Client Authorization Endpoints 2016-06-30 10:26:05 -03:00
Stian Thorgersen
588f6ba253 Merge pull request #2965 from mhajas/fixSSLTrustore 
KEYCLOAK-3174 Fix duplicate plugin for adding truststore
 2016-06-30 07:29:09 +02:00
Bill Burke
a9f6948d74 Merge remote-tracking branch 'upstream/master' 2016-06-29 15:37:32 -04:00
Bill Burke
f51098c50b user fed refactor 2016-06-29 15:37:22 -04:00
mhajas
836ab2820a Fix adapter tests on relative scenario 2016-06-27 14:18:32 +02:00
Vlasta Ramik
47fab2d034 removed adapter libs mode from testsuite 2016-06-24 13:32:03 +02:00
mhajas
69919902b4 Fix duplicate plugin for adding truststore 2016-06-24 12:50:39 +02:00
Stian Thorgersen
a6af72cbbc Removed perf package from testsuite/integration 2016-06-24 10:59:05 +02:00
Stian Thorgersen
4aa102fcab Remove testsuite/stress 2016-06-24 10:59:05 +02:00
Stan Silvert
5e450d5cd4 Minor cleanup. 2016-06-23 11:09:57 -04:00
Stan Silvert
38722e8273 KEYCLOAK-3031 Migrate exportimport package to arquillian testsuite 2016-06-23 11:09:55 -04:00
Stian Thorgersen
ce17999d26 Merge pull request #2962 from stianst/master 
Add retry to testPostEncryptedLoginLogout
 2016-06-23 15:48:43 +02:00
Stian Thorgersen
d869ab2823 Add retry to testPostEncryptedLoginLogout 2016-06-23 15:48:18 +02:00
mposolda
9b9a656192 Fix Oracle DB 2016-06-23 13:23:44 +02:00
Stian Thorgersen
184108c5ff Merge pull request #2959 from stianst/master 
Remove old performance testsuite
 2016-06-23 12:21:27 +02:00
Stian Thorgersen
1b9fe8edf7 Remove old performance testsuite 2016-06-23 10:59:02 +02:00
Stian Thorgersen
2e2f34d94e Merge pull request #2957 from pedroigor/authz-changes 
Changes to authz examples and some minor improvements
 2016-06-23 07:49:47 +02:00
Pedro Igor
074a312fe5 Renaming authorization attributes. 2016-06-22 17:20:50 -03:00
mposolda
f7a2ad021e KEYCLOAK-3141 Fix DB2 and some other DB issues 2016-06-22 17:06:55 +02:00
Stian Thorgersen
e2082ce29f Merge pull request #2950 from vramik/KEYCLOAK-3140 
KEYCLOAK-3140 - fixed HTTP 404 Not Found by removing duplicate declaration of plugins in auth-server-jboss
 2016-06-22 15:12:01 +02:00
mposolda
5c731b4d14 KEYCLOAK-3149 DB update triggered before DBLock is retrieved 2016-06-21 17:14:25 +02:00
Marek Posolda
190a1beefa Merge pull request #2951 from mposolda/KEYCLOAK-2474 
KEYCLOAK-2474 Possibility to add custom SPI and extend the data model
 2016-06-21 15:31:12 +02:00
mposolda
da945a69e6 KEYCLOAK-2474 Added test 2016-06-21 13:47:41 +02:00
mposolda
c4513fdad9 KEYCLOAK-2474 Polishing. Support for separate changelock table per changelog. Support for authenticated endpoint in domain-extension example 2016-06-21 12:06:22 +02:00
Vlasta Ramik
48bd019165 fixed duplicate declaration of plugins in auth-server-jboss 2016-06-21 11:21:52 +02:00
Pedro Igor
5f91f4e466 [KEYCLOAK-3062] - Async configuration to KeycloakServer 2016-06-20 11:55:17 -03:00
Stian Thorgersen
8f3cfed7c5 Merge pull request #2934 from fkiss/master-truststore 
KEYCLOAK-2283 added email truststore test
 2016-06-17 14:05:38 +02:00
Stian Thorgersen
807fc71626 Merge pull request #2939 from mhajas/fixEAP6 
KEYCLOAK-3125 Fix ssl tests on EAP6
 2016-06-17 14:02:23 +02:00
Stian Thorgersen
8ae08f0432 Merge pull request #2938 from mhajas/addJSConsoleTests-master 
KEYCLOAK-3121 Add JS adapter tests
 2016-06-17 14:01:21 +02:00
Stian Thorgersen
3c0f7e2ee2 Merge pull request #2617 from pedroigor/KEYCLOAK-2753 
[KEYCLOAK-2753] - Fine-grained Authorization Services
 2016-06-17 13:40:15 +02:00
Pedro Igor
086c29112a [KEYCLOAK-2753] - Fine-grained Authorization Services 2016-06-17 02:07:34 -03:00
mhajas
0df2525298 Fix ssl tests on EAP6 2016-06-16 11:56:31 +02:00
mhajas
cdb40fce19 Add JS adapter tests 2016-06-16 11:43:06 +02:00
fkiss
b50513a946 KEYCLOAK-2283 added email truststore test 2016-06-14 13:49:16 +02:00
Stian Thorgersen
e538394e60 KEYCLOAK-3091 Change brute force to use userId 2016-06-13 15:30:13 +02:00
Stian Thorgersen
46b17e6149 Merge pull request #2928 from mposolda/KEYCLOAK-3106 
KEYCLOAK-3106 EventStoreProviderTest.query is failing in some environ…
 2016-06-13 15:05:19 +02:00
mposolda
e6b3586b87 KEYCLOAK-3106 EventStoreProviderTest.query is failing in some environments 2016-06-13 15:02:10 +02:00
mposolda
1510ac5eb4 KEYCLOAK-3105 Can't access single realm with the admin user from master realm 2016-06-13 12:09:11 +02:00
mposolda
72736e5e47 KEYCLOAK-2028 Add test for token-minimum-time-to-live adapter option 2016-06-09 19:22:15 +02:00
Ben Loy
ec180db39f KEYCLOAK-2028: Add preemptive access token refresh support 
Add a new keycloak.json property and mechanism to automatically
refresh access tokens if they are going to expire in less than a configurable
amount of time.
 2016-06-09 19:22:15 +02:00
Stian Thorgersen
ce2f009e76 Merge pull request #2915 from pdrozd/KEYCLOAK-3082 
KEYCLOAK-3082 - clear queue before event
 2016-06-07 07:00:42 +02:00
Pavel Drozd
54d9943a3b KEYCLOAK-3085 - Add module org.jboss.resteasy.resteasy-jaxrs to integration-arquillian-testsuite-providers 2016-06-06 11:51:20 +02:00
Pavel Drozd
81de73df8e KEYCLOAK-3082 - clear queue before event 2016-06-06 11:46:39 +02:00
Bill Burke
4c9a0b45d4 Merge pull request #2229 from thomasdarimont/issue/KEYCLOAK-2489-script-based-authenticator-definitions 
KEYCLOAK-2489 - Add support for Script-based AuthenticationExecution definitions.
 2016-06-05 11:12:05 -04:00
mposolda
c42b8f81e3 KEYCLOAK-3074 Change the TestingResourceProvider to always both firstResults and maxResults in JPA criteria query 2016-06-03 10:31:32 +02:00
mposolda
13bf36ce49 KEYCLOAK-3074 Change the signature of TestingResourceProvider.getAdminEvents to use String instead of java.util.Date 2016-06-03 10:31:24 +02:00
Stian Thorgersen
31eee347d4 Merge pull request #2895 from mhajas/fixMissingPOM 
KEYCLOAK-3051 Fix missing version in POM
 2016-06-02 18:55:03 +02:00
Stian Thorgersen
c37f1c24ee Merge pull request #2900 from tkyjovsk/performance-tests 
Updates to the performance tests.
 2016-06-02 18:54:47 +02:00
Marko Strukelj
ec258c6515 KEYCLOAK-2879 UserResource 2016-06-02 15:23:18 +02:00
Tomas Kyjovsky
ef95510da4 Updates to the performance tests. 
Conflicts:
	testsuite/integration-arquillian/tests/other/adapters/jboss/remote/pom.xml
	testsuite/integration-arquillian/tests/other/clean-start/pom.xml
 2016-06-01 16:06:51 +02:00
Stian Thorgersen
8fab2f0718 KEYCLOAK-3066 
Uploaded Realm Certificate is not validated
 2016-06-01 15:12:21 +02:00
mhajas
6da8ca70dc Fix missing version in POM 2016-05-27 12:09:20 +02:00
Stian Thorgersen
2343e517c9 Merge pull request #2891 from pedroigor/KEYCLOAK-2894 
[KEYCLOAK-2894] - Fixing saml signature validation
 2016-05-26 16:57:13 +02:00
Pedro Igor
60f954a497 [KEYCLOAK-2894] - Fixing saml signature validation 2016-05-26 10:48:30 -03:00
Stian Thorgersen
af30142097 Merge pull request #2886 from ssilvert/migrate-events 
KEYCLOAK-2912 Migrate events package to new testsuite
 2016-05-26 15:01:57 +02:00
mposolda
882dbc3f25 KEYCLOAK-3006 Fix admin event inconsistencies related to roles (points 1,3,4,15,16 from JIRA) 2016-05-25 23:18:01 +02:00
mposolda
022be3aee5 KEYCLOAK-3006 Fix admin event inconsistencies (points 2,5-14 from JIRA) 2016-05-25 23:17:47 +02:00
mposolda
f58936025f KEYCLOAK-3003 Support for admin events in AuthenticationManagementResource 2016-05-25 23:17:24 +02:00
Stan Silvert
1042a22cf7 KEYCLOAK-2912 Migrate events package to new testsuite 2016-05-25 15:22:17 -04:00
Stian Thorgersen
9edec8e4a6 Merge pull request #2875 from abstractj/KEYCLOAK-3023 
OAuthRedirectUriTest.testLocalhost fails on wildfly
 2016-05-25 07:25:22 +02:00
Stian Thorgersen
f12c54387c Merge pull request #2873 from vramik/KEYCLOAK-3024 
KEYCLOAK-3024 support for smoke test - clean start domain mode
 2016-05-25 07:24:14 +02:00
Stian Thorgersen
d51a2cde2f Merge pull request #2859 from ssilvert/migrate-i18n 
KEYCLOAK-2913 Migrate i18n package to new testsuite
 2016-05-25 07:22:54 +02:00
Bruno Oliveira
b2850ec1d5
OAuthRedirectUriTest.testLocalhost fails on wildfly 2016-05-24 07:24:36 -03:00
Stan Silvert
8d56ab90ba KEYCLOAK-2913 Switch to use xpath for finding links instead of adding an 
id.
 2016-05-23 09:23:01 -04:00
Stian Thorgersen
097c49149c Merge pull request #2867 from stianst/KEYCLOAK-3020 
KEYCLOAK-3020
 2016-05-23 13:59:13 +02:00
Vlasta Ramik
a37d43714d support for smoke test - clean start domain mode 2016-05-23 13:29:05 +02:00
Stian Thorgersen
ff20c530cd Merge pull request #2869 from stianst/KEYCLOAK-2851 
KEYCLOAK-2851 InitialAccessTokenTest#createExpired fails occasionally
 2016-05-23 12:04:23 +02:00
Stian Thorgersen
e0ae98eb95 Merge pull request #2850 from wyvie/samltest 
KEYCLOAK-3000: fixed the saml brokering tests
 2016-05-23 11:23:27 +02:00
Stian Thorgersen
477c0872b0 KEYCLOAK-3020 
Increase default password hashing intervals to 20K
 2016-05-23 11:20:31 +02:00
Stian Thorgersen
e52f7c56a9 KEYCLOAK-2851 InitialAccessTokenTest#createExpired fails occasionally 2016-05-23 09:34:33 +02:00
Stian Thorgersen
74809b4132 Merge pull request #2864 from mhajas/fixOfflineServlets 
KEYCLOAK-3025 Fix offline servlet adapter tests and refactoring
 2016-05-23 08:41:42 +02:00
Stian Thorgersen
bee9ba0c19 Merge pull request #2862 from mhajas/fixSSLOnWildfly-master 
KEYCLOAK-3022 Fix ssl adapter tests on wildfly
 2016-05-23 08:40:12 +02:00
mhajas
22a94100c8 Fix offline servlets and refactoring 2016-05-20 15:09:54 +02:00
mhajas
183feeb952 Fix ssl adapter tests on wildfly 2016-05-20 14:53:44 +02:00
Stan Silvert
049b0dda23 KEYCLOAK-2913 Migrate i18n package to new testsuite 2016-05-20 08:04:07 -04:00
Vaclav Muzikar
7f474f574c KEYCLOAK-3013 Fix Upload Keystore tests in ClientAuthSignedJWTTest 2016-05-20 10:22:48 +02:00
Stian Thorgersen
af7fd0ef61 Merge pull request #2855 from raehalme/KEYCLOAK-3016-master 
KEYCLOAK-3016: BasicAuthRequestAuthenticator consumes HttpEntity on errors
 2016-05-20 09:14:37 +02:00
Stian Thorgersen
7f3ccad4cc Merge pull request #2852 from abstractj/OAuthRedirectUriTest 
OAuthRedirectUriTest migration
 2016-05-20 09:13:01 +02:00
Stian Thorgersen
264c816f08 Merge pull request #2846 from ssilvert/migrate-composites 
KEYCLOAK-2911 Migrate composites package to new testsuite.
 2016-05-20 09:12:30 +02:00
Stian Thorgersen
a6f8ff44a6 Merge pull request #2844 from vmuzikar/KEYCLOAK-3011 
KEYCLOAK-3011 Fix WelcomePageTest
 2016-05-20 09:10:52 +02:00
Stian Thorgersen
c03c5d2fe9 Merge pull request #2843 from vramik/KEYCLOAK-3010 
KEYCLOAK-3010 Add support for smoke test - clean start - standalone mode
 2016-05-20 09:07:06 +02:00
Stian Thorgersen
fcfe8582de Merge pull request #2838 from abstractj/KEYCLOAK-2908 
KEYCLOAK-2908 - Migration of oidc package
 2016-05-20 08:56:43 +02:00
Stian Thorgersen
63af03f11c Merge pull request #2833 from vmuzikar/master 
KEYCLOAK-3004 Fix PKCS12 tests in ClientAuthSignedJWTTest
 2016-05-20 08:55:15 +02:00
Stian Thorgersen
fe841e560d Merge pull request #2832 from ssilvert/migrate-account 
KEYCLOAK-2909 Migrate account package to new testsuite
 2016-05-20 08:40:15 +02:00
wyvie
88583362ad KEYCLOAK-3000: fixed the saml brokering tests 2016-05-19 14:30:48 +02:00
Thomas Raehalme
babe94c50d KEYCLOAK-3016: BasicAuthRequestAuthenticator now consumes HttpEntity also on errors. 2016-05-19 08:47:51 +03:00
Bruno Oliveira
e7c98bd31b OAuthRedirectUriTest migration 2016-05-18 18:24:10 -03:00
Stan Silvert
771b4c5b6e KEYCLOAK-2911 Migrate composites package to new testsuite. 2016-05-17 10:23:47 -04:00
Vlasta Ramik
ef716b8b94 Add support for smoke test - clean start - standalone mode 2016-05-17 13:55:24 +02:00
Vaclav Muzikar
6bcd72f7f2 KEYCLOAK-3011 Fix WelcomePageTest 2016-05-17 13:25:05 +02:00
Bruno Oliveira
c434dc8dcc
KEYCLOAK-2908 - Migration of oidc package 2016-05-14 00:50:23 -03:00
Vaclav Muzikar
62d6bf1dec KEYCLOAK-3004 Fix PKCS12 tests in ClientAuthSignedJWTTest 
Use smaller keys to avoid illegal key size exception
 2016-05-13 13:32:43 +02:00
mposolda
fc9dbcf6cb KEYCLOAK-2881 Admin events testing 2016-05-13 11:29:08 +02:00
Stian Thorgersen
686e48e9e2 Ignore KcSamlBrokerTest 2016-05-13 08:20:49 +02:00
Stian Thorgersen
9467370a8f Merge pull request #2826 from vmuzikar/master 
KEYCLOAK-2995 Revert changes from KEYCLOAK-2989 in JWTClientCredentialsProvider
 2016-05-13 07:50:24 +02:00
Stian Thorgersen
fff595b163 Merge pull request #2823 from mstruk/KEYCLOAK-2993 
KEYCLOAK-2993 Fix integration-arquillian tests failing with -Pauth-server-wildfly
 2016-05-13 07:32:21 +02:00
Stan Silvert
a46982f8ec KEYCLOAK-2909 Migrate account package to new testsuite 2016-05-12 15:52:45 -04:00
Stian Thorgersen
4ddd2ae31d Merge pull request #2821 from mstruk/KEYCLOAK-2863 
KEYCLOAK-2863 ClientAttributeCertificateResource
 2016-05-12 16:50:40 +02:00
Stian Thorgersen
1c1afc9eaa Merge pull request #2818 from pdrozd/master 
KEYCLOAK-2988 - Fix kerberos tests - able to run with Windows and RHIDM.
 2016-05-12 16:43:42 +02:00
Vaclav Muzikar
e6f0da99e6 KEYCLOAK-2995 Revert changes from KEYCLOAK-2989 in JWTClientCredentialsProvider 2016-05-12 10:45:45 +02:00
Marko Strukelj
0878109647 KEYCLOAK-2993 Fix integration-arquillian tests failing with -Pauth-server-wildfly 2016-05-12 09:39:25 +02:00
Stian Thorgersen
74ff101de4 Merge pull request #2819 from vmuzikar/master 
KEYCLOAK-2989 Extend ClientAuthSignedJWTTest
 2016-05-12 06:42:15 +02:00
Marko Strukelj
ebc184bf94 KEYCLOAK-2863 ClientAttributeCertificateResource 2016-05-11 15:22:39 +02:00
Bruno Oliveira
4664bb01d8
Migration of AuthorizationCodeTest 2016-05-11 06:21:12 -03:00
Stian Thorgersen
c9e92bce60 Merge pull request #2813 from abstractj/OAuthGrantTest 
OAuthGrantTest migration
 2016-05-11 06:57:58 +02:00
Stian Thorgersen
c04c047fbd Merge pull request #2781 from wyvie/brokering 
KEYCLOAK-2971: Added basic oidc broker testing to the new testsuite
 2016-05-11 06:57:36 +02:00
wyvie
9e857fe245 KEYCLOAK-2990: added test for single logout to broker testing (new testsuite) 2016-05-10 15:19:44 +02:00
Vaclav Muzikar
9ad584b34d KEYCLOAK-2989 Extend ClientAuthSignedJWTTest 2016-05-10 13:30:55 +02:00
Pavel Drozd
43ab806f8d KEYCLOAK-2988 - Fix kerberos tests - able to run with Windows and RHIDM. 2016-05-10 11:28:43 +02:00
wyvie
18a64103cd KEYCLOAK-2971: saml provider with signature in broker test 2016-05-10 11:07:19 +02:00
Bruno Oliveira
bb6a7e357f
OAuthGrantTest migration 2016-05-09 11:03:47 -03:00
Stian Thorgersen
d43b230b93 KEYCLOAK-2880 Refactor PermissionTest to not require Java8 2016-05-09 07:25:03 +02:00
mposolda
bea2678e85 KEYCLOAK-2862 AuthenticationManagementResource tests 2016-05-06 20:19:58 +02:00
Marek Posolda
016a19fcee Merge pull request #2807 from vramik/KEYCLOAK-2936 
KEYCLOAK-2936 add app.server.java.home to karaf arquillian.xsl to be able to run fu…
 2016-05-06 20:06:21 +02:00
wyvie
30f4f920c1 KEYCLOAK-2971: saml provider without signature in broker test 2016-05-06 16:04:39 +02:00
Vlasta Ramik
22200d857c add app.server.java.home to karaf arquillian.xsl to be able to run fuse tests on jdk7, minor test fix 2016-05-06 15:09:59 +02:00
Stian Thorgersen
713909fac9 Close admin client after test 2016-05-06 15:01:32 +02:00
Stian Thorgersen
f4d751c839 Merge pull request #2786 from stianst/master 
KEYCLOAK-2865 Extend coverage of client admin endpoints
 2016-05-06 11:13:15 +02:00
Marek Posolda
411b71bcbb Merge pull request #2768 from vramik/KEYCLOAK-2936 
KEYCLOAK-2936 Add app server module and test module for testing fuse6.3, ...
 2016-05-06 08:37:34 +02:00
Stian Thorgersen
0ca117b8e9 KEYCLOAK-2865 Extend coverage of client admin endpoints 2016-05-06 08:08:52 +02:00
Stian Thorgersen
dbd906b330 Merge pull request #2798 from abstractj/OAuthDance 
Migration of OAuthDanceClientSessionExtensionTest
 2016-05-06 07:06:22 +02:00
Stian Thorgersen
b7e70ea7e3 Merge pull request #2796 from abstractj/RefreshTokenTest 
Refresh token test
 2016-05-06 07:05:36 +02:00
Stian Thorgersen
0c5d1c7090 Merge pull request #2794 from mstruk/KEYCLOAK-2869 
KEYCLOAK-2869 IdentityProvidersResource/IdentityProviderResource
 2016-05-06 07:03:52 +02:00
Stian Thorgersen
1d87d1cce1 Merge pull request #2792 from ssilvert/migrate-forms 
KEYCLOAK-2906 Migrate forms package to new testsuite
 2016-05-06 07:00:10 +02:00
Bruno Oliveira
2a60f65229
Migration of OAuthDanceClientSessionExtensionTest 2016-05-05 15:29:51 -03:00
Bruno Oliveira
a5687e4660 Migration of RefreshTokenTest 2016-05-05 15:20:52 -03:00
Marko Strukelj
f337085ed0 KEYCLOAK-2869 IdentityProvidersResource/IdentityProviderResource 2016-05-05 17:04:45 +02:00
Bruno Oliveira
8418fec113 Replace by ClientManager and make the code less verbose 2016-05-05 11:53:17 -03:00
mhajas
40bf5fb5d2 Refactor and improve stability of SAML tests 2016-05-05 12:31:55 +02:00
Marek Posolda
49dc5363bb Merge pull request #2783 from mposolda/master 
Easier MariaDB support in tests
 2016-05-05 10:04:38 +02:00
Bruno Oliveira
9a3bea7062
RHSSO-121: Offline Tokens 2016-05-04 22:48:59 -03:00
Stan Silvert
c392f6659e KEYCLOAK-2906 Migrate forms package to new testsuite 2016-05-04 18:46:38 -04:00
mposolda
6a75aec6d8 Easier MariaDB support in tests 2016-05-04 23:08:30 +02:00
wyvie
a867a1646a KEYCLOAK-2971: Added basic oidc broker testing to the new testsuite 2016-05-04 17:29:56 +02:00
Stian Thorgersen
aba69e0628 Suppress log output from resteasy during tests 2016-05-04 13:57:28 +02:00
Stian Thorgersen
2355db57da KEYCLOAK-2880 Permissions tests for admin endpoints 2016-05-04 08:25:05 +02:00
mhajas
09d1c8bafc Improve stability of JS-console tests 2016-05-03 15:06:10 +02:00
Vlasta Ramik
01a96b62dc Add app server module and test module for testing fuse6.3, rename feature in fuse6.2 tests 2016-04-28 14:50:10 +02:00
Stian Thorgersen
19c29387fa Moved ClientRedirectTest to new testsuite 2016-04-28 13:42:18 +02:00
Stian Thorgersen
6ec19d0b63 KEYCLOAK-2932 KEYCLOAK-2934 2016-04-28 13:07:15 +02:00
Stian Thorgersen
20dac1d885 KEYCLOAK-2933 
RealmTest is failing on WildFly
 2016-04-28 12:22:41 +02:00
Vlasta Ramik
0b875d4688 Enabled/edited CustomAuthFlowCookieTest 2016-04-28 10:22:54 +02:00
Stan Silvert
29d6832882 KEYCLOAK-2905 Migrate actions package from old testsuite 2016-04-27 14:09:46 -04:00
Thomas Darimont
c8d47926b8 KEYCLOAK-2489 - Add support for Script-based AuthenticationExecution definitions. 
This is a POC for script based authenticator support.
Introduced a ScriptBasedAuthenticator that is bootstraped via a
ScriptBasedAuthenticatorFactory can be execute a configured script
against a provided execution context.
Added an alias property to the AuthFlowExecutionRepresentation in order
to be able to differentiate multiple instances of an Authenticator
within the same AuthFlow.

For convenience editing the AngularJS bindings for the ACE editor were
added for fancy script editing - this needs to be cut down a bit wrt to
themes and supported scripts - e.g. we probably don't expect users to write
authenticator scripts in Cobol...
Removed currently not needed ACE sytax highlighting and themes.

Scripting is now available to all keycloak components that have access to the KeycloakSession.
Introduced new Scripting SPI for configurable scripting providers.
 2016-04-27 14:37:13 +02:00
Stian Thorgersen
83370f0666 Merge pull request #2737 from mhajas/adapter-ssl-PR 
KEYCLOAK-2915 Fix adapter ssl tests on EAP/EAP6
 2016-04-27 13:50:08 +02:00
Stian Thorgersen
d77c1e616f Merge pull request #2734 from vramik/KEYCLOAK-2889 
KEYCLOAK-2889 Fix adapter tests for Karaf/Fuse
 2016-04-27 13:49:27 +02:00
Stian Thorgersen
95724e36f3 KEYCLOAK-2871 Extend coverage on RealmAdminResource 2016-04-27 10:29:24 +02:00
mposolda
225523fee0 KEYCLOAK-2898 Fix GroupMappersTest on wildfly. Clearing AssertEvents events queue before test instead of after 2016-04-26 16:10:40 +02:00
mhajas
57ccbb7f49 Fix adapter ssl tests on EAP/EAP6 2016-04-26 09:15:12 +02:00
Vlasta Ramik
bf76be21c7 Fix adapter tests for Karaf/Fuse 2016-04-25 15:29:41 +02:00
Bruno Oliveira
bbe7ff1dce RHSSO-106: Migration of ResourceOwnerPasswordCredentialsGrantTest 2016-04-25 10:15:27 -03:00
Stian Thorgersen
7dd2b3d7be Merge pull request #2730 from abstractj/RHSSO-130 
RHSSO-130: AccessTokenTest migration
 2016-04-25 13:43:03 +02:00
Stian Thorgersen
320a9da585 Merge pull request #2711 from ssilvert/migrate-LoginTest 
Migrate LoginTest
 2016-04-25 13:40:51 +02:00
Marek Posolda
6c3d31dd4c Merge pull request #2728 from mstruk/KEYCLOAK-2899 
KEYCLOAK-2899 Tests fail with -Pauth-server-wildfly due to missing logging dependecy
 2016-04-22 21:37:48 +02:00
Bruno Oliveira
1cc4ca2e71 RHSSO-130: AccessTokenTest migration 2016-04-22 16:30:57 -03:00
Marko Strukelj
eea19e7850 KEYCLOAK-2899 Tests fail with -Pauth-server-wildfly due to missing logging dependecy 2016-04-22 19:48:13 +02:00
Marek Posolda
2047363e86 Merge pull request #2722 from mstruk/KEYCLOAK-2893 
KEYCLOAK-2893 Fix TokenIntrospectionTest
 2016-04-22 15:16:17 +02:00
Marek Posolda
0d88c9050a Merge pull request #2718 from abstractj/RHSSO-108-client-auth-signed 
Rhsso 108 client auth signed
 2016-04-22 15:07:10 +02:00
Marko Strukelj
1a5517f986 KEYCLOAK-2893 Fix TokenIntrospectionTest 2016-04-22 14:23:59 +02:00
mposolda
01cc0d0e1d KEYCLOAK-2878 Added UserFederationLdapConnectionTest 2016-04-22 14:03:51 +02:00
mposolda
e0aedfb93d KEYCLOAK-2878 UserFederation mapper testing 2016-04-22 14:03:42 +02:00
Bruno Oliveira
ec77970021 Inclusion of try/finally suggested by Stian 2016-04-22 08:29:32 -03:00
Bruno Oliveira
30f34173c5 RHSSO-108: Migration of ClientAuthSignedJWTTest 2016-04-22 08:29:28 -03:00
Marko Strukelj
0e52781a1f KEYCLOAK-2893 Fix TokenIntrospectionTest 2016-04-22 11:18:09 +02:00
mposolda
afcdce6b71 Simplified calling of AuthenticationManagementResource.getExecutions() 2016-04-21 23:11:25 +02:00
mposolda
f6a718f10a KEYCLOAK-2878 Testing of UserFederation admin REST endpoints 2016-04-21 23:11:14 +02:00
Stan Silvert
9335ab6b22 Migrate LoginTest 2016-04-21 09:37:54 -04:00
Stian Thorgersen
756cc0dca0 KEYCLOAK-2866 KEYCLOAK-2874 Test role mapping resource 2016-04-21 14:21:27 +02:00
Stian Thorgersen
578b5e2b59 KEYCLOAK-2868 Extend coverage of GroupResource tests 2016-04-21 11:52:20 +02:00
Stian Thorgersen
34d5e85316 KEYCLOAK-2873 / KEYCLOAK-2875 Test RoleContainerResource 2016-04-21 10:58:46 +02:00
Stian Thorgersen
d0a9e45826 Merge pull request #2700 from stianst/KEYCLOAK-2864 
KEYCLOAK-2864 Test InitialAccessTokenResource
 2016-04-21 10:27:11 +02:00
Stian Thorgersen
23b4b4283b KEYCLOAK-2864 Test InitialAccessTokenResource 2016-04-21 09:44:29 +02:00
Stian Thorgersen
673253a539 Merge pull request #2697 from stianst/KEYCLOAK-2872 
KEYCLOAK-2872 Test RoleByIdResource
 2016-04-21 09:31:43 +02:00
Stian Thorgersen
4f5b71d81a KEYCLOAK-2872 Test RoleByIdResource 2016-04-21 07:09:25 +02:00
Stian Thorgersen
70ae0b2317 Merge pull request #2694 from abstractj/RHSSO-108 
RHSSO-108: Client signed token authentication (master)
 2016-04-21 06:19:25 +02:00
Stian Thorgersen
27fd5f395f Ignore failing CustomAuthFlowCookieTest 2016-04-21 06:05:45 +02:00
Bruno Oliveira
2f3b5e9b88 RHSSO-108: Client signed token authentication 2016-04-20 20:47:50 -03:00
Stian Thorgersen
890af8da52 Made AssertEvents work with @Rule 2016-04-20 20:09:09 +02:00
Stian Thorgersen
974906d37f Merge pull request #2688 from ssilvert/master 
Rename oauthClient to oauth in AbstractKeycloakTst
 2016-04-20 19:40:50 +02:00
Stian Thorgersen
f2f2158154 Merge pull request #2687 from mposolda/master 
KEYCLOAK-2842 Not possible to add new execution under registration flow
 2016-04-20 19:40:34 +02:00
Stian Thorgersen
ea99a05ffe Merge pull request #2684 from mstruk/assert-events-refactor 
KEYCLOAK-2755 Refactor testsuite events provider
 2016-04-20 19:36:57 +02:00
mposolda
a341889d2c KEYCLOAK-2842 Not possible to add new execution under registration flow 2016-04-20 18:39:11 +02:00
Stan Silvert
9007f8b19c Rename oauthClient to oauth in AbstractKeycloakTst 2016-04-20 12:37:38 -04:00
Marko Strukelj
b8832d2d71 KEYCLOAK-2755 Refactor testsuite events provider 2016-04-20 16:43:20 +02:00
Stian Thorgersen
86dfcecef6 KEYCLOAK-2861 Test AttackDetectionResource 2016-04-20 16:21:57 +02:00
Stian Thorgersen
1667ada111 Moved admin tests from endpoint package back to admin package 2016-04-20 14:56:07 +02:00
Stian Thorgersen
b6ed681402 Merge pull request #2677 from stianst/KEYCLOAK-2850 
KEYCLOAK-2850 Migrated ImpersonationTest and added builders
 2016-04-20 14:48:05 +02:00
Stian Thorgersen
b8b40e75ef KEYCLOAK-2850 Migrated ImpersonationTest and added builders 2016-04-20 13:52:08 +02:00
mposolda
afc8179cf8 KEYCLOAK-2846 export/import of clientTemplate scopes 2016-04-20 13:30:01 +02:00
mposolda
919a3791ea KEYCLOAK-2844 Unexpected error when trying to remove clientTemplate in use 2016-04-20 13:25:13 +02:00
Stian Thorgersen
e490a6e3bd Merge pull request #2673 from stianst/master 
KEYCLOAK-2850 Migrated ConcurrencyTest
 2016-04-20 12:49:48 +02:00
Stian Thorgersen
eab548d7f0 Merge pull request #2671 from stianst/KEYCLOAK-2491 
KEYCLOAK-2491 Fix permissions in admin console to match permissions i…
 2016-04-20 12:49:28 +02:00
Stian Thorgersen
37256b6b8f KEYCLOAK-2850 Migrated ConcurrencyTest 2016-04-20 10:07:16 +02:00
Stian Thorgersen
04d76b0052 KEYCLOAK-2491 Fix permissions in admin console to match permissions in admin endpoints 2016-04-20 09:57:57 +02:00
mposolda
d415bdb3d2 Remove AbstractAdminTest.assertNames and related methods (as they are available in Assert class) 2016-04-20 08:22:42 +02:00
mposolda
060527ac67 KEYCLOAK-2850 migrate RealmTest from old testsuite to new 2016-04-20 08:22:32 +02:00
Stian Thorgersen
656161ff61 Merge pull request #2651 from mhajas/truststore 
KEYCLOAK-2841 Trustore support in adapter tests
 2016-04-20 06:57:01 +02:00
Stian Thorgersen
d9f82affb0 Merge pull request #2664 from stianst/master 
Migrate pages from old testsuite, make OAuthClient injectable
 2016-04-19 22:08:47 +02:00
Stian Thorgersen
d2e3389414 Removed duplicated ClientInitialAccessTest 2016-04-19 20:34:59 +02:00
Stian Thorgersen
7cf77e1bb4 Merge pull request #2662 from vmuzikar/master 
KEYCLOAK-2854 Fix Client Settings Console UI test
 2016-04-19 20:32:09 +02:00
Stian Thorgersen
f4a41071ea Merge pull request #2652 from abstractj/apiutil-removal 
Removal of duplicated API Util
 2016-04-19 20:31:15 +02:00
Stian Thorgersen
a44add29b4 Merge pull request #2646 from tkyjovsk/performance-tests 
Added module 'adapters/jboss/remote' with performance tests.
 2016-04-19 20:30:26 +02:00
Stian Thorgersen
de8ffae427 Migrate pages from old testsuite, make OAuthClient injectable 2016-04-19 20:16:55 +02:00
Vaclav Muzikar
3d370f9d11 KEYCLOAK-2854 Fix Client Settings Console UI test 2016-04-19 17:54:58 +02:00
Marek Posolda
bead313e27 Merge pull request #2658 from stianst/KEYCLOAK-2850 
KEYCLOAK-2850 Migrate admin endpoint identity provider test
 2016-04-19 16:24:52 +02:00
Bruno Oliveira
8d1108ba1b Removal of duplicated API Util 2016-04-19 10:21:17 -03:00
mposolda
fb5e5d5cb6 KEYCLOAK-2849 Admin endpoint tests for client templates 2016-04-19 14:37:38 +02:00
Stian Thorgersen
899c9f48e9 KEYCLOAK-2850 Migrate admin endpoint identity provider test 2016-04-19 14:27:16 +02:00
Stian Thorgersen
5606160e70 KEYCLOAK-2828 Refactor contribution and add tests 2016-04-19 13:09:00 +02:00
mhajas
77c37ccaf6 Trustore support in adapter tests + fix tests 2016-04-18 16:14:10 +02:00
Pavel Drozd
c52c2eb471 KEYCLOAK-2839 - kerberos tests migration. 2016-04-18 14:37:33 +02:00
Tomas Kyjovsky
92d9808cc0 Added module 'adapters/jboss/remote' with performance tests. 2016-04-18 14:10:36 +02:00
Bill Burke
fdcc2d32f6 Merge pull request #2607 from vramik/KEYCLOAK-2757 
KEYCLOAK-2757 Add tests to cover custom auth flows
 2016-04-15 16:28:05 -04:00
Stan Silvert
6805b991e1 Move test under 'endpoint' package. 2016-04-14 19:46:15 -04:00
Stan Silvert
e25a0d3cf1 Create TestRealmKeycloakTest as common base class for tests that need 
testrealm.json.  Rename admin packaget to endpoint.  Rename legacy package
to match old testsuite.
test suite.
 2016-04-14 15:39:32 -04:00
Stan Silvert
ca72a3bd70 KEYCLOAK-2743: Port OAuthClient to new testsuite 2016-04-14 15:39:03 -04:00
Stian Thorgersen
f64ffcbefe KEYCLOAK-2818 
Fix poms not updated by versions plugin
 2016-04-14 08:16:07 +02:00
Bill Burke
b080e1e782 merge adapter-spi adapter-spi-public 2016-04-13 22:25:30 -04:00
mposolda
5a108c60a0 KEYCLOAK-2812 Make testsuite-arquillian working with -Pauth-server-wildfly 2016-04-13 16:05:03 +02:00
Vlasta Ramik
1754f242c7 Add tests to cover custom auth flows 2016-04-13 12:34:20 +02:00
mposolda
3c3bbdbbdb KEYCLOAK-2809 NPE when removing role, which is in scope of some ClientTemplate 2016-04-13 11:49:29 +02:00
Bill Burke
8f7f9e0b9c KEYCLOAK-2790 2016-04-12 18:25:23 -04:00
Bill Burke
6b261cd6e9 Merge pull request #2585 from mhajas/secureDeployment-PR 
KEYCLOAK-2199 Add tests for secure deployment
 2016-04-12 17:53:29 -04:00
Bill Burke
137edf9b1a Merge pull request #2587 from vramik/KEYCLOAK-2794 
KEYCLOAK-2794 Change undertow-embedded version
 2016-04-12 17:52:45 -04:00
Bill Burke
515ed226be Merge remote-tracking branch 'upstream/master' 2016-04-12 15:19:58 -04:00
Bill Burke
cca91dd175 public/private 2016-04-12 15:19:46 -04:00
Stian Thorgersen
1c2eafeb80 KEYCLOAK-2807 Fix server info providers page 2016-04-12 15:38:52 +02:00
Stian Thorgersen
538e49117f KEYCLOAK-2799 Show error for identity brokering login if user is disabled 2016-04-12 13:14:42 +02:00
Vlasta Ramik
36266b8574 Change undertow-embedded version from snapshot to released version 1.0.0.Alpha2 2016-04-12 09:40:57 +02:00
mhajas
8d15520939 Add tests for secure deployment 2016-04-12 09:13:15 +02:00
Stian Thorgersen
512a5ef079 Merge pull request #2572 from pdrozd/KEYCLOAK-2794 
KEYCLOAK-2794 - changed version of undertow-embedded.
 2016-04-12 07:42:13 +02:00
Stian Thorgersen
d748f7e459 Merge pull request #2573 from stianst/KEYCLOAK-2700 
KEYCLOAK-2700 Import existing realm fails due to can't delete group
 2016-04-12 07:20:01 +02:00
mposolda
e4f75409c9 KEYCLOAK-2802 NPE during identity broker cancelled from account mgmt 2016-04-11 23:31:24 +02:00
mposolda
98ad9b7e7c KEYCLOAK-2801 Redirected to login theme error page after failed social linking from account management 2016-04-11 23:30:18 +02:00
mposolda
3e9ba71baa KEYCLOAK-2769 Better error handling of expired code in IdentityBrokerService 2016-04-11 18:20:26 +02:00
Stian Thorgersen
e588860c21 KEYCLOAK-2700 Import existing realm fails due to can't delete group 2016-04-11 09:18:57 +02:00
Pavel Drozd
ba788eb678 KEYCLOAK-2794 - changed version of undertow-embedded. 2016-04-11 08:04:19 +02:00
Stian Thorgersen
19deb7c65e Merge pull request #2562 from guusdk/KEYCLOAK-2785 
KEYCLOAK-2785: Admin client should be able to delete a user.
 2016-04-11 07:14:06 +02:00
Stian Thorgersen
58b66b788f Merge pull request #2558 from mhajas/js-console-stability-PR 
KEYCLOAK-2780 Better stability in JSConsole test
 2016-04-11 07:12:22 +02:00
Stian Thorgersen
0447d857fd Merge pull request #2556 from mhajas/secure-porta-PR 
KEYCLOAK-2779 Fix DemoServletAdpater tests
 2016-04-11 07:11:19 +02:00
Stian Thorgersen
42b00ae080 Merge pull request #2554 from mhajas/eap6URLs-PR 
KEYCLOAK-2778 Fix urls on eap6
 2016-04-11 07:09:48 +02:00
mposolda
ee9c87877f KEYCLOAK-2769 Fix NPE during 'Identity Broker cancelled' and instead show keycloak 'we are sorry' page 2016-04-08 19:07:06 +02:00
Guus der Kinderen
38670df49a
KEYCLOAK-2785: Admin client should be able to delete a user. 
The delete user service should be exposed in the admin client.
 2016-04-08 16:34:46 +02:00
mhajas
d730da757e Better stability in JSConsole test 2016-04-08 13:55:33 +02:00
mhajas
fbca45d336 Fix DemoServlet test 2016-04-08 13:38:42 +02:00
mhajas
ff66d471e2 Fix timeouts in DemoServlets tests 2016-04-08 13:37:22 +02:00
mhajas
c65a156939 Fix urls on eap6 2016-04-08 13:26:16 +02:00
mposolda
90fc721315 KEYCLOAK-2614 Refactor database lock to use 'SELECT FOR UPDATE' pessimistic locking 2016-04-08 12:20:54 +02:00
Vaclav Muzikar
861e44b9c8 KEYCLOAK-2772 Add deletion test to GroupTest 2016-04-07 18:03:51 +02:00
Stian Thorgersen
c1a8e692d0 Merge pull request #2538 from stianst/KEYCLOAK-2751 
KEYCLOAK-2751
 2016-04-07 16:27:11 +02:00
Stian Thorgersen
b6d861fea6 KEYCLOAK-2751 
Separate HTTP status codes for REST API errors
 2016-04-07 15:39:12 +02:00
Guus der Kinderen
be578684b9
KEYCLOAK-2767: Should return a primitive if possible. 
A JSON primitive is valid JSON. There is no need to construct a JSON object
just for the sake of being JSON complient. This keeps things nice and simple.
 2016-04-07 13:19:29 +02:00
Stian Thorgersen
8de8446cb5 Merge pull request #2520 from stianst/KEYCLOAK-2756 
KEYCLOAK-2756
 2016-04-06 19:25:53 +02:00
Stian Thorgersen
6ccf3549ad KEYCLOAK-2756 
Renaming a realm breaks down the Clients
 2016-04-06 15:18:49 +02:00
Marek Posolda
c469109d22 Merge pull request #2517 from mposolda/master 
KEYCLOAK-1982 Some builtin objects might be missing when import JSON exported from previous versions
 2016-04-06 13:24:32 +02:00
mposolda
72371e5d76 KEYCLOAK-1982 Some builtin objects might be missing when import JSON exported from old versions 2016-04-06 11:43:58 +02:00
mposolda
f0b168c18f Ensure KeycloakSessionFactory.close is called before shutdown of auth-server-undertow 2016-04-06 11:43:49 +02:00
Stian Thorgersen
0fc4ca0d12 KEYCLOAK-2590 Add custom rest endpoint to set time offset 2016-04-06 11:14:37 +02:00
mposolda
784b724fe0 Removed docker-cluster as integration-arquillian has support for clustering tests now 2016-04-05 11:45:34 +02:00
Stian Thorgersen
373ded9761 Merge pull request #2500 from vmuzikar/master 
KEYCLOAK-2745 More UI tests stabilization
 2016-04-05 11:19:01 +02:00
Stian Thorgersen
3e9ae7aa82 Merge pull request #2498 from stianst/KEYCLOAK-2722 
KEYCLOAK-2722 Check user session in token introspection endpoint
 2016-04-05 11:18:32 +02:00
Vaclav Muzikar
3dbf5ee389 KEYCLOAK-2745 More UI tests stabilization 2016-04-05 10:13:40 +02:00
Stian Thorgersen
55c5e9a381 KEYCLOAK-2722 Check user session in token introspection endpoint 2016-04-05 09:31:39 +02:00
Stian Thorgersen
b924cf9e9f Merge pull request #2492 from stianst/KEYCLOAK-2704 
KEYCLOAK-2704
 2016-04-05 08:54:18 +02:00
Marek Posolda
1714422b10 Merge pull request #2487 from mposolda/master 
databaseSchema option - proper support for "validate" for both JPA and Mongo
 2016-04-05 08:48:33 +02:00
Stian Thorgersen
48551d362a KEYCLOAK-2704 
User count missing in REST admin endpoint
 2016-04-05 07:48:20 +02:00
Bill Burke
cee8fee504 Merge pull request #2490 from patriot1burke/master 
KEYCLOAK-2669
 2016-04-04 21:14:13 -04:00
Bill Burke
9a4308e092 fix again 2016-04-04 20:36:40 -04:00
Bill Burke
93b3f448d3 fix 2016-04-04 21:23:09 -04:00
Bill Burke
8beff63dc0 KEYCLOAK-2669 2016-04-04 21:12:55 -04:00
mposolda
3a8b450575 KEYCLOAK-2737 connectionsMongo: Support for 'databaseSchema: validate' 2016-04-04 22:24:33 +02:00
Bill Burke
dfa7c76331 Merge pull request #2475 from patriot1burke/master 
KEYCLOAK-2662
 2016-04-01 17:55:42 -04:00
Bill Burke
f21cede378 KEYCLOAK-2662 2016-04-01 16:43:38 -04:00
Bill Burke
80dfc63768 Merge pull request #2458 from vmuzikar/master 
KEYCLOAK-2732
 2016-04-01 16:03:01 -04:00
Bill Burke
4d5ae5dd68 KEYCLOAK-2512 2016-04-01 14:50:26 -04:00
mposolda
afd3a36ee4 KEYCLOAK-2737 Remove 'databaseSchema' property from connectionsMongo 2016-04-01 16:55:06 +02:00
mposolda
a4d9aaf916 KEYCLOAK-2613 Add version to RealmRepresentation in JSON exports 2016-04-01 16:04:58 +02:00
mposolda
5d7b549323 Fix LDAPGroupMapperTest with MSAD and Mongo 2016-04-01 10:44:35 +02:00
Vaclav Muzikar
4ce8b2431b KEYCLOAK-2732 2016-03-31 18:16:03 +02:00
mposolda
6ab411b2de KEYCLOAK-2610 More operations added to ManyUsersTest 2016-03-31 11:49:51 +02:00
Bill Burke
d1552cd6e8 resolve conflict 2016-03-30 18:23:40 -04:00
Bill Burke
545fb8b849 KEYCLOAK-2716 2016-03-30 18:15:11 -04:00
Bill Burke
e4fcaad243 Merge pull request #2450 from patriot1burke/master 
KEYCLOAK-2691
 2016-03-30 15:46:34 -04:00
Bill Burke
3d3d526e30 Merge pull request #2444 from mhajas/js-console-up-PR 
KEYCLOAK-2725 Run js-console example on non-relative scanario + tests of implicit flow
 2016-03-30 15:16:50 -04:00
Bill Burke
020d090aee Merge pull request #2430 from mstruk/assert-events 
KEYCLOAK-2589 KEYCLOAK-2607 KEYCLOAK-2597 Port AssertEvents to integration-arquillian
 2016-03-30 15:16:25 -04:00
Bill Burke
2cc3588be5 Merge remote-tracking branch 'upstream/master' 2016-03-30 15:07:35 -04:00
Bill Burke
12bf4b498e KEYCLOAK-2691 2016-03-30 15:07:24 -04:00
Tomas Kyjovsky
6b6a673642 KEYCLOAK-2641 updated READMEs 2016-03-30 18:11:09 +02:00
Tomas Kyjovsky
47773371e3 KEYCLOAK-2641 Fixed location of module.xsl 2016-03-30 14:48:19 +02:00
mhajas
d0aeb25f14 Run js-console example on non-relative scanario + tests of implicit flow 2016-03-30 11:52:05 +02:00
Stan Silvert
0f52768064 KEYCLOAK-2619: Partial Import doesn't support groups 2016-03-28 14:26:34 -04:00
Bill Burke
1dd4bdf0b7 KEYCLOAK-2718 2016-03-28 11:13:02 -04:00
Bill Burke
17fcc38157 Merge pull request #2426 from tkyjovsk/fail-if-no-tests-false 
Arq. TestSuite Surefire config: failIfNoTests=false
 2016-03-28 08:48:01 -04:00
Bill Burke
b253fe9532 Merge remote-tracking branch 'upstream/master' 2016-03-24 15:57:01 -04:00
Bill Burke
e2436c4722 KEYCLOAK-2624 2016-03-24 15:56:40 -04:00
Marko Strukelj
76a4db5d54 KEYCLOAK-2597 Invalid children group location header response 2016-03-24 17:13:00 +01:00
Marko Strukelj
790a068bdb KEYCLOAK-2607 Migrate Group tests to ARQ testsuite 2016-03-24 17:13:00 +01:00
Marko Strukelj
95d222348d KEYCLOAK-2589 Copy AssertEvents to Arquillian testsuite and modify to pull events from admin endpoints 2016-03-24 17:13:00 +01:00
Tomas Kyjovsky
f6dea6752c Arq. TestSuite Surefire config: failIfNoTests=false 2016-03-24 15:08:55 +01:00
Bill Burke
0f5caffbab Merge pull request #2421 from tkyjovsk/KEYCLOAK-2641 
KEYCLOAK-2641 moved app-server configurations from adapter tests
 2016-03-24 09:31:42 -04:00
Bill Burke
6030a65d1b KEYCLOAK-2543 2016-03-24 08:49:08 -04:00
Tomas Kyjovsky
a9c7bbd44c KEYCLOAK-2641 moved app-server configurations from adapter tests to servers/app-server module 2016-03-24 11:24:21 +01:00
mposolda
16ec76e864 KEYCLOAK-2712 Default required actions not added when user created through admin console 2016-03-24 11:11:35 +01:00
Stian Thorgersen
8f1292494f Merge pull request #2411 from vmuzikar/KEYCLOAK-2697 
[KEYCLOAK-2697] Fix some UI tests stability
 2016-03-24 08:19:45 +00:00
Stian Thorgersen
0ef36096fb Merge pull request #2407 from vmuzikar/KEYCLOAK-2694 
[KEYCLOAK-2694] Add system property for test constants location
 2016-03-24 08:18:31 +00:00
Stian Thorgersen
5181e95776 Merge pull request #2405 from vramik/KEYCLOAK-2676 
KEYCLOAK-2676 - Review clients tests
 2016-03-24 08:17:27 +00:00
mposolda
22ce20ff6b KEYCLOAK-2710 Possibility to log some hibernate statistics 2016-03-23 22:36:31 +01:00
Vaclav Muzikar
25363a91f9 [KEYCLOAK-2697] Fix some UI tests stability 2016-03-22 13:57:23 +01:00
mposolda
4a06d7590e KEYCLOAK-2682 NPE when LDAP groups points to non-existent user 2016-03-22 13:03:48 +01:00
Vaclav Muzikar
18b07190bf Add system property for test constants location 
(cherry picked from commit f9afa13)
 2016-03-22 12:17:13 +01:00
Vlasta Ramik
1cfe58bccd KEYCLOAK-2676 - Review clients tests 2016-03-22 11:57:41 +01:00
Stian Thorgersen
ce717fa20e KEYCLOAK-2469 Minor changes 2016-03-21 15:45:53 +01:00
Stian Thorgersen
204d226267 Merge branch 'issue/KEYCLOAK-2469' of https://github.com/thomasdarimont/keycloak into thomasdarimont-issue/KEYCLOAK-2469 2016-03-21 15:30:48 +01:00
Stian Thorgersen
ca67e8a764 Merge pull request #2398 from vramik/master-KEYCLOAK-2690 
KEYCLOAK-2690 - create page source file when test fails
 2016-03-21 15:26:30 +01:00
Stian Thorgersen
60667e65e7 Merge pull request #2395 from mhajas/mellon-realm-PR 
KEYCLOAK-2689 Modify mod_auth_mellon realm for rhel7
 2016-03-21 15:21:26 +01:00
Stian Thorgersen
3b7101650e Merge pull request #2393 from mhajas/mellon-timeout-PR 
KEYCLOAK-2688 Modified session length in mod_auth_mellon test
 2016-03-21 15:21:00 +01:00
Stian Thorgersen
82300a90f8 Merge pull request #2388 from pdrozd/KEYCLOAK-2685 
KEYCLOAK-2685 - Updated EAP7 namespaces
 2016-03-21 15:20:26 +01:00
Vlasta Ramik
75ef3efd15 create page source file when test fails 2016-03-21 14:19:11 +01:00
mhajas
e7ec454f81 Modify realm for rhel7 2016-03-21 12:41:17 +01:00
mhajas
a80a65c525 Modified session length 2016-03-21 12:32:51 +01:00
Pavel Drozd
c61b457c02 KEYCLOAK-2685 - Updated EAP7 namespaces 2016-03-21 08:48:47 +01:00
Vaclav Muzikar
5c3159c83d Merge with upstream 2016-03-14 16:09:56 +01:00
mposolda
2d188068c4 KEYCLOAK-2644 Delete user with a READ_ONLY LDAP federation provider just from Keycloak DB 2016-03-14 09:39:14 +01:00
mposolda
1142ed5583 KEYCLOAK-2655 Support of lazy sync LDAP groups, which user is member of 2016-03-11 22:33:03 +01:00
mposolda
85ccd64e01 KEYCLOAK-2643 Added write-only property to LDAP full-name attribute mapper 2016-03-11 22:32:55 +01:00
mposolda
73c3534e7a KEYCLOAK-2629 LDAP Federation provider - input fields validation 2016-03-11 22:32:45 +01:00
Thomas Darimont
41358eea4d KEYCLOAK-2469 - Introduced new redirect endpoint for clients. 
Previously one had to configure hardcoded urls to link from one client
application to others since keycloak didn't provide a way to get the
actual client URL by providing clientId and realm information.

We now support a new endpoint with the path {realm}/clients/{client_id}/redirect
that responds to GET requests with a 307 (temporary redirect) with the
configured client URL. This allows to refer to any client just by the
realmName and clientId and let Keycloak redirect to the actual client
application.

Add documentation for new redirect endpoint.
 2016-03-10 23:45:22 +01:00
Bill Burke
82ad26189f refactor user cache 2016-03-10 13:01:21 -05:00
Stian Thorgersen
36f2febde1 Next is 2.0.0.CR1 2016-03-10 13:01:18 -05:00
Stian Thorgersen
55e9f2e21b Allow ignoring patterns in LogChecker 2016-03-10 13:01:16 -05:00
Vlasta Ramik
81f1baff33 KEYCLOAK-2586 - fix URL providers on classpath for graphene 2.1.0.Aplha3 2016-03-10 13:01:14 -05:00
mposolda
e3f24f58df Fix failing test 2016-03-10 13:01:13 -05:00
mposolda
1939f25a71 KEYCLOAK-2601 Fix incorrectly autodetected dialect with MSSQL2014 2016-03-10 13:01:12 -05:00
Stian Thorgersen
76df229967 Next is 1.9.2.Final 2016-03-10 13:01:10 -05:00
mposolda
3ce6deaa1b Log DB info in arquillian testsuite 2016-03-10 13:01:09 -05:00
mposolda
428b85f1f8 Disable DBLockTest for now 2016-03-10 13:01:08 -05:00
mposolda
89a1141f8d Added exclusion of old commons-io dependency as it's causing issues in some environments 2016-03-10 13:01:07 -05:00
mposolda
4ff4f69343 KEYCLOAK-2611 Keycloak fails to start with Oracle DB 2016-03-10 13:01:05 -05:00
Marek Baluch
9e836162b7 KPR-87 - Agreement on terms and conditions as part of authentication - Tests 2016-03-10 13:01:03 -05:00
Tomas Kyjovsky
a27fd7ae1f Added workaround for KEYCLOAK-2560 to jpa-performance tests. 
Optional delete/reimport realm phases.
 2016-03-10 13:00:59 -05:00
mhajas
768a3ab941 IPv6 in login events 2016-03-10 13:00:58 -05:00
mhajas
5790dd44a4 Make adapter tests run also on EAP6 and EAP7 2016-03-10 13:00:57 -05:00
mhajas
d2b5cf08c6 IdpInitiated login unauthorized test 2016-03-10 13:00:55 -05:00
mposolda
062c8a06ab Fix testsuite with mongo 2016-03-10 13:00:53 -05:00
mposolda
6a48e00039 Check performance of multiple get calls over cluster 2016-03-10 13:00:52 -05:00
mposolda
6d0e5d6ad1 KEYCLOAK-2529 Concurrent startup by more cluster nodes at the same time. Added DBLockProvider 2016-03-10 13:00:51 -05:00
Stian Thorgersen
001ae5146a KEYCLOAK-2605 Revert upgrade of Arquillian Graphene 2016-03-10 13:00:50 -05:00
Stan Silvert
23175bf925 Make imports in ServerInfoAdminResource explicitly point to the new 
packages.
 2016-03-10 13:00:49 -05:00