mirror of
https://github.com/alexmickelson/canvasManagement.git
synced 2026-03-25 23:28:33 -06:00
updates
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
using System.Net;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using RestSharp;
|
||||
|
||||
@@ -7,10 +8,12 @@ public class WebRequestor : IWebRequestor
|
||||
private string token;
|
||||
private RestClient client;
|
||||
private readonly IConfiguration _config;
|
||||
private readonly ILogger<WebRequestor> logger;
|
||||
|
||||
public WebRequestor(IConfiguration config)
|
||||
public WebRequestor(IConfiguration config, ILogger<WebRequestor> logger)
|
||||
{
|
||||
_config = config;
|
||||
this.logger = logger;
|
||||
token =
|
||||
_config["CANVAS_TOKEN"]
|
||||
?? throw new Exception("CANVAS_TOKEN not in environment");
|
||||
@@ -33,22 +36,41 @@ public class WebRequestor : IWebRequestor
|
||||
|
||||
public async Task<RestResponse> PostAsync(RestRequest request)
|
||||
{
|
||||
using var activity = DiagnosticsConfig.Source.StartActivity("sending post");
|
||||
activity?.AddTag("success", false);
|
||||
|
||||
request.AddHeader("Content-Type", "application/json");
|
||||
var response = await client.ExecutePostAsync(request);
|
||||
if (!response.IsSuccessful)
|
||||
|
||||
try
|
||||
{
|
||||
Console.WriteLine(response.Content);
|
||||
Console.WriteLine(response.ResponseUri);
|
||||
Console.WriteLine("error with response");
|
||||
throw new Exception("error with response");
|
||||
var response = await client.ExecutePostAsync(request);
|
||||
activity?.AddTag("url", response.ResponseUri);
|
||||
|
||||
if (isRateLimited(response))
|
||||
logger.LogInformation("hit rate limit");
|
||||
|
||||
if (!response.IsSuccessful)
|
||||
{
|
||||
logger.LogError($"Error with response, response content: {response.Content}", response);
|
||||
throw new Exception("error with response");
|
||||
}
|
||||
activity?.AddTag("success", true);
|
||||
return response;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Console.WriteLine("inside post catch block");
|
||||
throw e;
|
||||
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
||||
private static bool isRateLimited(RestResponse response) =>
|
||||
response.StatusCode == HttpStatusCode.Forbidden && response.Content?.Contains("403 Forbidden (Rate Limit Exceeded)") != null;
|
||||
|
||||
public async Task<(T?, RestResponse)> PostAsync<T>(RestRequest request)
|
||||
{
|
||||
request.AddHeader("Content-Type", "application/json");
|
||||
var response = await client.ExecutePostAsync(request);
|
||||
var response = await PostAsync(request);
|
||||
return (deserialize<T>(response), response);
|
||||
}
|
||||
|
||||
@@ -75,11 +97,38 @@ public class WebRequestor : IWebRequestor
|
||||
|
||||
public async Task<RestResponse> DeleteAsync(RestRequest request)
|
||||
{
|
||||
return await client.DeleteAsync(request);
|
||||
// using var activity = DiagnosticsConfig.Source.StartActivity($"sending delete web request");
|
||||
// activity?.AddTag("success", false);
|
||||
|
||||
try
|
||||
{
|
||||
|
||||
var response = await client.DeleteAsync(request);
|
||||
if (isRateLimited(response))
|
||||
Console.WriteLine("after delete response in rate limited");
|
||||
// Console.WriteLine(response.Content);
|
||||
// activity?.AddTag("url", response.ResponseUri);
|
||||
// activity?.AddTag("success", true);
|
||||
return response;
|
||||
|
||||
}
|
||||
catch (HttpRequestException e)
|
||||
{
|
||||
if (e.StatusCode == HttpStatusCode.Forbidden) // && response.Content == "403 Forbidden (Rate Limit Exceeded)"
|
||||
logger.LogInformation("hit rate limit in delete");
|
||||
|
||||
Console.WriteLine(e.StatusCode);
|
||||
// Console.WriteLine();
|
||||
throw e;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private static T? deserialize<T>(RestResponse response)
|
||||
{
|
||||
// using var activity = DiagnosticsConfig.Source.StartActivity("deserializing response");
|
||||
// activity?.AddTag("url", response.ResponseUri);
|
||||
|
||||
if (!response.IsSuccessful)
|
||||
{
|
||||
Console.WriteLine(response.Content);
|
||||
|
||||
Reference in New Issue
Block a user