Set at all async method Cancellationtoken ct = default

Author: Suiram1701

API.Test/AuthentificationTests.cs

@@ -33,8 +33,8 @@ public void Authentification()
         try
         {
             using WebUntisClient client = new("WebUntisAPI_TEST");
-            client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password, CancellationToken.None).Wait();
-            client.LogoutAsync(CancellationToken.None).Wait();
+            client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
+            client.LogoutAsync().Wait();
         }
         catch
         {

API.Test/SchoolSearchTests.cs

@@ -17,7 +17,7 @@ internal class SchoolSearchTests
     [Test]
     public void NormalSearch()
     {
-        Task<School[]> schools = SchoolSearch.SearchAsync("Marie-Curie", CancellationToken.None);
+        Task<School[]> schools = SchoolSearch.SearchAsync("Marie-Curie");
         schools.Wait();
         if (schools.Result.Length > 0)
             Assert.Pass();
@@ -29,7 +29,7 @@ public void NormalSearch()
     [Test]
     public void ToManySchoolsFound()
     {
-        Task<School[]> schools = SchoolSearch.SearchAsync("M", CancellationToken.None);
+        Task<School[]> schools = SchoolSearch.SearchAsync("M");
         schools.Wait();
         if (schools.Result == null)
             Assert.Pass();
@@ -41,7 +41,7 @@ public void ToManySchoolsFound()
     [Test]
     public void NoSchoolsFound()
     {
-        Task<School[]> schools = SchoolSearch.SearchAsync("MMMMMMMMMMMMMMMMMMMMMMMMMMM", CancellationToken.None);
+        Task<School[]> schools = SchoolSearch.SearchAsync("MMMMMMMMMMMMMMMMMMMMMMMMMMM");
         schools.Wait();
         if (schools.Result.Length == 0)
             Assert.Pass();

API.Test/UserTest.cs

@@ -27,9 +27,9 @@ public void Setup()
     [Order(1)]
     public void GetStudents()
     {
-        Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password, CancellationToken.None).Wait();
+        Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
 
-        Task<Student[]> students = Client.GetAllStudentsAsync(CancellationToken.None);
+        Task<Student[]> students = Client.GetAllStudentsAsync();
         students.Wait();
         if (students.Result.Length > 0)
             Assert.Pass();
@@ -41,6 +41,6 @@ public void GetStudents()
     [Test]
     public void TearUp()
     {
-        Client.LogoutAsync(CancellationToken.None).Wait();
+        Client.LogoutAsync().Wait();
     }
 }

WebUntisAPI.Client/SchoolSearch.cs

@@ -33,7 +33,7 @@ public static class SchoolSearch
         /// <returns>All schools found, an empty array when no school found or <see langword="null"/> when too many schools found</returns>
         /// <exception cref="WebUntisException">Throws when the WebUntis API returned an error</exception>
         /// <exception cref="HttpRequestException">Throws when an error happend while request</exception>
-        public static async Task<School[]> SearchAsync(string name, CancellationToken ct, string id = "search")
+        public static async Task<School[]> SearchAsync(string name, string id = "getStudents", CancellationToken ct = default)
         {
             // Write request content
             JSONRPCRequestModel<SchoolSearchModel[]> requestModel = new JSONRPCRequestModel<SchoolSearchModel[]>()

WebUntisAPI.Client/WebUntisClient.User.cs

@@ -23,7 +23,7 @@ public partial class WebUntisClient
         /// <exception cref="WebUntisException">Thrown when the WebUntis API returned an error</exception>
         /// <exception cref="UnauthorizedAccessException">Thrown when you don't logged in</exception>
         /// <exception cref="HttpRequestException">Thrown when there was an error while the http request</exception>
-        public async Task<Student[]> GetAllStudentsAsync(CancellationToken ct, string id = "getStudents")
+        public async Task<Student[]> GetAllStudentsAsync(string id = "getStudents", CancellationToken ct = default)
         {
             if (!LoggedIn)
                 throw new UnauthorizedAccessException("You're not logged in");

WebUntisAPI.Client/WebUntisClient.cs

@@ -21,7 +21,7 @@ namespace WebUntisAPI.Client
     /// </summary>
     /// <remarks>
     ///     <para>
-    ///     Please use this class in a using declaration. When you dont use it in a using declaration please call <see cref="LogoutAsync(CancellationToken, string)"/> and <see cref="Dispose()"/> when you don't need the connection.
+    ///     Please use this class in a using declaration. When you dont use it in a using declaration please call <see cref="LogoutAsync(string, CancellationToken)"/> and <see cref="Dispose()"/> when you don't need the connection.
     ///     </para>
     ///     <para>
     ///     Under no circumstances should 10 req. per sec., more than 1800req. per hr (but in no case more than 3600 req. per hr). If the specifications are exceeded, access to WebUntis is permanently blocked by the WebUntis API.
@@ -85,7 +85,7 @@ public WebUntisClient(string clientName, int timeout = 500)
         /// <summary>
         /// Login as a user in a school to get and write data
         /// </summary>
-        /// <param name="school">The school to login (Use only returned instances from <see cref="SchoolSearch.SearchAsync(string, CancellationToken, string)"/>)</param>
+        /// <param name="school">The school to login (Use only returned instances from <see cref="SchoolSearch.SearchAsync(string, string, CancellationToken)"/>)</param>
         /// <param name="username">Name of the user to login</param>
         /// <param name="password">Password of the user to login</param>
         /// <param name="ct">Cancelationtoken</param>
@@ -94,8 +94,8 @@ public WebUntisClient(string clientName, int timeout = 500)
         /// <exception cref="ArgumentException">The server name is invalid</exception>
         /// <exception cref="HttpRequestException">There was an error while the request</exception>
         /// <exception cref="WebUntisException">The WebUntis server returned an error</exception>
-        public async Task<bool> LoginAsync(School school, string username, string password, CancellationToken ct, string id = "login") =>
-            await LoginAsync(school.Server, school.LoginName, username, password, ct, id);
+        public async Task<bool> LoginAsync(School school, string username, string password, string id = "getStudents", CancellationToken ct = default) =>
+            await LoginAsync(school.Server, school.LoginName, username, password, id, ct);
 
         /// <summary>
         /// Login as a user in a school to get and write data
@@ -110,7 +110,7 @@ public async Task<bool> LoginAsync(School school, string username, string passwo
         /// <exception cref="ArgumentException">The server name is invalid</exception>
         /// <exception cref="HttpRequestException">There was an error while the request</exception>
         /// <exception cref="WebUntisException">The WebUntis server returned an error</exception>
-        public async Task<bool> LoginAsync(string server, string loginName, string username, string password, CancellationToken ct, string id = "login")
+        public async Task<bool> LoginAsync(string server, string loginName, string username, string password, string id = "getStudents", CancellationToken ct = default)
         {
             // Check if you already logged in
             if (LoggedIn)
@@ -175,7 +175,7 @@ public async Task<bool> LoginAsync(string server, string loginName, string usern
         /// <param name="ct">Cancellation token</param>
         /// <returns>Task for the proccess</returns>
         /// <exception cref="HttpRequestException">There was an error while the request</exception>
-        public async Task LogoutAsync(CancellationToken ct, string id = "logout")
+        public async Task LogoutAsync(string id = "getStudents", CancellationToken ct = default)
         {
             // Check if you logged in
             if (!LoggedIn)
@@ -225,7 +225,7 @@ protected virtual void Dispose(bool disposing)
             {
                 // When not manually logged out then logout
                 if (LoggedIn)
-                    _ = LogoutAsync(CancellationToken.None);
+                    _ = LogoutAsync();
 
                 if (disposing)
                 {