fission UserAccountService.HandleCreateUser() into two methods, one which handles user command parsing and another which actually does the work
Justin Clark-Casey (justincc)
parent
3c0f34bc2b
commit
505cb82dee
|
|
@ -38,7 +38,6 @@ using OpenSim.Framework;
|
|||
using OpenSim.Framework.Serialization;
|
||||
using OpenSim.Framework.Serialization.External;
|
||||
using OpenSim.Framework.Communications;
|
||||
|
||||
using OpenSim.Framework.Communications.Osp;
|
||||
using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
|
||||
using OpenSim.Region.CoreModules.World.Serialiser;
|
||||
|
|
@ -545,45 +544,44 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
|
|||
// public void TestReplicateArchivePathToUserInventory()
|
||||
// {
|
||||
// TestHelper.InMethod();
|
||||
|
||||
// //log4net.Config.XmlConfigurator.Configure();
|
||||
|
||||
//
|
||||
// Scene scene = SceneSetupHelpers.SetupScene("inventory");
|
||||
// CommunicationsManager commsManager = scene.CommsManager;
|
||||
// CachedUserInfo userInfo;
|
||||
|
||||
//
|
||||
// lock (this)
|
||||
// {
|
||||
// // !!! REFACTORING PROBLEM. This needs to be rewritten
|
||||
// userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, InventoryReceived);
|
||||
// Monitor.Wait(this, 60000);
|
||||
// }
|
||||
|
||||
//
|
||||
// //Console.WriteLine("userInfo.RootFolder 1: {0}", userInfo.RootFolder);
|
||||
|
||||
//
|
||||
// Dictionary <string, InventoryFolderBase> foldersCreated = new Dictionary<string, InventoryFolderBase>();
|
||||
// List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>();
|
||||
|
||||
//
|
||||
// string folder1Name = "a";
|
||||
// string folder2Name = "b";
|
||||
// string itemName = "c.lsl";
|
||||
|
||||
//
|
||||
// string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1Name, UUID.Random());
|
||||
// string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random());
|
||||
// string itemArchiveName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random());
|
||||
|
||||
//
|
||||
// string itemArchivePath
|
||||
// = string.Format(
|
||||
// "{0}{1}{2}{3}",
|
||||
// ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemArchiveName);
|
||||
|
||||
//
|
||||
// //Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder);
|
||||
|
||||
//
|
||||
// new InventoryArchiveReadRequest(scene, userInfo, null, (Stream)null)
|
||||
// .ReplicateArchivePathToUserInventory(
|
||||
// itemArchivePath, false, scene.InventoryService.GetRootFolder(userInfo.UserProfile.ID),
|
||||
// foldersCreated, nodesLoaded);
|
||||
|
||||
//
|
||||
// //Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder);
|
||||
// //InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a");
|
||||
// InventoryFolderBase folder1
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ namespace OpenSim.Server
|
|||
string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
|
||||
string[] conns = connList.Split(new char[] {',', ' '});
|
||||
|
||||
int i = 0;
|
||||
// int i = 0;
|
||||
foreach (string c in conns)
|
||||
{
|
||||
if (c == String.Empty)
|
||||
|
|
|
|||
|
|
@ -277,8 +277,9 @@ namespace OpenSim.Services.UserAccountService
|
|||
#endregion
|
||||
|
||||
#region Console commands
|
||||
|
||||
/// <summary>
|
||||
/// Create a new user
|
||||
/// Handle the create user command from the console.
|
||||
/// </summary>
|
||||
/// <param name="cmdparams">string array with parameters: firstname, lastname, password, locationX, locationY, email</param>
|
||||
protected void HandleCreateUser(string module, string[] cmdparams)
|
||||
|
|
@ -304,6 +305,18 @@ namespace OpenSim.Services.UserAccountService
|
|||
email = MainConsole.Instance.CmdPrompt("Email", "");
|
||||
else email = cmdparams[5];
|
||||
|
||||
CreateUser(firstName, lastName, password, email);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Create a user
|
||||
/// </summary>
|
||||
/// <param name="firstName"></param>
|
||||
/// <param name="lastName"></param>
|
||||
/// <param name="password"></param>
|
||||
/// <param name="email"></param>
|
||||
public void CreateUser(string firstName, string lastName, string password, string email)
|
||||
{
|
||||
UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName);
|
||||
if (null == account)
|
||||
{
|
||||
|
|
@ -338,7 +351,6 @@ namespace OpenSim.Services.UserAccountService
|
|||
else
|
||||
m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to set home for account {0} {1}.",
|
||||
firstName, lastName);
|
||||
|
||||
}
|
||||
else
|
||||
m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to retrieve home region for account {0} {1}.",
|
||||
|
|
@ -350,7 +362,6 @@ namespace OpenSim.Services.UserAccountService
|
|||
m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to create inventory for account {0} {1}.",
|
||||
firstName, lastName);
|
||||
|
||||
|
||||
m_log.InfoFormat("[USER ACCOUNT SERVICE]: Account {0} {1} created successfully", firstName, lastName);
|
||||
}
|
||||
}
|
||||
|
|
@ -358,7 +369,6 @@ namespace OpenSim.Services.UserAccountService
|
|||
{
|
||||
m_log.ErrorFormat("[USER ACCOUNT SERVICE]: A user with the name {0} {1} already exists!", firstName, lastName);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
protected void HandleResetUserPassword(string module, string[] cmdparams)
|
||||
|
|
|
|||
|
|
@ -36,9 +36,6 @@ namespace OpenSim.Tests.Common.Setup
|
|||
/// </summary>
|
||||
public static class UserProfileTestUtils
|
||||
{
|
||||
// REFACTORING PROBLEM
|
||||
// This needs to be rewritten
|
||||
|
||||
// /// <summary>
|
||||
// /// Create a test user with a standard inventory
|
||||
// /// </summary>
|
||||
|
|
@ -54,7 +51,7 @@ namespace OpenSim.Tests.Common.Setup
|
|||
// UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099");
|
||||
// return CreateUserWithInventory(commsManager, userId, callback);
|
||||
// }
|
||||
|
||||
//
|
||||
// /// <summary>
|
||||
// /// Create a test user with a standard inventory
|
||||
// /// </summary>
|
||||
|
|
@ -70,7 +67,7 @@ namespace OpenSim.Tests.Common.Setup
|
|||
// {
|
||||
// return CreateUserWithInventory(commsManager, "Bill", "Bailey", userId, callback);
|
||||
// }
|
||||
|
||||
//
|
||||
// /// <summary>
|
||||
// /// Create a test user with a standard inventory
|
||||
// /// </summary>
|
||||
|
|
@ -89,7 +86,7 @@ namespace OpenSim.Tests.Common.Setup
|
|||
// {
|
||||
// return CreateUserWithInventory(commsManager, firstName, lastName, "troll", userId, callback);
|
||||
// }
|
||||
|
||||
//
|
||||
// /// <summary>
|
||||
// /// Create a test user with a standard inventory
|
||||
// /// </summary>
|
||||
|
|
@ -109,11 +106,11 @@ namespace OpenSim.Tests.Common.Setup
|
|||
// {
|
||||
// LocalUserServices lus = (LocalUserServices)commsManager.UserService;
|
||||
// lus.AddUser(firstName, lastName, password, "bill@bailey.com", 1000, 1000, userId);
|
||||
|
||||
//
|
||||
// CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
|
||||
// userInfo.OnInventoryReceived += callback;
|
||||
// userInfo.FetchInventory();
|
||||
|
||||
//
|
||||
// return userInfo;
|
||||
// }
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue