From 35b32ca4a0c32a4e0356d8f6faf243dc74a6c69e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Lain=C3=A9?= <phenixdotnet@gmail.com>
Date: Sat, 18 Jul 2020 10:19:05 +0200
Subject: [PATCH] Added UWP support

---
 .../Okta.Xamarin.UWP/OidcClient.UWP.cs        |  43 +++++
 .../Okta.Xamarin.UWP/Okta.Xamarin.UWP.csproj  | 158 ++++++++++++++++++
 .../Okta.Xamarin.UWP/OktaConfig.UWP.cs        |  16 ++
 .../Properties/AssemblyInfo.cs                |  29 ++++
 .../Properties/Okta.Xamarin.UWP.rd.xml        |  33 ++++
 Okta.Xamarin/Okta.Xamarin.sln                 | 106 ++++++++++++
 Okta.Xamarin/Okta.Xamarin/OidcClient.cs       |  17 +-
 7 files changed, 398 insertions(+), 4 deletions(-)
 create mode 100644 Okta.Xamarin/Okta.Xamarin.UWP/OidcClient.UWP.cs
 create mode 100644 Okta.Xamarin/Okta.Xamarin.UWP/Okta.Xamarin.UWP.csproj
 create mode 100644 Okta.Xamarin/Okta.Xamarin.UWP/OktaConfig.UWP.cs
 create mode 100644 Okta.Xamarin/Okta.Xamarin.UWP/Properties/AssemblyInfo.cs
 create mode 100644 Okta.Xamarin/Okta.Xamarin.UWP/Properties/Okta.Xamarin.UWP.rd.xml

