diff --git a/TIAMMobileApp/Services/UserDataServiceMobile.cs b/TIAMMobileApp/Services/UserDataServiceMobile.cs index 9fd69ed4..b2875955 100644 --- a/TIAMMobileApp/Services/UserDataServiceMobile.cs +++ b/TIAMMobileApp/Services/UserDataServiceMobile.cs @@ -44,13 +44,13 @@ namespace TIAMMobileApp.Services public async Task IsLoggedInAsync(Guid id) { - var dbUser = await GetUserByIdAsync(id); + var userModelDto = await GetUserByIdAsync(id); - if (dbUser != null) + if (userModelDto != null) { - var hasProperties = await _serviceProviderDataService.GetPropertiesByOwnerIdAsync(dbUser.Id); - var user = new UserSessionModel(dbUser.Id, UserType.User, dbUser.Profile?.Name, hasProperties, 1); + var hasProperties = await _serviceProviderDataService.GetPropertiesByOwnerIdAsync(userModelDto.Id); + var user = new UserSessionModel(userModelDto.Id, UserType.User, userModelDto, hasProperties, 1); return user; } @@ -127,9 +127,16 @@ namespace TIAMMobileApp.Services { return await http.GetFromJsonAsync(APIUrls.GetUserByEmail); } - public async Task GetUserByIdAsync(Guid Id) + public async Task GetUserByIdAsync(Guid id) { - return await http.GetFromJsonAsync(APIUrls.GetUserById); + var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetUserById}"; + //logToBrowserConsole.LogToBC("GetUserByIdAsync url: " + url + ", " + id.ToString()); + + var response = await http.PostAsJsonAsync(url, id); + var result = await response.Content.ReadAsStringAsync(); + var user = JsonConvert.DeserializeObject(result); + + return user; } public async Task RefreshToken() diff --git a/TIAMMobileApp/TIAMMobileApp.csproj b/TIAMMobileApp/TIAMMobileApp.csproj index 0324338b..6ace022f 100644 --- a/TIAMMobileApp/TIAMMobileApp.csproj +++ b/TIAMMobileApp/TIAMMobileApp.csproj @@ -77,6 +77,9 @@ ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.dll +