From e099f82f8e7be0dff1c1d910db02882dd50dbbae Mon Sep 17 00:00:00 2001 From: Loretta Date: Tue, 27 Aug 2024 12:37:54 +0200 Subject: [PATCH] ConsoleLog removed from production --- TIAMMobileApp/MauiProgram.cs | 6 +- TIAMSharedUI/Pages/Login.razor.cs | 2 +- TIAMWebApp/Client/Program.cs | 4 + .../Shared/Models/ClientSide/Setting.cs | 1 + .../Services/UserDataServiceClientBase.cs | 76 ++++++++----------- 5 files changed, 39 insertions(+), 50 deletions(-) diff --git a/TIAMMobileApp/MauiProgram.cs b/TIAMMobileApp/MauiProgram.cs index 00c8ccdb..14895811 100644 --- a/TIAMMobileApp/MauiProgram.cs +++ b/TIAMMobileApp/MauiProgram.cs @@ -49,9 +49,9 @@ namespace TIAMMobileApp builder.Services.AddScoped(); builder.Services.AddScoped(); - //builder.Services.AddScoped(); - //builder.Services.AddSingleton(); - builder.Services.AddSingleton(); + + builder.Services.AddSingleton(); + builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); diff --git a/TIAMSharedUI/Pages/Login.razor.cs b/TIAMSharedUI/Pages/Login.razor.cs index 1ecd54ee..0a81b8d1 100644 --- a/TIAMSharedUI/Pages/Login.razor.cs +++ b/TIAMSharedUI/Pages/Login.razor.cs @@ -29,7 +29,7 @@ namespace TIAMSharedUI.Pages [Inject] public IUserDataService userDataService { get; set; } [Inject] - public IAcLogWriterClientBase BrowserConsoleLogWriter { get; set; } + public IAcLogWriterClientBase BrowserConsoleLogWriter { get; set; } //TODO: Logger... J. [Inject] public IJSRuntime jsRuntime { get; set; } [Inject] diff --git a/TIAMWebApp/Client/Program.cs b/TIAMWebApp/Client/Program.cs index c3de9452..4be83f19 100644 --- a/TIAMWebApp/Client/Program.cs +++ b/TIAMWebApp/Client/Program.cs @@ -40,7 +40,11 @@ builder.Services.AddScoped(); //WebSpecific builder.Services.AddScoped(); builder.Services.AddSingleton(x => new ResourceManager("TIAMWebApp.Client.Resources.MyResources", typeof(Program).Assembly)); + +#if DEBUG builder.Services.AddSingleton(); +#endif + builder.Services.AddSingleton(); //builder.Services.AddSingleton(); builder.Services.AddSingleton(); diff --git a/TIAMWebApp/Shared/Models/ClientSide/Setting.cs b/TIAMWebApp/Shared/Models/ClientSide/Setting.cs index 87035f6e..fa257804 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/Setting.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/Setting.cs @@ -1,5 +1,6 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide { + //appsettings.json public class Setting { public static UserBasicDetails UserBasicDetails { get; set; } diff --git a/TIAMWebApp/Shared/Services/UserDataServiceClientBase.cs b/TIAMWebApp/Shared/Services/UserDataServiceClientBase.cs index d591ae7b..5d806ba7 100644 --- a/TIAMWebApp/Shared/Services/UserDataServiceClientBase.cs +++ b/TIAMWebApp/Shared/Services/UserDataServiceClientBase.cs @@ -39,41 +39,33 @@ public abstract class UserDataServiceClientBase : IUserDataService //api call to get user var userModelDto = await GetUserDetailByIdAsync(id); - if (userModelDto != null) + if (userModelDto == null) return null; + + var userProperties = new Dictionary(); + //get user's properties + var hasProperties = userModelDto.ServiceProviders.Count > 0 ? true : (userModelDto.ServiceProviders.Count == 0 ? false : false); + if (hasProperties) { - var userProperties = new Dictionary(); - //get user's properties - var hasProperties = userModelDto.ServiceProviders.Count > 0 ? true : (userModelDto.ServiceProviders.Count == 0 ? false : false); - if (hasProperties) + + //var Properties = await serviceProviderDataService.GetPropertiesByOwnerIdAsync(userModelDto.Id); + var properties = userModelDto.ServiceProviders; + + Logger.Info($"{properties.Count} properties found"); + foreach (var property in properties) { - - //var Properties = await serviceProviderDataService.GetPropertiesByOwnerIdAsync(userModelDto.Id); - var properties = userModelDto.ServiceProviders; - - Logger.Info($"{properties.Count} properties found"); - foreach (var property in properties) - { - userProperties.Add(property.Id, property.Name); - } + userProperties.Add(property.Id, property.Name); } - - //create user session model - var user = new UserSessionModel(userModelDto.Id, UserType.User, userModelDto, userProperties, 1); - return user; - } - else - { - - return null; } + //create user session model + var user = new UserSessionModel(userModelDto.Id, UserType.User, userModelDto, userProperties, 1); + return user; } public async Task TestUserApi(int Param) { var url = $"{Setting.ApiBaseUrl}/{APIUrls.UserTest}"; - var response = await Http.PostAsJsonAsync(url, Param); var result = await response.Content.ReadAsStringAsync(); return result; @@ -111,11 +103,12 @@ public abstract class UserDataServiceClientBase : IUserDataService public async Task<(bool isSuccess, string ErrorMessage)> CreateUser(RegistrationModel regModel) { - var isSuccess = true; var result = string.Empty; var url = $"{Setting.ApiBaseUrl}/{APIUrls.CreateUser}"; + Logger.Info("CreateUser url: " + url); + var response = await Http.PostAsJsonAsync(url, regModel); result = await response.Content.ReadAsStringAsync(); /*if (response.IsSuccessStatusCode) @@ -139,10 +132,11 @@ public abstract class UserDataServiceClientBase : IUserDataService var result = string.Empty; var user = new UserModelDto(); var url = $"{Setting.ApiBaseUrl}/{APIUrls.CreateGuestUser}"; + Logger.Info("CreateGuestUser url: " + url); + var response = await Http.PostAsJsonAsync(url, regModel); - - + if (response.IsSuccessStatusCode) { isSuccess = true; @@ -156,8 +150,7 @@ public abstract class UserDataServiceClientBase : IUserDataService result = await response.Content.ReadAsStringAsync(); user = null; } - - + return (isSuccess, user); } @@ -175,22 +168,21 @@ public abstract class UserDataServiceClientBase : IUserDataService var response = await Http.GetFromJsonAsync>(APIUrls.GetUsersWithDetails); //var result = await response.Content.ReadAsStringAsync(); //var user = JsonConvert.DeserializeObject(result); + return response ?? []; - } public async Task GetUserByEmailAsync(string email) { - - try { var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetUserByEmail}/{email}"; Logger.Info("GetUserByEmailAsync url: " + url + ", " + email); - var response = await Http.GetAsync(url); + var response = await Http.GetAsync(url); response.EnsureSuccessStatusCode(); - if (response.Content != null) + + if (response.IsSuccessStatusCode) { var jsonResponse = await response.Content.ReadAsStringAsync(); var user = System.Text.Json.JsonSerializer.Deserialize(jsonResponse, new JsonSerializerOptions @@ -200,11 +192,7 @@ public abstract class UserDataServiceClientBase : IUserDataService return user; } - else - { - return null; - } - + return null; } catch (HttpRequestException httpRequestException) { @@ -218,9 +206,6 @@ public abstract class UserDataServiceClientBase : IUserDataService Logger.DebugConditional($"An error occurred: {ex.Message}"); throw; } - - - } public async Task GetUserByIdAsync(Guid id) @@ -253,8 +238,8 @@ public abstract class UserDataServiceClientBase : IUserDataService public async Task RefreshToken() { Logger.Info("RefreshToken() called"); - var isTokenRefreshed = false; + var isTokenRefreshed = false; var url = $"{Setting.ApiBaseUrl}/{APIUrls.RefreshToken}"; //var url = APIUrls.RefreshToken; @@ -286,12 +271,9 @@ public abstract class UserDataServiceClientBase : IUserDataService } catch (Exception ex) { - var msg = ex.Message; Logger.Error("Refreshtoken exception: " + ex.Message, ex); } - - return isTokenRefreshed; } @@ -302,10 +284,12 @@ public abstract class UserDataServiceClientBase : IUserDataService var url = $"{Setting.ApiBaseUrl}/{APIUrls.LogoutUser}"; var result = false; var response = await Http.PostAsJsonAsync(url, refreshToken); + if (response.IsSuccessStatusCode) { var resultMessage = await response.Content.ReadAsStringAsync(); Logger.Detail($"Logout response: {resultMessage}"); + if (resultMessage == "OK") { result = true;