inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)

Browse Source 
135804 jkaabimofrad: APPSREPO-35, APPSREPO-118: Added tests for reset password service and REST API.
       - Added a utility class (EmailUtil) to work with MailActionExecutor in test mode
       - Added a new workflow task responsible for sending the reset password confirmation email (per peer review)
       - Changed the reset-password endpoint to return a 202 response for an inactive workflow or invalid workflow id, key or mismatched user
       - Some other minor changes as the result of adding tests
       - Also, fixed tests failures by changing the reset password workflow definition target namespace URI.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2017-03-16 19:39:31 +00:00
parent b96832b0fd
commit de94938b0d
15 changed files with 978 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
source/test-java/org/alfresco/util/email/ExtendedMailActionExecutor.java Normal file
View File

@@ -0,0 +1,88 @@
/*
* #%L
* Alfresco Remote API
* %%
* Copyright (C) 2005 - 2017 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.util.email;
import org.alfresco.repo.action.executer.MailActionExecuter;
import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.util.Pair;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.mail.javamail.MimeMessageHelper;
import javax.mail.internet.InternetAddress;
import java.io.Serializable;
import java.util.Collections;
import java.util.Locale;
import java.util.Map;
/**
* Extension of {@link MailActionExecuter} for test purposes.
*
* @author Jamal Kaabi-Mofrad
*/
public class ExtendedMailActionExecutor extends MailActionExecuter
{
private static final Log LOGGER = LogFactory.getLog(ExtendedMailActionExecutor.class);
private volatile Map<String, Serializable> parameterValues = Collections.emptyMap();
@Override
public MimeMessageHelper prepareEmail(Action ruleAction, NodeRef actionedUponNodeRef, Pair<String, Locale> recipient,
Pair<InternetAddress, Locale> sender)
{
parameterValues = ruleAction.getParameterValues();
return super.prepareEmail(ruleAction, actionedUponNodeRef, recipient, sender);
}
public Serializable getLastMessageActionParam(String name)
{
return parameterValues.get(name);
}
public Map<String, Object> getLastMessageTemplateModel()
{
Object model = parameterValues.get(PARAM_TEMPLATE_MODEL);
if (model instanceof Map)
{
return (Map<String, Object>) model;
}
else
{
String className = model == null ? "" : model.getClass().getName();
LOGGER.warn("Skipping unsupported email template model parameters of type " + className);
}
return Collections.emptyMap();
}
public void clearLastMessage()
{
parameterValues.clear();
super.clearLastTestMessage();
super.resetTestSentCount();
}
}