Merge remote-tracking branch 'origin/xamarin-fix-uwp-login' into dev

src/BuildingBlocks/Resilience/HttpResilience/ResilientHttpClient.cs

@@ -14,6 +14,7 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.HttpResilience
     /// <summary>
     /// HttpClient wrapper that integrates Retry and Circuit
     /// breaker policies when invoking HTTP services. 
+    /// Based on Polly library: https://github.com/App-vNext/Polly
     /// </summary>
     public class ResilientHttpClient : IHttpClient
     {

src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml

@@ -106,8 +106,9 @@
             <converters:InverseBoolConverter x:Key="InverseBoolConverter" />
             <converters:ItemsToHeightConverter x:Key="ItemsToHeightConverter" />
             <converters:ToUpperConverter x:Key="ToUpperConverter" />
-			<converters:WebNavigatingEventArgsConverter x:Key="WebNavigatingEventArgsConverter" />
+            <converters:WebNavigatingEventArgsConverter x:Key="WebNavigatingEventArgsConverter" />
-            
+            <converters:WebNavigatedEventArgsConverter x:Key="WebNavigatedEventArgsConverter" />
+
             <!-- STYLES -->
             <Style x:Key="EntryStyle"
                    TargetType="{x:Type Entry}">

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Converters/WebNavigatedEventArgsConverter.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Globalization;
+using Xamarin.Forms;
+
+namespace eShopOnContainers.Core.Converters
+{
+	public class WebNavigatedEventArgsConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			var eventArgs = value as WebNavigatedEventArgs;
+			if (eventArgs == null)
+				throw new ArgumentException("Expected WebNavigatedEventArgs as value", "value");
+
+			return eventArgs.Url;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

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

@@ -60,7 +60,7 @@
             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";
+            IdentityCallback = string.Format("{0}:5105/xamarincallback", baseEndpoint);
             LogoutCallback = string.Format("{0}:5105/Account/Redirecting", baseEndpoint);
         }
     }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs

@@ -221,14 +221,16 @@ namespace eShopOnContainers.Core.ViewModels
 
         private async Task NavigateAsync(string url)
         {
-            if (url.Equals(GlobalSetting.Instance.LogoutCallback))
+            var unescapedUrl = System.Net.WebUtility.UrlDecode(url);
+
+            if (unescapedUrl.Equals(GlobalSetting.Instance.LogoutCallback))
             {
                 Settings.AuthAccessToken = string.Empty;
                 Settings.AuthIdToken = string.Empty;
                 IsLogin = false;
                 LoginUrl = _identityService.CreateAuthorizeRequest();
             }
-            else if (url.Contains(GlobalSetting.Instance.IdentityCallback))
+            else if (unescapedUrl.Contains(GlobalSetting.Instance.IdentityCallback))
             {
                 var authResponse = new AuthorizeResponse(url);
 

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml

@@ -313,10 +313,26 @@
                   AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
                   AbsoluteLayout.LayoutFlags="All">
                     <WebView.Behaviors>
-						<behaviors:EventToCommandBehavior
+                        <OnPlatform x:TypeArguments="Behavior">
-							EventName="Navigating"
+                            <OnPlatform.Android>
-							EventArgsConverter="{StaticResource WebNavigatingEventArgsConverter}"
+                                <behaviors:EventToCommandBehavior
-							Command="{Binding NavigateCommand}" />
+							        EventName="Navigating"
+							        EventArgsConverter="{StaticResource WebNavigatingEventArgsConverter}"
+							        Command="{Binding NavigateCommand}" />
+                            </OnPlatform.Android>
+                            <OnPlatform.iOS>
+                                <behaviors:EventToCommandBehavior
+							        EventName="Navigating"
+							        EventArgsConverter="{StaticResource WebNavigatingEventArgsConverter}"
+							        Command="{Binding NavigateCommand}" />
+                            </OnPlatform.iOS>
+                            <OnPlatform.WinPhone>
+                                <behaviors:EventToCommandBehavior
+							        EventName="Navigated"
+							        EventArgsConverter="{StaticResource WebNavigatedEventArgsConverter}"
+							        Command="{Binding NavigateCommand}" />
+                            </OnPlatform.WinPhone>
+                        </OnPlatform>
                     </WebView.Behaviors>
                 </WebView>
             </AbsoluteLayout>

src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj

@@ -58,6 +58,7 @@
     <Compile Include="Converters\ItemsToHeightConverter.cs" />
     <Compile Include="Converters\ItemTappedEventArgsConverter.cs" />
     <Compile Include="Converters\ToUpperConverter.cs" />
+    <Compile Include="Converters\WebNavigatedEventArgsConverter.cs" />
     <Compile Include="Effects\LineColorEffect.cs" />
     <Compile Include="Exceptions\ServiceAuthenticationException.cs" />
     <Compile Include="Extensions\AnimationExtension.cs" />

src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Package.appxmanifest

@@ -24,5 +24,6 @@
   </Applications>
   <Capabilities>
     <Capability Name="internetClient" />
+    <Capability Name="privateNetworkClientServer" />
   </Capabilities>
 </Package>