hotfix

Author: yaroslawww

config/dropbox.php

@@ -2,6 +2,8 @@
 
 return [
 
+    'useLoggedUserId' => true,
+
     /*
     * set the client id
     */

src/Dropbox.php

@@ -67,12 +67,12 @@ public function connect()
         if (!request()->has('code')) {
 
             $url = self::$authorizeUrl . '?' . http_build_query([
-                'response_type' => 'code',
-                'client_id' => config('dropbox.clientId'),
-                'redirect_uri' => config('dropbox.redirectUri'),
-                'scope' => config('dropbox.scopes'),
-                'token_access_type' => config('dropbox.accessType')
-            ]);
+                    'response_type' => 'code',
+                    'client_id' => config('dropbox.clientId'),
+                    'redirect_uri' => config('dropbox.redirectUri'),
+                    'scope' => config('dropbox.scopes'),
+                    'token_access_type' => config('dropbox.accessType'),
+                ]);
 
             return redirect()->away($url);
         } elseif (request()->has('code')) {
@@ -81,11 +81,11 @@ public function connect()
             try {
 
                 $params = [
-                    'grant_type'    => 'authorization_code',
-                    'code'          => request('code'),
-                    'redirect_uri'  => config('dropbox.redirectUri'),
-                    'client_id'     => config('dropbox.clientId'),
-                    'client_secret' => config('dropbox.clientSecret')
+                    'grant_type' => 'authorization_code',
+                    'code' => request('code'),
+                    'redirect_uri' => config('dropbox.redirectUri'),
+                    'client_id' => config('dropbox.clientId'),
+                    'client_secret' => config('dropbox.clientSecret'),
                 ];
 
                 $token = $this->dopost(self::$tokenUrl, $params);
@@ -124,10 +124,10 @@ public function disconnect($redirectPath = '/')
         $id = auth()->id();
 
         $client = new Client;
-        $response = $client->post(self::$baseUrl.'auth/token/revoke', [
+        $response = $client->post(self::$baseUrl . 'auth/token/revoke', [
             'headers' => [
-                'Authorization' => 'Bearer ' . $this->getAccessToken()
-            ]
+                'Authorization' => 'Bearer ' . $this->getAccessToken(),
+            ],
         ]);
 
         //delete token from db
@@ -136,7 +136,7 @@ public function disconnect($redirectPath = '/')
             $token->delete();
         }
 
-        header('Location: ' .url($redirectPath));
+        header('Location: ' . url($redirectPath));
         exit();
     }
 
@@ -154,14 +154,14 @@ public function getAccessToken($returnNullNoAccessToken = null)
         }
 
         //use id if passed otherwise use logged in user
-        $id    = auth()->id();
+        $id = auth()->id();
         $token = DropboxToken::where('user_id', $id)->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
-            if ($returnNullNoAccessToken == true) {
+            if ($returnNullNoAccessToken == true || app()->runningInConsole()) {
                 return null;
             }
 
@@ -175,15 +175,15 @@ public function getAccessToken($returnNullNoAccessToken = null)
             if ($token->expires_in->lessThan(Carbon::now()->addMinutes(5))) {
                 // Token is expired (or very close to it) so let's refresh
                 $params = [
-                    'grant_type'    => 'refresh_token',
+                    'grant_type' => 'refresh_token',
                     'refresh_token' => $token->refresh_token,
-                    'client_id'     => config('dropbox.clientId'),
-                    'client_secret' => config('dropbox.clientSecret')
+                    'client_id' => config('dropbox.clientId'),
+                    'client_secret' => config('dropbox.clientSecret'),
                 ];
 
-                $tokenResponse       = $this->dopost(self::$tokenUrl, $params);
+                $tokenResponse = $this->dopost(self::$tokenUrl, $params);
                 $token->access_token = $tokenResponse['access_token'];
-                $token->expires_in   = now()->addseconds($tokenResponse['expires_in']);
+                $token->expires_in = now()->addseconds($tokenResponse['expires_in']);
                 $token->save();
 
                 return $token->access_token;
@@ -222,20 +222,20 @@ protected function storeToken($token)
         $id = auth()->id();
 
         $data = [
-            'user_id'       => $id,
-            'access_token'  => $token['access_token'],
-            'expires_in'    => now()->addseconds($token['expires_in']),
-            'token_type'    => $token['token_type'],
-            'uid'           => $token['uid'],
-            'account_id'    => $token['account_id'],
-            'scope'         => $token['scope']
+            'user_id' => config('dropbox.useLoggedUserId') ? $id : null,
+            'access_token' => $token['access_token'],
+            'expires_in' => now()->addseconds($token['expires_in']),
+            'token_type' => $token['token_type'],
+            'uid' => $token['uid'],
+            'account_id' => $token['account_id'],
+            'scope' => $token['scope'],
         ];
 
         if (isset($token['refresh_token'])) {
             $data['refresh_token'] = $token['refresh_token'];
         }
 
-        //cretate a new record or if the user id exists update record
+        //create a new record or if the user id exists update record
         return DropboxToken::updateOrCreate(['user_id' => $id], $data);
     }
 
@@ -253,7 +253,7 @@ protected function guzzle($type, $request, $data = [], $customHeaders = null, $u
             $client = new Client;
 
             $headers = [
-                'content-type' => 'application/json'
+                'content-type' => 'application/json',
             ];
 
             if ($useToken == true) {
@@ -268,14 +268,12 @@ protected function guzzle($type, $request, $data = [], $customHeaders = null, $u
 
             $response = $client->$type(self::$baseUrl . $request, [
                 'headers' => $headers,
-                'body' => json_encode($data)
+                'body' => json_encode($data),
             ]);
 
             return json_decode($response->getBody()->getContents(), true);
         } catch (ClientException $e) {
             throw new Exception($e->getResponse()->getBody()->getContents());
-        } catch (Exception $e) {
-            throw new Exception($e->getMessage());
         }
     }