From 57cd7aaf5a2154af698fddc39f4bff8fd3e4f6e7 Mon Sep 17 00:00:00 2001 From: Arthur Rand Date: Wed, 16 May 2018 05:55:27 -0700 Subject: [API-1584] Change AuthCredentials to accept a string identifier (#166) * make email optional, add optional phone number to AuthCredentials * make AuthCredentials take a String instead of an email * wrap phone number parsing in Try * add json formatter for AuthCredentials * try val --- src/main/scala/xyz/driver/core/domain.scala | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/main/scala/xyz/driver/core/domain.scala') diff --git a/src/main/scala/xyz/driver/core/domain.scala b/src/main/scala/xyz/driver/core/domain.scala index 7731345..fa3b5c4 100644 --- a/src/main/scala/xyz/driver/core/domain.scala +++ b/src/main/scala/xyz/driver/core/domain.scala @@ -32,9 +32,15 @@ object domain { private val phoneUtil = PhoneNumberUtil.getInstance() def parse(phoneNumber: String): Option[PhoneNumber] = { - val phone = phoneUtil.parseAndKeepRawInput(phoneNumber, "US") - if (!phoneUtil.isValidNumber(phone)) None - else Some(PhoneNumber(phone.getCountryCode.toString, phone.getNationalNumber.toString)) + val phone = scala.util.Try(phoneUtil.parseAndKeepRawInput(phoneNumber, "US")).toOption + + val validated = phone match { + case None => None + case Some(pn) => + if (!phoneUtil.isValidNumber(pn)) None + else Some(pn) + } + validated.map(pn => PhoneNumber(pn.getCountryCode.toString, pn.getNationalNumber.toString)) } } } -- cgit v1.2.3