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

Various fixes to "start" operation in Invite Web Script

Browse Source 
- Fixed bug where "start invite" web script operation was always generating a new disabled invitee account, even if an account for a user with the given invitee email address already existed.
- Make sure that invitee ONLY receives account details in invitation email if a disabled invitee account has just been created for invitee prior to sending out the email (i.e. if there was no pre-existing account for the invitee and thus a disabled invitee account had to be created)
- Breaking out the long "start invite" web script method into various helper methods
- Throw web script exception if "start invite" web script operation hasn't been able to generate a unique user name for the given invitee email address after 10 attempts.
- If "start invite" web script operation detects that a person already exists in the repository with the given invitee email address, then use that existing person as the invitee (instead of always creating a new person node for the given invitee email address)  
- Throw Web Script exception if "start invite" web script operation detects that given invitee is already a member of the given site
- Added more comments to the code

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10405 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Glen Johnson
2008-08-18 16:38:38 +00:00
parent db52f6c045
commit da322f33ca
4 changed files with 340 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

269
source/java/org/alfresco/repo/web/scripts/invite/Invite.java
View File

@@ -28,20 +28,25 @@ import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
import org.alfresco.repo.security.authentication.PasswordGenerator;
import org.alfresco.repo.security.authentication.UserNameGenerator;
import org.alfresco.repo.site.SiteService;
import org.alfresco.repo.workflow.WorkflowModel;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.workflow.WorkflowDefinition;
import org.alfresco.service.cmr.workflow.WorkflowPath;
import org.alfresco.service.cmr.workflow.WorkflowService;
import org.alfresco.service.cmr.workflow.WorkflowTask;
import org.alfresco.service.cmr.workflow.WorkflowTaskQuery;
import org.alfresco.service.cmr.workflow.WorkflowTaskState;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.web.scripts.DeclarativeWebScript;
@@ -84,7 +89,8 @@ public class Invite extends DeclarativeWebScript
private AuthenticationService authenticationService;
private MutableAuthenticationDao mutableAuthenticationDao;
private NamespaceService namespaceService;
private AuthenticationComponent authenticationComponent;
private SiteService siteService;
private NodeService nodeService;
// user name and password generation beans
private UserNameGenerator usernameGenerator;
@@ -102,6 +108,10 @@ public class Invite extends DeclarativeWebScript
public static final String WF_INVITE_TASK_INVITE_TO_SITE = "wf:inviteToSiteTask";
public static final String WORKFLOW_DEFINITION_NAME = "jbpm$wf:invite";
// maximum number of tries to generate a invitee user name which
// does not already belong to an existing person
public static final int MAX_NUM_INVITEE_USER_NAME_GEN_TRIES = 10;
/**
* Sets the workflowService property
*
@@ -159,16 +169,6 @@ public class Invite extends DeclarativeWebScript
this.namespaceService = namespaceService;
}
/**
* Set the authentication component
*
* @param authenticationComponent the authentication component to set
*/
public void setAuthenticationComponent(AuthenticationComponent authenticationComponent)
{
this.authenticationComponent = authenticationComponent;
}
/**
* Set the user name generator service
*
@@ -190,6 +190,28 @@ public class Invite extends DeclarativeWebScript
{
this.passwordGenerator = passwordGenerator;
}
/**
* Set the site service property
*
* @param siteService
* the site service to set
*/
public void setSiteService(SiteService siteService)
{
this.siteService = siteService;
}
/**
* Set the node service property
*
* @param nodeService
* the node service to set
*/
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
/*
* (non-Javadoc)
@@ -313,6 +335,109 @@ public class Invite extends DeclarativeWebScript
return model;
}
/**
* Creates a person for the invitee with a generated user name.
*
* @param inviteeFirstName first name of invitee
* @param inviteeLastName last name of invitee
* @param inviteeEmail email address of invitee
* @return invitee user name
*/
private String createInviteePerson(String inviteeFirstName, String inviteeLastName, String inviteeEmail)
{
// Attempt to generate user name for invitee
// which does not belong to an existing person
// Tries up to MAX_NUM_INVITEE_USER_NAME_GEN_TRIES
// at which point a web script exception is thrown
String inviteeUserName = null;
int i = 0;
do
{
inviteeUserName = usernameGenerator.generateUserName();
i++;
}
while (this.personService.personExists(inviteeUserName) && (i < MAX_NUM_INVITEE_USER_NAME_GEN_TRIES));
// if after 10 tries is not able to generate a user name for a
// person who doesn't already exist, then throw a web script exception
if (this.personService.personExists(inviteeUserName))
{
throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR,
"Failed to generate a user name for invitee, which doesn't already belong to "
+ "an existing person after " + MAX_NUM_INVITEE_USER_NAME_GEN_TRIES
+ " tries");
}
// create a person node for the invitee with generated invitee user name
// and other provided person property values
Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
properties.put(ContentModel.PROP_USERNAME, inviteeUserName);
properties.put(ContentModel.PROP_FIRSTNAME, inviteeFirstName);
properties.put(ContentModel.PROP_LASTNAME, inviteeLastName);
properties.put(ContentModel.PROP_EMAIL, inviteeEmail);
this.personService.createPerson(properties);
return inviteeUserName;
}
/**
* Creates a disabled user account for the given invitee user name
* with a generated password
*
* @param inviteeUserName
* @return password generated for invitee user account
*/
private String createInviteeDisabledAccount(String inviteeUserName)
{
// generate password using password generator
char[] generatedPassword = passwordGenerator.generatePassword().toCharArray();
// create disabled user account for invitee user name with generated password
this.mutableAuthenticationDao.createUser(inviteeUserName, generatedPassword);
this.mutableAuthenticationDao.setEnabled(inviteeUserName, false);
return String.valueOf(generatedPassword);
}
/**
* Returns whether there is an invite in progress for the given invite user name
* and site short name
*
* @param inviteeUserName
* @param siteShortName
* @return whether there is an invite in progress
*/
private boolean isInviteAlreadyInProgress(String inviteeUserName, String siteShortName)
{
// create workflow task query
WorkflowTaskQuery wfTaskQuery = new WorkflowTaskQuery();
// set query properties to look up task instances of inviteToSite task
// in active invite workflow instances
wfTaskQuery.setActive(Boolean.TRUE);
wfTaskQuery.setProcessName(QName.createQName("wf:invite", this.namespaceService));
wfTaskQuery.setTaskState(WorkflowTaskState.COMPLETED);
wfTaskQuery.setTaskName(QName.createQName(Invite.WF_INVITE_TASK_INVITE_TO_SITE,
this.namespaceService));
// set query process custom properties
HashMap<QName, Object> wfQueryProps = new HashMap<QName, Object>(2, 1.0f);
wfQueryProps.put(QName.createQName(Invite.WF_PROP_INVITEE_USER_NAME, this.namespaceService),
inviteeUserName);
wfQueryProps.put(QName.createQName(Invite.WF_PROP_SITE_SHORT_NAME, this.namespaceService),
siteShortName);
wfTaskQuery.setTaskCustomProps(wfQueryProps);
// query for invite workflow tasks in progress for person (having given invitee email address)
// and given site short name
List<WorkflowTask> inviteTasksInProgress = this.workflowService
.queryTasks(wfTaskQuery);
// throw web script exception if person (having the given invitee email address) already
// has an invitation in progress for the given site short name
return (inviteTasksInProgress.size() > 0);
}
/**
* Starts the Invite workflow
*
@@ -336,9 +461,77 @@ public class Invite extends DeclarativeWebScript
{
// get the inviter user name (the name of user web script is executed under)
// - needs to be assigned here because various system calls further on
// - in this method set the current user to the system user
// - in this method set the current user to the system user for some
// - odd reason
String inviterUserName = this.authenticationService.getCurrentUserName();
//
// if a person already exists who has the given invitee email address
//
// 1) obtain invitee user name from first person found having the invitee email address (there
// should only be one)
// 2) handle error conditions - (invitee already has an invitation in progress for the given site,
// or he/she is already a member of the given site
//
Set<NodeRef> peopleWithInviteeEmail = this.personService.getPeopleFilteredByProperty(
ContentModel.PROP_EMAIL, inviteeEmail);
String inviteeUserName;
if (peopleWithInviteeEmail.isEmpty() == false)
{
// get person already existing who has the given
// invitee email address (there should only be one, so just take
// the first from the set of people).
NodeRef person = (NodeRef) peopleWithInviteeEmail.toArray()[0];
// get invitee user name of that person
Serializable userNamePropertyVal = this.nodeService.getProperty(
person, ContentModel.PROP_USERNAME);
inviteeUserName = DefaultTypeConverter.INSTANCE.convert(String.class, userNamePropertyVal);
// throw web script exception if person is already a member of the given site
if (this.siteService.isMember(siteShortName, inviteeUserName))
{
throw new WebScriptException(Status.STATUS_CONFLICT,
"Cannot proceed with invitation. A person with user name: '" + inviteeUserName
+ "' and invitee email address: '"
+ inviteeEmail + "' is already a member of the site: '" + siteShortName + "'.");
}
// if an there is already an invite being processed for the person
// then throw a web script exception
// if (isInviteAlreadyInProgress(inviteeUserName, siteShortName))
// {
// throw new WebScriptException(Status.STATUS_CONFLICT,
// "Cannot proceed with invitation. There is already an invitation in progress " +
// "for a person with user name: '" + inviteeUserName + "' and invitee email address: '"
// + inviteeEmail + "' who is already a member of the site: '" + siteShortName + "'.");
// }
}
// else there are no existing people who have the given invitee email address
// so create invitee person
else
{
inviteeUserName = createInviteePerson(inviteeFirstName, inviteeLastName, inviteeEmail);
}
//
// If a user account does not already exist for invitee user name
// then create a disabled user account for the invitee.
// Hold a local reference to generated password if disabled invitee account
// is created, otherwise if a user account already exists for invitee
// user name, then local reference to invitee password will be "null"
//
String inviteePassword = null;
if (this.mutableAuthenticationDao.userExists(inviteeUserName) == false)
{
inviteePassword = createInviteeDisabledAccount(inviteeUserName);
}
//
// Start the invite workflow with inviter, invitee and site properties
//
WorkflowDefinition wfDefinition = this.workflowService
.getDefinitionByName(WORKFLOW_DEFINITION_NAME);
@@ -350,42 +543,6 @@ public class Invite extends DeclarativeWebScript
+ WORKFLOW_DEFINITION_NAME + " does not exist");
}
char[] generatedPassword = null;
// generate user name
String inviteeUserName = usernameGenerator.generateUserName();
// create person if user name does not already exist
if (!this.personService.personExists(inviteeUserName))
{
Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
properties.put(ContentModel.PROP_USERNAME, inviteeUserName);
properties.put(ContentModel.PROP_FIRSTNAME, inviteeFirstName);
properties.put(ContentModel.PROP_LASTNAME, inviteeLastName);
properties.put(ContentModel.PROP_EMAIL, inviteeEmail);
this.personService.createPerson(properties);
} else
{
throw new WebScriptException(
Status.STATUS_INTERNAL_SERVER_ERROR,
"When trying to create a user account for Invitee with generated user name, "
+ inviteeUserName
+ ", a person was found who already has that user name");
}
// create invitee person with generated user name and password, and with
// a disabled user account (with a generated password)
// generate password
generatedPassword = passwordGenerator.generatePassword().toCharArray();
// create account for person with generated userName and
// password
mutableAuthenticationDao.createUser(inviteeUserName, generatedPassword);
mutableAuthenticationDao.setEnabled(inviteeUserName, false);
// create workflow properties
Map<QName, Serializable> workflowProps = new HashMap<QName, Serializable>(
7);
@@ -398,7 +555,7 @@ public class Invite extends DeclarativeWebScript
workflowProps.put(QName.createQName(WF_PROP_INVITEE_LASTNAME, this.namespaceService),
inviteeLastName);
workflowProps.put(QName.createQName(WF_PROP_INVITEE_GEN_PASSWORD, this.namespaceService),
String.valueOf(generatedPassword));
inviteePassword);
workflowProps.put(QName.createQName(WF_PROP_SITE_SHORT_NAME, this.namespaceService),
siteShortName);
workflowProps.put(QName.createQName(WF_PROP_SERVER_PATH, this.namespaceService),
@@ -408,11 +565,13 @@ public class Invite extends DeclarativeWebScript
WorkflowPath wfPath = this.workflowService.startWorkflow(wfDefinition
.getId(), workflowProps);
// get the workflow instance and path IDs
//
// complete invite workflow start task to send out the invite email
//
// get the workflow tasks
String workflowId = wfPath.instance.id;
String wfPathId = wfPath.id;
// complete the start task
List<WorkflowTask> wfTasks = this.workflowService.getTasksForWorkflowPath(wfPathId);
// throw an exception if no tasks where found on the workflow path
@@ -432,11 +591,9 @@ public class Invite extends DeclarativeWebScript
+ " should be " + WF_INVITE_TASK_INVITE_TO_SITE);
}
// complete invite workflow start task
// get "inviteToSite" task
WorkflowTask wfStartTask = wfTasks.get(0);
// send out the invite
// attach empty package to start task, end it and follow transition
// thats sends out invite
NodeRef wfPackage = this.workflowService.createPackage(null);

135
source/java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java
View File

@@ -34,6 +34,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.site.SiteInfo;
import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.site.SiteService;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -82,9 +83,11 @@ public class InviteServiceTest extends BaseWebScriptTest
private static final String USER_INVITER = "InviterUser";
private static final String INVITEE_FIRSTNAME = "InviteeFirstName";
private static final String INVITEE_LASTNAME = "InviteeLastName";
private static final String INVITER_EMAIL = "FirstName123.LastName123@email.com";
private static final String INVITEE_EMAIL_DOMAIN = "alfrescotesting.com";
private static final String INVITEE_EMAIL_PREFIX = "invitee";
private static final String SITE_SHORT_NAME_INVITE = "InviteSiteShortName";
private static final String SITE_SHORT_NAME_INVITE_1 = "BananaMilkshakeSite";
private static final String SITE_SHORT_NAME_INVITE_2 = "DoubleScoopSite";
private static final String URL_INVITE_SERVICE = "/api/invite";
private static final String URL_INVITERSP_SERVICE = "/api/inviteresponse";
@@ -130,16 +133,23 @@ public class InviteServiceTest extends BaseWebScriptTest
public Object doWork() throws Exception
{
// Create inviter
createPerson(USER_INVITER);
createPerson(USER_INVITER, INVITER_EMAIL);
// Create site for Inviter to invite Invitee to
// - only create the site if it doesn't already exist
SiteInfo siteInfo = InviteServiceTest.this.siteService
.getSite(SITE_SHORT_NAME_INVITE);
if (siteInfo == null)
// Create sites for Inviter to invite Invitee to
SiteInfo siteInfo1 = InviteServiceTest.this.siteService
.getSite(SITE_SHORT_NAME_INVITE_1);
if (siteInfo1 == null)
{
InviteServiceTest.this.siteService.createSite(
"InviteSitePreset", SITE_SHORT_NAME_INVITE,
"InviteSitePreset", SITE_SHORT_NAME_INVITE_1,
"InviteSiteTitle", "InviteSiteDescription", true);
}
SiteInfo siteInfo2 = InviteServiceTest.this.siteService
.getSite(SITE_SHORT_NAME_INVITE_2);
if (siteInfo2 == null)
{
InviteServiceTest.this.siteService.createSite(
"InviteSitePreset", SITE_SHORT_NAME_INVITE_2,
"InviteSiteTitle", "InviteSiteDescription", true);
}
@@ -180,7 +190,7 @@ public class InviteServiceTest extends BaseWebScriptTest
for (NodeRef person : people)
{
String userName = DefaultTypeConverter.INSTANCE
.convert(String.class, nodeService.getProperty(
.convert(String.class, InviteServiceTest.this.nodeService.getProperty(
person, ContentModel.PROP_USERNAME));
// delete person
@@ -188,8 +198,9 @@ public class InviteServiceTest extends BaseWebScriptTest
}
}
// delete invite site
siteService.deleteSite(SITE_SHORT_NAME_INVITE);
// delete invite sites
siteService.deleteSite(SITE_SHORT_NAME_INVITE_1);
siteService.deleteSite(SITE_SHORT_NAME_INVITE_2);
return null;
}
@@ -237,7 +248,7 @@ public class InviteServiceTest extends BaseWebScriptTest
this.authorityService.deleteAuthority(fullGroupName);
}
private void createPerson(String userName)
private void createPerson(String userName, String emailAddress)
{
// if user with given user name doesn't already exist then create user
if (this.authenticationService.authenticationExists(userName) == false)
@@ -256,8 +267,7 @@ public class InviteServiceTest extends BaseWebScriptTest
personProps.put(ContentModel.PROP_USERNAME, userName);
personProps.put(ContentModel.PROP_FIRSTNAME, "FirstName123");
personProps.put(ContentModel.PROP_LASTNAME, "LastName123");
personProps.put(ContentModel.PROP_EMAIL,
"FirstName123.LastName123@email.com");
personProps.put(ContentModel.PROP_EMAIL, emailAddress);
personProps.put(ContentModel.PROP_JOBTITLE, "JobTitle123");
personProps.put(ContentModel.PROP_JOBTITLE, "Organisation123");
@@ -289,12 +299,9 @@ public class InviteServiceTest extends BaseWebScriptTest
}
private JSONObject startInvite(String inviteeFirstName,
String inviteeLastName, String siteShortName, int expectedStatus)
String inviteeLastName, String inviteeEmail, String siteShortName, int expectedStatus)
throws Exception
{
String inviteeEmail = INVITEE_EMAIL_PREFIX +
RandomStringUtils.randomAlphanumeric(6)
+ "@" + INVITEE_EMAIL_DOMAIN;
this.inviteeEmailAddrs.add(inviteeEmail);
// Inviter sends invitation to Invitee to join a Site
@@ -312,6 +319,19 @@ public class InviteServiceTest extends BaseWebScriptTest
return result;
}
private JSONObject startInvite(String inviteeFirstName,
String inviteeLastName, String siteShortName, int expectedStatus)
throws Exception
{
// String inviteeEmail = INVITEE_EMAIL_PREFIX +
// RandomStringUtils.randomAlphanumeric(6)
// + "@" + INVITEE_EMAIL_DOMAIN;
String inviteeEmail = "glen.johnson@alfresco.com";
return startInvite(inviteeFirstName, inviteeLastName, inviteeEmail, siteShortName,
expectedStatus);
}
private JSONArray getInvitesByInviteId(String inviteId, int expectedStatus)
throws Exception
{
@@ -378,7 +398,7 @@ public class InviteServiceTest extends BaseWebScriptTest
public void testStartInvite() throws Exception
{
JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME,
SITE_SHORT_NAME_INVITE, Status.STATUS_OK);
SITE_SHORT_NAME_INVITE_1, Status.STATUS_OK);
assertEquals(INVITE_ACTION_START, result.get("action"));
assertEquals(INVITEE_FIRSTNAME, result.get("inviteeFirstName"));
@@ -386,14 +406,71 @@ public class InviteServiceTest extends BaseWebScriptTest
assertEquals(this.inviteeEmailAddrs
.get(this.inviteeEmailAddrs.size() - 1), result
.get("inviteeEmail"));
assertEquals(SITE_SHORT_NAME_INVITE, result.get("siteShortName"));
assertEquals(SITE_SHORT_NAME_INVITE_1, result.get("siteShortName"));
}
public void testStartInviteWhenInviteeIsAlreadyMemberOfSite()
throws Exception
{
//
// add invitee as member of site: SITE_SHORT_NAME_INVITE
//
String randomStr = RandomStringUtils.randomNumeric(6);
final String inviteeUserName = "inviteeUserName" + randomStr;
final String inviteeEmailAddr = INVITEE_EMAIL_PREFIX + randomStr
+ "@" + INVITEE_EMAIL_DOMAIN;
AuthenticationUtil.runAs(new RunAsWork<Object>()
{
public Object doWork() throws Exception
{
// create person with invitee user name and invitee email address
createPerson(inviteeUserName, inviteeEmailAddr);
// add invitee person to site: SITE_SHORT_NAME_INVITE
InviteServiceTest.this.siteService.setMembership(
SITE_SHORT_NAME_INVITE_1, inviteeUserName,
SiteModel.SITE_COLLABORATOR);
return null;
}
}, USER_ADMIN);
JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME, inviteeEmailAddr,
SITE_SHORT_NAME_INVITE_1, Status.STATUS_CONFLICT);
}
public void testStartInviteWhenAlreadyInProgress()
throws Exception
{
JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME,
SITE_SHORT_NAME_INVITE_1, Status.STATUS_OK);
String inviteeEmail = (String) result.get("inviteeEmail");
startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME, inviteeEmail,
SITE_SHORT_NAME_INVITE_1, Status.STATUS_CONFLICT);
}
public void testStartInviteForSameInviteeButTwoDifferentSites()
throws Exception
{
JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME,
SITE_SHORT_NAME_INVITE_1, Status.STATUS_OK);
String inviteeEmail = (String) result.get("inviteeEmail");
startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME, inviteeEmail,
SITE_SHORT_NAME_INVITE_2, Status.STATUS_OK);
}
public void testCancelInvite() throws Exception
{
// inviter starts invite workflow
JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME,
SITE_SHORT_NAME_INVITE, Status.STATUS_OK);
SITE_SHORT_NAME_INVITE_1, Status.STATUS_OK);
// get hold of invite ID of started invite
String inviteId = result.getString("inviteId");
@@ -409,7 +486,7 @@ public class InviteServiceTest extends BaseWebScriptTest
{
// inviter starts invite (sends out invitation)
JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME,
SITE_SHORT_NAME_INVITE, Status.STATUS_OK);
SITE_SHORT_NAME_INVITE_1, Status.STATUS_OK);
// get hold of invite ID of started invite
String inviteId = result.getString("inviteId");
@@ -422,7 +499,7 @@ public class InviteServiceTest extends BaseWebScriptTest
String acceptInviteUrl = URL_INVITERSP_SERVICE + "/"
+ INVITE_RSP_ACCEPT + "?inviteId=" + inviteId
+ "&inviteeUserName=" + inviteeUserName + "&siteShortName="
+ SITE_SHORT_NAME_INVITE;
+ SITE_SHORT_NAME_INVITE_1;
MockHttpServletResponse response = getRequest(acceptInviteUrl,
Status.STATUS_OK);
@@ -445,7 +522,7 @@ public class InviteServiceTest extends BaseWebScriptTest
{
// inviter starts invite (sends out invitation)
JSONObject result = startInvite(INVITEE_FIRSTNAME, INVITEE_LASTNAME,
SITE_SHORT_NAME_INVITE, Status.STATUS_OK);
SITE_SHORT_NAME_INVITE_1, Status.STATUS_OK);
// get hold of invite ID of started invite
String inviteId = result.getString("inviteId");
@@ -458,7 +535,7 @@ public class InviteServiceTest extends BaseWebScriptTest
String rejectInviteUrl = URL_INVITERSP_SERVICE + "/"
+ INVITE_RSP_REJECT + "?inviteId=" + inviteId
+ "&inviteeUserName=" + inviteeUserName + "&siteShortName="
+ SITE_SHORT_NAME_INVITE;
+ SITE_SHORT_NAME_INVITE_1;
MockHttpServletResponse response = getRequest(rejectInviteUrl,
Status.STATUS_OK);
@@ -481,7 +558,7 @@ public class InviteServiceTest extends BaseWebScriptTest
{
// inviter starts invite workflow
JSONObject startInviteResult = startInvite(INVITEE_FIRSTNAME,
INVITEE_LASTNAME, SITE_SHORT_NAME_INVITE, Status.STATUS_OK);
INVITEE_LASTNAME, SITE_SHORT_NAME_INVITE_1, Status.STATUS_OK);
// get hold of workflow ID of started invite workflow instance
@@ -504,7 +581,7 @@ public class InviteServiceTest extends BaseWebScriptTest
{
// inviter starts invite workflow
JSONObject startInviteResult = startInvite(INVITEE_FIRSTNAME,
INVITEE_LASTNAME, SITE_SHORT_NAME_INVITE, Status.STATUS_OK);
INVITEE_LASTNAME, SITE_SHORT_NAME_INVITE_1, Status.STATUS_OK);
// get pending invites matching inviter user name used in invite started
// above
@@ -522,7 +599,7 @@ public class InviteServiceTest extends BaseWebScriptTest
{
// inviter starts invite workflow
JSONObject startInviteResult = startInvite(INVITEE_FIRSTNAME,
INVITEE_LASTNAME, SITE_SHORT_NAME_INVITE, Status.STATUS_OK);
INVITEE_LASTNAME, SITE_SHORT_NAME_INVITE_1, Status.STATUS_OK);
// get hold of invitee user name property of started invite workflow
// instance
@@ -547,7 +624,7 @@ public class InviteServiceTest extends BaseWebScriptTest
{
// inviter starts invite workflow
JSONObject startInviteResult = startInvite(INVITEE_FIRSTNAME,
INVITEE_LASTNAME, SITE_SHORT_NAME_INVITE, Status.STATUS_OK);
INVITEE_LASTNAME, SITE_SHORT_NAME_INVITE_1, Status.STATUS_OK);
// get hold of site short name property of started invite workflow
// instance