Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge keycloak/keycloak Tag 3.2.0 into fabric8 keycloak #93

Closed
wants to merge 118 commits into from

Conversation

sbose78
Copy link
Member

@sbose78 sbose78 commented Jul 11, 2017

Since this commit 44df071 was a squashed commit it had changed the original history from https://github.com/keycloak/keycloak . This was causing a lot of merge conflicts.

To resolve this,
I've reverted 44df071 and merged all the changes from https://github.com/keycloak/keycloak/tree/3.2.0.Final , in this PR.

Henceforth, we should avoid squashing commits before merging.

Frederik Libert and others added 30 commits April 24, 2017 11:29
…efault checkbox when the enable checkbox is not checked. The API will continue to silently drop actions that are not enabled for the realm.
…eryParamAsIs instead of encodeQueryParam when encoding key=value pairs for URI query sections. Also fix a few callers who were relying on the bad behaviour of queryParam.
Credentials are stored with user creation if they are present in the UserRepresentation.
pdrozd and others added 25 commits June 28, 2017 13:23
…lTest-testNoPortInDestination-fails-on-auth-server-wildfly

KEYCLOAK-5106 Fix BasicSamlTest on auth-server-wildfly
KEYCLOAK-5026 Store credentials
KEYCLOAK-3592 Docker auth implementation
Fallback to using username in FullNameMapper
KEYCLOAK-5107 Fix FineGrainAdminUnitTest and IllegalAdminUpgradeTest …
…ters (keycloak#4255)

* add rewrite rule config property

* add subsystem support for redirect rewrite

* update deployment unit test

* add license headers

* Optimize rewrite method
Authz tab not showing
Revert to WildFly 10 for 3.2 release

KEYCLOAK-4189 Fix cluster tests failures
* [KEYCLOAK-4992] - Allow clients to exclude resource_set_name from RPT

* Easy Spring security annotation

* [KEYCLOAK-4932] - Improvements to policy enforcer and better spring boot support

* [KEYCLOAK-4992] - Using query parameter metadata for GET requests

* [KEYCLOAK-4991] - Allow clients to limit the number of permission in a RPT when using entitlements

* [KEYCLOAK-4983] - Authz settings export of role base policy generates json where are just role-names

* Fixing tests and more client policy tests

* KEYCLOAK-4980 SAML adapter should return 401 when unauthenticated Ajax client accesses

* Missing invalidation for some queries cache

* KEYCLOAK-5044 Remove Angular2 example2

* [KEYCLOAK-4904] - Authorization Audit - Part 1

* KEYCLOAK-4189 - Cross DC testing

* [KEYCLOAK-5051] - Invalidate authz cache when realm cache is cleared

* KEYCLOAK-4924: pairwise clients get duplicate subs in tokens

* KEYCLOAK-4189 Fix in instructions for running Cross-DC tests

* Changing request matcher to attempt auth on /sso/login or Auhtorization header

Add default login URL.

Throwing exception if login fails to enable auth entry point

Adding a test for invalid token and bearer-only

handle redirect correctly

* [KEYCLOAK-5054] - Checking name availability only in cases name is filled

* KEYCLOAK-4189 add possibility to use jdg as cache server

* Author added

* new line in doc

* [KEYCLOAK-5056] - @nocache to scope admin api

* KEYCLOAK-4189 fixed issue with exlude cross DC tests by default

* JS policy should use ScriptingSPI

* Extract EvaluatebleScriptAdapter

Precursor for InvocableScriptAdapter, which compiles/evaluates a script without affecting the engine's bindings. This allows the same script to be compiled once and then evaluated multiple times (with the same ScriptEngine).

* Cache compiled scripts in JSPolicyProviderFactory

* KEYCLOAK-4327 Switching language on User consent gives error

* KEYCLOAK-4189 Infinispan cache and channel statistics for Cross-DC-testing

* KEYCLOAK-3316 Fixes for OAuth2 requests without 'scope=openid'

* KEYCLOAK-4438 Disable kerberos flow when provider removed
@sbose78 sbose78 changed the title Merging Tag 3.2.0 from keycloak/keycloak Merge keycloak/keycloak Tag 3.2.0 into fabric8 keycloak Jul 11, 2017
@alexeykazakov
Copy link
Collaborator

Yes, we should not have squashed commits.
I enabled commit merge now.
I also "fixed" master history by merging from upstream with force. Something we should avoid using in the future though.
Master is still behind upstream master but its history now in sync so it won't cause conflicts later.
I also pushed 3.2.0.Final tag from upstream. So we know can switch to that tag in keycloak-deployments.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet