Integrated with user API

Refactoring Mocks and App

Author: jsuarezruiz

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Extensions/ObservableExtension.cs

@@ -9,12 +9,19 @@ public static ObservableCollection<T> ToObservableCollection<T>(this IEnumerable
         {
             ObservableCollection<T> collection = new ObservableCollection<T>();
 
-            foreach (T item in source)
+            try
             {
-                collection.Add(item);
-            }
+                foreach (T item in source)
+                {
+                    collection.Add(item);
+                }
 
-            return collection;
+                return collection;
+            }
+            catch
+            {
+                return collection;
+            }
         }
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs

@@ -35,6 +35,8 @@ public string BaseEndpoint
 
         public string IdentityEndpoint { get; set; }
 
+        public string UserInfoEndpoint { get; set; }
+
         public string LogoutEndpoint { get; set; }
 
         public string IdentityCallback { get; set; }
@@ -46,6 +48,7 @@ private void UpdateEndpoint(string baseEndpoint)
             OrdersEndpoint = string.Format("{0}:5102", baseEndpoint);
             BasketEndpoint = string.Format("{0}:5103", baseEndpoint);
             IdentityEndpoint = string.Format("{0}:5105/connect/authorize", baseEndpoint);
+            UserInfoEndpoint = string.Format("{0}:5105/connect/userinfo", baseEndpoint);
             LogoutEndpoint = string.Format("{0}:5105/connect/endsession", baseEndpoint);
             IdentityCallback = "http://eshopxamarin/callback.html";
         }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/NumericHelper.cs

