SDK-603: Amend the Anchor converter to look for known Oids

Author: Moussa Sidibe

sandbox/src/Http/RequestBuilder.php

@@ -198,16 +198,17 @@ private function addAttribute(SandboxAttribute $attribute)
     private function formatAnchors(array $anchors)
     {
         $anchorsList = [];
+        $tsMultiplier = 1000000;
         foreach ($anchors as $anchor) {
             /** @var SandboxAnchor $anchor */
             if (!($anchor instanceof SandboxAnchor)) {
                 continue;
             }
             $anchorsList[] = [
-                'type' => $anchor->getType(),
+                'type' => strtoupper($anchor->getType()),
                 'value' => $anchor->getValue(),
                 'sub_type' => $anchor->getSubtype(),
-                'timestamp' => $anchor->getTimestamp()
+                'timestamp' => (int) $anchor->getTimestamp() * $tsMultiplier
             ];
         }
         return $anchorsList;

src/Yoti/Util/Profile/AnchorConverter.php

@@ -25,29 +25,38 @@ public static function convert(Anchor $protobufAnchor)
         $anchorSubType = $protobufAnchor->getSubType();
         $yotiSignedTimeStamp = self::convertToYotiSignedTimestamp($protobufAnchor);
         $X509CertsList = self::convertCertsListToX509($X509, $protobufAnchor->getOriginServerCerts());
+        $anchorTypesMap = self::getAnchorTypesMap();
 
         foreach ($X509CertsList as $certX509Obj) {
             $certExtArr = $certX509Obj->tbsCertificate->extensions;
 
-            if (count($certExtArr) > 1) {
-                $oid = $certExtArr[1]->extnId;
-                $anchorType = self::getAnchorTypeByOid($oid);
-                $extEncodedValue = $certExtArr[1]->extnValue;
-
-                if ($decodedAnchorValue = self::decodeAnchorValue($ASN1, $X509, $extEncodedValue)) {
-                    $yotiAnchor = self::createYotiAnchor(
-                        $decodedAnchorValue,
-                        $anchorType,
-                        $anchorSubType,
-                        $yotiSignedTimeStamp,
-                        $X509CertsList
-                    );
-                    $anchorMap = [
-                        'oid' => $oid,
-                        'yoti_anchor' => $yotiAnchor
-                    ];
-                    // We are only looking for one YotiAnchor from protobufAnchor
-                    break;
+            foreach($anchorTypesMap as $oid => $anchorType)
+            {
+                foreach($certExtArr as $extObj) {
+                    $extRaw = (array) $extObj;
+                    $oidFound = array_search($oid, $extRaw, TRUE);
+                    if ($oidFound !== FALSE) {
+                        $extEncodedValue = $extRaw['extnValue'];
+
+                        if (
+                            is_string($extEncodedValue)
+                            && ($decodedAnchorValue = self::decodeAnchorValue($ASN1, $X509, $extEncodedValue))
+                        ) {
+                            $yotiAnchor = self::createYotiAnchor(
+                                $decodedAnchorValue,
+                                $anchorType,
+                                $anchorSubType,
+                                $yotiSignedTimeStamp,
+                                $X509CertsList
+                            );
+                            $anchorMap = [
+                                'oid' => $oid,
+                                'yoti_anchor' => $yotiAnchor
+                            ];
+                            // We are only looking for one YotiAnchor from protobufAnchor
+                            break;
+                        }
+                    }
                 }
             }
         }