libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Merge pull request #1602 from stianst/master

Browse source 
Fixes
This commit is contained in:
Stian Thorgersen 2015-09-07 10:36:48 +02:00
commit bce0e0ea90
6 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/demo-template/third-party/src/main/webapp/WEB-INF/web.xml vendored
View file

@ -9,6 +9,12 @@
<listener>
<listener-class>org.keycloak.example.oauth.Bootstrap</listener-class>
</listener>
<error-page>
<exception-type>java.lang.RuntimeException</exception-type>
<location>/error.jsp</location>
</error-page>
<!--
<security-constraint>
<web-resource-collection>

1
examples/demo-template/third-party/src/main/webapp/error.jsp vendored Normal file
View file

@ -0,0 +1 @@
An error occurred. Click <a href="index.html"> to try again.

2
examples/themes/src/main/resources/theme/address/login/login-update-profile.ftl
View file

@ -5,7 +5,7 @@
<#elseif section = "header">
${msg("loginProfileTitle")}
<#elseif section = "form">
<form id="kc-update-profile-form" class="${properties.kcFormClass!}" action="${url.loginUpdateProfileUrl}" method="post">
<form id="kc-update-profile-form" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
<div class="${properties.kcFormGroupClass!} ${messagesPerField.printIfExists('email',properties.kcFormGroupErrorClass!)}">
<div class="${properties.kcLabelWrapperClass!}">
<label for="email" class="${properties.kcLabelClass!}">${msg("email")}</label>

2
forms/common-themes/src/main/resources/theme/base/account/applications.ftl
View file

@ -76,7 +76,7 @@
</td>
<td>
<#if application.client.consentRequired>
<#if application.client.consentRequired && application.claimsGranted?has_content>
<button type='submit' class='${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!}' id='revoke-${application.client.clientId}' name='clientId' value="${application.client.id}">${msg("revoke")}</button>
</#if>
</td>

2
forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-attributes.html
View file

@ -16,7 +16,7 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="(key, value) in (user.attributes | filter:search)">
<tr ng-repeat="(key, value) in user.attributes">
<td>{{key}}</td>
<td><input ng-model="user.attributes[key]" class="form-control" type="text" name="{{key}}" id="attribute-{{key}}" /></td>
<td class="kc-action-cell">

6
testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java
View file

@ -49,6 +49,7 @@ import org.keycloak.testsuite.pages.OAuthGrantPage;
import org.keycloak.testsuite.rule.KeycloakRule;
import org.keycloak.testsuite.rule.WebResource;
import org.keycloak.testsuite.rule.WebRule;
import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver;
import java.io.IOException;
@ -130,10 +131,15 @@ public class OAuthGrantTest {
events.expectCodeToToken(codeId, loginEvent.getSessionId()).client("third-party").assertEvent();
accountAppsPage.open();
assertEquals(1, driver.findElements(By.id("revoke-third-party")).size());
accountAppsPage.revokeGrant("third-party");
events.expect(EventType.REVOKE_GRANT)
.client("account").detail(Details.REVOKED_CLIENT, "third-party").assertEvent();
assertEquals(0, driver.findElements(By.id("revoke-third-party")).size());
}
@Test