aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs16
-rw-r--r--OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini33
-rw-r--r--OpenSim/Tests/Clients/UserAccounts/UserAccountsClient.cs120
-rw-r--r--prebuild.xml28
4 files changed, 189 insertions, 8 deletions
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
index 544ffea..b54b63e 100644
--- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -174,14 +174,14 @@ namespace OpenSim.Server.Handlers.UserAccounts
174 174
175 byte[] StoreAccount(Dictionary<string, object> request) 175 byte[] StoreAccount(Dictionary<string, object> request)
176 { 176 {
177 if (!request.ContainsKey("account")) 177 //if (!request.ContainsKey("account"))
178 return FailureResult(); 178 // return FailureResult();
179 if (request["account"] == null) 179 //if (request["account"] == null)
180 return FailureResult(); 180 // return FailureResult();
181 if (!(request["account"] is Dictionary<string, object>)) 181 //if (!(request["account"] is Dictionary<string, object>))
182 return FailureResult(); 182 // return FailureResult();
183 183
184 UserAccount account = new UserAccount((Dictionary<string, object>)request["account"]); 184 UserAccount account = new UserAccount(request);
185 185
186 if (m_UserAccountService.StoreUserAccount(account)) 186 if (m_UserAccountService.StoreUserAccount(account))
187 return SuccessResult(); 187 return SuccessResult();
diff --git a/OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini b/OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini
new file mode 100644
index 0000000..eb1f473
--- /dev/null
+++ b/OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini
@@ -0,0 +1,33 @@
1; * Run a ROBUST server shell like this, from bin:
2; * $ OpenSim.Server.exe -inifile ../OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
3; *
4; * Then run this client like this, from bin:
5; * $ OpenSim.Tests.Clients.UserAccountClient.exe
6; *
7; *
8
9[Startup]
10ServiceConnectors = "OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
11
12; * This is common for all services, it's the network setup for the entire
13; * server instance
14; *
15[Network]
16port = 8003
17
18; * The following are for the remote console
19; * They have no effect for the local or basic console types
20; * Leave commented to diable logins to the console
21;ConsoleUser = Test
22;ConsolePass = secret
23
24; * As an example, the below configuration precisely mimicks the legacy
25; * asset server. It is read by the asset IN connector (defined above)
26; * and it then loads the OUT connector (a local database module). That,
27; * in turn, reads the asset loader and database connection information
28; *
29[UserAccountService]
30 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
31 StorageProvider = "OpenSim.Data.MySQL.dll"
32 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
33
diff --git a/OpenSim/Tests/Clients/UserAccounts/UserAccountsClient.cs b/OpenSim/Tests/Clients/UserAccounts/UserAccountsClient.cs
new file mode 100644
index 0000000..56195b1
--- /dev/null
+++ b/OpenSim/Tests/Clients/UserAccounts/UserAccountsClient.cs
@@ -0,0 +1,120 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Reflection;
32
33using OpenMetaverse;
34using log4net;
35using log4net.Appender;
36using log4net.Layout;
37
38using OpenSim.Framework;
39using OpenSim.Services.Interfaces;
40using OpenSim.Services.Connectors;
41
42namespace OpenSim.Tests.Clients.PresenceClient
43{
44 public class UserAccountsClient
45 {
46 private static readonly ILog m_log =
47 LogManager.GetLogger(
48 MethodBase.GetCurrentMethod().DeclaringType);
49
50 public static void Main(string[] args)
51 {
52 ConsoleAppender consoleAppender = new ConsoleAppender();
53 consoleAppender.Layout =
54 new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline");
55 log4net.Config.BasicConfigurator.Configure(consoleAppender);
56
57 string serverURI = "http://127.0.0.1:8003";
58 UserAccountServicesConnector m_Connector = new UserAccountServicesConnector(serverURI);
59
60 UUID user1 = UUID.Random();
61 string first = "Completely";
62 string last = "Clueless";
63 string email = "foo@bar.com";
64
65 UserAccount account = new UserAccount(user1);
66 account.FirstName = first;
67 account.LastName = last;
68 account.Email = email;
69 account.ServiceURLs = new Dictionary<string, object>();
70 account.ServiceURLs.Add("InventoryServerURI", "http://cnn.com");
71 account.ServiceURLs.Add("AssetServerURI", "http://cnn.com");
72
73 bool success = m_Connector.StoreUserAccount(account);
74 if (success)
75 m_log.InfoFormat("[USER CLIENT]: Successfully created account for user {0} {1}", account.FirstName, account.LastName);
76 else
77 m_log.InfoFormat("[USER CLIENT]: failed to create user {0} {1}", account.FirstName, account.LastName);
78
79 System.Console.WriteLine("\n");
80
81 account = m_Connector.GetUserAccount(UUID.Zero, user1);
82 if (account == null)
83 m_log.InfoFormat("[USER CLIENT]: Unable to retrieve accouny by UUID for {0}", user1);
84 else
85 {
86 m_log.InfoFormat("[USER CLIENT]: Account retrieved correctly: userID={0}; FirstName={1}; LastName={2}; Email={3}",
87 account.PrincipalID, account.FirstName, account.LastName, account.Email);
88 foreach (KeyValuePair<string, object> kvp in account.ServiceURLs)
89 m_log.DebugFormat("\t {0} -> {1}", kvp.Key, kvp.Value);
90 }
91
92 System.Console.WriteLine("\n");
93
94 account = m_Connector.GetUserAccount(UUID.Zero, first, last);
95 if (account == null)
96 m_log.InfoFormat("[USER CLIENT]: Unable to retrieve accouny by name for {0}", user1);
97 else
98 {
99 m_log.InfoFormat("[USER CLIENT]: Account retrieved correctly: userID={0}; FirstName={1}; LastName={2}; Email={3}",
100 account.PrincipalID, account.FirstName, account.LastName, account.Email);
101 foreach (KeyValuePair<string, object> kvp in account.ServiceURLs)
102 m_log.DebugFormat("\t {0} -> {1}", kvp.Key, kvp.Value);
103 }
104
105 System.Console.WriteLine("\n");
106 account = m_Connector.GetUserAccount(UUID.Zero, email);
107 if (account == null)
108 m_log.InfoFormat("[USER CLIENT]: Unable to retrieve accouny by email for {0}", user1);
109 else
110 {
111 m_log.InfoFormat("[USER CLIENT]: Account retrieved correctly: userID={0}; FirstName={1}; LastName={2}; Email={3}",
112 account.PrincipalID, account.FirstName, account.LastName, account.Email);
113 foreach (KeyValuePair<string, object> kvp in account.ServiceURLs)
114 m_log.DebugFormat("\t {0} -> {1}", kvp.Key, kvp.Value);
115 }
116
117 }
118
119 }
120}
diff --git a/prebuild.xml b/prebuild.xml
index 48055a0..97ebce6 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3002,6 +3002,34 @@
3002 </Files> 3002 </Files>
3003 </Project> 3003 </Project>
3004 3004
3005 <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.UserAccountClient" path="OpenSim/Tests/Clients/UserAccounts" type="Exe">
3006 <Configuration name="Debug">
3007 <Options>
3008 <OutputPath>../../../../bin/</OutputPath>
3009 </Options>
3010 </Configuration>
3011 <Configuration name="Release">
3012 <Options>
3013 <OutputPath>../../../../bin/</OutputPath>
3014 </Options>
3015 </Configuration>
3016
3017 <ReferencePath>../../../../bin/</ReferencePath>
3018 <Reference name="System"/>
3019 <Reference name="OpenMetaverseTypes.dll"/>
3020 <Reference name="OpenMetaverse.dll"/>
3021 <Reference name="OpenSim.Framework"/>
3022 <Reference name="OpenSim.Services.Interfaces" />
3023 <Reference name="OpenSim.Services.Connectors" />
3024 <Reference name="Nini.dll" />
3025 <Reference name="log4net.dll"/>
3026
3027 <Files>
3028 <Match pattern="*.cs" recurse="true"/>
3029 </Files>
3030 </Project>
3031
3032
3005 <!-- Test assemblies --> 3033 <!-- Test assemblies -->
3006 <Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library"> 3034 <Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">
3007 <Configuration name="Debug"> 3035 <Configuration name="Debug">