MC-38539: Introduce JWT wrapper

Author: ogorkun

app/code/Magento/JwtFrameworkAdapter/Model/Data/Claim.php

@@ -8,66 +8,12 @@
 
 namespace Magento\JwtFrameworkAdapter\Model\Data;
 
-use Magento\Framework\Jwt\ClaimInterface;
+use Magento\Framework\Jwt\Claim\AbstractClaim;
 
-class Claim implements ClaimInterface
+class Claim extends AbstractClaim
 {
-    /**
-     * @var string
-     */
-    private $name;
-
-    /**
-     * @var mixed
-     */
-    private $value;
-
-    /**
-     * @var string|null
-     */
-    private $class;
-
-    /**
-     * @param string $name
-     * @param mixed $value
-     * @param string|null $class
-     */
-    public function __construct(string $name, $value, ?string $class)
-    {
-        $this->name = $name;
-        $this->value = $value;
-        $this->class = $class;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getClass(): ?string
-    {
-        return $this->class;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function isHeaderDuplicated(): bool
+    public function __construct(string $name, $value, ?int $class)
     {
-        return false;
+        parent::__construct($name, $value, $class, false);
     }
 }

lib/internal/Magento/Framework/Jwt/Claim/AbstractClaim.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Jwt\Claim;
+
+use Magento\Framework\Jwt\ClaimInterface;
+
+/**
+ * Abstract user-defined claim.
+ */
+abstract class AbstractClaim implements ClaimInterface
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var int|float|string|bool|array|null
+     */
+    private $value;
+
+    /**
+     * @var int|null
+     */
+    private $class;
+
+    /**
+     * @var bool
+     */
+    private $duplicated;
+
+    /**
+     * Parse NumericDate and return DateTime with UTC timezone.
+     *
+     * @param string $date
+     * @return \DateTimeInterface
+     */
+    public static function parseNumericDate(string $date): \DateTimeInterface
+    {
+        $dt = \DateTime::createFromFormat('Y-m-d\TH:i:sT', $date);
+        $dt->setTimezone(new \DateTimeZone('UTC'));
+
+        return \DateTimeImmutable::createFromMutable($dt);
+    }
+
+    public function __construct(string $name, $value, ?int $class, bool $duplicated = false)
+    {
+        $this->name = $name;
+        $this->value = $value;
+        $this->class = $class;
+        $this->duplicated = $duplicated;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getClass(): ?int
+    {
+        return $this->class;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isHeaderDuplicated(): bool
+    {
+        return $this->duplicated;
+    }
+}

lib/internal/Magento/Framework/Jwt/Claim/Audience.php

@@ -57,7 +57,7 @@ public function getValue()
     /**
      * @inheritDoc
      */
-    public function getClass(): ?string
+    public function getClass(): ?int
     {
         return self::CLASS_REGISTERED;
     }

lib/internal/Magento/Framework/Jwt/Claim/ExpirationTime.php

@@ -58,7 +58,7 @@ public function getValue()
     /**
      * @inheritDoc
      */
-    public function getClass(): ?string
+    public function getClass(): ?int
     {
         return self::CLASS_REGISTERED;
     }

lib/internal/Magento/Framework/Jwt/Claim/IssuedAt.php

@@ -58,7 +58,7 @@ public function getValue()
     /**
      * @inheritDoc
      */
-    public function getClass(): ?string
+    public function getClass(): ?int
     {
         return self::CLASS_REGISTERED;
     }

lib/internal/Magento/Framework/Jwt/Claim/Issuer.php

@@ -54,7 +54,7 @@ public function getValue()
     /**
      * @inheritDoc
      */
-    public function getClass(): ?string
+    public function getClass(): ?int
     {
         return self::CLASS_REGISTERED;
     }

lib/internal/Magento/Framework/Jwt/Claim/JwtId.php

@@ -54,7 +54,7 @@ public function getValue()
     /**
      * @inheritDoc
      */
-    public function getClass(): ?string
+    public function getClass(): ?int
     {
         return self::CLASS_REGISTERED;
     }

lib/internal/Magento/Framework/Jwt/Claim/NotBefore.php

@@ -58,7 +58,7 @@ public function getValue()
     /**
      * @inheritDoc
      */
-    public function getClass(): ?string
+    public function getClass(): ?int
     {
         return self::CLASS_REGISTERED;
     }

lib/internal/Magento/Framework/Jwt/Claim/PrivateClaim.php

@@ -8,69 +8,18 @@
 
 namespace Magento\Framework\Jwt\Claim;
 
-use Magento\Framework\Jwt\ClaimInterface;
-
 /**
  * Private non-registered claim.
  */
-class PrivateClaim implements ClaimInterface
+class PrivateClaim extends AbstractClaim
 {
-    /**
-     * @var string
-     */
-    private $name;
-
-    /**
-     * @var mixed
-     */
-    private $value;
-
-    /**
-     * @var bool
-     */
-    private $headerDuplicated;
-
     /**
      * @param string $name
-     * @param mixed $value
-     * @param bool $headerDuplicated
-     */
-    public function __construct(string $name, $value, bool $headerDuplicated = false)
-    {
-        $this->name = $name;
-        $this->value = $value;
-        $this->headerDuplicated = $headerDuplicated;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getClass(): ?string
-    {
-        return self::CLASS_PRIVATE;
-    }
-
-    /**
-     * @inheritDoc
+     * @param $value
+     * @param bool $duplicated
      */
-    public function isHeaderDuplicated(): bool
+    public function __construct(string $name, $value, bool $duplicated = false)
     {
-        return $this->headerDuplicated;
+        parent::__construct($name, $value, self::CLASS_PRIVATE, $duplicated);
     }
 }

lib/internal/Magento/Framework/Jwt/Claim/PublicClaim.php

@@ -8,67 +8,16 @@
 
 namespace Magento\Framework\Jwt\Claim;
 
-use Magento\Framework\Jwt\ClaimInterface;
-
-class PublicClaim implements ClaimInterface
+/**
+ * Public collision-resistant claim.
+ */
+class PublicClaim extends AbstractClaim
 {
-    /**
-     * @var string
-     */
-    private $name;
-
-    /**
-     * @var mixed
-     */
-    private $value;
-
-    /**
-     * @var bool
-     */
-    private $headerDuplicated;
-
-    /**
-     * @param string $name
-     * @param mixed $value
-     * @param string|null $prefix
-     * @param bool $headerDuplicated
-     */
-    public function __construct(string $name, $value, ?string $prefix, bool $headerDuplicated = false)
-    {
-        $this->name = $prefix ? $prefix .'-' .$name : $name;
-        $this->value = $value;
-        $this->headerDuplicated = $headerDuplicated;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getClass(): ?string
-    {
-        return self::CLASS_PUBLIC;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function isHeaderDuplicated(): bool
+    public function __construct(string $name, $value, ?string $prefix, bool $duplicated = false)
     {
-        return $this->headerDuplicated;
+        if ($prefix) {
+            $prefix .= '-';
+        }
+        parent::__construct($prefix .$name, $value, self::CLASS_PUBLIC, $duplicated);
     }
 }