Merge pull request #222 from EasyPost/simpler_address_verify

refactor: removes unreachable address verification code
EasyPost · Sep 21, 2022 · 6ab30f2 · 6ab30f2
2 parents 66e764c + 3696acc
commit 6ab30f2
Show file tree

Hide file tree

Showing 3 changed files with 168 additions and 14 deletions.
diff --git a/lib/EasyPost/Address.php b/lib/EasyPost/Address.php
@@ -97,13 +97,7 @@ public static function create_and_verify($params = null, $apiKey = null)
         $url = self::classUrl($class);
         list($response, $apiKey) = $requestor->request('post', $url . '/create_and_verify', $params);
 
-        if (isset($response['address'])) {
-            $verifiedAddress = Util::convertToEasyPostObject($response['address'], $apiKey);
-
-            return $verifiedAddress;
-        } else {
-            return Util::convertToEasyPostObject($response, $apiKey);
-        }
+        return Util::convertToEasyPostObject($response['address'], $apiKey);
     }
 
     /**
@@ -118,12 +112,6 @@ public function verify()
         $url = $this->instanceUrl() . '/verify';
         list($response, $apiKey) = $requestor->request('get', $url, null);
 
-        if (isset($response['address'])) {
-            $verifiedAddress = Util::convertToEasyPostObject($response['address'], $apiKey);
-
-            return $verifiedAddress;
-        } else {
-            return Util::convertToEasyPostObject($response, $apiKey);
-        }
+        return Util::convertToEasyPostObject($response['address'], $apiKey);
     }
 }
diff --git a/test/EasyPost/AddressTest.php b/test/EasyPost/AddressTest.php
@@ -165,4 +165,19 @@ public function testVerify()
         $this->assertStringMatchesFormat('adr_%s', $address->id);
         $this->assertEquals('388 Townsend St', $address->street1);
     }
+
+    /**
+     * Test we throw an error for an invalid address verification.
+     */
+    public function testVerifyInvalid()
+    {
+        VCR::insertCassette('addresses/verifyInvalid.yml');
+
+        try {
+            $address = Address::create(['street1' => 'invalid']);
+            $address->verify();
+        } catch (\EasyPost\Error $error) {
+            $this->assertEquals('Unable to verify address.', $error->getMessage());
+        }
+    }
 }
diff --git a/test/cassettes/addresses/verifyInvalid.yml b/test/cassettes/addresses/verifyInvalid.yml