Merge pull request #12 from Worth-NL/fix/EnvironmentVariables_UserAnd…

…NotifyAreSwapped Fix/environment variables user and notify are swapped
Worth-NL · Mar 26, 2024 · f3a81e0 · f3a81e0
2 parents d6bd86f + 721fc6d
commit f3a81e0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/EventsHandler/Api/EventsHandler/Constants/DefaultValues.cs b/EventsHandler/Api/EventsHandler/Constants/DefaultValues.cs
@@ -44,6 +44,8 @@ internal static class Authorization
             internal static class OpenApiSecurityScheme
             {
                 internal static string BearerFormat => "JWT";
+
+                internal static string BearerSchema => "Bearer";
             }
         }
         #endregion

diff --git a/EventsHandler/Api/EventsHandler/Services/DataQuerying/ApiDataQuery.cs b/EventsHandler/Api/EventsHandler/Services/DataQuerying/ApiDataQuery.cs
@@ -95,7 +95,7 @@ internal async Task<TModel> ProcessGetAsync<TModel>(HttpClientTypes httpsClientT
                 (bool isSuccess, string jsonResult) = await this._httpSupplier.GetAsync(httpsClientType, organizationId, uri);
 
                 return isSuccess ? this._serializer.Deserialize<TModel>(jsonResult)
-                                 : throw new HttpRequestException(fallbackErrorMessage);
+                                 : throw new HttpRequestException($"{fallbackErrorMessage} | URI: {uri} | JSON response: {jsonResult}");
             }
 
             /// <summary>
@@ -111,7 +111,7 @@ internal async Task<TModel> ProcessPostAsync<TModel>(HttpClientTypes httpsClient
                 (bool isSuccess, string jsonResult) = await this._httpSupplier.PostAsync(httpsClientType, organizationId, uri, body);
 
                 return isSuccess ? this._serializer.Deserialize<TModel>(jsonResult)
-                                 : throw new HttpRequestException(fallbackErrorMessage);
+                                 : throw new HttpRequestException($"{fallbackErrorMessage} | URI: {uri} | JSON response: {jsonResult}");
             }
 
             #region Internal query methods

diff --git a/EventsHandler/Api/EventsHandler/Services/DataReceiving/JwtHttpSupplier.cs b/EventsHandler/Api/EventsHandler/Services/DataReceiving/JwtHttpSupplier.cs
@@ -118,7 +118,8 @@ private HttpClient AuthorizeWithJwt(HttpClient httpClient)
                 this._configuration.User.Authorization.JWT.UserName());
 
             // Set Authorization header
-            httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", jwtToken);
+            httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(
+                DefaultValues.Authorization.OpenApiSecurityScheme.BearerSchema, jwtToken);
 
             return httpClient;
         }