Add private methods for API requests

Author: Suiram1701

WebUntisAPI.Client/WebUntisClient.Messages.cs

@@ -24,32 +24,8 @@ public partial class WebUntisClient
         /// <exception cref="HttpRequestException">Thrown when an error happened while the http request</exception>
         public async Task<int> GetUnreadMessagesCountAsync(CancellationToken ct = default)
         {
-            // Check for disposing
-            if (_disposedValue)
-                throw new ObjectDisposedException(GetType().FullName);
-
-            // Check if you logged in
-            if (!LoggedIn)
-                 throw new UnauthorizedAccessException("You're not logged in");
-
-            HttpRequestMessage request = new HttpRequestMessage()
-            {
-                Method = HttpMethod.Get,
-                RequestUri = new Uri(ServerUrl + "/WebUntis/api/rest/view/v1/messages/status")
-            };
-            SetRequestHeader(request.Headers, true);
-
-            HttpResponseMessage response = await _client.SendAsync(request, ct);
-
-            // Check cancellation token
-            if (ct.IsCancellationRequested)
-                return default;
-
-            // Verify response
-            if (response.StatusCode != HttpStatusCode.OK)
-                throw new HttpRequestException($"There was an error while the http request (Code: {response.StatusCode}).");
-
-            return JObject.Parse(await response.Content.ReadAsStringAsync()).Value<int>("unreadMessagesCount");
+            string responseString = await MakeAPIGetRequestAsync("/WebUntis/api/rest/view/v1/messages/status", ct);
+            return JObject.Parse(responseString).Value<int>("unreadMessagesCount");
         }
 
         /// <summary>
