Merge branch 'hotfix-10.27.35' into stable

Author: DominicWatson

system/services/presideObjects/VersioningService.cfc

@@ -697,7 +697,8 @@ component {
 		}
 
 		if ( StructKeyExists( objMeta.properties, idField ) ) {
-			objMeta.indexes[ "ix_#arguments.versionedObjectName#_record_id" ] = { unique=false, fields="#idField#,_version_number" };
+			objMeta.indexes[ "ix_#arguments.versionedObjectName#_record_id_solo" ] = { unique=false, fields=idField };
+			objMeta.indexes[ "ix_#arguments.versionedObjectName#_record_id"      ] = { unique=false, fields="#idField#,_version_number" }; // naming here off, but backwards compatible issue. See https://presidecms.atlassian.net/browse/PRESIDECMS-3022
 		}
 	}
 

system/services/taskmanager/AdHocTaskManagerService.cfc

@@ -136,6 +136,10 @@ component displayName="Ad-hoc Task Manager Service" {
 				return true;
 			}
 
+			if ( Len( task.web_owner ?: "" ) ) {
+				$getWebsiteLoginService().spoofUserLoginInBgThread( task.web_owner );
+			}
+
 			if ( task.status == "running" || !markTaskAsRunning( taskId=arguments.taskId ) ) {
 				$raiseError( error={
 					  type    = "AdHoTaskManagerService.task.already.running"

system/services/websiteUsers/WebsiteLoginService.cfc

@@ -89,6 +89,21 @@ component displayName="Website login service" {
 		return false;
 	}
 
+	/**
+	 * For background threads, allows the thread to assume that a specific user is logged in
+	 *
+	 */
+	public function spoofUserLoginInBgThread( required string userId ) {
+		var user = _getUserDao().selectData(
+			  filter   = { id=arguments.userId, active=true }
+			, useCache = false
+		);
+
+		if ( user.recordCount ) {
+			request._bgThreadUser = $helpers.queryRowToStruct( user );
+		}
+	}
+
 	/**
 	 * Impersonates a login
 	 *
@@ -205,6 +220,9 @@ component displayName="Website login service" {
 	 * If no user is logged in, an empty structure will be returned.
 	 */
 	public struct function getLoggedInUserDetails() autodoc=true {
+		if ( $getRequestContext().isBackgroundThread() ) {
+			return request._bgThreadUser ?: {};
+		}
 		var userDetails = _getSessionStorage().getVar( name=_getSessionKey(), default={} );
 
 		return !IsNull( local.userDetails ) && IsStruct( userDetails ) ? userDetails : {};

tests/unit/api/websiteUsers/WebsiteLoginServiceTest.cfc

@@ -471,6 +471,7 @@ component output="false" extends="tests.resources.HelperObjects.PresideTestCase"
 		mockUserDao           = getMockbox().createStub();
 		mockResetDao          = getMockbox().createStub();
 		mockUserLoginTokenDao = getMockbox().createStub();
+		mockRequestContext    = getMockbox().createStub();
 		mockBCryptService     = getMockBox().createEmptyMock( "preside.system.services.encryption.bcrypt.BCryptService" );
 		mockSysConfigService  = getMockBox().createEmptyMock( "preside.system.services.configuration.SystemConfigurationService" );
 		mockEmailService      = getMockBox().createEmptyMock( "preside.system.services.email.EmailService" );
@@ -490,10 +491,12 @@ component output="false" extends="tests.resources.HelperObjects.PresideTestCase"
 		mockActionsService.$( "promoteVisitorActionsToUserActions", 1 );
 		service.$( "$recordWebsiteUserAction" );
 		service.$( "$announceInterception" );
+		service.$( "$getRequestContext", mockRequestContext );
 		mockSessionStorage.$( "rotate" );
 		service.$( "$getPresideObject" ).$args( "website_user_reset_token" ).$results( mockResetDao );
 		mockResetDao.$( "insertData", 1 );
 		mockResetDao.$( "deleteData", 1 );
+		mockRequestContext.$( "isBackgroundThread", false );
 
 		return service;
 	}