Changes in Basket Integration

jsuarezruiz · jsuarezruiz · commit 2ab72466fc02 · 2016-12-09T14:11:34.000+01:00
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Controls/BindablePicker.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Controls/BindablePicker.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections;
+using System.Windows.Input;
 using Xamarin.Forms;
 
 namespace eShopOnContainers.Core.Controls
@@ -12,6 +13,9 @@ public class BindablePicker : Picker
         public static readonly BindableProperty SelectedItemProperty = BindableProperty.Create("SelectedItem",
             typeof(object), typeof(BindablePicker), null, BindingMode.TwoWay, propertyChanged: OnSelectedItemChanged);
 
+        public static readonly BindableProperty ItemSelectedCommandProperty = BindableProperty.Create("ItemSelectedCommand",
+          typeof(ICommand), typeof(BindablePicker), null);
+
         public BindablePicker()
         {
             SelectedIndexChanged += (o, e) =>
@@ -23,6 +27,7 @@ public BindablePicker()
                 }
 
                 var index = 0;
+
                 foreach (var item in ItemsSource)
                 {
                     if (index == SelectedIndex)
@@ -54,6 +59,12 @@ public Object SelectedItem
             }
         }
 
+        public ICommand ItemSelectedCommand
+        {
+            get { return (ICommand)GetValue(ItemSelectedCommandProperty); }
+            set { SetValue(ItemSelectedCommandProperty, value); }
+        }
+
         public event EventHandler<SelectedItemChangedEventArgs> ItemSelected;
 
         private void InternalUpdateSelectedIndex()
@@ -107,6 +118,11 @@ private static void OnSelectedItemChanged(BindableObject bindable, object oldVal
                 boundPicker.ItemSelected(boundPicker, new SelectedItemChangedEventArgs(newValue));
             }
 
+            if(boundPicker.ItemSelectedCommand != null)
+            {
+                boundPicker.ItemSelectedCommand.Execute(newValue);
+            }
+
             boundPicker.InternalUpdateSelectedIndex();
         }
     }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs
@@ -105,4 +105,4 @@ public override string ToString()
             return String.Format("Product Id: {0}, Quantity: {1}", ProductId, Quantity);
         }
     }
-}
+}
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketMockService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketMockService.cs
@@ -29,19 +29,29 @@ public async Task<CustomerBasket> GetBasketAsync(string guidUser, string token)
             return MockCustomBasket;
         }
 
-        public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket)
+        public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket, string token)
         {
             await Task.Delay(500);
 
+            if (string.IsNullOrEmpty(token))
+            {
+                return new CustomerBasket();
+            }
+
             MockCustomBasket = customerBasket;
 
             return MockCustomBasket;
         }
 
-        public async Task ClearBasketAsync(string guidUser)
+        public async Task ClearBasketAsync(string guidUser, string token)
         {
             await Task.Delay(500);
 
+            if (string.IsNullOrEmpty(token))
+            {
+                return;
+            }
+
             if (!string.IsNullOrEmpty(guidUser))
             {
                 MockCustomBasket.Items.Clear();
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs
@@ -39,26 +39,26 @@ public async Task<CustomerBasket> GetBasketAsync(string guidUser, string token)
             }
         }
 
-        public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket)
+        public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket, string token)
         {
             UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint);
 
             string uri = builder.ToString();
 
-            var result = await _requestProvider.PostAsync(uri, customerBasket);
+            var result = await _requestProvider.PostAsync(uri, customerBasket, token);
 
             return result;
         }
 
-        public async Task ClearBasketAsync(string guidUser)
+        public async Task ClearBasketAsync(string guidUser, string token)
         {
             UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint);
 
             builder.Path = guidUser;
 
             string uri = builder.ToString();
 
-             await _requestProvider.DeleteAsync(uri);
+             await _requestProvider.DeleteAsync(uri, token);
         }
     }
 }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/IBasketService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/IBasketService.cs
