Various improvements

whisperfish · Mar 3, 2021 · f3916ab · f3916ab
1 parent cf7c9af
commit f3916ab
Show file tree

Hide file tree

Showing 12 changed files with 207 additions and 210 deletions.
diff --git a/libsignal-service-actix/examples/registering.rs b/libsignal-service-actix/examples/registering.rs
@@ -40,7 +40,7 @@ async fn main() -> Result<(), Error> {
         &mut signaling_key,
     )
     .unwrap();
-    let credentials = Credentials {
+    let credentials = ServiceCredentials {
         uuid: None,
         phonenumber: args.username.clone(),
         password: Some(password),

diff --git a/libsignal-service-actix/src/provisioning.rs b/libsignal-service-actix/src/provisioning.rs
@@ -10,7 +10,7 @@ use libsignal_protocol::{
 };
 use libsignal_service::{
     configuration::ServiceConfiguration,
-    messagepipe::Credentials,
+    messagepipe::ServiceCredentials,
     prelude::PushService,
     provisioning::{ProvisioningError, ProvisioningPipe, ProvisioningStep},
     push_service::{ConfirmDeviceMessage, DeviceId},
@@ -108,9 +108,10 @@ where
 
                 // we need to authenticate with the phone number
                 // to confirm the new device
+                // TODO: we should now be able to override credentials?
                 let mut push_service = AwcPushService::new(
                     service_configuration.clone(),
-                    Some(Credentials {
+                    Some(ServiceCredentials {
                         phonenumber: phone_number.clone(),
                         uuid: None,
                         password: Some(password.to_string()),