Add LogoutAsync(string).

Author: Berrysoft

samples/TsinghuaNet/Program.vb

@@ -48,7 +48,7 @@ Module Program
                 Console.Error.WriteLine("Invalid host.")
                 Return
             End If
-            Logout(helper).Wait()
+            Logout(helper, command.Username).Wait()
         End If
         If command.Flux Then
             If helper Is Nothing Then
@@ -83,9 +83,13 @@ Module Program
             Console.Error.WriteLine("Exception occured: {0}", ex.Message)
         End Try
     End Function
-    Async Function Logout(helper As IConnect) As Task
+    Async Function Logout(helper As IConnect, username As String) As Task
         Try
-            Console.WriteLine(Await helper.LogoutAsync())
+            If username Is Nothing Then
+                Console.WriteLine(Await helper.LogoutAsync())
+            Else
+                Console.WriteLine(Await helper.LogoutAsync(username))
+            End If
         Catch ex As Exception
             Console.Error.WriteLine("Exception occured: {0}", ex.Message)
         End Try

src/Berrysoft.Tsinghua.Net/AuthHelper.cs

@@ -14,7 +14,8 @@ public abstract class AuthHelper : NetHelperBase, IConnect
         private const string LogUriBase = "https://auth{0}.tsinghua.edu.cn/cgi-bin/srun_portal";
         private const string FluxUriBase = "https://auth{0}.tsinghua.edu.cn/rad_user_info.php";
         private const string ChallengeUriBase = "https://auth{0}.tsinghua.edu.cn/cgi-bin/get_challenge?username={{0}}&double_stack=1&ip&callback=callback";
-        private const string LogoutData = "action=logout&ac_id=1&ip=&double_stack=1";
+        private const string LogoutData = "action=logout";
+        private const string LogoutUserData = "action=logout&username={0}";
         private readonly string LogUri;
         private readonly string FluxUri;
         private readonly string ChallengeUri;
@@ -67,6 +68,14 @@ internal AuthHelper(string username, string password, HttpClient client, int ver
         /// <returns>The response of the website.</returns>
         public Task<string> LogoutAsync() => PostAsync(LogUri, LogoutData);
         /// <summary>
+        /// Logout from the network with the specified username.
+        /// When a user logged in through <see cref="AuthHelper"/> and logged out through <see cref="NetHelper"/>,
+        /// he should call this method with his username explicitly, or he can't logout.
+        /// </summary>
+        /// <param name="username">The specified username.</param>
+        /// <returns>The response of the website.</returns>
+        public Task<string> LogoutAsync(string username) => PostAsync(LogUri, string.Format(LogoutUserData, username));
+        /// <summary>
         /// Get information of the user online.
         /// </summary>
         /// <returns>An instance of <see cref="FluxUser"/> class of the current user.</returns>

src/Berrysoft.Tsinghua.Net/NetHelper.cs

@@ -13,6 +13,7 @@ public class NetHelper : NetHelperBase, IConnect
         private const string LogUri = "http://net.tsinghua.edu.cn/do_login.php";
         private const string FluxUri = "http://net.tsinghua.edu.cn/rad_user_info.php";
         private const string LogoutData = "action=logout";
+        private const string LogoutUserData = "action=logout&username={0}";
         /// <summary>
         /// Initializes a new instance of the <see cref="NetHelper"/> class.
         /// </summary>
@@ -54,6 +55,12 @@ public NetHelper(string username, string password, HttpClient client)
         /// <returns>The response of the website.</returns>
         public Task<string> LogoutAsync() => PostAsync(LogUri, LogoutData);
         /// <summary>
+        /// Logout from the network with the specified username.
+        /// </summary>
+        /// <param name="username">The specified username.</param>
+        /// <returns>The response of the website.</returns>
+        public Task<string> LogoutAsync(string username) => PostAsync(LogUri, string.Format(LogoutUserData, username));
+        /// <summary>
         /// Get information of the user online.
         /// </summary>
         /// <returns>An instance of <see cref="FluxUser"/> class of the current user.</returns>

src/Berrysoft.Tsinghua.Net/NetHelperBase.cs

@@ -22,6 +22,12 @@ public interface IConnect : IDisposable
         /// <returns>The response of the website, may be a sentense or a html page.</returns>
         Task<string> LogoutAsync();
         /// <summary>
+        /// Logout from the network with the specified username.
+        /// </summary>
+        /// <param name="username">The specified username.</param>
+        /// <returns>The response of the website, may be a sentense or a html page.</returns>
+        Task<string> LogoutAsync(string username);
+        /// <summary>
         /// Get information of the user online.
         /// </summary>
         /// <returns>An instance of <see cref="FluxUser"/> class of the current user.</returns>