SDK-1019: Ensure formatted address has structured address anchors

Author: davidgrayston

src/Yoti/Entity/Anchor.php

@@ -18,7 +18,6 @@ class Anchor
     const TYPE_UNKNOWN_NAME = 'UNKNOWN';
     const TYPE_SOURCE_OID = '1.3.6.1.4.1.47127.1.1.1';
     const TYPE_VERIFIER_OID = '1.3.6.1.4.1.47127.1.1.2';
-    const TYPE_UNKNOWN_OID = '';
 
     /**
      * @var string

src/Yoti/Entity/Profile.php

@@ -235,11 +235,27 @@ private function getFormattedAddress()
                 $postalAddress = new Attribute(
                     self::ATTR_POSTAL_ADDRESS,
                     $postalAddressValue,
-                    $structuredPostalAddress->getSources(),
-                    $structuredPostalAddress->getVerifiers()
+                    $this->getAttributeAnchorMap($structuredPostalAddress)
                 );
             }
         }
         return $postalAddress;
     }
+
+    /**
+     * Get anchor map for provided anchor.
+     *
+     * @param Attribute $attribute
+     * @return array attribute map
+     */
+    private function getAttributeAnchorMap(Attribute $attribute)
+    {
+        return [
+            Anchor::TYPE_UNKNOWN_NAME => array_filter($attribute->getAnchors(), function ($anchor) {
+                return $anchor->getType() == Anchor::TYPE_UNKNOWN_NAME;
+            }),
+            Anchor::TYPE_VERIFIER_OID => $attribute->getVerifiers(),
+            Anchor::TYPE_SOURCE_OID => $attribute->getSources(),
+        ];
+    }
 }

src/Yoti/Util/Profile/AnchorConverter.php

@@ -29,8 +29,9 @@ public static function convertAnchor(Anchor $protobufAnchor)
 
             foreach ($certExtsArr as $extObj) {
                 $anchorType = self::getAnchorTypeByOid($extObj->extnId);
-                $anchorValue = '';
-                if ($anchorType !== YotiAnchor::TYPE_UNKNOWN_NAME) {
+                if ($anchorType === YotiAnchor::TYPE_UNKNOWN_NAME) {
+                    $anchorValue = '';
+                } else {
                     $anchorValue = self::decodeAnchorValue($extObj->extnValue);
                 }
                 $yotiAnchor = self::createYotiAnchor(
@@ -206,7 +207,7 @@ private static function getAnchorTypesMap()
         return [
             YotiAnchor::TYPE_SOURCE_OID => YotiAnchor::TYPE_SOURCE_NAME,
             YotiAnchor::TYPE_VERIFIER_OID => YotiAnchor::TYPE_VERIFIER_NAME,
-            YotiAnchor::TYPE_UNKNOWN_OID => YotiAnchor::TYPE_UNKNOWN_NAME,
+            YotiAnchor::TYPE_UNKNOWN_NAME => YotiAnchor::TYPE_UNKNOWN_NAME,
         ];
     }
 }

tests/Entity/ProfileTest.php

@@ -6,6 +6,9 @@
 use Yoti\Entity\Profile;
 use Yoti\Entity\Attribute;
 use Yoti\Entity\AgeVerification;
+use Yoti\Entity\Anchor;
+use Yoti\Util\Profile\AnchorListConverter;
+use YotiTest\Util\Profile\TestAnchors;
 
 /**
  * @coversDefaultClass \Yoti\Entity\Profile
@@ -15,22 +18,22 @@ class ProfileTest extends TestCase
     /**
      * @var \Yoti\Entity\Profile
      */
-    public $profile;
+    private $profile;
 
     /**
      * @var \Yoti\YotiClient
      */
-    public $yotiClient;
+    private $yotiClient;
 
     /**
      * @var string
      */
-    public $expectedPhoneNumber;
+    private $expectedPhoneNumber;
 
     /**
      * @var Array Structured Postal Address
      */
-    public $dummyStructuredPostalAddress;
+    private $dummyStructuredPostalAddress;
 
     public function setup()
     {
@@ -93,28 +96,43 @@ public function testGetAttributeName()
      */
     public function testShouldReturnFormattedAddressAsPostalAddressWhenNull()
     {
+        $anchorsMap = AnchorListConverter::convert(new \ArrayObject([
+            $this->parseAnchor(TestAnchors::VERIFIER_YOTI_ADMIN_ANCHOR),
+            $this->parseAnchor(TestAnchors::UNKNOWN_ANCHOR),
+            $this->parseAnchor(TestAnchors::SOURCE_DL_ANCHOR),
+        ]));
+
         $structuredPostalAddress = new Attribute(
             Profile::ATTR_STRUCTURED_POSTAL_ADDRESS,
             $this->dummyStructuredPostalAddress,
-            []
+            $anchorsMap
         );
-        $profileData = [
+
+        $profile = new Profile([
             Profile::ATTR_STRUCTURED_POSTAL_ADDRESS => $structuredPostalAddress,
             Profile::ATTR_GIVEN_NAMES => new Attribute(
                 Profile::ATTR_GIVEN_NAMES,
                 'Given Name TEST',
                 []
             ),
-        ];
-        $profile = new Profile($profileData);
-        $expectedPostalAddress = '15a North Street CARSHALTON SM5 2HW UK';
-
+        ]);
         $this->assertEquals('Given Name TEST', $profile->getGivenNames()->getValue());
-        $this->assertEquals($expectedPostalAddress, $profile->getPostalAddress()->getValue());
         $this->assertEquals(
             json_encode($this->dummyStructuredPostalAddress),
             json_encode($profile->getStructuredPostalAddress()->getValue())
         );
+
+        $postalAddress = $profile->getPostalAddress();
+
+        $this->assertEquals('15a North Street CARSHALTON SM5 2HW UK', $postalAddress->getValue());
+        $this->assertEquals($anchorsMap[Anchor::TYPE_SOURCE_OID], $postalAddress->getSources());
+        $this->assertEquals($anchorsMap[Anchor::TYPE_VERIFIER_OID], $postalAddress->getVerifiers());
+
+        $anchors = [];
+        array_walk($anchorsMap, function ($val) use (&$anchors) {
+            $anchors = array_merge($anchors, array_values($val));
+        });
+        $this->assertEquals($anchors, $postalAddress->getAnchors());
     }
 
     /**
@@ -223,4 +241,16 @@ public function testGetDocumentImages()
         $profile = new Profile($profileData);
         $this->assertSame($profileData['document_images'], $profile->getDocumentImages());
     }
+
+    /**
+     * @param string $anchorString
+     *
+     * @return array $anchors
+     */
+    private function parseAnchor($anchorString)
+    {
+        $anchor = new \Attrpubapi\Anchor();
+        $anchor->mergeFromString(base64_decode($anchorString));
+        return $anchor;
+    }
 }