mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-29 15:21:53 +00:00
f1ebfb963f
93992: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
93945: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
93895: MNT-12873: Merged V4.2.3 (4.2.3.16) to V4.2-BUG-FIX(4.2.5)
93552 :Merged DEV to V4.2.3 (4.2.3.16)
93524: MNT-13156: CLONE - Introduction of SiteRole in 4.2.x breaks sites API when there is a custom role defined
- Implement site role as String instead of enumeration to allow custom roles. Add CustomRoleTest Unit Test. In SitesImpl convert UnknownAuthorityException into InvalidArgumentException.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
123 lines
4.8 KiB
Java
Executable File
123 lines
4.8 KiB
Java
Executable File
/*
|
|
* Copyright (C) 2005-2015 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* 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/>.
|
|
*/
|
|
package org.alfresco.repo.site;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Arrays;
|
|
import java.util.List;
|
|
|
|
import org.alfresco.model.ContentModel;
|
|
import org.alfresco.query.PagingRequest;
|
|
import org.alfresco.query.PagingResults;
|
|
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
|
import org.alfresco.service.cmr.security.PersonService;
|
|
import org.alfresco.service.cmr.site.SiteService;
|
|
import org.alfresco.service.cmr.site.SiteVisibility;
|
|
import org.alfresco.util.ApplicationContextHelper;
|
|
import org.alfresco.util.BaseAlfrescoSpringTest;
|
|
import org.alfresco.util.Pair;
|
|
import org.alfresco.util.PropertyMap;
|
|
|
|
/**
|
|
* Test custom role for a Site. Based on MNT-12873
|
|
*
|
|
* @author Alex Bykov
|
|
*/
|
|
public class CustomRoleTest extends BaseAlfrescoSpringTest
|
|
{
|
|
private static final String USER_ONE = "UserOne_CustomRoleTest";
|
|
private static final String USER_TWO = "UserTwo_CustomRoleTest";
|
|
|
|
private SiteService siteService;
|
|
private PersonService personService;
|
|
|
|
@SuppressWarnings("deprecation")
|
|
protected void onSetUpInTransaction() throws Exception
|
|
{
|
|
super.onSetUpInTransaction();
|
|
|
|
// Get the required services
|
|
this.authenticationComponent = (AuthenticationComponent) this.applicationContext.getBean("authenticationComponent");
|
|
this.siteService = (SiteService) this.applicationContext.getBean("SiteService");
|
|
this.personService = (PersonService) this.applicationContext.getBean("PersonService");
|
|
|
|
// Create the test users
|
|
createUser(USER_ONE, "UserOne");
|
|
createUser(USER_TWO, "UserTwo");
|
|
|
|
// Set the current authentication
|
|
this.authenticationComponent.setCurrentUser(USER_ONE);
|
|
}
|
|
|
|
// MNT-12873
|
|
public void testCustomRole()
|
|
{
|
|
try
|
|
{
|
|
// Create a site
|
|
siteService.createSite("customrolessite", "customrolessite", "Test custom role", "Test custom role", SiteVisibility.PUBLIC);
|
|
|
|
this.siteService.setMembership("customrolessite", USER_TWO, "SiteCoordinator");
|
|
|
|
// Get the members of the site
|
|
final List<Pair<SiteService.SortFields, Boolean>> sort = new ArrayList<Pair<SiteService.SortFields, Boolean>>();
|
|
sort.add(new Pair<SiteService.SortFields, Boolean>(SiteService.SortFields.SiteTitle, Boolean.TRUE));
|
|
sort.add(new Pair<SiteService.SortFields, Boolean>(SiteService.SortFields.Role, Boolean.TRUE));
|
|
|
|
PagingResults<SiteMembership> sites = siteService.listSitesPaged(USER_TWO, sort, new PagingRequest(0, 100));
|
|
assertNotNull(sites);
|
|
assertEquals(sites.getPage().size(), 1);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
fail("Custom role breaks sites API. Take a look on MNT-12873\n" + ex.getMessage());
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected String[] getConfigLocations()
|
|
{
|
|
String[] existingConfigLocations = ApplicationContextHelper.CONFIG_LOCATIONS;
|
|
|
|
List<String> locations = Arrays.asList(existingConfigLocations);
|
|
List<String> mutableLocationsList = new ArrayList<String>(locations);
|
|
mutableLocationsList.add("classpath:org/alfresco/repo/site/site-custom-context.xml");
|
|
|
|
String[] result = mutableLocationsList.toArray(new String[mutableLocationsList.size()]);
|
|
return result;
|
|
}
|
|
|
|
private void createUser(String userName, String nameSuffix)
|
|
{
|
|
if (this.authenticationService.authenticationExists(userName) == false)
|
|
{
|
|
this.authenticationService.createAuthentication(userName, "PWD".toCharArray());
|
|
|
|
PropertyMap ppOne = new PropertyMap(4);
|
|
ppOne.put(ContentModel.PROP_USERNAME, userName);
|
|
ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName" + nameSuffix);
|
|
ppOne.put(ContentModel.PROP_LASTNAME, "lastName" + nameSuffix);
|
|
ppOne.put(ContentModel.PROP_EMAIL, "email" + nameSuffix + "@email.com");
|
|
ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
|
|
|
|
this.personService.createPerson(ppOne);
|
|
}
|
|
}
|
|
}
|