Skip to content

daemon: rename internal SelectCredential states to SelectingCredential #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kpanuragh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

daemon: rename internal SelectCredential states to SelectingCredential #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions credentialsd/src/credential_service/nfc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ impl InProcessNfcHandler {
),
))
} else {
Ok(NfcStateInternal::SelectCredential {
Ok(NfcStateInternal::SelectingCredential {
response: get_assertion_response,
cred_tx: cred_tx.clone(),
})
Expand Down Expand Up @@ -203,7 +203,7 @@ impl InProcessNfcHandler {
| NfcStateInternal::NeedsUserVerification { .. } => {
Self::process_user_interaction(&mut signal_rx, &cred_tx).await
}
NfcStateInternal::SelectCredential {
NfcStateInternal::SelectingCredential {
ref response,
cred_tx: _,
} => Self::process_select_credential(response, &mut cred_rx).await,
Expand Down Expand Up @@ -449,7 +449,7 @@ pub(super) enum NfcStateInternal {
NeedsUserVerification { attempts_left: Option<u32> },

/// Multiple credentials have been found and the user has to select which to use
SelectCredential {
SelectingCredential {
response: GetAssertionResponse,
cred_tx: mpsc::Sender<String>,
},
Expand Down Expand Up @@ -532,7 +532,7 @@ impl From<NfcStateInternal> for NfcState {
}
NfcStateInternal::Completed(_) => NfcState::Completed,
NfcStateInternal::Restarting => NfcState::Restarting,
NfcStateInternal::SelectCredential { response, cred_tx } => {
NfcStateInternal::SelectingCredential { response, cred_tx } => {
NfcState::SelectingCredential {
creds: response
.assertions
Expand Down
8 changes: 4 additions & 4 deletions credentialsd/src/credential_service/usb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ impl InProcessUsbHandler {
),
))
} else {
Ok(UsbStateInternal::SelectCredential {
Ok(UsbStateInternal::SelectingCredential {
response: get_assertion_response,
cred_tx: cred_tx.clone(),
})
Expand Down Expand Up @@ -310,7 +310,7 @@ impl InProcessUsbHandler {
| UsbStateInternal::NeedsUserPresence => {
Self::process_user_interaction(&mut signal_rx, &cred_tx).await
}
UsbStateInternal::SelectCredential {
UsbStateInternal::SelectingCredential {
ref response,
cred_tx: _,
} => Self::process_select_credential(response, &mut cred_rx).await,
Expand Down Expand Up @@ -559,7 +559,7 @@ pub(super) enum UsbStateInternal {
NeedsUserPresence,

/// Multiple credentials have been found and the user has to select which to use
SelectCredential {
SelectingCredential {
response: GetAssertionResponse,
cred_tx: mpsc::Sender<String>,
},
Expand Down Expand Up @@ -652,7 +652,7 @@ impl From<UsbStateInternal> for UsbState {
UsbStateInternal::NeedsUserPresence => UsbState::NeedsUserPresence,
UsbStateInternal::Completed(_) => UsbState::Completed,
UsbStateInternal::SelectingDevice(_) => UsbState::SelectingDevice,
UsbStateInternal::SelectCredential { response, cred_tx } => {
UsbStateInternal::SelectingCredential { response, cred_tx } => {
UsbState::SelectingCredential {
creds: response
.assertions
Expand Down