linting, tenant slug -> name

backend/src/routes/auth.rs

@@ -41,7 +41,7 @@ pub struct LoginRequest {
     pub username: String,
     pub password: String,
     #[serde(default)]
-    pub preferred_tenant_slug: Option<String>,
+    pub preferred_tenant_id: Option<Uuid>,
 }
 
 #[derive(Deserialize)]
@@ -61,7 +61,7 @@ pub struct LoginResponse {
 #[derive(Serialize)]
 pub struct TenantSnippet {
     pub id: Uuid,
-    pub slug: String,
+    pub name: String,
 }
 
 #[derive(Serialize)]
@@ -109,9 +109,9 @@ pub async fn signup(
 
     insert_user(&mut conn, user_id, username, &password_hash)?;
 
-    let tenant_slug = username.to_lowercase();
+    let tenant_name = username.to_string();
     let tenant = state.tenants.create_tenant(
-        &tenant_slug,
+        &tenant_name,
         None,
         None,
         TenantStatus::Creating,
@@ -147,13 +147,7 @@ pub async fn login(
         return Err(AppError::unauthorized());
     }
 
-    let preferred_slug = payload
-        .preferred_tenant_slug
-        .as_ref()
-        .map(|slug| slug.trim().to_string())
-        .filter(|slug| !slug.is_empty());
-
-    complete_login(&state, &mut conn, &user, preferred_slug)
+    complete_login(&state, &mut conn, &user, payload.preferred_tenant_id)
 }
 
 pub async fn refresh(
@@ -323,10 +317,10 @@ pub async fn list_tenants(
     let tenants = memberships_dsl::user_memberships
         .inner_join(tenant_dsl::tenants)
         .filter(memberships_dsl::user_id.eq(user_id))
-        .select((tenant_dsl::id, tenant_dsl::slug))
+        .select((tenant_dsl::id, tenant_dsl::name))
         .load::<(Uuid, String)>(&mut conn)?
         .into_iter()
-        .map(|(id, slug)| TenantSnippet { id, slug })
+        .map(|(id, name)| TenantSnippet { id, name })
         .collect();
 
     Ok(Json(TenantListResponse { tenants }))
@@ -424,7 +418,7 @@ fn complete_login(
     state: &AppState,
     conn: &mut PgConnection,
     user: &User,
-    preferred_slug: Option<String>,
+    preferred_tenant_id: Option<Uuid>,
 ) -> AppResult<Response> {
     let memberships: Vec<(UserMembership, Tenant)> = memberships_dsl::user_memberships
         .inner_join(tenant_dsl::tenants)
@@ -435,10 +429,10 @@ fn complete_login(
         return Err(AppError::unauthorized());
     }
 
-    if let Some(ref slug) = preferred_slug {
+    if let Some(preferred_id) = preferred_tenant_id {
         if let Some((_, tenant)) = memberships
             .iter()
-            .find(|(_, tenant)| tenant.slug.eq_ignore_ascii_case(slug))
+            .find(|(_, tenant)| tenant.id == preferred_id)
         {
             return issue_session(state, conn, user, tenant.id);
         }
@@ -457,7 +451,7 @@ fn complete_login(
         .into_iter()
         .map(|(_, tenant)| TenantSnippet {
             id: tenant.id,
-            slug: tenant.slug,
+            name: tenant.name,
         })
         .collect();
 
@@ -480,9 +474,9 @@ fn issue_session(
         .generate_token(user.id, tenant_id, &user.username)
         .map_err(AppError::from)?;
 
-    let tenant_slug: String = tenant_dsl::tenants
+    let tenant_name: String = tenant_dsl::tenants
         .find(tenant_id)
-        .select(tenant_dsl::slug)
+        .select(tenant_dsl::name)
         .first(conn)
         .map_err(AppError::from)?;
 
@@ -509,7 +503,7 @@ fn issue_session(
         expires_in: state.config.jwt_expiry_minutes * 60,
         tenant: TenantSnippet {
             id: tenant_id,
-            slug: tenant_slug,
+            name: tenant_name,
         },
     })
     .into_response();

backend/src/routes/webdav/mod.rs

@@ -457,11 +457,11 @@ fn authenticate(state: &AppState, headers: &HeaderMap) -> Result<Option<WebDavCo
         .inner_join(tenant_dsl::tenants)
         .filter(memberships_dsl::user_id.eq(user.id))
         .filter(memberships_dsl::tenant_id.eq(token.tenant_id))
-        .select((tenant_dsl::id, tenant_dsl::slug))
+        .select((tenant_dsl::id, tenant_dsl::name))
         .first::<(Uuid, String)>(&mut conn)
         .optional()?;
 
-    let (tenant_id, _slug) = match tenant_row {
+    let (tenant_id, _name) = match tenant_row {
         Some(row) => row,
         None => {
             tracing::warn!(