Skip to content

fix: use standard auths layout as CLI default, not radicle #67

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

Merged
bordumb merged 1 commit into from
Mar 10, 2026
Merged

fix: use standard auths layout as CLI default, not radicle #67

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
21 changes: 6 additions & 15 deletions crates/auths-cli/src/commands/id/identity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ use auths_id::{
storage::{
attestation::AttestationSource,
identity::IdentityStorage,
layout::{self, BlobName, GitRef, StorageLayoutConfig},
layout::{self, StorageLayoutConfig},
},
};
use auths_storage::git::{
Expand All @@ -44,10 +44,10 @@ use auths_storage::git::{
/// Storage layout presets for different ecosystems.
#[derive(Debug, Clone, Copy, ValueEnum, Default)]
pub enum LayoutPreset {
/// RIP-X layout (refs/rad/id, refs/keys)
/// Standard Auths layout (refs/auths/identity, refs/auths/keys)
#[default]
Default,
/// Alias for default — explicitly Radicle-compatible
/// Radicle-compatible layout (refs/rad/id, refs/keys)
Radicle,
/// Gitoxide-compatible layout (refs/auths/id, refs/auths/devices)
Gitoxide,
Expand All @@ -57,18 +57,9 @@ impl LayoutPreset {
/// Convert the preset to a StorageLayoutConfig.
pub fn to_config(self) -> StorageLayoutConfig {
match self {
LayoutPreset::Default | LayoutPreset::Radicle => StorageLayoutConfig {
identity_ref: GitRef::new("refs/rad/id"),
device_attestation_prefix: GitRef::new("refs/keys"),
attestation_blob_name: BlobName::new(layout::ATTESTATION_JSON),
identity_blob_name: BlobName::new(layout::IDENTITY_JSON),
},
LayoutPreset::Gitoxide => StorageLayoutConfig {
identity_ref: GitRef::new("refs/auths/id"),
device_attestation_prefix: GitRef::new("refs/auths/devices"),
attestation_blob_name: BlobName::new(layout::ATTESTATION_JSON),
identity_blob_name: BlobName::new(layout::IDENTITY_JSON),
},
LayoutPreset::Default => StorageLayoutConfig::default(),
LayoutPreset::Radicle => StorageLayoutConfig::radicle(),
LayoutPreset::Gitoxide => StorageLayoutConfig::gitoxide(),
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions crates/auths-cli/src/commands/registry_overrides.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@ pub struct RegistryOverrides {
#[arg(
long = "identity-ref",
value_name = "GIT_REF",
help = "Override Git ref for the identity commit [default: refs/rad/id]"
help = "Override Git ref for the identity commit [default: refs/auths/identity]"
)]
pub identity_ref: Option<String>,

#[arg(
long = "identity-blob",
value_name = "FILENAME",
help = "Override blob filename for identity data [default: radicle-identity.json]"
help = "Override blob filename for identity data [default: identity.json]"
)]
pub identity_blob: Option<String>,

#[arg(
long = "attestation-prefix",
value_name = "GIT_REF_PREFIX",
help = "Override base Git ref prefix for device authorizations [default: refs/keys]"
help = "Override base Git ref prefix for device authorizations [default: refs/auths/keys]"
)]
pub attestation_prefix: Option<String>,

#[arg(
long = "attestation-blob",
value_name = "FILENAME",
help = "Override blob filename for device authorization data [default: link-attestation.json]"
help = "Override blob filename for device authorization data [default: attestation.json]"
)]
pub attestation_blob: Option<String>,
}