From ba723bdddb1e640dea8c7158067cc46cb4122406 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Thu, 16 May 2024 09:23:33 +0200 Subject: [PATCH] Removed state and ErrorResponse(Exception e) from BaseController. Added logging to catch part in Document and Envelope Controller. --- .../Controllers/BaseController.cs | 17 ++---------- .../Controllers/DocumentController.cs | 6 +++-- .../Controllers/EnvelopeController.cs | 6 +++-- .../Controllers/HomeController.cs | 26 +++---------------- .../appsettings.Development.json | 8 ------ EnvelopeGenerator.Web/appsettings.json | 15 ++++++++--- 6 files changed, 24 insertions(+), 54 deletions(-) diff --git a/EnvelopeGenerator.Web/Controllers/BaseController.cs b/EnvelopeGenerator.Web/Controllers/BaseController.cs index 0906c6e2..ebdcc258 100644 --- a/EnvelopeGenerator.Web/Controllers/BaseController.cs +++ b/EnvelopeGenerator.Web/Controllers/BaseController.cs @@ -6,27 +6,14 @@ namespace EnvelopeGenerator.Web.Controllers { public class BaseController : Controller { - internal DatabaseService database; - internal State state; + protected readonly DatabaseService database; - internal ILogger _logger; + protected readonly ILogger _logger; public BaseController(DatabaseService database, ILogger logger) { this.database = database; - this.state = database.State; _logger = logger; } - - internal ObjectResult ErrorResponse(Exception e) - { - // Log the detailed error message. - _logger.LogError(e, "An unexpected error occurred."); - - return Problem( - statusCode: 500, - detail: e.Message, - type: "ServerError"); - } } } diff --git a/EnvelopeGenerator.Web/Controllers/DocumentController.cs b/EnvelopeGenerator.Web/Controllers/DocumentController.cs index 25a77d8a..7313f192 100644 --- a/EnvelopeGenerator.Web/Controllers/DocumentController.cs +++ b/EnvelopeGenerator.Web/Controllers/DocumentController.cs @@ -41,7 +41,8 @@ namespace EnvelopeGenerator.Web.Controllers } catch(Exception ex) { - return ErrorResponse(ex); + _logger.LogError(ex, "{Message}", ex.Message); + return StatusCode(StatusCodes.Status500InternalServerError); } } @@ -66,7 +67,8 @@ namespace EnvelopeGenerator.Web.Controllers } catch(Exception ex) { - return ErrorResponse(ex); + _logger.LogError(ex, "{Message}", ex.Message); + return StatusCode(StatusCodes.Status500InternalServerError); } } diff --git a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs index e4e69167..a83926f4 100644 --- a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs +++ b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs @@ -43,7 +43,8 @@ namespace EnvelopeGenerator.Web.Controllers } catch (Exception e) { - return ErrorResponse(e); + _logger.LogError(e, "{Message}", e.Message); + return StatusCode(StatusCodes.Status500InternalServerError); } } @@ -88,7 +89,8 @@ namespace EnvelopeGenerator.Web.Controllers } catch (Exception e) { - return ErrorResponse(e); + _logger.LogError(e, "{Message}", e.Message); + return StatusCode(StatusCodes.Status500InternalServerError); } } } diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs index 51cb6ec3..5c5a19eb 100644 --- a/EnvelopeGenerator.Web/Controllers/HomeController.cs +++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs @@ -227,23 +227,14 @@ namespace EnvelopeGenerator.Web.Controllers return Ok(new { EnvelopeUuid = envelopeUuid, ReceiverSignature = receiverSignature }); } - [NonAction] - public IActionResult GetLanguage() => Ok(UserLanguage); - [HttpPost("lang/{language}")] public IActionResult SetLanguage([FromRoute] string language) { try { - if (Languages is null) - { - _logger.LogWarning("There is no language assigned under languages key in appesettings.json"); - return StatusCode(statusCode: StatusCodes.Status500InternalServerError); - } - else if (!language.Contains(language)) - return BadRequest(); - language = _urlEncoder.Encode(language); + if (!_cultures.Languages.Contains(language)) + return BadRequest(); UserLanguage = language; @@ -257,16 +248,7 @@ namespace EnvelopeGenerator.Web.Controllers } [HttpGet("lang")] - public IActionResult GetLanguages() - { - if(Languages is null) - { - _logger.LogWarning("There is no language assigned under languages key in appesettings.json"); - return StatusCode(statusCode: StatusCodes.Status500InternalServerError); - } - else - return Ok(Languages); - } + public IActionResult GetLanguages() => Ok(_cultures.Languages); private string UserLanguage { @@ -297,8 +279,6 @@ namespace EnvelopeGenerator.Web.Controllers } } - private string[]? Languages => _configuration.GetSection("Languages").Get(); - public IActionResult Error404() => this.ViewError404(); } } \ No newline at end of file diff --git a/EnvelopeGenerator.Web/appsettings.Development.json b/EnvelopeGenerator.Web/appsettings.Development.json index 83b8aace..b6f634e5 100644 --- a/EnvelopeGenerator.Web/appsettings.Development.json +++ b/EnvelopeGenerator.Web/appsettings.Development.json @@ -5,13 +5,5 @@ "Default": "Information", "Microsoft.AspNetCore": "Warning" } - }, - "Config": { - "ConnectionString": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;", - //preivous connection string without Encrypt=false and TrustServerCertificate=True -> "Server=sDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;" - "LogPath": "E:\\EnvelopeGenerator\\Logs", - "LogDebug": true, - "LogJson": true, - "AdminPassword": "dd" } } \ No newline at end of file diff --git a/EnvelopeGenerator.Web/appsettings.json b/EnvelopeGenerator.Web/appsettings.json index 27287230..421e1c0d 100644 --- a/EnvelopeGenerator.Web/appsettings.json +++ b/EnvelopeGenerator.Web/appsettings.json @@ -10,6 +10,13 @@ "Microsoft.AspNetCore.Hosting.Diagnostics": "Warning" } }, + "Config": { + "ConnectionString": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;", + "LogPath": "E:\\EnvelopeGenerator\\Logs", + "LogDebug": true, + "LogJson": true, + "AdminPassword": "dd" + }, "PSPDFKitLicenseKey": null, /* The first format parameter {0} will be replaced by the nonce value. */ "TestCSP": false, @@ -96,13 +103,13 @@ To add a new language, first you should write the required resx file. first is the default culture name. */ "Cultures": [ - { - "Language": "en-US", - "FIClass": "fi-us" - }, { "Language": "de-DE", "FIClass": "fi-de" + }, + { + "Language": "en-US", + "FIClass": "fi-us" } ], "DisableMultiLanguage": false