fixes

src/auth/mod.rs

@@ -116,6 +116,63 @@ pub struct ResourceItem {
     shared_by: String,
 }
 
+#[derive(Debug)]
+struct SharingUserRow {
+    email: String,
+    nickname: String,
+    permission: String,
+}
+
+impl<'r> sqlx::FromRow<'r, AnyRow> for SharingUserRow {
+    fn from_row(row: &'r AnyRow) -> Result<Self, sqlx::Error> {
+        Ok(Self {
+            email: crate::row_decode::text(row, 0)?,
+            nickname: crate::row_decode::text(row, 1)?,
+            permission: crate::row_decode::text(row, 2)?,
+        })
+    }
+}
+
+#[derive(Debug)]
+struct SharingLinkRow {
+    token_hash: String,
+    token: Option<String>,
+    permission: String,
+    expires_at: Option<String>,
+    created_at: String,
+}
+
+impl<'r> sqlx::FromRow<'r, AnyRow> for SharingLinkRow {
+    fn from_row(row: &'r AnyRow) -> Result<Self, sqlx::Error> {
+        Ok(Self {
+            token_hash: crate::row_decode::text(row, 0)?,
+            token: crate::row_decode::optional_text(row, 1)?,
+            permission: crate::row_decode::text(row, 2)?,
+            expires_at: crate::row_decode::optional_text(row, 3)?,
+            created_at: crate::row_decode::text(row, 4)?,
+        })
+    }
+}
+
+#[derive(Debug)]
+struct PendingShareRow {
+    email: String,
+    nickname: String,
+    permission: String,
+    expires_at: Option<String>,
+}
+
+impl<'r> sqlx::FromRow<'r, AnyRow> for PendingShareRow {
+    fn from_row(row: &'r AnyRow) -> Result<Self, sqlx::Error> {
+        Ok(Self {
+            email: crate::row_decode::text(row, 0)?,
+            nickname: crate::row_decode::text(row, 1)?,
+            permission: crate::row_decode::text(row, 2)?,
+            expires_at: crate::row_decode::optional_text(row, 3)?,
+        })
+    }
+}
+
 impl<'r> sqlx::FromRow<'r, AnyRow> for User {
     fn from_row(row: &'r AnyRow) -> Result<Self, sqlx::Error> {
         Ok(Self {
@@ -1413,7 +1470,7 @@ pub async fn resource_sharing(
         .get("slug")
         .ok_or_else(|| AuthError::bad_request("Missing slug."))?;
     ensure_owner(&state, owner.id, kind, slug).await?;
-    let users: Vec<(String, String, String)> = sqlx::query_as(queries::get(
+    let users: Vec<SharingUserRow> = sqlx::query_as(queries::get(
         state.db.kind(),
         queries::RESOURCE_SHARING_USERS,
     ))
@@ -1422,15 +1479,16 @@ pub async fn resource_sharing(
     .fetch_all(state.db.pool())
     .await
     .map_err(AuthError::database)?;
-    let links: Vec<(String, Option<String>, String, Option<String>, String)> = sqlx::query_as(
-        queries::get(state.db.kind(), queries::RESOURCE_SHARING_LINKS),
-    )
+    let links: Vec<SharingLinkRow> = sqlx::query_as(queries::get(
+        state.db.kind(),
+        queries::RESOURCE_SHARING_LINKS,
+    ))
     .bind(kind)
     .bind(slug)
     .fetch_all(state.db.pool())
     .await
     .map_err(AuthError::database)?;
-    let pending: Vec<(String, String, String, Option<String>)> = sqlx::query_as(queries::get(
+    let pending: Vec<PendingShareRow> = sqlx::query_as(queries::get(
         state.db.kind(),
         queries::RESOURCE_SHARING_PENDING,
     ))
@@ -1440,7 +1498,7 @@ pub async fn resource_sharing(
     .await
     .map_err(AuthError::database)?;
     Ok(Json(
-        serde_json::json!({"users":users.into_iter().map(|(email,nickname,permission)|serde_json::json!({"email":email,"nickname":nickname,"permission":permission})).collect::<Vec<_>>(), "pending":pending.into_iter().map(|(email,nickname,permission,expires_at)|serde_json::json!({"email":email,"nickname":nickname,"permission":permission,"expires_at":expires_at})).collect::<Vec<_>>(), "links":links.into_iter().map(|(token_hash,token,permission,expires_at,created_at)|serde_json::json!({"token_hash":token_hash,"token":token,"permission":permission,"expires_at":expires_at,"created_at":created_at})).collect::<Vec<_>>() }),
+        serde_json::json!({"users":users.into_iter().map(|row|serde_json::json!({"email":row.email,"nickname":row.nickname,"permission":row.permission})).collect::<Vec<_>>(), "pending":pending.into_iter().map(|row|serde_json::json!({"email":row.email,"nickname":row.nickname,"permission":row.permission,"expires_at":row.expires_at})).collect::<Vec<_>>(), "links":links.into_iter().map(|row|serde_json::json!({"token_hash":row.token_hash,"token":row.token,"permission":row.permission,"expires_at":row.expires_at,"created_at":row.created_at})).collect::<Vec<_>>() }),
     ))
 }