Added auth to ClientQuery and fixed QueryType detection

Author: Scordo

TS3QueryLib.ClientQuery.TestApp/MainWindow.xaml.cs

@@ -74,8 +74,26 @@ public void Connect()
         private void QueryDispatcher_ReadyForSendingCommands(object sender, System.EventArgs e)
         {
             Model.ConnectionState = ConnectionState.Connected;
+
+            string apiKey = Microsoft.VisualBasic.Interaction.InputBox("Api-Key:", "Please provide your API-Key");
+            
+            if (string.IsNullOrWhiteSpace(apiKey))
+            {
+                Disconnect();
+                return;
+            }
+            
             // you can only run commands on the queryrunner when this event has been raised first!
             QueryRunner = new QueryRunner(QueryDispatcher);
+            SimpleResponse authResponse = QueryRunner.Authenticate(apiKey);
+
+            if (authResponse.IsErroneous)
+            {
+                MessageBox.Show("Api-Key was wrong!");
+                Disconnect();
+                return;
+            }
+
             QueryRunner.Notifications.ChannelTalkStatusChanged += Notifications_ChannelTalkStatusChanged;
             QueryRunner.RegisterForNotifications(ClientNotifyRegisterEvent.Any);
 

TS3QueryLib.ClientQuery.TestApp/TS3QueryLib.ClientQuery.TestApp.csproj

@@ -40,6 +40,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />

TS3QueryLib.Core.Silverlight/AsyncTcpDispatcher.cs

@@ -301,6 +301,7 @@ private void MessageReceived(object sender, SocketAsyncEventArgs socketAsyncEven
 
         private bool HandleClientQueryGreeting(string greeting)
         {
+            string originalGreeting = greeting;
             if (!greeting.StartsWith(CLIENT_GREETING, StringComparison.InvariantCultureIgnoreCase))
             {
                 _greetingReceived = true;
@@ -312,7 +313,7 @@ private bool HandleClientQueryGreeting(string greeting)
             const string PATTERN_STATIC_PART = "selected schandlerid=";
             const string PATTERN = PATTERN_STATIC_PART + @"(?<id>\d+)" + Ts3Util.QUERY_REGEX_LINE_BREAK;
 
-            if (!PATTERN_STATIC_PART.StartsWith(greeting, StringComparison.InvariantCultureIgnoreCase) && !greeting.StartsWith(PATTERN_STATIC_PART, StringComparison.InvariantCultureIgnoreCase))
+            if (greeting.IndexOf(PATTERN_STATIC_PART, StringComparison.InvariantCultureIgnoreCase) == -1)
             {
                 _greetingReceived = true;
                 return false;
@@ -329,7 +330,7 @@ private bool HandleClientQueryGreeting(string greeting)
 
             LastServerConnectionHandlerId = Convert.ToInt32(match.Groups["id"].Value);
             // greeting was correct!
-            _receiveRepository.Remove(0, CLIENT_GREETING.Length + match.Length);
+            _receiveRepository.Remove(0, originalGreeting.Length);
             ThreadPool.QueueUserWorkItem(x => OnReadyForSendingCommands());
 
             return true;

TS3QueryLib.Core.Silverlight/Client/CommandName.cs

@@ -4,6 +4,7 @@ namespace TS3QueryLib.Core.Client
 {
     public enum CommandName
     {
+        Auth,
         ChannelConnectInfo,
         ClientNotifyRegister,
         ServerConnectionHandlerList,

TS3QueryLib.Core.Silverlight/Client/QueryRunner.cs

@@ -34,6 +34,22 @@ public QueryRunner(IQueryDispatcher queryDispatcher) : base(queryDispatcher)
 
         #region Public Methods
 
+        /// <summary>
+        /// Authenticate against the local query client
+        /// </summary>
+        /// <param name="apiKey">The api key used to authenticate</param>
+        public SimpleResponse Authenticate(string apiKey)
+        {
+            Command command = CommandName.Auth.CreateCommand();
+
+            if (apiKey == null)
+                throw new ArgumentNullException("apiKey");
+
+            command.AddParameter("apikey", apiKey);
+
+            return ResponseBase<SimpleResponse>.Parse(SendCommand(command));
+        }
+
         /// <summary>
         /// This command allows you to listen to events that the client encounters. Events
         /// are things like people starting or stopping to talk, people joining or leaving,