@@ -62,9 +38,9 @@ public async Task<int> GetUnreadMessagesCountAsync(CancellationToken ct = defaul
         /// <exception cref="HttpRequestException">Thrown when an error happened while the http request</exception>
         public async Task<MessagePermissions> GetMessagePermissionsAsync(CancellationToken ct = default)
         {
-            // Check for disposing
-            if (_disposedValue)
-                throw new ObjectDisposedException(GetType().FullName);
+            string responseString = await MakeAPIGetRequestAsync("/WebUntis/api/rest/view/v1/messages/permissions", ct);
+            return JsonConvert.DeserializeObject<MessagePermissions>(responseString);
+        }
 
             // Check if you logged in
             if (!LoggedIn)

WebUntisAPI.Client/WebUntisClient.Teaching.cs

@@ -105,34 +105,10 @@ public async Task<Department[]> GetDepartmentsAsync(string id = "getDepartments"
         /// <exception cref="HttpRequestException">Thrown when an error happend while the http request</exception>
         public async Task<News> GetNewsFeedAsync(DateTime date, CancellationToken ct = default)
         {
-            // Check for disposing
-            if (_disposedValue)
-                throw new ObjectDisposedException(GetType().FullName);
-
-            // Check if you logged in
-            if (!LoggedIn)
-                throw new UnauthorizedAccessException("You're not logged in");
-
             date.ToWebUntisTimeFormat(out string dateString, out _);
+            string responseString = await MakeAPIGetRequestAsync("/WebUntis/api/public/news/newsWidgetData?date=" + dateString, ct);
 
-            HttpRequestMessage request = new HttpRequestMessage()
-            {
-                Method = HttpMethod.Get,
-                RequestUri = new Uri(ServerUrl + "/WebUntis/api/public/news/newsWidgetData?date=" + dateString)
-            };
-            SetRequestHeader(request.Headers);
-
-            HttpResponseMessage response = await _client.SendAsync(request, ct);
-
-            // Check cancellation token
-            if (ct.IsCancellationRequested)
-                return default;
-
-            // Verify response
-            if (response.StatusCode != HttpStatusCode.OK)
-                throw new HttpRequestException($"There was an error while the http request (Code: {response.StatusCode}).");
-
-            JToken data = JObject.Parse(await response.Content.ReadAsStringAsync()).GetValue("data");
+            JToken data = JObject.Parse(responseString).GetValue("data");
             return data.ToObject<News>();
         }
     }

WebUntisAPI.Client/WebUntisClient.cs

@@ -229,7 +229,7 @@ public async Task LogoutAsync(string id = "Logout", CancellationToken ct = defau
                 Params = new object()
             };
             StringContent requestContent = new StringContent(JsonConvert.SerializeObject(requestModel), Encoding.UTF8, "application/json");
-            SetRequestHeader(requestContent.Headers);
+            requestContent.Headers.Add("JSESSIONID", _sessonId);
 
             // Send request
             _ = await _client.PostAsync(ServerUrl + "/WebUntis/jsonrpc.do", requestContent, ct);
@@ -291,7 +291,7 @@ private async Task<TResult> MakeJSONRPCRequestAsync<TRequest, TResult>(string id
                 Params = requestParams
             };
             StringContent requestContent = new StringContent(JsonConvert.SerializeObject(requestModel), Encoding.UTF8, "application/json");
-            SetRequestHeader(requestContent.Headers);
+            requestContent.Headers.Add("JSESSIONID", _sessonId);
 
             // Send request
             HttpResponseMessage response = await _client.PostAsync(ServerUrl + requestUrl, requestContent, ct);
@@ -322,6 +322,46 @@ private async Task<TResult> MakeJSONRPCRequestAsync<TRequest, TResult>(string id
             return responseModel.Result;
         }
 
+        /// <summary>
+        /// Make a GET request to the API
+        /// </summary>
+        /// <param name="requestUrl">Url to request</param>
+        /// <param name="ct">Cnacellation  token</param>
+        /// <returns>The returned content</returns>
+        /// <exception cref="ObjectDisposedException">Thrown when the instance was disposed</exception>
+        /// <exception cref="UnauthorizedAccessException">Thrown when the client isn't logged in</exception>
+        /// <exception cref="HttpRequestException">Thrown when an error happend while the http request</exception>
+        private async Task<string> MakeAPIGetRequestAsync(string requestUrl, CancellationToken ct)
+        {
+            // Check for disposing
+            if (_disposedValue)
+                throw new ObjectDisposedException(GetType().FullName);
+
+            // Check if you logged in
+            if (!LoggedIn)
+                throw new UnauthorizedAccessException("You're not logged in");
+
+            HttpRequestMessage request = new HttpRequestMessage()
+            {
+                Method = HttpMethod.Get,
+                RequestUri = new Uri(ServerUrl + requestUrl)
+            };
+            request.Headers.Add("JSESSIONID", _sessonId);
+            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", _bearerToken);
+
+            HttpResponseMessage response = await _client.SendAsync(request, ct);
+
+            // Check cancellation token
+            if (ct.IsCancellationRequested)
+                return default;
+
+            // Verify response
+            if (response.StatusCode != HttpStatusCode.OK)
+                throw new HttpRequestException($"There was an error while the http request (Code: {response.StatusCode}).");
+
+            return await response.Content.ReadAsStringAsync();
+        }
+
         /// <summary>
         /// Get the bearer auth token for the api authentication
         /// </summary>
@@ -335,7 +375,7 @@ private async Task<string> GetBearerTokenAsync(CancellationToken ct)
                 Method = HttpMethod.Get,
                 RequestUri = new Uri(ServerUrl + "/WebUntis/api/token/new")
             };
-            SetRequestHeader(request.Headers);
+            request.Headers.Add("JSESSIONID", _sessonId);
 
             HttpResponseMessage response = await _client.SendAsync(request, ct);
 
@@ -351,18 +391,6 @@ private async Task<string> GetBearerTokenAsync(CancellationToken ct)
             return await response.Content.ReadAsStringAsync();
         }
 
-        /// <summary>
-        /// Add the default headers to a WebUntis API request
-        /// </summary>
-        /// <param name="headers">The headers object to add</param>
-        /// <param name="setBearer"><see langword="true"/> if the auth header should be set</param>
-        private void SetRequestHeader(HttpHeaders headers, bool setBearer = false)
-        {
-            headers.Add("JSESSIONID", _sessonId);
-            if (setBearer)
-                (headers as HttpRequestHeaders).Authorization = new AuthenticationHeaderValue("Bearer", _bearerToken);
-        }
-
         #region IDisposable
         private bool _disposedValue;