MAKS-IT/maksit-certs-ui
1
0
Fork 0
mirror of https://github.com/MAKS-IT-COM/maksit-certs-ui.git synced 2025-12-31 04:00:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

(refactor): dedup error message handling

Browse Source
This commit is contained in:
Maksym Sadovnychyy 2025-10-26 12:53:26 +01:00
parent 950b858af7
commit dcc33ac513
1 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/LetsEncrypt/Services/LetsEncryptService.cs
View File

@ -138,15 +138,10 @@ public class LetsEncryptService : ILetsEncryptService {
return Result.Ok("Client configured successfully."); return Result.Ok("Client configured successfully.");
} }
catch (LetsEncrytException ex) { catch (LetsEncrytException ex) {
List<string> messages = ["Let's Encrypt client encountered a problem"]; return HandleUnhandledException(ex, "Let's Encrypt client encountered a problem");
_logger.LogError(ex, messages.FirstOrDefault());
messages.Add(ex.Message);
return Result.InternalServerError([.. messages]);
} }
catch (Exception ex) { catch (Exception ex) {
const string message = "Let's Encrypt client unhandled exception"; return HandleUnhandledException(ex);
_logger.LogError(ex, message);
return Result.InternalServerError(message);
} }
} }
#endregion #endregion
@ -231,15 +226,10 @@ public class LetsEncryptService : ILetsEncryptService {
return Result.Ok("Initialization successful."); return Result.Ok("Initialization successful.");
} }
catch (LetsEncrytException ex) { catch (LetsEncrytException ex) {
List<string> messages = ["Let's Encrypt client encountered a problem"]; return HandleUnhandledException(ex, "Let's Encrypt client encountered a problem");
_logger.LogError(ex, messages.FirstOrDefault());
messages.Add(ex.Message);
return Result.InternalServerError([.. messages]);
} }
catch (Exception ex) { catch (Exception ex) {
const string message = "Let's Encrypt client unhandled exception"; return HandleUnhandledException(ex);
_logger.LogError(ex, message);
return Result.InternalServerError(message);
} }
} }
#endregion #endregion
@ -267,10 +257,7 @@ public class LetsEncryptService : ILetsEncryptService {
return Result<string?>.Ok(state.Directory.Meta.TermsOfService); return Result<string?>.Ok(state.Directory.Meta.TermsOfService);
} }
catch (Exception ex) { catch (Exception ex) {
List<string> messages = new List<string> { "Let's Encrypt client unhandled exception" }; return HandleUnhandledException<string?>(ex);
_logger.LogError(ex, messages.FirstOrDefault());
messages.Add(ex.Message);
return Result<string?>.InternalServerError(null, [.. messages]);
} }
} }
#endregion #endregion
@ -383,10 +370,7 @@ public class LetsEncryptService : ILetsEncryptService {
return Result<Dictionary<string, string>?>.Ok(results); return Result<Dictionary<string, string>?>.Ok(results);
} }
catch (Exception ex) { catch (Exception ex) {
List<string> messages = new List<string> { "Let's Encrypt client unhandled exception" }; return HandleUnhandledException<Dictionary<string, string>?>(ex);
_logger.LogError(ex, messages.FirstOrDefault());
messages.Add(ex.Message);
return Result<Dictionary<string, string>?>.InternalServerError(null, [.. messages]);
} }
} }
#endregion #endregion
@ -431,10 +415,7 @@ public class LetsEncryptService : ILetsEncryptService {
return Result.Ok(); return Result.Ok();
} }
catch (Exception ex) { catch (Exception ex) {
List<string> messages = new List<string> { "Let's Encrypt client unhandled exception" }; return HandleUnhandledException(ex);
_logger.LogError(ex, messages.FirstOrDefault());
messages.Add(ex.Message);
return Result.InternalServerError([.. messages]);
} }
} }
#endregion #endregion
@ -472,10 +453,7 @@ public class LetsEncryptService : ILetsEncryptService {
return Result.Ok(); return Result.Ok();
} }
catch (Exception ex) { catch (Exception ex) {
List<string> messages = new List<string> { "Let's Encrypt client unhandled exception" }; return HandleUnhandledException(ex);
_logger.LogError(ex, messages.FirstOrDefault());
messages.Add(ex.Message);
return Result.InternalServerError([.. messages]);
} }
} }
#endregion #endregion
@ -596,10 +574,7 @@ public class LetsEncryptService : ILetsEncryptService {
return Result.Ok(); return Result.Ok();
} }
catch (Exception ex) { catch (Exception ex) {
List<string> messages = new List<string> { "Let's Encrypt client unhandled exception" }; return HandleUnhandledException(ex);
_logger.LogError(ex, messages.FirstOrDefault());
messages.Add(ex.Message);
return Result.InternalServerError([.. messages]);
} }
} }
#endregion #endregion
@ -672,10 +647,7 @@ public class LetsEncryptService : ILetsEncryptService {
} }
catch (Exception ex) { catch (Exception ex) {
List<string> messages = new List<string> { "Let's Encrypt client unhandled exception" }; return HandleUnhandledException(ex);
_logger.LogError(ex, messages.FirstOrDefault());
messages.Add(ex.Message);
return Result.InternalServerError([.. messages]);
} }
} }
@ -714,10 +686,7 @@ public class LetsEncryptService : ILetsEncryptService {
return Result<string?>.Ok(nonce); return Result<string?>.Ok(nonce);
} }
catch (Exception ex) { catch (Exception ex) {
List<string> messages = new List<string> { "Let's Encrypt client unhandled exception" }; return HandleUnhandledException<string?>(ex);
_logger.LogError(ex, messages.FirstOrDefault());
messages.Add(ex.Message);
return Result<string?>.InternalServerError(null, [.. messages]);
} }
} }
@ -770,4 +739,16 @@ public class LetsEncryptService : ILetsEncryptService {
// Helper for status comparison // Helper for status comparison
private static bool StatusEquals(string? status, OrderStatus expected) => status == expected.GetDisplayName(); private static bool StatusEquals(string? status, OrderStatus expected) => status == expected.GetDisplayName();
private Result HandleUnhandledException(Exception ex, string defaultMessage = "Let's Encrypt client unhandled exception") {
List<string> messages = new() { defaultMessage };
_logger.LogError(ex, messages.FirstOrDefault());
return Result.InternalServerError([.. messages]);
}
private Result<T?> HandleUnhandledException<T>(Exception ex, T? defaultValue = default, string defaultMessage = "Let's Encrypt client unhandled exception") {
List<string> messages = new() { defaultMessage };
_logger.LogError(ex, messages.FirstOrDefault());
return Result<T?>.InternalServerError(defaultValue, [.. messages]);
}
} }