server: Update sea-orm, strum

server/Cargo.toml

@@ -43,7 +43,6 @@ serde = "*"
 serde_bytes = "0.11"
 serde_json = "1"
 sha2 = "0.10"
-strum = "0.24"
 thiserror = "*"
 time = "0.3"
 tokio-rustls = "0.23"
@@ -91,6 +90,10 @@ version = "0.8"
 features = ["serde"]
 version = "*"
 
+[dependencies.strum]
+features = ["derive"]
+version = "0.25"
+
 [dependencies.tokio]
 features = ["full"]
 version = "1.25"
@@ -113,7 +116,7 @@ default-features = false
 version = "0.24"
 
 [dependencies.sea-orm]
-version= "0.11"
+version= "0.12"
 default-features = false
 features = ["macros", "with-chrono", "with-uuid", "sqlx-all", "runtime-actix-rustls"]
 

server/src/domain/sql_migrations.rs

@@ -7,13 +7,13 @@ use sea_orm::{
     sea_query::{
         self, all, ColumnDef, Expr, ForeignKey, ForeignKeyAction, Func, Index, Query, Table, Value,
     },
-    ConnectionTrait, DatabaseTransaction, DbErr, FromQueryResult, Iden, Order, Statement,
+    ConnectionTrait, DatabaseTransaction, DbErr, DeriveIden, FromQueryResult, Iden, Order,
-    TransactionTrait,
+    Statement, TransactionTrait,
 };
 use serde::{Deserialize, Serialize};
 use tracing::{error, info, instrument, warn};
 
-#[derive(Iden, PartialEq, Eq, Debug, Serialize, Deserialize, Clone, Copy)]
+#[derive(DeriveIden, PartialEq, Eq, Debug, Serialize, Deserialize, Clone, Copy)]
 pub enum Users {
     Table,
     UserId,
@@ -29,7 +29,7 @@ pub enum Users {
     Uuid,
 }
 
-#[derive(Iden, PartialEq, Eq, Debug, Serialize, Deserialize, Clone, Copy)]
+#[derive(DeriveIden, PartialEq, Eq, Debug, Serialize, Deserialize, Clone, Copy)]
 pub enum Groups {
     Table,
     GroupId,
@@ -38,14 +38,14 @@ pub enum Groups {
     Uuid,
 }
 
-#[derive(Iden, Clone, Copy)]
+#[derive(DeriveIden, Clone, Copy)]
 pub enum Memberships {
     Table,
     UserId,
     GroupId,
 }
 
-#[derive(Iden, PartialEq, Eq, Debug, Serialize, Deserialize, Clone, Copy)]
+#[derive(DeriveIden, PartialEq, Eq, Debug, Serialize, Deserialize, Clone, Copy)]
 pub enum UserAttributeSchema {
     Table,
     UserAttributeSchemaName,
@@ -56,7 +56,7 @@ pub enum UserAttributeSchema {
     UserAttributeSchemaIsHardcoded,
 }
 
-#[derive(Iden, PartialEq, Eq, Debug, Serialize, Deserialize, Clone, Copy)]
+#[derive(DeriveIden, PartialEq, Eq, Debug, Serialize, Deserialize, Clone, Copy)]
 pub enum UserAttributes {
     Table,
     UserAttributeUserId,
@@ -64,7 +64,7 @@ pub enum UserAttributes {
     UserAttributeValue,
 }
 
-#[derive(Iden, PartialEq, Eq, Debug, Serialize, Deserialize, Clone, Copy)]
+#[derive(DeriveIden, PartialEq, Eq, Debug, Serialize, Deserialize, Clone, Copy)]
 pub enum GroupAttributeSchema {
     Table,
     GroupAttributeSchemaName,
@@ -75,7 +75,7 @@ pub enum GroupAttributeSchema {
     GroupAttributeSchemaIsHardcoded,
 }
 
-#[derive(Iden, PartialEq, Eq, Debug, Serialize, Deserialize, Clone, Copy)]
+#[derive(DeriveIden, PartialEq, Eq, Debug, Serialize, Deserialize, Clone, Copy)]
 pub enum GroupAttributes {
     Table,
     GroupAttributeGroupId,
@@ -84,7 +84,7 @@ pub enum GroupAttributes {
 }
 
 // Metadata about the SQL DB.
-#[derive(Iden)]
+#[derive(DeriveIden)]
 pub enum Metadata {
     Table,
     // Which version of the schema we're at.
@@ -388,7 +388,7 @@ async fn replace_column<I: Iden + Copy + 'static, const N: usize>(
     //  - update the new one if there are changes needed
     //  - drop the old one
     let builder = transaction.get_database_backend();
-    #[derive(Iden)]
+    #[derive(DeriveIden)]
     enum TempTable {
         TempName,
     }

server/src/domain/types.rs

@@ -3,10 +3,10 @@ use chrono::{NaiveDateTime, TimeZone};
 use sea_orm::{
     entity::IntoActiveValue,
     sea_query::{value::ValueType, ArrayType, BlobSize, ColumnType, Nullable, ValueTypeErr},
-    strum::{EnumString, IntoStaticStr},
     DbErr, FromQueryResult, QueryResult, TryFromU64, TryGetError, TryGetable, Value,
 };
 use serde::{Deserialize, Serialize};
+use strum::{EnumString, IntoStaticStr};
 
 pub use super::model::{GroupColumn, UserColumn};
 

server/src/infra/jwt_sql_tables.rs

@@ -1,12 +1,12 @@
 use sea_orm::{
-    sea_query::{self, ColumnDef, ForeignKey, ForeignKeyAction, Iden, Table},
+    sea_query::{ColumnDef, ForeignKey, ForeignKeyAction, Table},
-    ConnectionTrait,
+    ConnectionTrait, DeriveIden,
 };
 
 pub use crate::domain::{sql_migrations::Users, sql_tables::DbConnection};
 
 /// Contains the refresh tokens for a given user.
-#[derive(Iden)]
+#[derive(DeriveIden)]
 pub enum JwtRefreshStorage {
     Table,
     RefreshTokenHash,
@@ -15,7 +15,7 @@ pub enum JwtRefreshStorage {
 }
 
 /// Contains the blacklisted JWT that haven't expired yet.
-#[derive(Iden)]
+#[derive(DeriveIden)]
 pub enum JwtStorage {
     Table,
     JwtHash,
@@ -25,7 +25,7 @@ pub enum JwtStorage {
 }
 
 /// Contains the temporary tokens to reset the password, sent by email.
-#[derive(Iden)]
+#[derive(DeriveIden)]
 pub enum PasswordResetTokens {
     Table,
     Token,