From 117bb1a759dea9695c20250548f75df4702a22f7 Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <noreply@wonky.codeberg.org>
Date: Mon, 28 Nov 2022 15:45:11 +0100
Subject: [PATCH] wip

---
 Wonky.Client/Components/ReportTableComponent.razor | 10 +++++-----
 Wonky.Client/Services/AuthenticationService.cs     |  7 ++++++-
 Wonky.Client/wwwroot/appsettings.json              |  6 +++---
 Wonky.Entity/Views/UserInfoView.cs                 |  5 +++--
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Wonky.Client/Components/ReportTableComponent.razor b/Wonky.Client/Components/ReportTableComponent.razor
index b5cf84f7..a4b75f99 100644
--- a/Wonky.Client/Components/ReportTableComponent.razor
+++ b/Wonky.Client/Components/ReportTableComponent.razor
@@ -82,8 +82,8 @@
             </a>
         }
     }
-</div>
-else
-{
-<LoaderThreeDots/>
-}
\ No newline at end of file
+    else
+    {
+        <LoaderThreeDots/>
+    }
+</div>
\ No newline at end of file
diff --git a/Wonky.Client/Services/AuthenticationService.cs b/Wonky.Client/Services/AuthenticationService.cs
index b58c6032..6edc770f 100644
--- a/Wonky.Client/Services/AuthenticationService.cs
+++ b/Wonky.Client/Services/AuthenticationService.cs
@@ -66,6 +66,8 @@ namespace Wonky.Client.Services
                     IsSuccess = false, ErrorMessage = $"Kontroller indtastning"
                 };
             
+            Console.WriteLine(resContent);
+            
             // process response content
             var data = JsonSerializer.Deserialize<AuthResponseView>(resContent, _options);
             await _localStorage.SetItemAsync("_xa", data.AccessToken);
@@ -75,6 +77,7 @@ namespace Wonky.Client.Services
             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", data.AccessToken);
 
             var userInfo = await UserInfo();
+            
             await _localStorage.SetItemAsync("_xu", userInfo);
             
             // notify system on state change
@@ -119,7 +122,9 @@ namespace Wonky.Client.Services
 
         public async Task<UserInfoView> UserInfo(bool write = false)
         {
-            var infoResponse = await _client.GetAsync(_apiConfig.Value.UserInfo);
+            _logger.LogDebug("sending userinfo request");
+            var infoResponse = await _client.GetAsync(_apiConfig.Value.UserInfo).ConfigureAwait(true);
+            
             var infoContent = await infoResponse.Content.ReadAsStringAsync();
             
             _logger.LogDebug("UserInfo <= {}", infoContent);
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 6bf41381..85469b92 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,13 +1,13 @@
 {
     "appInfo": {
         "name": "Wonky Client",
-        "version": "0.60.1",
+        "version": "0.70.2",
         "rc": true,
-        "sandBox": true,
+        "sandBox": false,
         "image": "grumpy-coder.png"
     },
     "apiConfig": {
-        "baseUrl": "https://dev.innotec.dk",
+        "baseUrl": "https://zeta.innotec.dk",
         "catalog": "api/v2/catalog",
         "crmCustomers": "api/v2/crm/companies",
         "crmInventoryExt": "history/inventory",
diff --git a/Wonky.Entity/Views/UserInfoView.cs b/Wonky.Entity/Views/UserInfoView.cs
index 394118c1..e519a7b6 100644
--- a/Wonky.Entity/Views/UserInfoView.cs
+++ b/Wonky.Entity/Views/UserInfoView.cs
@@ -19,14 +19,13 @@ namespace Wonky.Entity.Views;
 
 public class UserInfoView
 {
-    [JsonPropertyName("id")] public string Id { get; set; } = "";
     [JsonPropertyName("advisor")] public string Advisor { get; set; } = "";
     [JsonPropertyName("companyId")] public string ReferenceId { get; set; } = "";
     [JsonPropertyName("countryCode")] public string CountryCode { get; set; } = "";
     [JsonPropertyName("countryName")] public string CountryName { get; set; } = "";
     [JsonPropertyName("email")] public string Email { get; set; } = "";
     [JsonPropertyName("fullName")] public string FullName { get; set; } = "";
-    [JsonPropertyName("phoneNumber")] public string PhoneNumber { get; set; } = "";
+    [JsonPropertyName("id")] public string Id { get; set; } = "";
     [JsonPropertyName("isAdmin")] public bool IsAdmin { get; set; }
     [JsonPropertyName("isAdvisor")] public bool IsAdvisor { get; set; }
     [JsonPropertyName("isEDoc")] public bool IsEDoc { get; set; }
@@ -34,4 +33,6 @@ public class UserInfoView
     [JsonPropertyName("isOffice")] public bool IsOffice { get; set; }
     [JsonPropertyName("isWarehouse")] public bool IsWareHouse { get; set; }
     [JsonPropertyName("isSupervisor")] public bool IsSupervisor { get; set; }
+    [JsonPropertyName("phoneNumber")] public string PhoneNumber { get; set; } = "";
+    [JsonPropertyName("roles")] public string Roles { get; set; } = "";
 }
\ No newline at end of file