Merge pull request #20 from irvinesunday/master

Updates to Graph and MSAL libraries and Markdown content updates

Author: irvinesunday

README.md

@@ -29,18 +29,26 @@ To use the Connect sample for Android, you need the following:
 <a name="register"></a>
 ## Register and configure the app
 
-1. Sign into the [App Registration Portal](https://apps.dev.microsoft.com/) using either your personal or work or school account.
-2. Add a new **Converged application** by Selecting **Add an app**.
-   > **Note:** The app registration portal also allows you to create **Azure AD Only** applications. The authentication library used in this sample is not compatible with Azure AD Only applications.
+1. Open a browser and navigate to the [Azure Active Directory admin center](https://aad.portal.azure.com). Login using a **Work or School Account**.
 
-3. Enter a name for the app, and select **Create application**.
-	
-	The registration page displays, listing the properties of your app.
- 
-4. Under **Platforms**, select **Add platform**.
-5. Select **Mobile application**.
-6. Copy the **Application Id**, you'll need it in the next section.
-7. Click **Save**.
+1. Select **Azure Active Directory** in the left-hand navigation, then select **App registrations (Preview)** under **Manage**.
+
+    ![A screenshot of the App registrations ](./readme-images/aad-portal-app-registrations.png)
+
+1. Select **New registration**. On the **Register an application** page, set the values as follows.
+
+    - Set a preferred **Name** e.g. `AndroidJavaConnect`
+    - Set **Supported account types** to **Accounts in any organizational directory**.
+
+    ![A screenshot of the Register an application page](./readme-images/aad-register-an-app.PNG)
+
+1. Choose **Register**. On the **AndroidJavaConnect** app page, select **Overview** and copy the value of the **Application (client) ID** and save it, you will need it in the next step.
+
+    ![A screenshot of Application Id](./readme-images/aad-application-id.PNG)
+
+1. Still on the app page, select **Authentication**. Locate the section **Redirect URIs**. In the _Suggested Redirect URIs for public clients(mobile,desktop)_, check the second box so that the app can work with the MSAL libraries used in the application. (The box should contain the option _msal<YOUR_CLIENT_ID>://auth_). Choose **Save**.
+
+    ![A screenshot of Suggested Redirect URIs for Public Client](./readme-images/aad-redirect-uri-public-client.PNG)
 
 To learn about authenticating with MSAL for Android to make calls to Microsoft Graph, see [Call the Microsoft Graph API from an Android app](https://docs.microsoft.com/en-us/azure/active-directory/develop/guidedsetups/active-directory-android).
 
@@ -91,4 +99,4 @@ This sample just shows the essentials that your apps need to work with Microsoft
 * [Snippets sample for Android](../../../android-java-snippets-sample)
 
 ## Copyright
-Copyright (c) 2016 Microsoft. All rights reserved.
+Copyright (c) 2019 Microsoft. All rights reserved.

app/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 27
     defaultConfig {
         applicationId "com.microsoft.graph.connect"
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 2
         versionName "2.0"
         multiDexEnabled true
@@ -34,29 +33,27 @@ android {
     packagingOptions {
         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'
     }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.1.0'
-
-    compile ('com.microsoft.identity.client:msal:0.1.+') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-    }
-    compile 'com.android.volley:volley:1.0.0'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.12'
+    implementation 'com.android.support:appcompat-v7:27.0.0'
+    implementation 'com.android.volley:volley:1.1.0'
     // Include the SDK as a dependency
-    compile 'com.microsoft.graph:msgraph-sdk-android:1.3.2'
-
+    implementation 'com.microsoft.graph:microsoft-graph:1.2.0'
+    implementation 'com.microsoft.graph:microsoft-graph-android-auth:0.1.0-SNAPSHOT'
     // Include GSON as a dependency
-    compile 'com.google.code.gson:gson:2.6.2'
-    compile 'commons-io:commons-io:2.0.1'
+    implementation 'com.google.code.gson:gson:2.6.2'
+    implementation 'commons-io:commons-io:2.0.1'
     // Test libraries
-    androidTestCompile 'com.android.support:support-annotations:25.3.1'
-    androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support.test:rules:0.5'
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
-    androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.2'
-    androidTestCompile 'com.android.support.test.espresso:espresso-web:2.2.2'
+    androidTestImplementation 'com.android.support:support-annotations:25.3.1'
+    androidTestImplementation 'com.android.support.test:runner:0.5'
+    androidTestImplementation 'com.android.support.test:rules:0.5'
+    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'
+
 }

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

@@ -10,11 +10,13 @@
 import android.content.Context;
 import android.util.Log;
 
+import com.microsoft.graph.connect.util.IManifestReader;
+import com.microsoft.graph.connect.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.exception.MsalException;
 import com.microsoft.identity.client.PublicClientApplication;
-import com.microsoft.identity.client.User;
 
 import java.io.IOException;
 
@@ -33,8 +35,12 @@ private AuthenticationManager() {
     public static synchronized AuthenticationManager getInstance() {
         if (INSTANCE == null) {
             INSTANCE = new AuthenticationManager();
+
+            IManifestReader metaDataReader = new ManifestReader();
+            String clientID = metaDataReader.getApplicationMetadataValueString("com.microsoft.identity.client.ClientId");
+
             if (mPublicClientApplication == null) {
-                mPublicClientApplication = new PublicClientApplication(Connect.getInstance());
+                mPublicClientApplication = new PublicClientApplication(Connect.getInstance(), clientID);
             }
         }
         return INSTANCE;
@@ -44,7 +50,6 @@ public static synchronized void resetInstance() {
         INSTANCE = null;
     }
 
-
      /**
      * Returns the access token obtained in authentication
      *
@@ -63,7 +68,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();
     }
@@ -79,9 +84,9 @@ public void callAcquireToken(Activity activity, final MSALAuthenticationCallback
         mPublicClientApplication.acquireToken(
                 activity, Constants.SCOPES, getAuthInteractiveCallback());
     }
-    public void callAcquireTokenSilent(User user, boolean forceRefresh, MSALAuthenticationCallback msalAuthenticationCallback) {
+    public void callAcquireTokenSilent(IAccount account, boolean forceRefresh, MSALAuthenticationCallback msalAuthenticationCallback) {
         mActivityCallback = msalAuthenticationCallback;
-        mPublicClientApplication.acquireTokenSilentAsync(Constants.SCOPES, user, null, forceRefresh, getAuthSilentCallback());
+        mPublicClientApplication.acquireTokenSilentAsync(Constants.SCOPES, account, null, forceRefresh, getAuthSilentCallback());
     }
 //
 // App callbacks for MSAL

app/src/main/java/com/microsoft/graph/connect/ConnectActivity.java

@@ -17,14 +17,13 @@
 
 import com.microsoft.identity.client.AuthenticationResult;
 import com.microsoft.identity.client.Logger;
-import com.microsoft.identity.client.MsalClientException;
-import com.microsoft.identity.client.MsalException;
-import com.microsoft.identity.client.MsalServiceException;
-import com.microsoft.identity.client.MsalUiRequiredException;
-import com.microsoft.identity.client.User;
+import com.microsoft.identity.client.exception.MsalException;
+import com.microsoft.identity.client.exception.MsalClientException;
+import com.microsoft.identity.client.exception.MsalServiceException;
+import com.microsoft.identity.client.exception.MsalUiRequiredException;
+import com.microsoft.identity.client.IAccount;
 
 import java.util.List;
-import java.util.concurrent.ExecutionException;
 
 /**
  * Starting Activity of the app. Handles the connection to Office 365.
@@ -33,12 +32,14 @@
  * If there are cached tokens, the app tries to reuse them.
  * The activity redirects the user to the SendMailActivity upon successful connection.
  */
-public class ConnectActivity extends AppCompatActivity implements MSALAuthenticationCallback {
+public class ConnectActivity
+        extends AppCompatActivity
+        implements MSALAuthenticationCallback {
 
     private static final String TAG = "ConnectActivity";
 
     private boolean mEnablePiiLogging = false;
-    private User mUser;
+    private IAccount mAccount;
     private Handler mHandler;
 
     private Button mConnectButton;
@@ -71,7 +72,6 @@ public void onClick(View v) {
                     connect();
                 }
             });
-
     }
 
     private void connect() {
@@ -89,16 +89,16 @@ private void connect() {
           /* Attempt to get a user and acquireTokenSilent
    * If this fails we do an interactive request
    */
-        List<User> users = null;
+        List<IAccount> accounts = null;
 
         try {
-            users = mgr.getPublicClient().getUsers();
+            accounts = mgr.getPublicClient().getAccounts();
 
-            if (users != null && users.size() == 1) {
+            if (accounts != null && accounts.size() == 1) {
           /* We have 1 user */
-                mUser = users.get(0);
+                mAccount = accounts.get(0);
                 mgr.callAcquireTokenSilent(
-                        mUser,
+                        mAccount,
                         true,
                         this);
             } else {
@@ -109,12 +109,7 @@ private void connect() {
                         this,
                         this);
             }
-        } catch (MsalClientException e) {
-            Log.d(TAG, "MSAL Exception Generated while getting users: " + e.toString());
-            showConnectErrorUI(e.getMessage());
-
-
-        } catch (IndexOutOfBoundsException e) {
+        }catch (IndexOutOfBoundsException e) {
             Log.d(TAG, "User at this position does not exist: " + e.toString());
             showConnectErrorUI(e.getMessage());
 
@@ -209,15 +204,15 @@ private Handler getHandler() {
 
     @Override
     public void onSuccess(AuthenticationResult authenticationResult) {
-        mUser = authenticationResult.getUser();
+        mAccount = authenticationResult.getAccount();
 
         String name = "";
         String preferredUsername = "";
 
         try {
             // get the user info from the id token
-            name = authenticationResult.getUser().getName();
-            preferredUsername = authenticationResult.getUser().getDisplayableId();
+            name = authenticationResult.getAccount().getUsername();
+            preferredUsername = authenticationResult.getAccount().getUsername();
 
             AuthenticationManager mgr = AuthenticationManager.getInstance();
 
@@ -270,7 +265,6 @@ public void onError(MsalException exception) {
 
             mgr.callAcquireToken(ConnectActivity.this, this);
         }
-
     }
 
     @Override
@@ -283,8 +277,5 @@ public void onError(Exception exception) {
     public void onCancel() {
         showMessage("User cancelled the flow.");
         showConnectErrorUI("User cancelled the flow.");
-
     }
-
-
 }

app/src/main/java/com/microsoft/graph/connect/GraphServiceClientManager.java

@@ -6,13 +6,14 @@
 
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
+import android.app.Activity;
+import android.app.Application;
 import android.util.Log;
 
 import com.microsoft.graph.authentication.IAuthenticationProvider;
-import com.microsoft.graph.core.DefaultClientConfig;
-import com.microsoft.graph.core.IClientConfig;
-import com.microsoft.graph.extensions.GraphServiceClient;
-import com.microsoft.graph.extensions.IGraphServiceClient;
+import com.microsoft.graph.authentication.MSALAuthenticationProvider;
+import com.microsoft.graph.requests.extensions.GraphServiceClient;
+import com.microsoft.graph.models.extensions.IGraphServiceClient;
 import com.microsoft.graph.http.IHttpRequest;
 
 import java.io.IOException;
@@ -21,11 +22,23 @@
  * Singleton class that manages a GraphServiceClient object.
  * It implements IAuthentication provider to authenticate requests using an access token.
  */
-public class GraphServiceClientManager implements IAuthenticationProvider {
+public class GraphServiceClientManager extends Application implements IAuthenticationProvider {
     private IGraphServiceClient mGraphServiceClient;
     private static GraphServiceClientManager INSTANCE;
+    private AuthenticationManager mAuthenticationManager;
+    private static Activity connectActivity;
+    private MSALAuthenticationProvider msalAuthenticationProvider;
+    private IGraphServiceClient graphClient;
 
-    private GraphServiceClientManager() {}
+
+    public static GraphServiceClientManager getApp() {
+        return INSTANCE;
+    }
+    public static Activity getAppActivity() {return connectActivity;}
+
+    private GraphServiceClientManager() {
+        mAuthenticationManager = AuthenticationManager.getInstance();
+    }
 
     /**
      * Appends an access token obtained from the {@link AuthenticationManager} class to the
@@ -67,12 +80,22 @@ public synchronized IGraphServiceClient getGraphServiceClient() {
 
     public synchronized IGraphServiceClient getGraphServiceClient(IAuthenticationProvider authenticationProvider) {
         if (mGraphServiceClient == null) {
-            IClientConfig clientConfig = DefaultClientConfig.createWithAuthenticationProvider(
-                    authenticationProvider
-            );
-            mGraphServiceClient = new GraphServiceClient.Builder().fromConfig(clientConfig).buildClient();
+            if(msalAuthenticationProvider == null){
+                msalAuthenticationProvider = new MSALAuthenticationProvider(
+                        getAppActivity(),
+                        GraphServiceClientManager.getApp(),
+                        mAuthenticationManager.getPublicClient(),
+                        Constants.SCOPES);
+            }
+            if(graphClient == null){
+                graphClient =
+                        GraphServiceClient
+                                .builder()
+                                .authenticationProvider(msalAuthenticationProvider)
+                                .buildClient();
+            }
+            return graphClient;
         }
-
         return mGraphServiceClient;
     }
 }