Merge pull request #44 from ChrisToxz/master

Rewrote MsGraphAdmin token methods

Author: dcblogdev

src/MsGraphAdmin.php

@@ -69,33 +69,23 @@ public function isConnected()
      */
     public function connect()
     {
-        //when no code param redirect to Microsoft
-        if (! request()->has('tenant')) {
-            $url = config('msgraph.tenantUrlAuthorize').'?'.http_build_query([
-                'client_id'    => config('msgraph.clientId'),
-                'redirect_uri' => config('msgraph.redirectUri'),
-            ]);
+        try {
+            $params = [
+                'scope'         => 'https://graph.microsoft.com/.default',
+                'client_id'     => config('msgraph.clientId'),
+                'client_secret' => config('msgraph.clientSecret'),
+                'grant_type'    => 'client_credentials',
+            ];
 
-            return redirect()->away($url);
-        } elseif (request()->has('tenant')) {
-            // With the authorization code, we can retrieve access tokens and other data.
-            try {
-                $params = [
-                    'scope'         => 'https://graph.microsoft.com/.default',
-                    'client_id'     => config('msgraph.clientId'),
-                    'client_secret' => config('msgraph.clientSecret'),
-                    'grant_type'    => 'client_credentials'
-                ];
+            $token = $this->dopost(config('msgraph.tenantUrlAccessToken'), $params);
 
-                $token = $this->dopost(config('msgraph.tenantUrlAccessToken'), $params);
+            // Store token
+            return $this->storeToken($token->access_token, '', $token->expires_in);
 
-                $this->storeToken($token->access_token, '', $token->expires_in);
 
-                return redirect(config('msgraph.msgraphLandingUri'));
-            } catch (Exception $e) {
-                throw new Exception($e->getMessage());
-            }
-        }
+          } catch (Exception $e) {
+              throw new Exception($e->getMessage());
+          }
     }
 
     /**
@@ -106,37 +96,25 @@ public function connect()
      */
     public function getAccessToken($returnNullNoAccessToken = null)
     {
-        //use id if passed otherwise use logged-in user
+        // Admin token will be stored without user_id
         $token = MsGraphToken::where('user_id', null)->first();
 
         // Check if tokens exist otherwise run the oauth request
         if (! isset($token->access_token)) {
-            //don't redirect simply return null when no token found with this option
+            // Don't request new token, simply return null when no token found with this option
             if ($returnNullNoAccessToken == true) {
                 return null;
             }
-
-            return redirect(config('msgraph.redirectUri'));
+            // Run the oath request and return new token
+            return $this->connect()->access_token;
         }
 
         // Check if token is expired
         // Get current time + 5 minutes (to allow for time differences)
         $now = time() + 300;
         if ($token->expires <= $now) {
             // Token is expired (or very close to it) so let's refresh
-
-            $params = [
-                'scope'         => 'https://graph.microsoft.com/.default',
-                'client_id'     => config('msgraph.clientId'),
-                'client_secret' => config('msgraph.clientSecret'),
-                'grant_type'    => 'client_credentials'
-            ];
-
-            $token = $this->dopost(config('msgraph.tenantUrlAccessToken'), $params);
-
-            $newToken = $this->storeToken($token->access_token, '', $token->expires_in);
-
-            return $newToken->access_token;
+            return $this->connect()->access_token;
         } else {
             // Token is still valid, just return it
             return $token->access_token;
@@ -162,10 +140,11 @@ public function getTokenData()
      */
     protected function storeToken($access_token, $refresh_token, $expires)
     {
-        //cretate a new record or if the user id exists update record
+        //Create or update a new record for admin token
         return MsGraphToken::updateOrCreate(['user_id' => null], [
+            'email'         => 'application_token', // Placeholder name
             'access_token'  => $access_token,
-            'expires'       => $expires,
+            'expires'       => (time() + $expires),
             'refresh_token' => $refresh_token,
         ]);
     }
@@ -247,7 +226,7 @@ protected static function dopost($url, $params)
         } catch (ClientException $e) {
             return json_decode(($e->getResponse()->getBody()->getContents()));
         } catch (Exception $e) {
-            return json_decode($e->getResponse(), true);
+            throw new Exception($e->getMessage());
         }
     }