Merge branch 'master' of github.com:dcblogdev/laravel-microsoft-graph

Author: dcblogdev

src/MsGraph.php

@@ -131,8 +131,9 @@ public function isConnected($id = null)
      */
     public function disconnect($redirectPath = '/', $logout = true, $id = null)
     {
-        $id    = ($id) ? $id : auth()->id();
-        $token = MsGraphToken::where('user_id', $id)->first();
+        $id = ($id) ? $id : auth()->id();
+        $token = MsGraphToken::where('user_id', $id)->latest()->first();
+
         if ($token != null) {
             $token->delete();
         }
@@ -155,7 +156,7 @@ public function getAccessToken($id = null, $returnNullNoAccessToken = null)
     {
         //use id if passed otherwise use logged in user
         $id    = ($id) ? $id : auth()->id();
-        $token = MsGraphToken::where('user_id', $id)->first();
+        $token = MsGraphToken::where('user_id', $id)->where('refresh_token', '<>', '')->latest()->first();
 
         // Check if tokens exist otherwise run the oauth request
         if (!isset($token->access_token)) {
@@ -202,9 +203,8 @@ public function getAccessToken($id = null, $returnNullNoAccessToken = null)
      */
     public function getTokenData($id = null)
     {
-        $id = $id ?: auth()->id();
-
-        return MsGraphToken::where('user_id', $id)->first();
+        $id = ($id) ? $id : auth()->id();
+        return MsGraphToken::where('user_id', $id)->where('refresh_token', '<>', '')->latest()->first();
     }
 
     /**

src/MsGraphAdmin.php

@@ -53,7 +53,7 @@ public function files()
      * Set the base url that all API requests use.
      * @var string
      */
-    protected static $baseUrl = 'https://graph.microsoft.com/beta/';
+    protected static $baseUrl = 'https://graph.microsoft.com/v1.0/';
 
     /**
      * @return object
@@ -85,6 +85,7 @@ public function connect()
                     'client_id'     => config('msgraph.clientId'),
                     'client_secret' => config('msgraph.clientSecret'),
                     'grant_type'    => 'client_credentials',
+                    'resource' => 'https://graph.microsoft.com',
                 ];
 
                 $token = $this->dopost(config('msgraph.tenantUrlAccessToken'), $params);
@@ -131,6 +132,7 @@ public function getAccessToken($returnNullNoAccessToken = null)
                 'client_id'     => config('msgraph.clientId'),
                 'client_secret' => config('msgraph.clientSecret'),
                 'grant_type'    => 'client_credentials',
+                'resource' => 'https://graph.microsoft.com',
             ];
 
             $token = $this->dopost(config('msgraph.tenantUrlAccessToken'), $params);