Merge pull request #14 from titusgicheru/master

Andoid-SDK update to Java-SDK and Android wrapper for MSAL

Author: titusgicheru

README.md

@@ -88,25 +88,23 @@ To use the Microsoft Graph SDK snippets project, you need the following:
 
 ## Azure client application registration
 
-
-1. Sign in to the [Application Registration portal](https://apps.dev.microsoft.com).
-3. Click on the blue **Add an app** button on the right side of the page.
-4. Give your application a name.
-4. _Un_-check **Let us help you get started** under the **Guided Setup** section
-4. Click the blue **Create** button to create the registration.
-5. Click the **Add Platform** button under the **Platforms** section and choose **Native Application**.
-8. Configure Permissions for your application - Under **Microsoft Graph Permissions** click the blue **Add** button adjacent to **Delegated Permissions**
-9. Add the following delegated permissions:
-   * Sign in and read user profile
-   * Have full access to all files user can access
-   * Have full access to user calendars
-   * Read and write access to user mail 
-   * Send mail as a user
-   * Read user mail
-   * Read and write directory data
-   * Read all users' basic profiles
-   * Read and write all groups
-13. Click **Save** in the bottom menu.
+1. Navigate to the [Azure portal - App registrations](https://go.microsoft.com/fwlink/?linkid=2083908) page. 
+1. Select **New registration**. 
+1. When the **Register an application page** appears, enter your application's registration information: 
+    - In the **Name** section, enter a meaningful application name that will be displayed to users of the app, for example `Android Java Snippets Sample`. 
+    - In the **Supported account types** section, select **Accounts in any organizational directory**. 
+1. Select **Register** to create the application. 
+1. On the app **Overview** page, find the **Application (client) ID** value and record it for later. You'll need it to configure the Visual Studio configuration file for this project. 
+1. In the list of pages for the app, select **Manifest**, and: 
+    - In the manifest editor, set the ``allowPublicClient`` property to **true** 
+    - Select **Save** in the bar above the manifest editor. 
+1. In the list of pages for the app, select **API permissions** 
+    - Click the **Add a permission** button and then, 
+    - Ensure that the **Microsoft APIs** tab is selected 
+    - In the *Commonly used Microsoft APIs* section, click on **Microsoft Graph** 
+    - In the **Delegated permissions** section, ensure that the right permissions are checked. Use the search box if necessary.
+    - **User.Read**, **Mail.Send**, **Mail.ReadWrite**, **Files.ReadWrite**, **User.ReadBasic.All**, **Calendars.ReadWrite**, **Group.Read.All**  
+    - Select the **Add permissions** button 
 
 > **Note:**
 > In [Configure the project](#configure-the-project), you'll be asked to copy some strings that are generated by the application registration portal. Be sure to stay on application registration page while you configure the project. The strings that you copy from the application registration will be pasted into the source code of the project.
@@ -120,8 +118,8 @@ To use the Microsoft Graph SDK snippets project, you need the following:
 5. Respond to the dialog box ("Gradle Sync: Gradle settings for this project are not configured yet. Would you like the project to use the Gradle wrapper? ") by clicking the **OK** button to use the Gradle wrapper. 
 4. In the application registration page that you just visited, copy the custom redirect URI (`msal{application id as GUID}`) to the clipboard. **Be sure you don't copy `://auth`**
    <br/>For example: `msal0575d7fe-8ec7-4925-9ce2-87074778a039` is copied and `://auth` is ignored.
-4. Paste the clipboard contents in **app/src/main/AndroidManifest.xml**, line 42 to replace `ENTER_YOUR_CLIENT_ID` with the clipboard contents.
-4. Copy the **GUID portion** of the custom redirect URI into **app/src/main/AndroidManifest.xml**, line 51 to replace `ENTER_YOUR_CLIENT_ID` with the clipboard contents.
+4. Paste the clipboard contents in **app/src/main/AndroidManifest.xml**, line 41 to replace `ENTER_YOUR_CLIENT_ID` with the clipboard contents.
+4. Copy the **GUID portion** of the custom redirect URI into **app/src/main/AndroidManifest.xml**, line 49 to replace `ENTER_YOUR_CLIENT_ID` with the clipboard contents.
 
 ## Run the project
 After you've built the project you can run it on an emulator or device.
@@ -188,4 +186,4 @@ General questions about Microsoft Graph development should be posted to [Stack O
 |1.0|Initial release|
 |1.5|- MSAL authentication library replaced ADAL authentication library <br/> - Microsoft Graph SDK version 1.5|
 
-Copyright (c) 2015 Microsoft. All rights reserved.
+Copyright (c) 2019 Microsoft. All rights reserved.

app/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 26
+    buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "com.microsoft.graph.snippets"
         minSdkVersion 21
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 2
         versionName '1.5'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -15,7 +15,6 @@ android {
                 includeCompileClasspath false
             }
         }
-
     }
     buildTypes {
         release {
@@ -28,6 +27,7 @@ android {
         exclude 'META-INF/NOTICE.txt'
         exclude 'META-INF/maven/com.google.guava/guava/pom.properties'
         exclude 'META-INF/maven/com.google.guava/guava/pom.xml'
+        exclude 'META-INF/jersey-module-version'
     }
     configurations {
         all {
@@ -39,16 +39,12 @@ android {
 }
 
 dependencies {
-    implementation('com.microsoft.identity.client:msal:0.1.+') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-    }
     implementation 'com.android.volley:volley:1.0.0'
     implementation 'com.android.support:support-fragment:25.1.0'
     implementation 'com.android.support:appcompat-v7:25.1.0'
     // Butterknife
     implementation 'com.jakewharton:butterknife:8.4.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
-    implementation 'com.microsoft.graph:msgraph-sdk-android:1.5.0'
     implementation 'joda-time:joda-time:2.9.4'
     implementation 'com.google.guava:guava:19.0'
     // Test libraries
@@ -59,4 +55,7 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-intents:2.2.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-web:2.2.2'
+    //implementation 'com.microsoft.graph:microsoft-graph:1.2.0'
+  //  implementation 'com.microsoft.identity.client:msal:0.2.2'
+    implementation 'com.microsoft.graph:microsoft-graph-android-auth:0.1.0-SNAPSHOT'
 }

app/src/androidTest/java/com/microsoft/graph/snippets/SignInActivityTests.java

@@ -10,18 +10,14 @@
 import android.support.test.espresso.web.webdriver.Locator;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-
 import junit.framework.AssertionFailedError;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import java.io.FileNotFoundException;
-
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.intent.Intents.intended;

app/src/androidTest/java/com/microsoft/graph/snippets/SnippetDetailActivityTests.java

@@ -9,17 +9,14 @@
 import android.support.test.espresso.intent.Intents;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import java.io.FileNotFoundException;
 import java.util.List;
-
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.Espresso.registerIdlingResources;
 import static android.support.test.espresso.Espresso.unregisterIdlingResources;

app/src/androidTest/java/com/microsoft/graph/snippets/SnippetListActivityTests.java

@@ -10,19 +10,15 @@
 import android.support.test.runner.AndroidJUnit4;
 import android.widget.ListAdapter;
 import android.widget.ListView;
-
 import com.microsoft.graph.snippets.snippet.AbstractSnippet;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
 import static android.support.test.espresso.action.ViewActions.click;

app/src/androidTest/java/com/microsoft/graph/snippets/TestCredentials.java

@@ -5,10 +5,8 @@
 package com.microsoft.graph.snippets;
 
 import android.os.Environment;
-
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;

app/src/main/AndroidManifest.xml

@@ -32,15 +32,13 @@
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.microsoft.graph.snippets.SnippetListActivity" />
-
         <activity
             android:name="com.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="msalENTER_YOUR_CLIENT_ID"
-                    android:host="auth" />
+                <data android:scheme="msalENTER_YOUR_CLIENT_ID"  android:host="auth" />
             </intent-filter>
         </activity>
         <meta-data
@@ -49,7 +47,5 @@
         <meta-data
             android:name="com.microsoft.identity.client.ClientId"
             android:value="ENTER_YOUR_CLIENT_ID"/>
-
     </application>
-
 </manifest>

app/src/main/java/com/microsoft/graph/snippets/AuthenticationManager.java

@@ -9,15 +9,18 @@
 import android.app.Activity;
 import android.content.Context;
 import android.util.Log;
-
 import com.microsoft.graph.authentication.IAuthenticationProvider;
+import com.microsoft.graph.authentication.MSALAuthenticationProvider;
 import com.microsoft.graph.http.IHttpRequest;
 import com.microsoft.graph.snippets.application.SnippetApp;
+import com.microsoft.graph.snippets.util.IManifestReader;
+import com.microsoft.graph.snippets.util.ManifestReader;
 import com.microsoft.identity.client.AuthenticationCallback;
 import com.microsoft.identity.client.AuthenticationResult;
-import com.microsoft.identity.client.MsalException;
+import com.microsoft.identity.client.IAccount;
 import com.microsoft.identity.client.PublicClientApplication;
-import com.microsoft.identity.client.User;
+import com.microsoft.identity.client.exception.MsalException;
+
 
 import java.io.IOException;
 
@@ -30,14 +33,17 @@ public class AuthenticationManager implements IAuthenticationProvider {
     private static PublicClientApplication mPublicClientApplication;
     private AuthenticationResult mAuthResult;
     private MSALAuthenticationCallback mActivityCallback;
+
     private AuthenticationManager() {
     }
 
     public static synchronized AuthenticationManager getInstance() {
         if (INSTANCE == null) {
             INSTANCE = new AuthenticationManager();
             if (mPublicClientApplication == null) {
-                mPublicClientApplication = new PublicClientApplication(SnippetApp.getApp());
+                IManifestReader metaDataReader = new ManifestReader();
+                String clientID = metaDataReader.getApplicationMetadataValueString("com.microsoft.identity.client.ClientId");
+                mPublicClientApplication = new PublicClientApplication(SnippetApp.getContext(), clientID);
             }
         }
         return INSTANCE;
@@ -66,7 +72,7 @@ public PublicClientApplication getPublicClient(){
      * to null, and removing the user id from shred preferences.
      */
     public void disconnect() {
-        mPublicClientApplication.remove(mAuthResult.getUser());
+        mPublicClientApplication.removeAccount(mAuthResult.getAccount());
         // Reset the AuthenticationManager object
         AuthenticationManager.resetInstance();
     }
@@ -82,7 +88,7 @@ public void callAcquireToken(Activity activity, final MSALAuthenticationCallback
         mPublicClientApplication.acquireToken(
                 activity, ServiceConstants.SCOPES, getAuthInteractiveCallback());
     }
-    public void callAcquireTokenSilent(User user, boolean forceRefresh, MSALAuthenticationCallback msalAuthenticationCallback) {
+    public void callAcquireTokenSilent(IAccount user, boolean forceRefresh, MSALAuthenticationCallback msalAuthenticationCallback) {
         mActivityCallback = msalAuthenticationCallback;
         mPublicClientApplication.acquireTokenSilentAsync(ServiceConstants.SCOPES, user, null, forceRefresh, getAuthSilentCallback());
     }

app/src/main/java/com/microsoft/graph/snippets/BaseActivity.java

@@ -6,6 +6,5 @@
 
 import android.app.Activity;
 
-
 public abstract class BaseActivity extends Activity {
 }

app/src/main/java/com/microsoft/graph/snippets/MSALAuthenticationCallback.java

@@ -1,8 +1,7 @@
 package com.microsoft.graph.snippets;
 
 import com.microsoft.identity.client.AuthenticationResult;
-import com.microsoft.identity.client.MsalException;
-
+import com.microsoft.identity.client.exception.MsalException;
 
 interface MSALAuthenticationCallback {
     void onSuccess(AuthenticationResult authenticationResult);