Merge pull request #2436 from WPO-Foundation/fix-explosion-account-page

fix(account): sometimes company name is null, not empty
catchpoint · Oct 6, 2022 · c03e23b · c03e23b
2 parents dd3e181 + 76ca195
commit c03e23b
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/tests/Handlers/AccountTest.php b/tests/Handlers/AccountTest.php
@@ -636,4 +636,35 @@ public function testGetAccountPageDefaultFree(): void
 
         Account::getAccountPage($req, $page);
     }
+
+    public function testGetAccountPageDefaultFreeCompanyNull(): void
+    {
+        $page = "";
+
+        $req = new RequestContext([]);
+        $user = new User();
+        $user->setUserId(12345);
+        $req->setUser($user);
+
+        $client = $this->createMock(CPClient::class);
+        $client->expects($this->once())
+            ->method('getFullWptPlanSet');
+        $client->expects($this->once())
+            ->method('getUserContactInfo')
+            ->with(12345)
+            ->willReturn([
+                'firstName' => "Goober",
+                'lastName' => "Goob",
+                'companyName' => null
+            ]);
+        $req->setClient($client);
+
+        $bmm = $this->createMock(BannerMessageManager::class);
+        $bmm->expects($this->once())
+            ->method('get')
+            ->willReturn([]);
+        $req->setBannerMessageManager($bmm);
+
+        Account::getAccountPage($req, $page);
+    }
 }
diff --git a/www/src/Handlers/Account.php b/www/src/Handlers/Account.php
@@ -687,7 +687,7 @@ public static function getAccountPage(RequestContext $request_context, string $p
         $contact_info = $request_context->getClient()->getUserContactInfo($user_id);
         $first_name = $contact_info['firstName'];
         $last_name = $contact_info['lastName'];
-        $company_name = $contact_info['companyName'];
+        $company_name = $contact_info['companyName'] ?? "";
 
 
         $contact_info = [