Skip to content

Commit

Permalink
Accept raw string confirmation code on confirm device (#240)
Browse files Browse the repository at this point in the history
Accept raw string confirmation code on confirm device

Co-authored-by: Ruben De Smet <[email protected]>
  • Loading branch information
MarcusGrass and rubdos committed Aug 7, 2023
1 parent 5b72a78 commit 81eb911
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions libsignal-service/src/provisioning/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ impl<'a, P: PushService + 'a> ProvisioningManager<'a, P> {

pub(crate) async fn confirm_device(
&mut self,
confirm_code: u32,
confirm_code: &str,
confirm_code_message: ConfirmDeviceMessage,
) -> Result<DeviceId, ServiceError> {
self.push_service
Expand Down Expand Up @@ -346,16 +346,15 @@ impl<P: PushService> LinkingManager<P> {
self.password.clone(),
);

let provisioning_code = message.provisioning_code.ok_or(
ProvisioningError::InvalidData {
reason: "no provisioning confirmation code".into(),
},
)?;

let device_id = provisioning_manager
.confirm_device(
message
.provisioning_code
.ok_or(ProvisioningError::InvalidData {
reason: "no provisioning confirmation code"
.into(),
})?
.parse()
.unwrap(),
&provisioning_code,
ConfirmDeviceMessage {
signaling_key: signaling_key.to_vec(),
supports_sms: false,
Expand Down

0 comments on commit 81eb911

Please sign in to comment.