Merge pull request #111 from Azure-Samples/tibre/droidCodeActivity

Adding Activity in code

Author: Tiago Brenck

README.md

@@ -84,39 +84,40 @@ Your native application registration should include the following information:
 #### [OPTIONAL] Step 6a: Configure the iOS project with your app's return URI
  1. Open the `UserDetailsClient.iOS\info.plist` file in a text editor (opening it in Visual Studio won't work for this step as you need to edit the text)
  1. In the URL types, section, add an entry for the authorization schema used in your redirectUri.
+
  ```xml
  <array>
   <dict>
     <key>CFBundleURLName</key>
     <string>active-directory-b2c-xamarin-native</string>
     <key>CFBundleURLSchemes</key>
     <array>
-      <string>msal[APPLICATIONID]</string>
+      <string>msal[ClientID]</string>
     </array>
     <key>CFBundleTypeRole</key>
     <string>None</string>
   </dict>
 </array>
  ```
- where `[APPLICATIONID]` is the identifier you copied in step 2. Save the file.
+ 
+ where `[ClientID]` is the identifier you copied in step 2. Save the file.
 
 #### [OPTIONAL] Step 6b: Configure the Android project with your app's return URI
 
- 1. Open the `UserDetailsClient.Droid\Properties\AndroidManifest.xml`
- 1. Add or modify the `<application>` element as in the following
- ```xml
-<application>
-  <activity android:name="microsoft.identity.client.BrowserTabActivity">
-    <intent-filter>
-      <action android:name="android.intent.action.VIEW" />
-      <category android:name="android.intent.category.DEFAULT" />
-      <category android:name="android.intent.category.BROWSABLE" />
-      <data android:scheme="msal[APPLICATIONID]" android:host="auth" />
-    </intent-filter>
-  </activity>
-</application>
- ```
- where `[APPLICATIONID]` is the identifier you copied in step 2. Save the file.
+1. Open the `UserDetailsClient.Droid\MsalActivity.cs` file.
+1. Replace `[ClientID]` with the identifier you copied in step 2.
+1. Save the file.
+
+```csharp
+  [Activity]
+  [IntentFilter(new[] { Intent.ActionView },
+        Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault },
+        DataHost = "auth",
+        DataScheme = "msal[ClientID]")]
+  public class MsalActivity : BrowserTabActivity
+  {
+  }
+```
 
 ### Step 7: Run the sample
 
@@ -128,8 +129,8 @@ Your native application registration should include the following information:
 
 #### Running in an Android Emulator
 
-If you have issues with the Android emulator, please refer to [this document](https://github.com/Azure-Samples/active-directory-general-docs/blob/master/AndroidEmulator.md) for instructions on how to ensure that your emulator supports the features required by MSAL. 
- 
+If you have issues with the Android emulator, please refer to [this document](https://github.com/Azure-Samples/active-directory-general-docs/blob/master/AndroidEmulator.md) for instructions on how to ensure that your emulator supports the features required by MSAL.
+
 ## About the code
 
 The structure of the solution is straightforward. All the application logic and UX reside in UserDetailsClient (portable).
@@ -169,11 +170,13 @@ AuthenticationResult ar = await App.PCA.AcquireTokenInteractive(App.Scopes)
                                         .WithParentActivityOrWindow(App.ParentActivityOrWindow)
                                         .ExecuteAsync();
 ```
-The `Scopes` parameter indicates the permissions the application needs to gain access to the data requested through subsequent web API call (in this sample, encapsulated in `OnCallApi`). Scopes should be input in the following format: `https://{tenant_name}.onmicrosoft.com/{app_name}/{scope_value}` 
+
+The `Scopes` parameter indicates the permissions the application needs to gain access to the data requested through subsequent web API call (in this sample, encapsulated in `OnCallApi`). Scopes should be input in the following format: `https://{tenant_name}.onmicrosoft.com/{app_name}/{scope_value}`
 
 The `.WithParentActivityOrWindow()` is used in Android to tie the authentication flow to the current activity, and is ignored on all other platforms. For more platform specific considerations, please see below.
 
-The sign out logic is very simple. In this sample we have just one user, however we are demonstrating a more generic sign out logic that you can apply if you have multiple concurrent users and you want to clear up the entire cache.               
+The sign out logic is very simple. In this sample we have just one user, however we are demonstrating a more generic sign out logic that you can apply if you have multiple concurrent users and you want to clear up the entire cache.
+
 ```csharp
 var accounts = await App.GetAccountsAsync();
 foreach (var account in accounts.ToArray())
@@ -196,23 +199,26 @@ AuthenticationContinuationHelper.SetAuthenticationContinuationEventArgs(requestC
 That line ensures that control goes back to MSAL once the interactive portion of the authentication flow ended.
 
 In `OnCreate`, we need to add the following assignment:
+
 ```csharp
 App.ParentActivityOrWindow = this; // This activity
 ```
-That code ensures that the authentication flows occur in the context of the current activity.  
 
+That code ensures that the authentication flows occur in the context of the current activity.  
 
 ### iOS specific considerations
 
 UserDetailsClient.iOS only requires one extra line, in AppDelegate.cs.
-You need to ensure that the OpenUrl handler looks as ine snippet below:
+You need to ensure that the OpenUrl handler looks as the snippet below:
+
 ```csharp
 public override bool OpenUrl(UIApplication app, NSUrl url, NSDictionary options)
 {
     AuthenticationContinuationHelper.SetAuthenticationContinuationEventArgs(url);
     return true;
 }
 ```
+
 Once again, this logic is meant to ensure that once the interactive portion of the authentication flow is concluded, the flow goes back to MSAL.
 
 In order to make the token cache work and have the `AcquireTokenSilentAsync` work multiple steps must be followed :
@@ -221,7 +227,6 @@ In order to make the token cache work and have the `AcquireTokenSilentAsync` wor
 1. In your project options, on iOS **Bundle Signing view**, select your `Entitlements.plist` file for the Custom Entitlements field.
 1. When signing a certificate, make sure XCode uses the same Apple Id. 
 
-
 ## More information
 
 For more information on Azure B2C, see [the Azure AD B2C documentation homepage](http://aka.ms/aadb2c). 

UserDetailsClient/UserDetailsClient.Droid/MsalActivity.cs

@@ -0,0 +1,19 @@
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+using Microsoft.Identity.Client;
+
+namespace UserDetailsClient.Droid
+{
+    [Activity]
+    [IntentFilter(new[] { Intent.ActionView },
+        Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault },
+        DataHost = "auth",
+        DataScheme = "msal90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6")]
+    public class MsalActivity : BrowserTabActivity
+    {
+    }
+}

UserDetailsClient/UserDetailsClient.Droid/Properties/AndroidManifest.xml

@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="UserDetailsClient.Droid">
 	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<application>
-		<activity android:name="microsoft.identity.client.BrowserTabActivity">
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:scheme="msal90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6" android:host="auth" />
-			</intent-filter>
-		</activity>
+		
 	</application>
 </manifest>

UserDetailsClient/UserDetailsClient.Droid/UserDetailsClient.Droid.csproj

@@ -18,7 +18,7 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
-    <AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis>
+    <AndroidSupportedAbis>arm64-v8a;x86</AndroidSupportedAbis>
     <AndroidStoreUncompressedFileExtensions />
     <MandroidI18n />
     <JavaMaximumHeapSize />
@@ -50,8 +50,8 @@
   <ItemGroup>
     <Reference Include="Java.Interop" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Identity.Client, Version=4.6.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Identity.Client.4.6.0\lib\monoandroid90\Microsoft.Identity.Client.dll</HintPath>
+    <Reference Include="Microsoft.Identity.Client, Version=4.7.1.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Identity.Client.4.7.1\lib\monoandroid90\Microsoft.Identity.Client.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
@@ -201,6 +201,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
+    <Compile Include="MsalActivity.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

UserDetailsClient/UserDetailsClient.Droid/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="monoandroid81" developmentDependency="true" />
   <package id="Microsoft.CSharp" version="4.5.0" targetFramework="monoandroid81" />
-  <package id="Microsoft.Identity.Client" version="4.6.0" targetFramework="monoandroid90" />
+  <package id="Microsoft.Identity.Client" version="4.7.1" targetFramework="monoandroid90" />
   <package id="Microsoft.NETCore.Platforms" version="2.1.0" targetFramework="monoandroid81" />
   <package id="Microsoft.NETCore.Targets" version="1.1.3" targetFramework="monoandroid90" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid60" />

UserDetailsClient/UserDetailsClient.UWP/UserDetailsClient.UWP.csproj

@@ -132,7 +132,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Identity.Client">
-      <Version>4.6.0</Version>
+      <Version>4.7.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.1.4</Version>

UserDetailsClient/UserDetailsClient.iOS/UserDetailsClient.iOS.csproj

@@ -106,8 +106,8 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Identity.Client, Version=4.6.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Identity.Client.4.6.0\lib\xamarinios10\Microsoft.Identity.Client.dll</HintPath>
+    <Reference Include="Microsoft.Identity.Client, Version=4.7.1.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Identity.Client.4.7.1\lib\xamarinios10\Microsoft.Identity.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.IdentityModel" />

UserDetailsClient/UserDetailsClient.iOS/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="xamarinios10" developmentDependency="true" />
   <package id="Microsoft.CSharp" version="4.5.0" targetFramework="xamarinios10" />
-  <package id="Microsoft.Identity.Client" version="4.6.0" targetFramework="xamarinios10" />
+  <package id="Microsoft.Identity.Client" version="4.7.1" targetFramework="xamarinios10" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.1" targetFramework="xamarinios10" />
   <package id="Microsoft.NETCore.Targets" version="1.1.3" targetFramework="xamarinios10" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="xamarinios10" />