Use account id and convert igid to fbid v2

Summary:
Per discussion with Shuang, user id could be many things, and we should use account id to report the usage.  So use getAccountID for fb user.

Regarding ig user, deltoid expectes FBIDv2 only. So if one igid is passed in, we need to convert it to FBIDv2.

Differential Revision: D83168475

fbshipit-source-id: ec0d6f24615c6b3f0eada0680e3cd77e2c915d9b

Author: Baohua Shan

thrift/lib/hack/src/ThriftContextPropState.php

@@ -245,7 +245,7 @@ private static function updateFBUserIdFromVC(
       );
       $user_id = ZERO_FBID;
     } else {
-      $user_id = $vc->getUserID();
+      $user_id = $vc->getAccountID();
     }
 
     if ($user_id !== ZERO_FBID && self::updateFBUserId($user_id, $src)) {
@@ -263,6 +263,25 @@ private static function updateIGUserIdFromVC(
     return self::updateIGUserId($vc->getViewerID(), $src);
   }
 
+  private static function getIgUserId(int $ig_user_id): ?int {
+    if (IgidUtils::isUserFbid($ig_user_id)) {
+      return $ig_user_id;
+    }
+    try {
+      if (IgidUtils::isUserIgid($ig_user_id)) {
+        return IgidUtils::userIgidToFbid($ig_user_id);
+      }
+    } catch (\Exception $ex) {
+      ope(
+        $ex,
+        causes_the('No valid fbid for ig user id')->to(
+          'context proper user id',
+        ),
+      );
+    }
+    return null;
+  }
+
   // returns id if it is valid (non-null, positive), and should match the type
   private static function coerceId(
     ?int $user_id,
@@ -279,11 +298,7 @@ private static function coerceId(
         }
         break;
       case UserIdCategory::IG:
-        if (
-          IgidUtils::isUserFbid($user_id) || IgidUtils::isUserIgid($user_id)
-        ) {
-          return $user_id;
-        }
+        return self::getIgUserId($user_id);
     }
     return null;
   }

thrift/lib/hack/src/__tests__/ThriftContextPropStateTest.php

@@ -231,7 +231,7 @@ public function testInitialization()[defaults]: void {
     );
 
     // set up mocks for VC
-    $fb_vc = mock(IFBViewerContext::class)->mockReturn('getUserID', fbid(1));
+    $fb_vc = mock(IFBViewerContext::class)->mockReturn('getAccountID', fbid(1));
     $ig_vc = mock(IIGViewerContext::class)->mockReturn('getViewerID', fbid(2));
 
     $buf = new TMemoryBuffer();
@@ -260,7 +260,8 @@ public function testInitialization()[defaults]: void {
     );
 
     // set up mocks for VC
-    $fb_vc = mock(IFBViewerContext::class)->mockReturn('getUserID', fbid(123));
+    $fb_vc =
+      mock(IFBViewerContext::class)->mockReturn('getAccountID', fbid(123));
 
     $buf = new TMemoryBuffer();
     $prot = new TCompactProtocolAccelerated($buf);
@@ -286,9 +287,8 @@ public function testInitialization()[defaults]: void {
     $tfm->baggage->user_ids = ContextProp\UserIds::fromShape(
       shape('fb_user_id' => 123, 'ig_user_id' => 456),
     );
-
     // set up mocks for VC
-    $fb_vc = mock(IFBViewerContext::class)->mockReturn('getUserID', fbid(1));
+    $fb_vc = mock(IFBViewerContext::class)->mockReturn('getAccountID', fbid(1));
     $ig_vc = mock(IIGViewerContext::class)->mockReturn('getViewerID', fbid(2));
 
     $buf = new TMemoryBuffer();