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

Merge pull request #486 from stianst/master

Browse source 
Bug fixes
This commit is contained in:
Stian Thorgersen 2014-06-27 12:21:39 +01:00
commit 18094370a6
4 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
forms/email-freemarker/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailProvider.java
View file

@ -17,6 +17,7 @@ import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@ -130,6 +131,7 @@ public class FreeMarkerEmailProvider implements EmailProvider {
msg.setSubject(subject);
msg.setText(body);
msg.saveChanges();
msg.setSentDate(new Date());
Transport transport = session.getTransport("smtp");
if (auth) {

12
services/src/main/java/org/keycloak/services/resources/RequiredActionsService.java
View file

@ -224,6 +224,13 @@ public class RequiredActionsService {
audit.clone().event(EventType.UPDATE_PASSWORD).success();
// Password reset through email won't have an associated session
if (accessCode.getSessionState() == null) {
UserSessionModel userSession = realm.createUserSession(realm.getUserById(accessCode.getUser().getId()), clientConnection.getRemoteAddr());
accessCode.getToken().setSessionState(userSession.getId());
audit.session(userSession);
}
return redirectOauth(user, accessCode);
}
@ -322,10 +329,7 @@ public class RequiredActionsService {
Set<RequiredAction> requiredActions = new HashSet<RequiredAction>(user.getRequiredActions());
requiredActions.add(RequiredAction.UPDATE_PASSWORD);
UserSessionModel session = realm.createUserSession(user, clientConnection.getRemoteAddr());
audit.session(session);
AccessCodeEntry accessCode = tokenManager.createAccessCode(scopeParam, state, redirect, realm, client, user, session);
AccessCodeEntry accessCode = tokenManager.createAccessCode(scopeParam, state, redirect, realm, client, user, null);
accessCode.setRequiredActions(requiredActions);
accessCode.setAuthMethod("form");
accessCode.setUsernameUsed(username);

1
services/src/main/java/org/keycloak/services/resources/flows/OAuthFlows.java
View file

@ -42,6 +42,7 @@ import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.services.managers.AccessCodeEntry;
import org.keycloak.services.managers.AuthenticationManager;
import org.keycloak.services.managers.TokenManager;
import org.keycloak.services.util.CookieHelper;
import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.MultivaluedMap;

7
testsuite/tools/src/main/webapp/pages/mail.html
View file

@ -7,17 +7,18 @@
<table class="table table-striped table-bordered">
<thead>
<tr>
<th>From</th>
<th>Date</th>
<th>To</th>
<th>From</th>
<th>Subject</th>
<th>Body</th>
</tr>
</thead>
<tr data-ng-repeat="m in messages|reverse">
<td>{{m.from}}</td>
<td>{{m.date|date:'medium'}}</td>
<td>{{m.to}}</td>
<td>{{m.from}}</td>
<td>{{m.subject}}</td>
<td><pre>{{m.body}}</pre></td>
<td>{{m.date|date:'medium'}}</td>
</tr>
</table>