@@ -6,7 +6,7 @@ namespace eShopOnContainers.Core.Services.Basket
     public interface IBasketService
     {
         Task<CustomerBasket> GetBasketAsync(string guidUser, string token);
-        Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket);
-        Task ClearBasketAsync(string guidUser);
+        Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket, string token);
+        Task ClearBasketAsync(string guidUser, string token);
     }
 }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/IRequestProvider.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/IRequestProvider.cs
@@ -4,18 +4,16 @@ namespace eShopOnContainers.Core.Services.RequestProvider
 {
     public interface IRequestProvider
     {
-        Task<TResult> GetAsync<TResult>(string uri);
+        Task<TResult> GetAsync<TResult>(string uri, string token = "");
 
-        Task<TResult> GetAsync<TResult>(string uri, string token);
+        Task<TResult> PostAsync<TResult>(string uri, TResult data, string token = "");
 
-        Task<TResult> PostAsync<TResult>(string uri, TResult data);
+        Task<TResult> PostAsync<TRequest, TResult>(string uri, TRequest data, string token = "");
 
-        Task<TResult> PostAsync<TRequest, TResult>(string uri, TRequest data);
+        Task<TResult> PutAsync<TResult>(string uri, TResult data, string token = "");
 
-        Task<TResult> PutAsync<TResult>(string uri, TResult data);
+        Task<TResult> PutAsync<TRequest, TResult>(string uri, TRequest data, string token = "");
 
-        Task<TResult> PutAsync<TRequest, TResult>(string uri, TRequest data);
-
-        Task DeleteAsync(string uri);
+        Task DeleteAsync(string uri, string token = "");
     }
 }
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs
@@ -26,9 +26,9 @@ public RequestProvider()
             _serializerSettings.Converters.Add(new StringEnumConverter());
         }
 
-        public async Task<TResult> GetAsync<TResult>(string uri)
+        public async Task<TResult> GetAsync<TResult>(string uri, string token = "")
         {
-            HttpClient httpClient = CreateHttpClient();
+            HttpClient httpClient = CreateHttpClient(token);
             HttpResponseMessage response = await httpClient.GetAsync(uri);
 
             await HandleResponse(response);
@@ -41,30 +41,14 @@ public async Task<TResult> GetAsync<TResult>(string uri)
             return result;
         }
 
-        public async Task<TResult> GetAsync<TResult>(string uri, string token)
+        public Task<TResult> PostAsync<TResult>(string uri, TResult data, string token = "")
         {
-            HttpClient httpClient = CreateHttpClient();
-            httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-            HttpResponseMessage response = await httpClient.GetAsync(uri);
-
-            await HandleResponse(response);
-
-            string serialized = await response.Content.ReadAsStringAsync();
-
-            TResult result = await Task.Run(() =>
-                JsonConvert.DeserializeObject<TResult>(serialized, _serializerSettings));
-
-            return result;
-        }
-
-        public Task<TResult> PostAsync<TResult>(string uri, TResult data)
-        {
-            return PostAsync<TResult, TResult>(uri, data);
+            return PostAsync<TResult, TResult>(uri, data, token);
         }
 
-        public async Task<TResult> PostAsync<TRequest, TResult>(string uri, TRequest data)
+        public async Task<TResult> PostAsync<TRequest, TResult>(string uri, TRequest data, string token = "")
         {
-            HttpClient httpClient = CreateHttpClient();
+            HttpClient httpClient = CreateHttpClient(token);
             string serialized = await Task.Run(() => JsonConvert.SerializeObject(data, _serializerSettings));
             HttpResponseMessage response = await httpClient.PostAsync(uri, new StringContent(serialized, Encoding.UTF8, "application/json"));
 
@@ -75,14 +59,14 @@ public async Task<TResult> PostAsync<TRequest, TResult>(string uri, TRequest dat
             return await Task.Run(() => JsonConvert.DeserializeObject<TResult>(responseData, _serializerSettings));
         }
 
-        public Task<TResult> PutAsync<TResult>(string uri, TResult data)
+        public Task<TResult> PutAsync<TResult>(string uri, TResult data, string token = "")
         {
-            return PutAsync<TResult, TResult>(uri, data);
+            return PutAsync<TResult, TResult>(uri, data, token);
         }
 
-        public async Task<TResult> PutAsync<TRequest, TResult>(string uri, TRequest data)
+        public async Task<TResult> PutAsync<TRequest, TResult>(string uri, TRequest data, string token = "")
         {
-            HttpClient httpClient = CreateHttpClient();
+            HttpClient httpClient = CreateHttpClient(token);
             string serialized = await Task.Run(() => JsonConvert.SerializeObject(data, _serializerSettings));
             HttpResponseMessage response = await httpClient.PutAsync(uri, new StringContent(serialized, Encoding.UTF8, "application/json"));
 
@@ -93,19 +77,24 @@ public async Task<TResult> PutAsync<TRequest, TResult>(string uri, TRequest data
             return await Task.Run(() => JsonConvert.DeserializeObject<TResult>(responseData, _serializerSettings));
         }
 
-        public async Task DeleteAsync(string uri)
+        public async Task DeleteAsync(string uri, string token = "")
         {
-            HttpClient httpClient = CreateHttpClient();
+            HttpClient httpClient = CreateHttpClient(token);
 
             await httpClient.DeleteAsync(uri);
         }
 
-        private HttpClient CreateHttpClient()
+        private HttpClient CreateHttpClient(string token = "")
         {
             var httpClient = new HttpClient();
 
             httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
 
+            if (!string.IsNullOrEmpty(token))
+            {
+                httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
+            }
+
             return httpClient;
         }
 
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs
@@ -1,4 +1,5 @@
-﻿using eShopOnContainers.Core.Models.Basket;
+﻿using eShopOnContainers.Core.Helpers;
+using eShopOnContainers.Core.Models.Basket;
 using eShopOnContainers.Core.Models.Catalog;
 using eShopOnContainers.Core.Models.User;
 using eShopOnContainers.Core.Services.Basket;
@@ -133,12 +134,14 @@ private void ReCalculateTotal()
             {
                 Total += (orderItem.Quantity * orderItem.UnitPrice);
             }
-            
+
+            var authToken = Settings.AuthAccessToken;
+
             _basketService.UpdateBasketAsync(new CustomerBasket
             {
                 BuyerId = _user.GuidUser,
                 Items = BasketItems.ToList()
-            });
+            }, authToken);
         }
 
         private void Checkout()
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
@@ -13,6 +13,7 @@
 using System.Collections.Generic;
 using eShopOnContainers.Core.Services.Basket;
 using eShopOnContainers.Core.Services.Order;
+using eShopOnContainers.Core.Helpers;
 
 namespace eShopOnContainers.Core.ViewModels
 {
@@ -94,8 +95,10 @@ public override async Task InitializeAsync(object navigationData)
 
         private async void Checkout()
         {
+            var authToken = Settings.AuthAccessToken;
+
             await _orderService.CreateOrderAsync(Order);
-            await _basketService.ClearBasketAsync(User.GuidUser);
+            await _basketService.ClearBasketAsync(User.GuidUser, authToken);
             
             await NavigationService.NavigateToAsync<MainViewModel>(new TabParameter { TabIndex = 1 });
             await NavigationService.RemoveLastFromBackStackAsync();
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs
@@ -186,9 +186,9 @@ private void Logout()
 
             if(!string.IsNullOrEmpty(logoutRequest))
             {
-                IsValid = false;
                 LoginUrl = logoutRequest;
                 Settings.AuthAccessToken = string.Empty;
+                IsValid = true;
             }
         }
 
@@ -209,6 +209,13 @@ private async void NavigateAsync(string url)
                     }
                 }
             }
