OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove CreateUserAccount. Rename SetUserAccount to StoreUserAccount. 

Implement the fetch operations fully. Rename one last UserService file to
UserAccountService
slimupdates
Melanie 2009-12-31 01:16:16 +00:00
parent 96f387ce49
commit 3507005d9d
6 changed files with 79 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
View File

@ -159,15 +159,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
// Update all updatable fields
//
public bool SetUserAccount(UserAccount data)
public bool StoreUserAccount(UserAccount data)
{
return m_UserService.SetUserAccount(data);
}
// Creates a user data record
public bool CreateUserAccount(UserAccount data)
{
return m_UserService.CreateUserAccount(data);
return m_UserService.StoreUserAccount(data);
}
#endregion

25
OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
View File

@ -85,10 +85,8 @@ namespace OpenSim.Server.Handlers.UserAccounts
return GetAccount(request);
case "getaccounts":
return GetAccounts(request);
case "createaccount":
return CreateAccount(request);
case "setaccount":
return SetAccount(request);
return StoreAccount(request);
}
m_log.DebugFormat("[PRESENCE HANDLER]: unknown method request: {0}", method);
}
@ -174,24 +172,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
return encoding.GetBytes(xmlString);
}
byte[] CreateAccount(Dictionary<string, object> request)
{
if (!request.ContainsKey("account"))
return FailureResult();
if (request["account"] == null)
return FailureResult();
if (!(request["account"] is Dictionary<string, object>))
return FailureResult();
UserAccount account = new UserAccount((Dictionary<string, object>) request["account"]);
if (m_UserAccountService.CreateUserAccount(account))
return SuccessResult();
return FailureResult();
}
byte[] SetAccount(Dictionary<string, object> request)
byte[] StoreAccount(Dictionary<string, object> request)
{
if (!request.ContainsKey("account"))
return FailureResult();
@ -202,7 +183,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
UserAccount account = new UserAccount((Dictionary<string, object>)request["account"]);
if (m_UserAccountService.SetUserAccount(account))
if (m_UserAccountService.StoreUserAccount(account))
return SuccessResult();
return FailureResult();

15
OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
View File

@ -186,7 +186,7 @@ namespace OpenSim.Services.Connectors
return accounts;
}
public bool SetUserAccount(UserAccount data)
public bool StoreUserAccount(UserAccount data)
{
Dictionary<string, object> sendData = new Dictionary<string, object>();
//sendData["SCOPEID"] = scopeID.ToString();
@ -199,19 +199,6 @@ namespace OpenSim.Services.Connectors
return SendAndGetBoolReply(sendData);
}
public bool CreateUserAccount(UserAccount data)
{
Dictionary<string, object> sendData = new Dictionary<string, object>();
//sendData["SCOPEID"] = scopeID.ToString();
sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
sendData["METHOD"] = "createaccount";
sendData["account"] = data.ToKeyValuePairs();
return SendAndGetBoolReply(sendData);
}
private UserAccount SendAndGetReply(Dictionary<string, object> sendData)
{
string reply = string.Empty;

8
OpenSim/Services/Interfaces/IUserService.cs → OpenSim/Services/Interfaces/IUserAccountService.cs
View File

@ -95,11 +95,9 @@ namespace OpenSim.Services.Interfaces
//
List<UserAccount> GetUserAccounts(UUID scopeID, string query);
// Update all updatable fields
// Store the data given, wich replaces the sotred data, therefore
// must be complete.
//
bool SetUserAccount(UserAccount data);
// Creates a user data record
bool CreateUserAccount(UserAccount data);
bool StoreUserAccount(UserAccount data);
}
}

86
OpenSim/Services/UserAccountService/UserAccountService.cs
View File

@ -62,33 +62,85 @@ namespace OpenSim.Services.UserAccountService
if (d.Length < 1)
return null;
UserAccount u = new UserAccount();
u.FirstName = d[0].FirstName;
u.LastName = d[0].LastName;
u.PrincipalID = d[0].PrincipalID;
u.ScopeID = d[0].ScopeID;
u.Email = d[0].Data["Email"].ToString();
u.Created = Convert.ToInt32(d[0].Data["Created"].ToString());
return MakeUserAccount(d[0]);
}
return null;
private UserAccount MakeUserAccount(UserAccountData d)
{
UserAccount u = new UserAccount();
u.FirstName = d.FirstName;
u.LastName = d.LastName;
u.PrincipalID = d.PrincipalID;
u.ScopeID = d.ScopeID;
u.Email = d.Data["Email"].ToString();
u.Created = Convert.ToInt32(d.Data["Created"].ToString());
string[] URLs = d.Data["ServiceURLs"].ToString().Split(new char[] {' '});
u.ServiceURLs = new Dictionary<string, object>();
foreach(string url in URLs)
{
string[] parts = url.Split(new char[] {'='});
if (parts.Length != 2)
continue;
string name = System.Web.HttpUtility.UrlDecode(parts[0]);
string val = System.Web.HttpUtility.UrlDecode(parts[1]);
u.ServiceURLs[name] = val;
}
return u;
}
public UserAccount GetUserAccount(UUID scopeID, string email)
{
return null;
UserAccountData[] d;
if (scopeID != UUID.Zero)
{
d = m_Database.Get(
new string[] {"ScopeID", "Email"},
new string[] {scopeID.ToString(), email});
}
else
{
d = m_Database.Get(
new string[] {"Email"},
new string[] {email});
}
if (d.Length < 1)
return null;
return MakeUserAccount(d[0]);
}
public UserAccount GetUserAccount(UUID scopeID, UUID userID)
public UserAccount GetUserAccount(UUID scopeID, UUID principalID)
{
return null;
UserAccountData[] d;
if (scopeID != UUID.Zero)
{
d = m_Database.Get(
new string[] {"ScopeID", "PrincipalID"},
new string[] {scopeID.ToString(), principalID.ToString()});
}
else
{
d = m_Database.Get(
new string[] {"PrincipalID"},
new string[] {principalID.ToString()});
}
if (d.Length < 1)
return null;
return MakeUserAccount(d[0]);
}
public bool SetUserAccount(UserAccount data)
{
return false;
}
public bool CreateUserAccount(UserAccount data)
public bool StoreUserAccount(UserAccount data)
{
return false;
}

1
prebuild.xml
View File

@ -1052,6 +1052,7 @@
<ReferencePath>../../../bin/</ReferencePath>
<Reference name="System"/>
<Reference name="System.Web"/>
<Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.dll"/>
<Reference name="OpenSim.Framework"/>