Own String in HttpCredentials

whisperfish · Mar 4, 2021 · 28c04b3 · 28c04b3
1 parent 305806e
commit 28c04b3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/libsignal-service-actix/src/push_service.rs b/libsignal-service-actix/src/push_service.rs
@@ -35,7 +35,7 @@ impl AwcPushService {
         let client = get_client(&cfg, user_agent);
         Self {
             cfg,
-            credentials: credentials.map(|c| c.authorization()),
+            credentials: credentials.and_then(|c| c.authorization()),
             client,
         }
     }
@@ -55,7 +55,7 @@ impl AwcPushService {
         {
             builder = builder.basic_auth(
                 &http_credentials.username,
-                http_credentials.password.as_deref(),
+                Some(&http_credentials.password),
             );
         }
         Ok(builder)

diff --git a/libsignal-service/src/configuration.rs b/libsignal-service/src/configuration.rs
@@ -33,11 +33,11 @@ pub struct ServiceCredentials {
 }
 
 impl ServiceCredentials {
-    pub fn authorization(&self) -> HttpCredentials {
-        HttpCredentials {
+    pub fn authorization(&self) -> Option<HttpCredentials> {
+        self.password.as_ref().map(|password| HttpCredentials {
             username: self.login(),
-            password: self.password.clone(),
-        }
+            password: password.clone(),
+        })
     }
 
     pub fn e164(&self) -> String {

diff --git a/libsignal-service/src/gv2/api.rs b/libsignal-service/src/gv2/api.rs
@@ -172,9 +172,8 @@ impl<'a, S: PushService, C: CredentialsCache> GroupsV2Api<'a, S, C> {
             &group_secret_params.get_public_params(),
         )?);
 
-        let password = Some(hex::encode(bincode::serialize(
-            &auth_credential_presentation,
-        )?));
+        let password =
+            hex::encode(bincode::serialize(&auth_credential_presentation)?);
 
         Ok(HttpCredentials { username, password })
     }

diff --git a/libsignal-service/src/push_service.rs b/libsignal-service/src/push_service.rs
@@ -143,7 +143,7 @@ pub struct PreKeyStatus {
 #[derive(Clone)]
 pub struct HttpCredentials {
     pub username: String,
-    pub password: Option<String>,
+    pub password: String,
 }
 
 impl ProfileKey {