Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"args": [],
"env": {
"RUST_LOG": "credentialsd=debug,libwebauthn=debug,libwebauthn::webauthn=debug,libwebauthn=warn,libwebauthn::proto::ctap2::preflight=debug,libwebauthn::transport::channel=debug,zbus::object_server::debug,zbus=debug",
"CREDSD_TRUSTED_CALLERS": "/usr/bin/python3.14",
"CREDSD_TRUSTED_APP_IDS": "app:xyz.iinuwa.credentialsd.DemoCredentialsUi",
"CREDSD_TRUSTED_CALLERS": "/usr/bin/python3.14,${workspaceFolder}/../../portal/xdg-desktop-portal/build/src/xdg-desktop-portal",
"CREDSD_TRUSTED_APP_IDS": "xyz.iinuwa.credentialsd.DemoCredentialsUi",
},
"sourceLanguages": [
"rust"
Expand Down
4 changes: 2 additions & 2 deletions credentialsd-common/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use std::pin::Pin;
use futures_lite::Stream;

use crate::{
model::{BackgroundEvent, Device},
server::RequestId,
model::Device,
server::{BackgroundEvent, RequestId},
};

/// Used for communication from trusted UI to credential service
Expand Down
11 changes: 3 additions & 8 deletions credentialsd-common/src/model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,13 @@ pub struct RequestingParty {
pub origin: String,
}

// TODO: Move to credentialsd-ui
#[derive(Debug, Clone, Serialize, Deserialize)]
pub enum ViewUpdate {
SetTitle((String, String)),
SetDevices(Vec<Device>),
SetCredentials(Vec<Credential>),
// TODO: Fix this
SetCredentials(Vec<crate::server::Credential>),

WaitingForDevice(Device),
SelectingDevice,
Expand Down Expand Up @@ -252,13 +254,6 @@ pub enum NfcState {
Failed(Error),
}

#[derive(Clone, Debug)]
pub enum BackgroundEvent {
UsbStateChanged(UsbState),
HybridQrStateChanged(HybridState),
NfcStateChanged(NfcState),
}

#[derive(Debug, Clone)]
pub enum Error {
/// Some unknown error with the authenticator occurred.
Expand Down
Loading
Loading