caps and delete
This commit is contained in:
+180
-23
@@ -14,7 +14,7 @@ use uuid::Uuid;
|
||||
use utoipa::ToSchema;
|
||||
|
||||
use crate::schema::sql_types::{
|
||||
ApiTokenCapability as ApiTokenCapabilitySql, MagicTokenKind as MagicTokenKindSql,
|
||||
ApiCapability as ApiCapabilitySql, MagicTokenKind as MagicTokenKindSql,
|
||||
TenantStatus as TenantStatusSql,
|
||||
};
|
||||
use crate::schema::*;
|
||||
@@ -29,6 +29,7 @@ pub struct UserMembership {
|
||||
pub tenant_id: Uuid,
|
||||
pub created_at: NaiveDateTime,
|
||||
pub updated_at: NaiveDateTime,
|
||||
pub capability_set_id: Option<Uuid>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Insertable)]
|
||||
@@ -37,6 +38,7 @@ pub struct NewUserMembership {
|
||||
pub id: Uuid,
|
||||
pub user_id: Uuid,
|
||||
pub tenant_id: Uuid,
|
||||
pub capability_set_id: Option<Uuid>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, AsExpression, FromSqlRow)]
|
||||
@@ -57,13 +59,58 @@ pub enum MagicTokenKind {
|
||||
}
|
||||
|
||||
#[derive(
|
||||
Debug, Clone, Copy, PartialEq, Eq, AsExpression, FromSqlRow, Serialize, Deserialize, ToSchema,
|
||||
Debug,
|
||||
Clone,
|
||||
Copy,
|
||||
PartialEq,
|
||||
Eq,
|
||||
Hash,
|
||||
AsExpression,
|
||||
FromSqlRow,
|
||||
Serialize,
|
||||
Deserialize,
|
||||
ToSchema,
|
||||
)]
|
||||
#[diesel(sql_type = ApiTokenCapabilitySql)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum ApiTokenCapability {
|
||||
Api,
|
||||
Webdav,
|
||||
#[diesel(sql_type = ApiCapabilitySql)]
|
||||
pub enum ApiCapability {
|
||||
#[serde(rename = "documents:read")]
|
||||
DocumentsRead,
|
||||
#[serde(rename = "documents:edit")]
|
||||
DocumentsEdit,
|
||||
#[serde(rename = "documents:write")]
|
||||
DocumentsWrite,
|
||||
#[serde(rename = "documents:upload")]
|
||||
DocumentsUpload,
|
||||
#[serde(rename = "folders:read")]
|
||||
FoldersRead,
|
||||
#[serde(rename = "folders:edit")]
|
||||
FoldersEdit,
|
||||
#[serde(rename = "folders:write")]
|
||||
FoldersWrite,
|
||||
#[serde(rename = "tags:read")]
|
||||
TagsRead,
|
||||
#[serde(rename = "tags:edit")]
|
||||
TagsEdit,
|
||||
#[serde(rename = "tags:write")]
|
||||
TagsWrite,
|
||||
#[serde(rename = "correspondents:read")]
|
||||
CorrespondentsRead,
|
||||
#[serde(rename = "correspondents:edit")]
|
||||
CorrespondentsEdit,
|
||||
#[serde(rename = "correspondents:write")]
|
||||
CorrespondentsWrite,
|
||||
#[serde(rename = "profile:read")]
|
||||
ProfileRead,
|
||||
#[serde(rename = "profile:write")]
|
||||
ProfileWrite,
|
||||
#[serde(rename = "webdav:read")]
|
||||
WebdavRead,
|
||||
#[serde(rename = "webdav:write")]
|
||||
WebdavWrite,
|
||||
#[serde(rename = "capability_sets:read")]
|
||||
CapabilitySetsRead,
|
||||
#[serde(rename = "capability_sets:write")]
|
||||
CapabilitySetsWrite,
|
||||
}
|
||||
|
||||
impl MagicTokenKind {
|
||||
@@ -79,16 +126,53 @@ impl MagicTokenKind {
|
||||
}
|
||||
}
|
||||
|
||||
impl ApiTokenCapability {
|
||||
impl ApiCapability {
|
||||
pub fn as_str(&self) -> &'static str {
|
||||
match self {
|
||||
ApiTokenCapability::Api => "api",
|
||||
ApiTokenCapability::Webdav => "webdav",
|
||||
ApiCapability::DocumentsRead => "documents:read",
|
||||
ApiCapability::DocumentsEdit => "documents:edit",
|
||||
ApiCapability::DocumentsWrite => "documents:write",
|
||||
ApiCapability::DocumentsUpload => "documents:upload",
|
||||
ApiCapability::FoldersRead => "folders:read",
|
||||
ApiCapability::FoldersEdit => "folders:edit",
|
||||
ApiCapability::FoldersWrite => "folders:write",
|
||||
ApiCapability::TagsRead => "tags:read",
|
||||
ApiCapability::TagsEdit => "tags:edit",
|
||||
ApiCapability::TagsWrite => "tags:write",
|
||||
ApiCapability::CorrespondentsRead => "correspondents:read",
|
||||
ApiCapability::CorrespondentsEdit => "correspondents:edit",
|
||||
ApiCapability::CorrespondentsWrite => "correspondents:write",
|
||||
ApiCapability::ProfileRead => "profile:read",
|
||||
ApiCapability::ProfileWrite => "profile:write",
|
||||
ApiCapability::WebdavRead => "webdav:read",
|
||||
ApiCapability::WebdavWrite => "webdav:write",
|
||||
ApiCapability::CapabilitySetsRead => "capability_sets:read",
|
||||
ApiCapability::CapabilitySetsWrite => "capability_sets:write",
|
||||
}
|
||||
}
|
||||
|
||||
pub fn variants() -> &'static [&'static str] {
|
||||
&["api", "webdav"]
|
||||
&[
|
||||
"documents:read",
|
||||
"documents:edit",
|
||||
"documents:write",
|
||||
"documents:upload",
|
||||
"folders:read",
|
||||
"folders:edit",
|
||||
"folders:write",
|
||||
"tags:read",
|
||||
"tags:edit",
|
||||
"tags:write",
|
||||
"correspondents:read",
|
||||
"correspondents:edit",
|
||||
"correspondents:write",
|
||||
"profile:read",
|
||||
"profile:write",
|
||||
"webdav:read",
|
||||
"webdav:write",
|
||||
"capability_sets:read",
|
||||
"capability_sets:write",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,7 +182,7 @@ impl fmt::Display for MagicTokenKind {
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for ApiTokenCapability {
|
||||
impl fmt::Display for ApiCapability {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
write!(f, "{}", self.as_str())
|
||||
}
|
||||
@@ -111,7 +195,7 @@ impl ToSql<MagicTokenKindSql, Pg> for MagicTokenKind {
|
||||
}
|
||||
}
|
||||
|
||||
impl ToSql<ApiTokenCapabilitySql, Pg> for ApiTokenCapability {
|
||||
impl ToSql<ApiCapabilitySql, Pg> for ApiCapability {
|
||||
fn to_sql<'b>(&'b self, out: &mut Output<'b, '_, Pg>) -> serialize::Result {
|
||||
out.write_all(self.as_str().as_bytes())?;
|
||||
Ok(IsNull::No)
|
||||
@@ -131,14 +215,31 @@ impl FromSql<MagicTokenKindSql, Pg> for MagicTokenKind {
|
||||
}
|
||||
}
|
||||
|
||||
impl FromSql<ApiTokenCapabilitySql, Pg> for ApiTokenCapability {
|
||||
impl FromSql<ApiCapabilitySql, Pg> for ApiCapability {
|
||||
fn from_sql(bytes: PgValue<'_>) -> deserialize::Result<Self> {
|
||||
match std::str::from_utf8(bytes.as_bytes())? {
|
||||
"api" => Ok(ApiTokenCapability::Api),
|
||||
"webdav" => Ok(ApiTokenCapability::Webdav),
|
||||
"documents:read" => Ok(ApiCapability::DocumentsRead),
|
||||
"documents:edit" => Ok(ApiCapability::DocumentsEdit),
|
||||
"documents:write" => Ok(ApiCapability::DocumentsWrite),
|
||||
"documents:upload" => Ok(ApiCapability::DocumentsUpload),
|
||||
"folders:read" => Ok(ApiCapability::FoldersRead),
|
||||
"folders:edit" => Ok(ApiCapability::FoldersEdit),
|
||||
"folders:write" => Ok(ApiCapability::FoldersWrite),
|
||||
"tags:read" => Ok(ApiCapability::TagsRead),
|
||||
"tags:edit" => Ok(ApiCapability::TagsEdit),
|
||||
"tags:write" => Ok(ApiCapability::TagsWrite),
|
||||
"correspondents:read" => Ok(ApiCapability::CorrespondentsRead),
|
||||
"correspondents:edit" => Ok(ApiCapability::CorrespondentsEdit),
|
||||
"correspondents:write" => Ok(ApiCapability::CorrespondentsWrite),
|
||||
"profile:read" => Ok(ApiCapability::ProfileRead),
|
||||
"profile:write" => Ok(ApiCapability::ProfileWrite),
|
||||
"webdav:read" => Ok(ApiCapability::WebdavRead),
|
||||
"webdav:write" => Ok(ApiCapability::WebdavWrite),
|
||||
"capability_sets:read" => Ok(ApiCapability::CapabilitySetsRead),
|
||||
"capability_sets:write" => Ok(ApiCapability::CapabilitySetsWrite),
|
||||
other => Err(Box::new(std::io::Error::new(
|
||||
std::io::ErrorKind::InvalidData,
|
||||
format!("invalid api_token_capability '{other}'"),
|
||||
format!("invalid api_capability '{other}'"),
|
||||
))),
|
||||
}
|
||||
}
|
||||
@@ -156,14 +257,31 @@ impl str::FromStr for MagicTokenKind {
|
||||
}
|
||||
}
|
||||
|
||||
impl str::FromStr for ApiTokenCapability {
|
||||
impl str::FromStr for ApiCapability {
|
||||
type Err = &'static str;
|
||||
|
||||
fn from_str(value: &str) -> Result<Self, Self::Err> {
|
||||
match value {
|
||||
"api" => Ok(ApiTokenCapability::Api),
|
||||
"webdav" => Ok(ApiTokenCapability::Webdav),
|
||||
_ => Err("unsupported api token capability"),
|
||||
"documents:read" => Ok(ApiCapability::DocumentsRead),
|
||||
"documents:edit" => Ok(ApiCapability::DocumentsEdit),
|
||||
"documents:write" => Ok(ApiCapability::DocumentsWrite),
|
||||
"documents:upload" => Ok(ApiCapability::DocumentsUpload),
|
||||
"folders:read" => Ok(ApiCapability::FoldersRead),
|
||||
"folders:edit" => Ok(ApiCapability::FoldersEdit),
|
||||
"folders:write" => Ok(ApiCapability::FoldersWrite),
|
||||
"tags:read" => Ok(ApiCapability::TagsRead),
|
||||
"tags:edit" => Ok(ApiCapability::TagsEdit),
|
||||
"tags:write" => Ok(ApiCapability::TagsWrite),
|
||||
"correspondents:read" => Ok(ApiCapability::CorrespondentsRead),
|
||||
"correspondents:edit" => Ok(ApiCapability::CorrespondentsEdit),
|
||||
"correspondents:write" => Ok(ApiCapability::CorrespondentsWrite),
|
||||
"profile:read" => Ok(ApiCapability::ProfileRead),
|
||||
"profile:write" => Ok(ApiCapability::ProfileWrite),
|
||||
"webdav:read" => Ok(ApiCapability::WebdavRead),
|
||||
"webdav:write" => Ok(ApiCapability::WebdavWrite),
|
||||
"capability_sets:read" => Ok(ApiCapability::CapabilitySetsRead),
|
||||
"capability_sets:write" => Ok(ApiCapability::CapabilitySetsWrite),
|
||||
_ => Err("unsupported api capability"),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -322,7 +440,46 @@ pub struct ApiToken {
|
||||
pub last_used_at: Option<NaiveDateTime>,
|
||||
pub expires_at: Option<NaiveDateTime>,
|
||||
pub revoked_at: Option<NaiveDateTime>,
|
||||
pub capabilities: Vec<ApiTokenCapability>,
|
||||
pub capability_set_id: Uuid,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Queryable, Identifiable, Associations)]
|
||||
#[diesel(table_name = capability_sets)]
|
||||
#[diesel(belongs_to(Tenant))]
|
||||
pub struct CapabilitySet {
|
||||
pub id: Uuid,
|
||||
pub tenant_id: Uuid,
|
||||
pub slug: String,
|
||||
pub cap_version: i32,
|
||||
pub is_system: bool,
|
||||
pub created_at: NaiveDateTime,
|
||||
pub updated_at: NaiveDateTime,
|
||||
}
|
||||
|
||||
#[derive(Debug, Insertable)]
|
||||
#[diesel(table_name = capability_sets)]
|
||||
pub struct NewCapabilitySet {
|
||||
pub id: Uuid,
|
||||
pub tenant_id: Uuid,
|
||||
pub slug: String,
|
||||
pub cap_version: i32,
|
||||
pub is_system: bool,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Queryable, Identifiable, Associations)]
|
||||
#[diesel(table_name = capability_set_capabilities)]
|
||||
#[diesel(primary_key(capability_set_id, capability))]
|
||||
#[diesel(belongs_to(CapabilitySet, foreign_key = capability_set_id))]
|
||||
pub struct CapabilitySetCapability {
|
||||
pub capability_set_id: Uuid,
|
||||
pub capability: ApiCapability,
|
||||
}
|
||||
|
||||
#[derive(Debug, Insertable)]
|
||||
#[diesel(table_name = capability_set_capabilities)]
|
||||
pub struct NewCapabilitySetCapability {
|
||||
pub capability_set_id: Uuid,
|
||||
pub capability: ApiCapability,
|
||||
}
|
||||
|
||||
#[derive(Debug, Insertable)]
|
||||
@@ -335,7 +492,7 @@ pub struct NewApiToken {
|
||||
pub token_hash: String,
|
||||
pub label: Option<String>,
|
||||
pub expires_at: Option<NaiveDateTime>,
|
||||
pub capabilities: Vec<ApiTokenCapability>,
|
||||
pub capability_set_id: Uuid,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Queryable, Identifiable)]
|
||||
|
||||
Reference in New Issue
Block a user