GraphServiceClient::withUserCredentials method introduced

Author: vgrem

examples/OneNote/ListPages.php

@@ -7,17 +7,9 @@
 use Office365\Runtime\Auth\AADTokenProvider;
 use Office365\Runtime\Auth\UserCredentials;
 
-function acquireToken()
-{
-    $settings = include( '../../tests/Settings.php');
-    $resource = "https://graph.microsoft.com";
-    $provider = new AADTokenProvider($settings['TenantName']);
-    return $provider->acquireTokenForPassword($resource, $settings['ClientId'],
-        new UserCredentials($settings['UserName'], $settings['Password']));
-}
-
-
-$client = new GraphServiceClient("acquireToken");
+$settings = include( '../../tests/Settings.php');
+$client = GraphServiceClient::withUserCredentials(
+    $settings['TenantName'], $settings['ClientId'], $settings['UserName'], $settings['Password']);
 
 $pages = $client->getMe()->getOneNote()->getPages()->get()->executeQuery();
 /** @var OnenotePage $page */

examples/Outlook/ListCals.php

@@ -8,16 +8,10 @@
 
 require_once '../vendor/autoload.php';
 
-function acquireToken()
-{
-    $resource = "https://graph.microsoft.com";
-    $settings = include('../../tests/Settings.php');
-    $provider = new AADTokenProvider($settings['TenantName']);
-    return $provider->acquireTokenForPassword($resource, $settings['ClientId'],
-        new UserCredentials($settings['UserName'], $settings['Password']));
-}
-
-$client = new GraphServiceClient("acquireToken");
+$settings = include('../../tests/Settings.php');
+$client = GraphServiceClient::withUserCredentials(
+    $settings['TenantName'], $settings['ClientId'], $settings['UserName'], $settings['Password']
+);
 
 $userCals = $client->getMe()->getCalendars()->get()->executeQuery();
 /** @var Calendar $cal */

src/GraphServiceClient.php

@@ -12,6 +12,8 @@
 use Office365\OneDrive\Drives\DriveCollection;
 use Office365\OneDrive\Sites\Site;
 use Office365\Reports\ReportRoot;
+use Office365\Runtime\Auth\AADTokenProvider;
+use Office365\Runtime\Auth\UserCredentials;
 use Office365\Runtime\ClientRuntimeContext;
 use Office365\Runtime\Actions\DeleteEntityQuery;
 use Office365\Runtime\Http\HttpMethod;
@@ -46,6 +48,24 @@ public function __construct(callable $acquireToken)
         parent::__construct();
     }
 
+    /**
+     * Initializes a client to acquire a token via user credentials.
+     * @param $tenantName
+     * @param $clientId
+     * @param $userName
+     * @param $password
+     * @return GraphServiceClient
+     */
+    public static function withUserCredentials($tenantName, $clientId, $userName, $password)
+    {
+        return new GraphServiceClient(function () use ($password, $userName, $clientId, $tenantName) {
+            $resource = "https://graph.microsoft.com";
+            $provider = new AADTokenProvider($tenantName);
+            return $provider->acquireTokenForPassword($resource, $clientId,
+                new UserCredentials($userName, $password));
+        });
+    }
+
     /**
      * @return ODataRequest
      */

tests/GraphTestCase.php

@@ -2,8 +2,6 @@
 
 namespace Office365;
 
-use Office365\Runtime\Auth\AADTokenProvider;
-use Office365\Runtime\Auth\UserCredentials;
 use PHPUnit\Framework\TestCase;
 
 
@@ -25,25 +23,19 @@ public static function setUpBeforeClass(): void
     {
         self::$settings = include(__DIR__ . '/Settings.php');
         self::$testAccountName = self::$settings['TestAccountName'];
-        self::$graphClient = new GraphServiceClient(function () {
-            return self::acquireToken();
-        });
+        self::$graphClient = GraphServiceClient::withUserCredentials(
+            self::$settings['TenantName'],
+            self::$settings['ClientId'],
+            self::$settings['UserName'],
+            self::$settings['Password']
+        );
     }
 
     public static function tearDownAfterClass(): void
     {
         self::$graphClient = null;
     }
 
-
-    public static function acquireToken()
-    {
-        $resource = "https://graph.microsoft.com";
-        $provider = new AADTokenProvider(self::$settings['TenantName']);
-        return $provider->acquireTokenForPassword($resource, self::$settings['ClientId'],
-            new UserCredentials(self::$settings['UserName'], self::$settings['Password']));
-    }
-
     public static function createUniqueName($prefix){
         return  $prefix . "_" . rand(1, 100000);
     }