+
+            /*
+            if(url.Contains("endsession"))
+            {
+                await SignInAsync();
+            }
+            */
         }
 
         private bool Validate()

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections;`
	`3`	`+using System.Windows.Input;`
`3`	`4`	`using Xamarin.Forms;`
`4`	`5`
`5`	`6`	`namespace eShopOnContainers.Core.Controls`
`@@ -12,6 +13,9 @@ public class BindablePicker : Picker`
`12`	`13`	`public static readonly BindableProperty SelectedItemProperty = BindableProperty.Create("SelectedItem",`
`13`	`14`	`typeof(object), typeof(BindablePicker), null, BindingMode.TwoWay, propertyChanged: OnSelectedItemChanged);`
`14`	`15`
	`16`	`+ public static readonly BindableProperty ItemSelectedCommandProperty = BindableProperty.Create("ItemSelectedCommand",`
	`17`	`+ typeof(ICommand), typeof(BindablePicker), null);`
	`18`	`+`
`15`	`19`	`public BindablePicker()`
`16`	`20`	`{`
`17`	`21`	`SelectedIndexChanged += (o, e) =>`
`@@ -23,6 +27,7 @@ public BindablePicker()`
`23`	`27`	`}`
`24`	`28`
`25`	`29`	`var index = 0;`
	`30`	`+`
`26`	`31`	`foreach (var item in ItemsSource)`
`27`	`32`	`{`
`28`	`33`	`if (index == SelectedIndex)`
`@@ -54,6 +59,12 @@ public Object SelectedItem`
`54`	`59`	`}`
`55`	`60`	`}`
`56`	`61`
	`62`	`+ public ICommand ItemSelectedCommand`
	`63`	`+ {`
	`64`	`+ get { return (ICommand)GetValue(ItemSelectedCommandProperty); }`
	`65`	`+ set { SetValue(ItemSelectedCommandProperty, value); }`
	`66`	`+ }`
	`67`	`+`
`57`	`68`	`public event EventHandler<SelectedItemChangedEventArgs> ItemSelected;`
`58`	`69`
`59`	`70`	`private void InternalUpdateSelectedIndex()`
`@@ -107,6 +118,11 @@ private static void OnSelectedItemChanged(BindableObject bindable, object oldVal`
`107`	`118`	`boundPicker.ItemSelected(boundPicker, new SelectedItemChangedEventArgs(newValue));`
`108`	`119`	`}`
`109`	`120`
	`121`	`+ if(boundPicker.ItemSelectedCommand != null)`
	`122`	`+ {`
	`123`	`+ boundPicker.ItemSelectedCommand.Execute(newValue);`
	`124`	`+ }`
	`125`	`+`
`110`	`126`	`boundPicker.InternalUpdateSelectedIndex();`
`111`	`127`	`}`
`112`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,4 +105,4 @@ public override string ToString()`
`105`	`105`	`return String.Format("Product Id: {0}, Quantity: {1}", ProductId, Quantity);`
`106`	`106`	`}`
`107`	`107`	`}`
`108`		`-}`
	`108`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -29,19 +29,29 @@ public async Task<CustomerBasket> GetBasketAsync(string guidUser, string token)`
`29`	`29`	`return MockCustomBasket;`
`30`	`30`	`}`
`31`	`31`
`32`		`- public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket)`
	`32`	`+ public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket, string token)`
`33`	`33`	`{`
`34`	`34`	`await Task.Delay(500);`
`35`	`35`
	`36`	`+ if (string.IsNullOrEmpty(token))`
	`37`	`+ {`
	`38`	`+ return new CustomerBasket();`
	`39`	`+ }`
	`40`	`+`
`36`	`41`	`MockCustomBasket = customerBasket;`
`37`	`42`
`38`	`43`	`return MockCustomBasket;`
`39`	`44`	`}`
`40`	`45`
`41`		`- public async Task ClearBasketAsync(string guidUser)`
	`46`	`+ public async Task ClearBasketAsync(string guidUser, string token)`
`42`	`47`	`{`
`43`	`48`	`await Task.Delay(500);`
`44`	`49`
	`50`	`+ if (string.IsNullOrEmpty(token))`
	`51`	`+ {`
	`52`	`+ return;`
	`53`	`+ }`
	`54`	`+`
`45`	`55`	`if (!string.IsNullOrEmpty(guidUser))`
`46`	`56`	`{`
`47`	`57`	`MockCustomBasket.Items.Clear();`
Original file line number	Diff line number	Diff line change
`@@ -39,26 +39,26 @@ public async Task<CustomerBasket> GetBasketAsync(string guidUser, string token)`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`- public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket)`
	`42`	`+ public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket, string token)`
`43`	`43`	`{`
`44`	`44`	`UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint);`
`45`	`45`
`46`	`46`	`string uri = builder.ToString();`
`47`	`47`
`48`		`- var result = await _requestProvider.PostAsync(uri, customerBasket);`
	`48`	`+ var result = await _requestProvider.PostAsync(uri, customerBasket, token);`
`49`	`49`
`50`	`50`	`return result;`
`51`	`51`	`}`
`52`	`52`
`53`		`- public async Task ClearBasketAsync(string guidUser)`
	`53`	`+ public async Task ClearBasketAsync(string guidUser, string token)`
`54`	`54`	`{`
`55`	`55`	`UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint);`
`56`	`56`
`57`	`57`	`builder.Path = guidUser;`
`58`	`58`
`59`	`59`	`string uri = builder.ToString();`
`60`	`60`
`61`		`- await _requestProvider.DeleteAsync(uri);`
	`61`	`+ await _requestProvider.DeleteAsync(uri, token);`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace eShopOnContainers.Core.Services.Basket`
