Rate limiting (#2)

* Rate limiting * Make stan happy * Throw original exception if cannot be json decoded * Remove unnecessary count check on errors * Clean up code --------- Co-authored-by: Morgan Arnel <[email protected]>
SynergiTech · Sep 12, 2023 · ee08ff6 · ee08ff6
1 parent 5d3b7d8
commit ee08ff6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Services/SalesforceService.php b/src/Services/SalesforceService.php
@@ -4,6 +4,7 @@
 
 use Exception;
 use Omniphx\Forrest\Providers\Laravel\Facades\Forrest;
+use Omniphx\Forrest\Providers\Laravel\LaravelCache;
 use SynergiTech\Salesforce\Exceptions\AuthenticationFailedException;
 
 class SalesforceService
@@ -14,8 +15,13 @@ public static function table(string $tableName): TableService
         return new TableService($tableName);
     }
 
-    protected static function authenticate(): void
+    protected static function authenticate(bool $force = false): void
     {
+        /** @var LaravelCache $cache */
+        $cache = app(LaravelCache::class);
+        if (!$force && $cache->has('token')) {
+            return;
+        }
         try {
             Forrest::authenticate();
         } catch (Exception $ex) {

diff --git a/src/Services/TableService.php b/src/Services/TableService.php
@@ -213,6 +213,10 @@ protected function decodeError(SalesforceException $ex): stdClass
             throw new JsonParseErrorException('Error message received was not valid json. Message: ' . $message);
         }
 
+        if (!$errors) {
+            throw $ex;
+        }
+
         /** @var stdClass{errorCode:string, message:string} $error */
         return $errors[0];
     }