@@ -1,105 +1,23 @@
-using eShopOnContainers.Core.Helpers;
-using eShopOnContainers.Core.ViewModels.Base;
-using eShopOnContainers.ViewModels.Base;
-using System;
-using System.Collections.ObjectModel;
-using Xamarin.Forms;
+using System;
 
 namespace eShopOnContainers.Core.Models.Basket
 {
-    public class BasketItem : ExtendedBindableObject
+    public class BasketItem 
     {
-        private string _id;
-        private string _productId;
-        private string _productName;
-        private decimal _unitPrice;
-        private int _quantity;
-        private string _pictureUrl;
-        private ObservableCollection<int> _numbers;
+        public string Id { get; set; }
+       
+        public string ProductId { get; set; }
 
-        public BasketItem()
-        {
-            Numbers = NumericHelper.GetNumericList();
-        }
+        public string ProductName { get; set; }
 
-        public string Id
-        {
-            get { return _id; }
-            set
-            {
-                _id = value;
-                RaisePropertyChanged(() => Id);
-            }
-        }
+        public decimal UnitPrice { get; set; }
 
-        public string ProductId
-        {
-            get { return _productId; }
-            set
-            {
-                _productId = value;
-                RaisePropertyChanged(() => ProductId);
-            }
-        }
+        public int Quantity { get; set; }
 
-        public string ProductName
-        {
-            get { return _productName; }
-            set
-            {
-                _productName = value;
-                RaisePropertyChanged(() => ProductName);
-            }
-        }
-
-        public decimal UnitPrice
-        {
-            get { return _unitPrice; }
-            set
-            {
-                _unitPrice = value;
-                RaisePropertyChanged(() => UnitPrice);
-            }
-        }
-
-        public int Quantity
-        {
-            get { return _quantity; }
-            set
-            {
-                if (_quantity != value)
-                {
-                    _quantity = value;
-                    RaisePropertyChanged(() => Quantity);
-                    RaisePropertyChanged(() => Total);
-
-                    MessagingCenter.Send(this, MessengerKeys.UpdateProduct);
-                }
-            }
-        }
-
-        public string PictureUrl
-        {
-            get { return _pictureUrl; }
-            set
-            {
-                _pictureUrl = value;
-                RaisePropertyChanged(() => PictureUrl);
-            }
-        }
+        public string PictureUrl { get; set; }
 
         public decimal Total { get { return Quantity * UnitPrice; } }
 
-        public ObservableCollection<int> Numbers
-        {
-            get { return _numbers; }
-            set
-            {
-                _numbers = value;
-                RaisePropertyChanged(() => Numbers);
-            }
-        }
-
         public override string ToString()
         {
             return String.Format("Product Id: {0}, Quantity: {1}", ProductId, Quantity);

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs

@@ -1,109 +1,18 @@
-using eShopOnContainers.Core.Helpers;
-using eShopOnContainers.ViewModels.Base;
-using System;
-using System.Collections.ObjectModel;
+using System;
 
 namespace eShopOnContainers.Core.Models.Orders
 {
-    public class OrderItem : ExtendedBindableObject
+    public class OrderItem
     {
-        private string _pictureUrl;
-        private string _productId;
-        private Guid _orderId;
-        private string _productName;
-        private decimal _unitPrice;
-        private int _quantity;
-        private decimal _discount;
-        private ObservableCollection<int> _numbers;
-
-        public OrderItem()
-        {
-            Numbers = NumericHelper.GetNumericList();
-        }
-
-        public string ProductId
-        {
-            get { return _productId; }
-            set
-            {
-                _productId = value;
-                RaisePropertyChanged(() => ProductId);
-            }
-        }
-
-        public Guid OrderId
-        {
-            get { return _orderId; }
-            set
-            {
-                _orderId = value;
-                RaisePropertyChanged(() => OrderId);
-            }
-        }
-
-        public string ProductName
-        {
-            get { return _productName; }
-            set
-            {
-                _productName = value;
-                RaisePropertyChanged(() => ProductName);
-            }
-        }
-
-        public decimal UnitPrice
-        {
-            get { return _unitPrice; }
-            set
-            {
-                _unitPrice = value;
-                RaisePropertyChanged(() => UnitPrice);
-            }
-        }
-
-        public int Quantity
-        {
-            get { return _quantity; }
-            set
-            {
-                _quantity = value;
-                RaisePropertyChanged(() => Quantity);
-                RaisePropertyChanged(() => Total);
-            }
-        }
-
-        public decimal Discount
-        {
-            get { return _discount; }
-            set
-            {
-                _discount = value;
-                RaisePropertyChanged(() => Discount);
-            }
-        }
-
+        public Guid ProductId { get; set; }
+        public Guid OrderId { get; set; }
+        public decimal UnitPrice { get; set; }
+        public string ProductName { get; set; }
+        public string PictureUrl { get; set; }
+        public int Quantity { get; set; }
+        public decimal Discount { get; set; }
         public decimal Total { get { return Quantity * UnitPrice; } }
 
-        public string PictureUrl
-        {
-            get { return _pictureUrl; }
-            set
-            {
-                _pictureUrl = value;
-                RaisePropertyChanged(() => PictureUrl);
-            }
-        }
-
-        public ObservableCollection<int> Numbers
-        {
-            get { return _numbers; }
-            set
-            {
-                _numbers = value;
-                RaisePropertyChanged(() => Numbers);
-            }
-        }
-
         public override string ToString()
         {
             return String.Format("Product Id: {0}, Quantity: {1}", ProductId, Quantity);

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/OrderItem.cs

@@ -3,7 +3,6 @@
 
 namespace eShopOnContainers.Core.Models.User
 {
-
     public class PaymentInfo
     {
         public Guid Id { get; set; }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/User/PaymentInfo.cs

@@ -0,0 +1,55 @@
+using Newtonsoft.Json;
+
+namespace eShopOnContainers.Core.Models.User
+{
+    public class UserInfo
+    {
+        [JsonProperty("sub")]
+        public string UserId { get; set; }
+
+        [JsonProperty("preferred_username")]
+        public string PreferredUsername { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("last_name")]
+        public string LastName { get; set; }
+
+        [JsonProperty("card_number")]
+        public string CardNumber { get; set; }
+
+        [JsonProperty("card_holder")]
+        public string CardHolder { get; set; }
+
+        [JsonProperty("card_security_number")]
+        public string CardSecurityNumber { get; set; }
+
+        [JsonProperty("address_city")]
+        public string Address { get; set; }
+
+        [JsonProperty("address_country")]
+        public string Country { get; set; }
+
+        [JsonProperty("address_state")]
+        public string State { get; set; }
+
+        [JsonProperty("address_street")]
+        public string Street { get; set; }
+
+        [JsonProperty("address_zip_code")]
+        public string ZipCode { get; set; }
+
+        [JsonProperty("email")]
+        public string Email { get; set; }
+
+        [JsonProperty("email_verified")]
+        public bool EmailVerified { get; set; }
+
+        [JsonProperty("phone_number")]
+        public string PhoneNumber { get; set; }
+
+        [JsonProperty("phone_number_verified")]
+        public bool PhoneNumberVerified { get; set; }
+    }
+}

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/User/UserInfo.cs

@@ -12,8 +12,8 @@ public class BasketMockService : IBasketService
             BuyerId = "9245fe4a-d402-451c-b9ed-9c1a04247482",
             Items = new List<BasketItem>
                 {
-                    new BasketItem { Id = "1", PictureUrl = Device.OS != TargetPlatform.Windows ? "fake_product_01.png" : "Assets/fake_product_01.png", ProductId = "1", ProductName = ".NET Bot Blue Sweatshirt (M)", Quantity = 1, UnitPrice = 19.50M },
-                    new BasketItem { Id = "2", PictureUrl = Device.OS != TargetPlatform.Windows ? "fake_product_04.png" : "Assets/fake_product_04.png", ProductId = "4", ProductName = ".NET Black Cupt", Quantity = 1, UnitPrice = 17.00M }
+                    new BasketItem { Id = "1", PictureUrl = Device.OS != TargetPlatform.Windows ? "fake_product_01.png" : "Assets/fake_product_01.png", ProductId = Common.Common.MockCatalogItemId01.ToString(), ProductName = ".NET Bot Blue Sweatshirt (M)", Quantity = 1, UnitPrice = 19.50M },
+                    new BasketItem { Id = "2", PictureUrl = Device.OS != TargetPlatform.Windows ? "fake_product_04.png" : "Assets/fake_product_04.png", ProductId = Common.Common.MockCatalogItemId04.ToString(), ProductName = ".NET Black Cupt", Quantity = 1, UnitPrice = 17.00M }
                 }
         };