NTR - Fix minor syntax

Author: vienthuong

src/Data/AccessToken.php

@@ -25,6 +25,6 @@ public function isExpired() : bool
         $payload = json_decode(base64_decode(explode('.', $this->accessToken)[1]), true);
         $expiresAt = $payload['exp'];
 
-        return $expiresAt * 1000 < time();
+        return $expiresAt - 10 < time();
     }
 }

src/Data/Webhook/AppAction/AppAction.php

@@ -51,7 +51,7 @@ public static function createFromPayload(array $payload, ?array $headers = []):
         $source = $action = $meta = null;
 
         if ($rawSource = $payload['source']) {
-            $source = new Source($rawSource['url'], $rawSource['shopId'], (int) $rawSource['appVersion']);
+            $source = new Source($rawSource['url'], $rawSource['shopId'], (string) $rawSource['appVersion']);
         }
 
 

src/Data/Webhook/Event/Event.php

@@ -51,7 +51,7 @@ public static function createFromPayload(array $payload, ?array $headers = []):
         $source = $data = null;
 
         if ($rawSource = $payload['source']) {
-            $source = new Source($rawSource['url'], $rawSource['shopId'], (int) $rawSource['appVersion']);
+            $source = new Source($rawSource['url'], $rawSource['shopId'], (string) $rawSource['appVersion']);
         }
 
 

src/Data/Webhook/Source.php

@@ -10,12 +10,12 @@ class Source extends Struct
 
     private string $shopId;
 
-    private int $appVersion;
+    private string $appVersion;
 
     /**
      * Create the event from Event::createFromPayload.
      */
-    public function __construct(string $shopUrl, string $shopId, int $appVersion)
+    public function __construct(string $shopUrl, string $shopId, string $appVersion)
     {
         $this->shopUrl = $shopUrl;
         $this->shopId = $shopId;
@@ -32,7 +32,7 @@ public function getShopId(): string
         return $this->shopId;
     }
 
-    public function getAppVersion(): int
+    public function getAppVersion(): string
     {
         return $this->appVersion;
     }

src/Repository/Struct/VersionResponse.php

@@ -8,7 +8,7 @@ class VersionResponse extends Struct
 {
     protected string $versionId;
 
-    protected string $versionName;
+    protected ?string $versionName;
 
     protected string $id;
 
@@ -42,12 +42,12 @@ public function setVersionId(string $versionId): void
         $this->versionId = $versionId;
     }
 
-    public function getVersionName(): string
+    public function getVersionName(): ?string
     {
         return $this->versionName;
     }
 
-    public function setVersionName(string $versionName): void
+    public function setVersionName(?string $versionName): void
     {
         $this->versionName = $versionName;
     }

tests/AdminAuthenticatorTest.php

@@ -87,13 +87,13 @@ public function testCallTokenCallback(): void
 
     public function testTokenExpired(): void
     {
-        $token = 'abc.' . base64_encode(json_encode(['exp' => (time() - 1000)/1000])) . '.xyz';
+        $token = 'abc.' . base64_encode(json_encode(['exp' => time() - 100])) . '.xyz';
 
         $accessToken = new AccessToken($token);
 
         static::assertTrue($accessToken->isExpired());
 
-        $token = 'abc.' . base64_encode(json_encode(['exp' => (time() + 1000)/1000])) . '.xyz';
+        $token = 'abc.' . base64_encode(json_encode(['exp' => time() + 100])) . '.xyz';
 
         $accessToken = new AccessToken($token);