diff --git a/services/identity/src/service.rs b/services/identity/src/service.rs --- a/services/identity/src/service.rs +++ b/services/identity/src/service.rs @@ -103,7 +103,7 @@ registration::handle_registration_upload_and_credential_request( second_message, tx.clone(), - self.client.clone(), + &self.client, ®istration_state, pake_state, ) @@ -112,7 +112,7 @@ registration::handle_credential_finalization( third_message, tx, - self.client.clone(), + &self.client, ®istration_state, server_login, ) @@ -136,12 +136,9 @@ let (tx, rx) = mpsc::channel(MPSC_CHANNEL_BUFFER_CAPACITY); let first_message = in_stream.next().await; - let login_state = login::handle_login_request( - first_message, - tx.clone(), - self.client.clone(), - ) - .await?; + let login_state = + login::handle_login_request(first_message, tx.clone(), &self.client) + .await?; // login_state will be None if user is logging in with a wallet if let Some(state) = login_state { @@ -280,7 +277,7 @@ } async fn put_token_helper( - client: DatabaseClient, + client: &DatabaseClient, auth_type: AuthType, user_id: &str, signing_public_key: &str, @@ -352,7 +349,7 @@ } async fn wallet_login_helper( - client: DatabaseClient, + client: &DatabaseClient, wallet_login_request: WalletLoginRequestStruct, rng: &mut (impl Rng + CryptoRng), ) -> Result { @@ -386,7 +383,7 @@ } async fn pake_login_start( - client: DatabaseClient, + client: &DatabaseClient, user_id: &str, pake_credential_request: &[u8], ) -> Result { @@ -422,7 +419,7 @@ async fn pake_login_finish( user_id: &str, signing_public_key: &str, - client: DatabaseClient, + client: &DatabaseClient, server_login: ServerLogin, pake_credential_finalization: &Vec, rng: &mut (impl Rng + CryptoRng), @@ -479,7 +476,7 @@ async fn pake_registration_finish( user_id: &str, - client: DatabaseClient, + client: &DatabaseClient, registration_upload_bytes: &Vec, server_registration: ServerRegistration, username: &str, diff --git a/services/identity/src/service/login.rs b/services/identity/src/service/login.rs --- a/services/identity/src/service/login.rs +++ b/services/identity/src/service/login.rs @@ -7,7 +7,7 @@ pub async fn handle_login_request( message: Option>, tx: mpsc::Sender>, - client: DatabaseClient, + client: &DatabaseClient, ) -> Result, Status> { match message { Some(Ok(LoginRequest { @@ -72,7 +72,7 @@ let login_finish_result = pake_login_finish( &login_state.user_id, &login_state.signing_public_key, - client, + &client, login_state.pake_state, &pake_credential_finalization, &mut OsRng, diff --git a/services/identity/src/service/registration.rs b/services/identity/src/service/registration.rs --- a/services/identity/src/service/registration.rs +++ b/services/identity/src/service/registration.rs @@ -59,7 +59,7 @@ pub async fn handle_registration_upload_and_credential_request( message: Option>, tx: mpsc::Sender>, - client: DatabaseClient, + client: &DatabaseClient, registration_state: &RegistrationState, pake_state: ServerRegistration, ) -> Result, Status> { @@ -72,7 +72,7 @@ })) => { let response_and_state = match pake_registration_finish( ®istration_state.user_id, - client.clone(), + client, &pake_registration_upload_and_credential_request .pake_registration_upload, pake_state, @@ -112,7 +112,7 @@ pub async fn handle_credential_finalization( message: Option>, tx: mpsc::Sender>, - client: DatabaseClient, + client: &DatabaseClient, registration_state: &RegistrationState, server_login: ServerLogin, ) -> Result<(), Status> {