TIAMMobileApp/Services/UserDataServiceMobile.cs

@@ -1,6 +1,5 @@
 using System.Net.Http.Json;
 using System.Text;
-using System.Text.Json;
 using AyCode.Interfaces.StorageHandlers;
 using AyCode.Services.Loggers;
 using Newtonsoft.Json;
@@ -21,8 +20,9 @@ namespace TIAMMobileApp.Services
         private readonly HttpClient http;
         private readonly ISecureStorageHandler secureStorageHandler;        
         private readonly IServiceProviderDataService serviceProviderDataService;
-        private readonly LoggerClient<UserDataServiceMobile> _logger;
+        private readonly ILogger _logger;
 
+        public Dictionary<int, string> userRoleTypes { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
         public UserDataServiceMobile(HttpClient http, ISecureStorageHandler secureStorageHandler, IServiceProviderDataService serviceProviderDataService, IEnumerable<IAcLogWriterClientBase> logWriters)
         {
@@ -183,46 +183,16 @@ namespace TIAMMobileApp.Services
 
         public async Task<UserModelDto?> GetUserByEmailAsync(string email)
         {
+            var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetUserByEmail}";
+
+            _logger.Info("GetUserByEmailAsync url: " + url + ", " + email);
+            //GlobalLogger.Info("GetUserByEmailAsync url: " + url + ", " + email, "GLOBAL_LOGGER");
 
 
-            try
+            var response = await http.PostAsJsonAsync(url, email);
-            {
+            var result = await response.Content.ReadAsStringAsync();
-                var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetUserByEmail}/{email}";
+            var user = JsonConvert.DeserializeObject<UserModelDto>(result);
-                _logger.Info("GetUserByEmailAsync url: " + url + ", " + email);
+            return user;
-                var response = await http.GetAsync(url);
-
-                response.EnsureSuccessStatusCode();
-                if (response.Content != null)
-                {
-                    var jsonResponse = await response.Content.ReadAsStringAsync();
-                    var user = System.Text.Json.JsonSerializer.Deserialize<UserModelDto>(jsonResponse, new JsonSerializerOptions
-                    {
-                        PropertyNameCaseInsensitive = true
-                    });
-                    return user;
-                }
-
-                else
-                {
-                    return null;
-                }
-
-            }
-            catch (HttpRequestException httpRequestException)
-            {
-                // Handle specific HTTP request exceptions
-                _logger.DebugConditional($"Request error: {httpRequestException.Message}");
-                throw;
-            }
-            catch (Exception ex)
-            {
-                // Handle other possible exceptions
-                _logger.DebugConditional($"An error occurred: {ex.Message}");
-                throw;
-            }
-
-
-
         }
 
         public async Task<UserModelDto?> GetUserByIdAsync(Guid id)

TIAMWebApp/Client/Services/UserDataServiceWeb.cs

@@ -9,9 +9,6 @@ using TIAMWebApp.Shared.Application.Utility;
 using AyCode.Interfaces.StorageHandlers;
 using TIAM.Models.Dtos.Users;
 using AyCode.Services.Loggers;
-using System.Net.Http;
-using AyCode.Core.Extensions;
-using System.Text.Json;
 
 
 namespace TIAMWebApp.Client.Services
@@ -24,7 +21,8 @@ namespace TIAMWebApp.Client.Services
         private readonly IServiceProviderDataService serviceProviderDataService;
         private readonly LoggerClient<UserDataServiceWeb> _logger;
 
-        
+
+        public Dictionary<int, string> userRoleTypes { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
         public UserDataServiceWeb(HttpClient http, ISecureStorageHandler secureStorageHandler, IServiceProviderDataService serviceProviderDataService, IEnumerable<IAcLogWriterClientBase> logWriters)
         //public UserDataServiceWeb(HttpClient http, ISecureStorageHandler secureStorageHandler, IJSRuntime jSRuntime, IServiceProviderDataService serviceProviderDataService, HttpClientLogItemWriter logWriter)
@@ -188,46 +186,16 @@ namespace TIAMWebApp.Client.Services
 
         public async Task<UserModelDto?> GetUserByEmailAsync(string email)
         {
+            var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetUserByEmail}/{email}";
             
-
+            _logger.Info("GetUserByEmailAsync url: " + url + ", " + email);
-            try
+            //GlobalLogger.Info("GetUserByEmailAsync url: " + url + ", " + email, "GLOBAL_LOGGER");
-            {
-                var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetUserByEmail}/{email}";
-                _logger.Info("GetUserByEmailAsync url: " + url + ", " + email);
-                var response = await http.GetAsync(url);
-
-                response.EnsureSuccessStatusCode();
-                if (response.Content != null)
-                {
-                    var jsonResponse = await response.Content.ReadAsStringAsync();
-                    var user = System.Text.Json.JsonSerializer.Deserialize<UserModelDto>(jsonResponse, new JsonSerializerOptions
-                    {
-                        PropertyNameCaseInsensitive = true
-                    });
-                    return user;
-                }
-
-                else
-                {
-                    return null;
-                }
-
-            }
-            catch (HttpRequestException httpRequestException)
-            {
-                // Handle specific HTTP request exceptions
-                _logger.DebugConditional($"Request error: {httpRequestException.Message}");
-                throw;
-            }
-            catch (Exception ex)
-            {
-                // Handle other possible exceptions
-                _logger.DebugConditional($"An error occurred: {ex.Message}");
-                throw;
-            }
-
 
 
+            var response = (UserModelDto)(await http.GetFromJsonAsync(url,typeof (UserModelDto)));
+            
+            //var user = JsonConvert.DeserializeObject<UserModelDto>(result);
+            return response;
         }
 
         public async Task<UserModelDto?> GetUserByIdAsync(Guid id)

TIAMWebApp/Server/Controllers/UserAPIController.cs

@@ -358,20 +358,10 @@ namespace TIAMWebApp.Server.Controllers
         [AllowAnonymous]
         [HttpGet]
         [Route(APIUrls.GetUserByEmailRouteName + "/{email}")]
-        public async Task<UserModelDto>? GetUserByEmail(string email)
+        public Task<UserModelDto?> GetUserByEmail(string email)
         {
-            _logger.Info($"GetUserByEmail called with email: {email}");  
+            _logger.Info($"GetUserByEmail called with email: {email}");            
-            var result = _userDal.GetUserModelDtoByEmailAsync<UserModelDto>(email, false);
+            return _userDal.GetUserModelDtoByEmailAsync<UserModelDto>(email, false);
-            if (result.Result == null)
-            {
-                UserModelDto resultDto = new UserModelDto();
-                return resultDto;
-            }
-            else
-            {
-                return result.Result;
-            }
-
         }
 
         [AllowAnonymous]

TIAMWebApp/Shared/Interfaces/IUserDataService.cs

@@ -5,7 +5,8 @@ using TIAMWebApp.Shared.Application.Models.PageModels;
 namespace TIAMWebApp.Shared.Application.Interfaces
 {
     public interface IUserDataService
-    {        
+    {
+        public Dictionary<int, string> userRoleTypes { get; set; }
 
         public Task<UserSessionModel> IsLoggedInAsync(Guid id);