APNs token handling improvements. (#157)

* APNs token handling improvements.

- Calls VerifyClient without token anyway if the APNs token cannot be retrieved.
  This allows server to use discretion if needed in future. The developer will
  receive the same error as before.
- Moves token formatting code to the token class itself to make the main logic
  in the provider class more clear. This also eliminates duplicated code in the
  sample app.

* Adds a comment about a string constant used in test.

2 files changed, 17 insertions, 3 deletions

diff --git a/Example/Auth/Tests/FIRAuthAPNSTokenTests.m b/Example/Auth/Tests/FIRAuthAPNSTokenTests.m
index d2cd0b5..6eeabd3 100644
--- a/Example/Auth/Tests/FIRAuthAPNSTokenTests.m
+++ b/Example/Auth/Tests/FIRAuthAPNSTokenTests.m
@@ -27,14 +27,15 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 @implementation FIRAuthAPNSTokenTests
 
-/** @fn testInitializer
-    @brief Tests the initializer of the class.
+/** @fn testProperties
+    @brief Tests the properties of the class.
  */
-- (void)testInitializer {
+- (void)testProperties {
   NSData *data = [@"asdf" dataUsingEncoding:NSUTF8StringEncoding];
   FIRAuthAPNSToken *token = [[FIRAuthAPNSToken alloc] initWithData:data
                                                               type:FIRAuthAPNSTokenTypeProd];
   XCTAssertEqualObjects(token.data, data);
+  XCTAssertEqualObjects(token.string, @"61736466");  // hex string representation of "asdf"
   XCTAssertEqual(token.type, FIRAuthAPNSTokenTypeProd);
 }
 
diff --git a/Example/Auth/Tests/FIRPhoneAuthProviderTests.m b/Example/Auth/Tests/FIRPhoneAuthProviderTests.m
index 05f3774..5d67ac8 100644
--- a/Example/Auth/Tests/FIRPhoneAuthProviderTests.m
+++ b/Example/Auth/Tests/FIRPhoneAuthProviderTests.m
@@ -275,12 +275,25 @@ static const NSTimeInterval kExpectationTimeout = 1;
   OCMExpect([_mockAppCredentialManager credential]).andReturn(nil);
   OCMExpect([_mockAPNSTokenManager getTokenWithCallback:OCMOCK_ANY])
       .andCallBlock1(^(FIRAuthAPNSTokenCallback callback) { callback(nil); });
+  // Expect verify client request to the backend wth empty token.
+  OCMExpect([_mockBackend verifyClient:[OCMArg any] callback:[OCMArg any]])
+      .andCallBlock2(^(FIRVerifyClientRequest *request,
+                       FIRVerifyClientResponseCallback callback) {
+    XCTAssertNil(request.appToken);
+    dispatch_async(FIRAuthGlobalWorkQueue(), ^() {
+      // The backend is supposed to return an error.
+      callback(nil, [NSError errorWithDomain:FIRAuthErrorDomain
+                                        code:FIRAuthErrorCodeMissingAppToken
+                                    userInfo:nil]);
+    });
+  });
 
   XCTestExpectation *expectation = [self expectationWithDescription:@"callback"];
   [_provider verifyPhoneNumber:kTestPhoneNumber
                     completion:^(NSString *_Nullable verificationID, NSError *_Nullable error) {
     XCTAssertTrue([NSThread isMainThread]);
     XCTAssertNil(verificationID);
+    XCTAssertEqualObjects(error.domain, FIRAuthErrorDomain);
     XCTAssertEqual(error.code, FIRAuthErrorCodeMissingAppToken);
     [expectation fulfill];
   }];