Java Graph, MSAL and Android MSAL wrapper update

Author: titusgicheru

app/build.gradle

@@ -57,4 +57,5 @@ dependencies {
     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/main/AndroidManifest.xml

@@ -32,14 +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"
+                <data android:scheme="msalEnter_ClientId_Here"
                     android:host="auth" />
             </intent-filter>
         </activity>
@@ -48,8 +47,6 @@
             android:value="https://login.microsoftonline.com/common"/>
         <meta-data
             android:name="com.microsoft.identity.client.ClientId"
-            android:value="ENTER_YOUR_CLIENT_ID"/>
-
+            android:value="Enter_ClientId_Here"/>
     </application>
-
 </manifest>

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

@@ -10,14 +10,18 @@
 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.models.extensions.User;
 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.IAccount;
 import com.microsoft.identity.client.PublicClientApplication;
 import com.microsoft.identity.client.exception.MsalException;
+
+
 import java.io.IOException;
 
 /**
@@ -29,14 +33,18 @@ public class AuthenticationManager implements IAuthenticationProvider {
     private static PublicClientApplication mPublicClientApplication;
     private AuthenticationResult mAuthResult;
     private MSALAuthenticationCallback mActivityCallback;
+    public static  MSALAuthenticationProvider msalAuthenticationProvider;
+
     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;

app/src/main/java/com/microsoft/graph/snippets/application/SnippetApp.java

@@ -6,32 +6,45 @@
 
 import android.app.Application;
 import android.content.Context;
-import com.microsoft.graph.core.DefaultClientConfig;
-import com.microsoft.graph.core.IClientConfig;
+import com.microsoft.graph.authentication.MSALAuthenticationProvider;
 import com.microsoft.graph.requests.extensions.GraphServiceClient;
 import com.microsoft.graph.models.extensions.IGraphServiceClient;
 import com.microsoft.graph.snippets.AuthenticationManager;
+import com.microsoft.graph.snippets.ServiceConstants;
+import com.microsoft.graph.snippets.SignInActivity;
 
 public class SnippetApp extends Application {
     private static SnippetApp sSnippetApp;
+    private static SignInActivity signInActivity;
     private AuthenticationManager mAuthenticationManager;
 
     public static SnippetApp getApp() {
         return sSnippetApp;
     }
+    public static SignInActivity getAppActivity() {return signInActivity;}
 
     @Override
     public void onCreate() {
         super.onCreate();
         sSnippetApp = this;
+        signInActivity = new SignInActivity();
         mAuthenticationManager = AuthenticationManager.getInstance();
     }
 
     public IGraphServiceClient getGraphServiceClient() {
-        IClientConfig clientConfig = DefaultClientConfig.createWithAuthenticationProvider(
-                mAuthenticationManager
-        );
-        return GraphServiceClient.fromConfig(clientConfig);
+
+        MSALAuthenticationProvider msalAuthenticationProvider = new MSALAuthenticationProvider(
+                getAppActivity(),
+                SnippetApp.getApp(),
+                mAuthenticationManager.getPublicClient(),
+                ServiceConstants.SCOPES);
+
+         IGraphServiceClient graphClient =
+                GraphServiceClient
+                        .builder()
+                        .authenticationProvider(msalAuthenticationProvider)
+                        .buildClient();
+         return graphClient;
     }
 
     public static Context getContext() {

build.gradle

@@ -17,6 +17,9 @@ allprojects {
     repositories {
         jcenter()
         google()
+        jcenter{
+            url 'http://oss.jfrog.org/oss-snapshot-local'
+        }
     }
 }