Pass encrypted phone number (#110)

Author: andrei-21

graphql/schemas/operations.graphql

@@ -169,8 +169,8 @@ mutation SubmitLnurlPayInvoice($id: String!, $invoice: String) {
   submit_lnurl_pay_invoice(id: $id, invoice: $invoice)
 }
 
-mutation RequestPhoneNumberVerification($number: String!) {
-  request_phone_number_verification(number: $number)
+mutation RequestPhoneNumberVerification($encryptedNumber: String!, $number: String!) {
+  request_phone_number_verification(encryptedNumber: $encryptedNumber, number: $number)
 }
 
 mutation VerifyPhoneNumber($number: String!, $otp: String!) {
@@ -179,6 +179,6 @@ mutation VerifyPhoneNumber($number: String!, $otp: String!) {
 
 query VerifiedPhoneNumber {
   verified_phone_number {
-    phoneNumber
+    encryptedPhoneNumber
   }
 }

graphql/schemas/schema_wallet_read.graphql

@@ -264,6 +264,10 @@ type TokenContainer {
   refreshToken: String
 }
 
+type VerifiedPhoneNumberResponse {
+  encryptedPhoneNumber: String!
+}
+
 scalar Void
 
 type WalletAcl {
@@ -721,24 +725,16 @@ type mutation_root {
   recover_backup(schemaName: String!): RecoverBackupResponse
   refresh_session(refreshToken: String!): TokenContainer
   refresh_session_v2(refreshToken: String!): SessionPermit
-  """
-  Allows registering even if a previous registration is verified or pending verification.
-  """
-  request_phone_number_verification(number: String!): Void
-
-  """
-  If a distinct phone number was previously registered, expire it in case this
-  new one gets verified.
-  """
-  verify_phone_number(number: String!, otp: String!): Void
   register_notification_token(language: String!, notificationToken: String!): Token
   register_topup(email: String, orderId: String!): RegisterTopupResponse
   report_payment_telemetry(events: PaymentTelemetryEventsInput, telemetryId: String!): ReportPaymentTelemetryResponse
+  request_phone_number_verification(encryptedNumber: String!, number: String!): Void
   start_prepared_session(challenge: String!, challengeSignature: String!, challengeSignatureType: ChallengeSignatureType, preparedPermissionToken: String!): TokenContainer
   start_prepared_session_v2(challenge: String!, challengeSignature: String!, challengeSignatureType: ChallengeSignatureType, preparedPermissionToken: String!): SessionPermit
   start_session(authPubKey: String!, challenge: String!, challengeSignature: String!, challengeSignatureType: ChallengeSignatureType, signedAuthPubKey: String!, walletPubKey: String!): TokenContainer
   start_session_v2(authPubKey: String!, challenge: String!, challengeSignature: String!, challengeSignatureType: ChallengeSignatureType, signedAuthPubKey: String!, walletPubKey: String!): SessionPermit
   submit_lnurl_pay_invoice(id: String!, invoice: String): Void
+  verify_phone_number(number: String!, otp: String!): Void
 }
 
 scalar numeric
@@ -826,12 +822,6 @@ type query_root {
   """fetch data from the table: "country" using primary key columns"""
   country_by_pk(countryCode: String!): country
 
-  """
-  Returns the PhoneNumberResponse corresponding to the VERIFIED registration.
-  If there's no VERIFIED registration, it returns null.
-  """
-  verified_phone_number: PhoneNumberResponse
-
   """
   fetch data from the table: "currency"
   """
@@ -884,6 +874,7 @@ type query_root {
   notification_service_version: String
   payment_service_version: String
   prepare_wallet_session(challenge: String!, ownerPubKeyId: String!, signature: String!): String
+  sms_service_version: String
 
   """
   fetch data from the table: "token"
@@ -931,6 +922,7 @@ type query_root {
   """fetch data from the table: "topup" using primary key columns"""
   topup_by_pk(id: uuid!): topup
   topup_service_version: String
+  verified_phone_number: VerifiedPhoneNumberResponse
 
   """
   fetch data from the table: "wallet_acl"
@@ -956,10 +948,6 @@ type query_root {
   wallet_acl_by_pk(id: uuid!): wallet_acl
 }
 
-type PhoneNumberResponse {
-  phoneNumber: String!
-}
-
 enum service_enum {
   LIPA_WALLET
   POCKET_EXCHANGE

pigeon/src/lib.rs

@@ -48,13 +48,17 @@ pub async fn request_phone_number_verification(
     backend_url: &str,
     auth: &Auth,
     number: String,
+    encrypted_number: String,
 ) -> graphql::Result<()> {
     let token = auth.query_token().await?;
     let client = build_async_client(Some(&token))?;
     let _data = post::<RequestPhoneNumberVerification>(
         &client,
         backend_url,
-        request_phone_number_verification::Variables { number },
+        request_phone_number_verification::Variables {
+            encrypted_number,
+            number,
+        },
     )
     .await?;
     Ok(())
@@ -86,5 +90,5 @@ pub async fn query_verified_phone_number(
     let data =
         post::<VerifiedPhoneNumber>(&client, backend_url, verified_phone_number::Variables {})
             .await?;
-    Ok(data.verified_phone_number.map(|n| n.phone_number))
+    Ok(data.verified_phone_number.map(|n| n.encrypted_phone_number))
 }