`6`	`6`	`public interface IBasketService`
`7`	`7`	`{`
`8`	`8`	`Task<CustomerBasket> GetBasketAsync(string guidUser, string token);`
`9`		`- Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket);`
`10`		`- Task ClearBasketAsync(string guidUser);`
	`9`	`+ Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket, string token);`
	`10`	`+ Task ClearBasketAsync(string guidUser, string token);`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,18 +4,16 @@ namespace eShopOnContainers.Core.Services.RequestProvider`
`4`	`4`	`{`
`5`	`5`	`public interface IRequestProvider`
`6`	`6`	`{`
`7`		`- Task<TResult> GetAsync<TResult>(string uri);`
	`7`	`+ Task<TResult> GetAsync<TResult>(string uri, string token = "");`
`8`	`8`
`9`		`- Task<TResult> GetAsync<TResult>(string uri, string token);`
	`9`	`+ Task<TResult> PostAsync<TResult>(string uri, TResult data, string token = "");`
`10`	`10`
`11`		`- Task<TResult> PostAsync<TResult>(string uri, TResult data);`
	`11`	`+ Task<TResult> PostAsync<TRequest, TResult>(string uri, TRequest data, string token = "");`
`12`	`12`
`13`		`- Task<TResult> PostAsync<TRequest, TResult>(string uri, TRequest data);`
	`13`	`+ Task<TResult> PutAsync<TResult>(string uri, TResult data, string token = "");`
`14`	`14`
`15`		`- Task<TResult> PutAsync<TResult>(string uri, TResult data);`
	`15`	`+ Task<TResult> PutAsync<TRequest, TResult>(string uri, TRequest data, string token = "");`
`16`	`16`
`17`		`- Task<TResult> PutAsync<TRequest, TResult>(string uri, TRequest data);`
`18`		`-`
`19`		`- Task DeleteAsync(string uri);`
	`17`	`+ Task DeleteAsync(string uri, string token = "");`
`20`	`18`	`}`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ public RequestProvider()`
`26`	`26`	`_serializerSettings.Converters.Add(new StringEnumConverter());`
`27`	`27`	`}`
`28`	`28`
`29`		`- public async Task<TResult> GetAsync<TResult>(string uri)`
	`29`	`+ public async Task<TResult> GetAsync<TResult>(string uri, string token = "")`
`30`	`30`	`{`
`31`		`- HttpClient httpClient = CreateHttpClient();`
	`31`	`+ HttpClient httpClient = CreateHttpClient(token);`
`32`	`32`	`HttpResponseMessage response = await httpClient.GetAsync(uri);`
`33`	`33`
`34`	`34`	`await HandleResponse(response);`
`@@ -41,30 +41,14 @@ public async Task<TResult> GetAsync<TResult>(string uri)`
`41`	`41`	`return result;`
`42`	`42`	`}`
`43`	`43`
`44`		`- public async Task<TResult> GetAsync<TResult>(string uri, string token)`
	`44`	`+ public Task<TResult> PostAsync<TResult>(string uri, TResult data, string token = "")`
`45`	`45`	`{`
`46`		`- HttpClient httpClient = CreateHttpClient();`
`47`		`- httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);`
`48`		`- HttpResponseMessage response = await httpClient.GetAsync(uri);`
`49`		`-`
`50`		`- await HandleResponse(response);`
`51`		`-`
`52`		`- string serialized = await response.Content.ReadAsStringAsync();`
`53`		`-`
`54`		`- TResult result = await Task.Run(() =>`
`55`		`- JsonConvert.DeserializeObject<TResult>(serialized, _serializerSettings));`
`56`		`-`
`57`		`- return result;`
`58`		`- }`
`59`		`-`
`60`		`- public Task<TResult> PostAsync<TResult>(string uri, TResult data)`
`61`		`- {`
`62`		`- return PostAsync<TResult, TResult>(uri, data);`
	`46`	`+ return PostAsync<TResult, TResult>(uri, data, token);`
`63`	`47`	`}`
`64`	`48`
`65`		`- public async Task<TResult> PostAsync<TRequest, TResult>(string uri, TRequest data)`
	`49`	`+ public async Task<TResult> PostAsync<TRequest, TResult>(string uri, TRequest data, string token = "")`
`66`	`50`	`{`
`67`		`- HttpClient httpClient = CreateHttpClient();`
	`51`	`+ HttpClient httpClient = CreateHttpClient(token);`
`68`	`52`	`string serialized = await Task.Run(() => JsonConvert.SerializeObject(data, _serializerSettings));`
`69`	`53`	`HttpResponseMessage response = await httpClient.PostAsync(uri, new StringContent(serialized, Encoding.UTF8, "application/json"));`
`70`	`54`
`@@ -75,14 +59,14 @@ public async Task<TResult> PostAsync<TRequest, TResult>(string uri, TRequest dat`
`75`	`59`	`return await Task.Run(() => JsonConvert.DeserializeObject<TResult>(responseData, _serializerSettings));`
`76`	`60`	`}`
`77`	`61`
`78`		`- public Task<TResult> PutAsync<TResult>(string uri, TResult data)`
	`62`	`+ public Task<TResult> PutAsync<TResult>(string uri, TResult data, string token = "")`
`79`	`63`	`{`
`80`		`- return PutAsync<TResult, TResult>(uri, data);`
	`64`	`+ return PutAsync<TResult, TResult>(uri, data, token);`
`81`	`65`	`}`
`82`	`66`
`83`		`- public async Task<TResult> PutAsync<TRequest, TResult>(string uri, TRequest data)`
	`67`	`+ public async Task<TResult> PutAsync<TRequest, TResult>(string uri, TRequest data, string token = "")`
`84`	`68`	`{`
`85`		`- HttpClient httpClient = CreateHttpClient();`
	`69`	`+ HttpClient httpClient = CreateHttpClient(token);`
`86`	`70`	`string serialized = await Task.Run(() => JsonConvert.SerializeObject(data, _serializerSettings));`
`87`	`71`	`HttpResponseMessage response = await httpClient.PutAsync(uri, new StringContent(serialized, Encoding.UTF8, "application/json"));`
`88`	`72`
`@@ -93,19 +77,24 @@ public async Task<TResult> PutAsync<TRequest, TResult>(string uri, TRequest data`
`93`	`77`	`return await Task.Run(() => JsonConvert.DeserializeObject<TResult>(responseData, _serializerSettings));`
`94`	`78`	`}`
`95`	`79`
`96`		`- public async Task DeleteAsync(string uri)`
	`80`	`+ public async Task DeleteAsync(string uri, string token = "")`
`97`	`81`	`{`
`98`		`- HttpClient httpClient = CreateHttpClient();`
	`82`	`+ HttpClient httpClient = CreateHttpClient(token);`
`99`	`83`
`100`	`84`	`await httpClient.DeleteAsync(uri);`
`101`	`85`	`}`
`102`	`86`
`103`		`- private HttpClient CreateHttpClient()`
	`87`	`+ private HttpClient CreateHttpClient(string token = "")`
`104`	`88`	`{`
`105`	`89`	`var httpClient = new HttpClient();`
`106`	`90`
`107`	`91`	`httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));`
`108`	`92`
	`93`	`+ if (!string.IsNullOrEmpty(token))`
	`94`	`+ {`
	`95`	`+ httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);`
	`96`	`+ }`
	`97`	`+`
`109`	`98`	`return httpClient;`
`110`	`99`	`}`
`111`	`100`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using eShopOnContainers.Core.Models.Basket;`
	`1`	`+using eShopOnContainers.Core.Helpers;`
	`2`	`+using eShopOnContainers.Core.Models.Basket;`
`2`	`3`	`using eShopOnContainers.Core.Models.Catalog;`
`3`	`4`	`using eShopOnContainers.Core.Models.User;`
`4`	`5`	`using eShopOnContainers.Core.Services.Basket;`
`@@ -133,12 +134,14 @@ private void ReCalculateTotal()`
`133`	`134`	`{`
`134`	`135`	`Total += (orderItem.Quantity * orderItem.UnitPrice);`
`135`	`136`	`}`
`136`		`-`
	`137`	`+`
	`138`	`+ var authToken = Settings.AuthAccessToken;`
	`139`	`+`
`137`	`140`	`_basketService.UpdateBasketAsync(new CustomerBasket`
`138`	`141`	`{`
`139`	`142`	`BuyerId = _user.GuidUser,`
`140`	`143`	`Items = BasketItems.ToList()`
`141`		`- });`
	`144`	`+ }, authToken);`
`142`	`145`	`}`
`143`	`146`
`144`	`147`	`private void Checkout()`
Original file line number	Diff line number	Diff line change
`@@ -186,9 +186,9 @@ private void Logout()`
`186`	`186`
`187`	`187`	`if(!string.IsNullOrEmpty(logoutRequest))`
`188`	`188`	`{`
`189`		`- IsValid = false;`
`190`	`189`	`LoginUrl = logoutRequest;`
`191`	`190`	`Settings.AuthAccessToken = string.Empty;`
	`191`	`+ IsValid = true;`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`
`@@ -209,6 +209,13 @@ private async void NavigateAsync(string url)`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`	`}`
	`212`	`+`
	`213`	`+ /*`
	`214`	`+ if(url.Contains("endsession"))`
	`215`	`+ {`
	`216`	`+ await SignInAsync();`
	`217`	`+ }`
	`218`	`+ */`
`212`	`219`	`}`
`213`	`220`
`214`	`221`	`private bool Validate()`