Merge pull request #4 from codebar-ag/feature-updated

Fix Authentication refreshToken Bug
codebar-ag · Jan 30, 2025 · a7d8456 · a7d8456
2 parents 73aa600 + 365440f
commit a7d8456
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -0,0 +1,12 @@
+includes:
+    - phpstan-baseline.neon
+
+parameters:
+    level: 4
+    paths:
+        - src
+        - config
+    tmpDir: build/phpstan
+    checkOctaneCompatibility: true
+    checkModelProperties: true
+
diff --git a/src/Actions/InstagramHandler.php b/src/Actions/InstagramHandler.php
@@ -35,7 +35,8 @@ public static function connector(): InstagramConnector
         if ($authenticator->hasExpired()) {
             $authenticator = $connector->refreshAccessToken($authenticator);
 
-            Cache::store(config('instagram.cache_store'))->put('instagram.authenticator', $serialized, now()->addDays(60));
+            // @phpstan-ignore-next-line
+            Cache::store(config('instagram.cache_store'))->put('instagram.authenticator', $authenticator->serialize(), now()->addDays(60));
         }
 
         $connector->authenticate($authenticator);

diff --git a/src/Data/InstagramUser.php b/src/Data/InstagramUser.php
@@ -27,7 +27,7 @@ public function __construct(
         public string $username,
         public string $name,
         public string $account_type,
-        public string $profile_picture_url,
+        public ?string $profile_picture_url,
         public int $followers_count,
         public int $follows_count,
         public int $media_count,

diff --git a/src/Http/Controllers/InstagramController.php b/src/Http/Controllers/InstagramController.php
@@ -34,8 +34,8 @@ public function callback(Request $request)
 
         $connector = new InstagramConnector;
         $shortLivedAuthenticator = $connector->getShortLivedAccessToken(code: $request->get('code'));
-        $authenticator = $connector->getAccessToken(code: $shortLivedAuthenticator->accessToken);
-        $serialized = $authenticator->serialize();
+        $authenticator = $connector->getAccessToken(code: $shortLivedAuthenticator->accessToken); // @phpstan-ignore-line
+        $serialized = $authenticator->serialize(); // @phpstan-ignore-line
 
         Cache::store(config('instagram.cache_store'))->put('instagram.authenticator', $serialized, now()->addDays(60));
 
@@ -50,8 +50,6 @@ public function callback(Request $request)
 
         $json = $response->json();
 
-        ray($json);
-
         Cache::store(config('instagram.cache_store'))->put('instagram.authenticated', $json, now()->addDays(60));
 
         return response('Authenticated Instagram account: '.Arr::get($json, 'username'), 200);

diff --git a/src/Requests/Authentication/GetAccessTokenRequest.php b/src/Requests/Authentication/GetAccessTokenRequest.php
@@ -39,10 +39,8 @@ public function __construct(protected string $code, protected OAuthConfig $oauth
      *
      * @return array{
      *     grant_type: string,
-     *     code: string,
-     *     client_id: string,
+     *     access_token: string,
      *     client_secret: string,
-     *     redirect_uri: string,
      * }
      */
     public function defaultQuery(): array