Skip to content

editoast: authz: slightly improve models Rust interface #16039

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
leovalais merged 2 commits into from
Apr 2, 2026
+29 −7
Merged

editoast: authz: slightly improve models Rust interface #16039

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c2a307
editoast: authz: improve `Subject` interface
leovalais Mar 18, 2026
1a4a359
editoast: authz: make `Infra` hashable
leovalais Mar 18, 2026
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
36 changes: 29 additions & 7 deletions editoast/authz/src/model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ pub enum Subject {
}

impl Subject {
pub fn user(id: i64) -> Self {
Subject::User(User(id))
pub fn user(user: impl Into<User>) -> Self {
Subject::User(user.into())
}

pub fn group(id: i64) -> Self {
Subject::Group(Group(id))
pub fn group(group: impl Into<Group>) -> Self {
Subject::Group(group.into())
}

pub fn id(&self) -> i64 {
Expand Down Expand Up @@ -65,16 +65,38 @@ impl AsRef<Group> for Subject {
}

#[derive(
fga::Type, fga::User, fga::Object, derive_more::FromStr, Debug, Clone, Copy, PartialEq, Eq, Hash,
fga::Type,
fga::User,
fga::Object,
derive_more::From,
derive_more::FromStr,
Debug,
Clone,
Copy,
PartialEq,
Eq,
Hash,
)]
pub struct User(pub i64);

#[derive(
fga::Type, fga::User, fga::Object, derive_more::FromStr, Debug, Clone, Copy, PartialEq, Eq, Hash,
fga::Type,
fga::User,
fga::Object,
derive_more::From,
derive_more::FromStr,
Debug,
Clone,
Copy,
PartialEq,
Eq,
Hash,
)]
pub struct Group(pub i64);

#[derive(fga::Type, fga::User, fga::Object, derive_more::FromStr, Debug, Clone, Copy)]
#[derive(
fga::Type, fga::User, fga::Object, derive_more::FromStr, Debug, Clone, Copy, PartialEq, Eq, Hash,
)]
pub struct Infra(pub i64);

#[derive(Debug, Clone, Copy, Display, PartialEq, Eq, Hash, Serialize, Deserialize, ToSchema)]
Expand Down
Loading