diff --git a/Okta.Xamarin/Okta.Xamarin.UWP/OidcClient.UWP.cs b/Okta.Xamarin/Okta.Xamarin.UWP/OidcClient.UWP.cs
new file mode 100644
index 00000000..265e675c
--- /dev/null
+++ b/Okta.Xamarin/Okta.Xamarin.UWP/OidcClient.UWP.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Threading.Tasks;
+using Windows.Security.Authentication.Web;
+
+namespace Okta.Xamarin
+{
+	public partial class OidcClient : IOidcClient
+    {
+		/// <summary>
+		/// Creates a new UWO Okta OidcClient based on the specified <see cref="OktaConfig"/>
+		/// </summary>
+		/// <param name="config">The <see cref="OktaConfig"/> to use for this client.  The config must be valid at the time this is called.</param>
+		public OidcClient(IOktaConfig config)
+		{
+			this.Config = config;
+			validator.Validate(Config);
+		}
+
+		private async Task LaunchBrowserAsync(string url)
+		{
+			var appUri = WebAuthenticationBroker.GetCurrentApplicationCallbackUri().AbsoluteUri;
+
+			var result = await WebAuthenticationBroker.AuthenticateAsync(
+										WebAuthenticationOptions.None,
+										new Uri(url), 
+										new Uri(appUri));
+			if (result.ResponseStatus == WebAuthenticationStatus.Success)
+				OidcClient.CaptureRedirectUrl(new Uri(result.ResponseData));
+			else if (result.ResponseStatus == WebAuthenticationStatus.UserCancel)
+				throw new TaskCanceledException(result.ResponseData);
+			else
+				throw new Exception(result.ResponseData);
+		}
+
+		/// <summary>
+		/// Called by the cross-platform code to close the browser used for login after the redirect.  On UWP this is handled automatically, so an implementation is not needed.
+		/// </summary>
+		private void CloseBrowser()
+		{
+			// not needed on UWP
+		}
+	}
+}
diff --git a/Okta.Xamarin/Okta.Xamarin.UWP/Okta.Xamarin.UWP.csproj b/Okta.Xamarin/Okta.Xamarin.UWP/Okta.Xamarin.UWP.csproj
new file mode 100644
index 00000000..70fc64fa
--- /dev/null
+++ b/Okta.Xamarin/Okta.Xamarin.UWP/Okta.Xamarin.UWP.csproj
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{772D0C03-592E-4478-A25F-E336BE66E10F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Okta.Xamarin.UWP</RootNamespace>
+    <AssemblyName>Okta.Xamarin.UWP</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
+    <PlatformTarget>ARM</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
+    <PlatformTarget>ARM</PlatformTarget>
+    <OutputPath>bin\ARM\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
+    <PlatformTarget>ARM64</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
+    <PlatformTarget>ARM64</PlatformTarget>
+    <OutputPath>bin\ARM64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Okta.Xamarin\OidcClient.cs">
+      <Link>OidcClient.cs</Link>
+    </Compile>
+    <Compile Include="..\Okta.Xamarin\OktaConfig.cs">
+      <Link>OktaConfig.cs</Link>
+    </Compile>
+    <Compile Include="OktaConfig.UWP.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Properties\Okta.Xamarin.UWP.rd.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.2.10</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Okta.Xamarin\Okta.Xamarin.csproj">
+      <Project>{49cd54c4-eb9a-423d-a2e8-885d80744659}</Project>
+      <Name>Okta.Xamarin</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="OidcClient.UWP.cs" />
+  </ItemGroup>
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Okta.Xamarin/Okta.Xamarin.UWP/OktaConfig.UWP.cs b/Okta.Xamarin/Okta.Xamarin.UWP/OktaConfig.UWP.cs
new file mode 100644
index 00000000..d1d70023
--- /dev/null
+++ b/Okta.Xamarin/Okta.Xamarin.UWP/OktaConfig.UWP.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Okta.Xamarin
+{
+	/// <summary>
+	/// Stores configuration for the Okta UWP OIDC client
+	/// </summary>
+	public partial class OktaConfig : IOktaConfig
+    {
+		
+    }
+}
diff --git a/Okta.Xamarin/Okta.Xamarin.UWP/Properties/AssemblyInfo.cs b/Okta.Xamarin/Okta.Xamarin.UWP/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..72e3324b
--- /dev/null
+++ b/Okta.Xamarin/Okta.Xamarin.UWP/Properties/AssemblyInfo.cs
@@ -0,0 +1,29 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Okta.Xamarin.UWP")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Okta")]
+[assembly: AssemblyProduct("Okta.Xamarin.UWP")]
+[assembly: AssemblyCopyright("Copyright ©  2019 Okta")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Okta.Xamarin/Okta.Xamarin.UWP/Properties/Okta.Xamarin.UWP.rd.xml b/Okta.Xamarin/Okta.Xamarin.UWP/Properties/Okta.Xamarin.UWP.rd.xml
new file mode 100644
index 00000000..5e3bb84d
--- /dev/null
+++ b/Okta.Xamarin/Okta.Xamarin.UWP/Properties/Okta.Xamarin.UWP.rd.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file contains Runtime Directives, specifications about types your application accesses
+    through reflection and other dynamic code patterns. Runtime Directives are used to control the
+    .NET Native optimizer and ensure that it does not remove code accessed by your library. If your
+    library does not do any reflection, then you generally do not need to edit this file. However,
+    if your library reflects over types, especially types passed to it or derived from its types,
+    then you should write Runtime Directives.
+
+    The most common use of reflection in libraries is to discover information about types passed
+    to the library. Runtime Directives have three ways to express requirements on types passed to
+    your library.
+
+    1.  Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
+        Use these directives to reflect over types passed as a parameter.
+
+    2.  SubTypes
+        Use a SubTypes directive to reflect over types derived from another type.
+
+    3.  AttributeImplies
+        Use an AttributeImplies directive to indicate that your library needs to reflect over
+        types or methods decorated with an attribute.
+
+    For more information on writing Runtime Directives for libraries, please visit
+    https://go.microsoft.com/fwlink/?LinkID=391919
+-->
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Library Name="Okta.Xamarin.UWP">
+
+  	<!-- add directives for your library here -->
+
+  </Library>
+</Directives>
diff --git a/Okta.Xamarin/Okta.Xamarin.sln b/Okta.Xamarin/Okta.Xamarin.sln
index eb0bb5aa..c6302d6a 100644
--- a/Okta.Xamarin/Okta.Xamarin.sln
+++ b/Okta.Xamarin/Okta.Xamarin.sln
@@ -24,79 +24,185 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{80
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D2A7ED8B-B27B-4EA6-88FF-CF76C87D4FAF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Okta.Xamarin.UWP", "Okta.Xamarin.UWP\Okta.Xamarin.UWP.csproj", "{772D0C03-592E-4478-A25F-E336BE66E10F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Android = Debug|Android
 		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
 		Debug|iPhone = Debug|iPhone
 		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Android = Release|Android
 		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
 		Release|iPhone = Release|iPhone
 		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|Android.ActiveCfg = Debug|Any CPU
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|x64.Build.0 = Debug|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Debug|x86.Build.0 = Debug|Any CPU
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|Android.ActiveCfg = Release|Any CPU
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|Android.Build.0 = Release|Any CPU
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|ARM.Build.0 = Release|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|ARM64.Build.0 = Release|Any CPU
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|iPhone.Build.0 = Release|Any CPU
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|x64.ActiveCfg = Release|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|x64.Build.0 = Release|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|x86.ActiveCfg = Release|Any CPU
+		{D698F0D7-DFBA-4AE3-9ABE-219D87B1DFEE}.Release|x86.Build.0 = Release|Any CPU
 		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Debug|Android.ActiveCfg = Debug|Any CPU
 		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Debug|Android.Build.0 = Debug|Any CPU
 		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Debug|ARM.Build.0 = Debug|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Debug|x64.Build.0 = Debug|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Debug|x86.Build.0 = Debug|Any CPU
 		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|Android.ActiveCfg = Release|Any CPU
 		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|Android.Build.0 = Release|Any CPU
 		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|ARM.ActiveCfg = Release|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|ARM.Build.0 = Release|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|ARM64.Build.0 = Release|Any CPU
 		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|iPhone.Build.0 = Release|Any CPU
 		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|x64.ActiveCfg = Release|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|x64.Build.0 = Release|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|x86.ActiveCfg = Release|Any CPU
+		{727DA7A1-7D67-4402-82AD-3F43FAC34BF9}.Release|x86.Build.0 = Release|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|Android.ActiveCfg = Debug|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|Android.Build.0 = Debug|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|ARM.Build.0 = Debug|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|x64.Build.0 = Debug|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Debug|x86.Build.0 = Debug|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|Android.ActiveCfg = Release|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|Android.Build.0 = Release|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|ARM.ActiveCfg = Release|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|ARM.Build.0 = Release|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|ARM64.Build.0 = Release|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|iPhone.Build.0 = Release|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|x64.ActiveCfg = Release|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|x64.Build.0 = Release|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|x86.ActiveCfg = Release|Any CPU
+		{49CD54C4-EB9A-423D-A2E8-885D80744659}.Release|x86.Build.0 = Release|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|Android.ActiveCfg = Debug|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|Android.Build.0 = Debug|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|x64.Build.0 = Debug|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Debug|x86.Build.0 = Debug|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|Android.ActiveCfg = Release|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|Android.Build.0 = Release|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|ARM.Build.0 = Release|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|ARM64.Build.0 = Release|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|iPhone.Build.0 = Release|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|x64.ActiveCfg = Release|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|x64.Build.0 = Release|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|x86.ActiveCfg = Release|Any CPU
+		{6BC0D61C-8B1E-4AE3-A718-8118CF5F68DD}.Release|x86.Build.0 = Release|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|Android.ActiveCfg = Debug|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|Android.Build.0 = Debug|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|ARM.ActiveCfg = Debug|ARM
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|ARM.Build.0 = Debug|ARM
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|ARM64.Build.0 = Debug|ARM64
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|x64.ActiveCfg = Debug|x64
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|x64.Build.0 = Debug|x64
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|x86.ActiveCfg = Debug|x86
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Debug|x86.Build.0 = Debug|x86
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|Android.ActiveCfg = Release|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|Android.Build.0 = Release|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|ARM.ActiveCfg = Release|ARM
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|ARM.Build.0 = Release|ARM
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|ARM64.Build.0 = Release|ARM64
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|iPhone.Build.0 = Release|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|x64.ActiveCfg = Release|x64
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|x64.Build.0 = Release|x64
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|x86.ActiveCfg = Release|x86
+		{772D0C03-592E-4478-A25F-E336BE66E10F}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Okta.Xamarin/Okta.Xamarin/OidcClient.cs b/Okta.Xamarin/Okta.Xamarin/OidcClient.cs
index fed4e220..abf08341 100644
--- a/Okta.Xamarin/Okta.Xamarin/OidcClient.cs
+++ b/Okta.Xamarin/Okta.Xamarin/OidcClient.cs
@@ -44,16 +44,25 @@ public partial class OidcClient : IOidcClient
 		/// Start the authorization flow.  This is an async method and should be awaited.
 		/// </summary>
 		/// <returns>In case of successful authorization, this Task will return a valid <see cref="StateManager"/>.  Clients are responsible for further storage and maintenance of the manager.</returns>
-		public Task<StateManager> SignInWithBrowserAsync()
+		public
+#if WINDOWS_UWP
+			async
+#endif
+			Task<StateManager> SignInWithBrowserAsync()
 		{
 			validator.Validate(Config);
 
 			currentTask = new TaskCompletionSource<StateManager>();
 			GenerateStateCodeVerifierAndChallenge();
 			currentAuthenticatorbyState.Add(State, this);
-			this.LaunchBrowser(this.GenerateAuthorizeUrl());
 
+#if !WINDOWS_UWP
+			this.LaunchBrowser(this.GenerateAuthorizeUrl());
 			return currentTask.Task;
+#else
+			await this.LaunchBrowserAsync(this.GenerateAuthorizeUrl()).ConfigureAwait(false);
+			return await currentTask.Task;
+#endif
 		}
 
 		/// <summary>
@@ -232,11 +241,11 @@ private string GenerateAuthorizeUrl()
 			string url = baseUri.AbsoluteUri;
 
 			// remove fragment if any
-			if (url.Contains('#'))
+			if (url.Contains("#"))
 				url = url.Substring(0, url.IndexOf('#'));
 
 			// if url already has a query, then append to it
-			if (!baseUri.PathAndQuery.Contains('?'))
+			if (!baseUri.PathAndQuery.Contains("?"))
 				url += "?";
 			else
 				url += "&";