Initial work towards supporting Groups v2 (#73)

whisperfish · Mar 4, 2021 · d234dcb · d234dcb
1 parent 65d0ba3
commit d234dcb
Show file tree

Hide file tree

Showing 17 changed files with 1,180 additions and 234 deletions.
diff --git a/libsignal-service-actix/Cargo.toml b/libsignal-service-actix/Cargo.toml
@@ -13,7 +13,7 @@ libsignal-protocol = { git = "https://github.com/Michael-F-Bryan/libsignal-proto
 awc = { version = "3.0.0-beta.1", features=["rustls"] }
 actix = "0.11.0-beta.1"
 actix-http = "3.0.0-beta.1"
-actix-rt = "2.0.0"
+actix-rt = "2.0"
 mpart-async = "0.5.0"
 serde_json = "1.0"
 futures = "0.3"

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()),