Skip to content
Open
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
3 changes: 3 additions & 0 deletions src/canister_tests/src/api/archive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ pub mod compat {
UpdateAccount { name: Option<Private> },
#[serde(rename = "delete_account")]
DeleteAccount,
#[serde(rename = "set_default_account")]
SetDefaultAccount,
}

impl From<Operation> for CompatOperation {
Expand Down Expand Up @@ -134,6 +136,7 @@ pub mod compat {
Operation::CreateAccount { name } => CompatOperation::CreateAccount { name },
Operation::UpdateAccount { name } => CompatOperation::UpdateAccount { name },
Operation::DeleteAccount => CompatOperation::DeleteAccount,
Operation::SetDefaultAccount => CompatOperation::SetDefaultAccount,
}
}
}
Expand Down
32 changes: 24 additions & 8 deletions src/internet_identity/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use crate::anchor_management::tentative_device_registration;
use crate::archive::ArchiveState;
use crate::assets::init_assets;
use crate::authz_utils::IdentityUpdateError;
use crate::state::persistent_state;
use crate::stats::event_stats::all_aggregations_top_n;
use anchor_management::registration;
Expand All @@ -12,7 +13,7 @@ use ic_canister_sig_creation::signature_map::LABEL_SIG;
use ic_cdk::api::{caller, set_certified_data, trap};
use ic_cdk::call;
use ic_cdk_macros::{init, post_upgrade, pre_upgrade, query, update};
use internet_identity_interface::archive::types::BufferedEntry;
use internet_identity_interface::archive::types::{BufferedEntry, Operation};
use internet_identity_interface::http_gateway::{HttpRequest, HttpResponse};
use internet_identity_interface::internet_identity::types::openid::{
OpenIdCredentialAddError, OpenIdCredentialRemoveError, OpenIdDelegationError,
Expand Down Expand Up @@ -402,19 +403,34 @@ fn get_default_account(
Ok(default_account_info)
}

impl From<IdentityUpdateError> for SetDefaultAccountError {
fn from(src: IdentityUpdateError) -> Self {
match src {
IdentityUpdateError::Unauthorized(principal) => Self::Unauthorized(principal),
IdentityUpdateError::StorageError(anchor_number, storage_error) => {
Self::InternalCanisterError(format!(
"Identity: {}, Error: {}",
anchor_number, storage_error
))
}
}
}
}

#[update]
fn set_default_account(
anchor_number: AnchorNumber,
origin: FrontendHostname,
account_number: Option<AccountNumber>,
) -> Result<AccountInfo, SetDefaultAccountError> {
check_authorization(anchor_number)
.map_err(|err| SetDefaultAccountError::Unauthorized(err.principal))?;

let default_account_info =
account_management::set_default_account_for_origin(anchor_number, origin, account_number)?;

Ok(default_account_info)
anchor_operation_with_authz_check(anchor_number, |_| {
let result = account_management::set_default_account_for_origin(
anchor_number,
origin,
account_number,
)?;
Ok((result, Operation::SetDefaultAccount))
})
}

#[update]
Expand Down
3 changes: 3 additions & 0 deletions src/internet_identity_interface/src/archive/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ pub enum Operation {
UpdateAccount { name: Option<Private> },
#[serde(rename = "delete_account")]
DeleteAccount,

#[serde(rename = "set_default_account")]
SetDefaultAccount,
}

#[derive(Eq, PartialEq, Clone, Debug, CandidType, Deserialize)]
Expand Down
Loading