mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged 5.2.N (5.2.1) to HEAD (5.2)
130406 jvonka: REPO-1062 / MNT-16176: allow existing users to use SSO external auth via Sharewhen repo is read-only - re-implement the fix (note: we do not allow auto-creation of missing users) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -433,10 +433,14 @@ public final class AuthenticationHelper
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug("Creating an object for " + currentUsername + " with ticket: " + ticket);
|
||||
final ServiceRegistry services = (ServiceRegistry) wc.getBean(ServiceRegistry.SERVICE_REGISTRY);
|
||||
|
||||
// If the repository is read only, we have to settle for a read only transaction. Auto user creation
|
||||
// will not be possible.
|
||||
boolean readOnly = services.getTransactionService().isReadOnly();
|
||||
|
||||
return services.getTransactionService().getRetryingTransactionHelper().doInTransaction(
|
||||
new RetryingTransactionHelper.RetryingTransactionCallback<User>()
|
||||
{
|
||||
|
||||
public User execute() throws Throwable
|
||||
{
|
||||
NodeService nodeService = services.getNodeService();
|
||||
@@ -453,7 +457,7 @@ public final class AuthenticationHelper
|
||||
user.setHomeSpaceId(homeRef.getId());
|
||||
return user;
|
||||
}
|
||||
});
|
||||
}, readOnly, false);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user