Merge pull request #6 from mixini/migrate

migrate to latest versions of libraries

Cargo.toml

@@ -10,20 +10,20 @@ edition = "2021"
 members = [".", "entity"]
 
 [dependencies]
-anyhow = "1.0.53"
-axum = { version = "0.4.5", features = ["headers", "http2", "multipart"] }
+anyhow = "1.0.56"
+axum = { version = "0.5.1", features = ["headers", "http2", "multipart"] }
 chrono = { version = "0.4.19", features = ["serde"] }
 dotenv = "0.15.0"
 entity = { path = "entity" }
 fieldfilter = "0.1.0"
 lazy_static = "1.4.0"
-lettre = { version = "0.10.0-rc.4", features = [
+lettre = { version = "0.10.0-rc.5", features = [
     "tokio1",
     "tokio1-native-tls",
     "tracing",
     "serde",
 ] }
-libreauth = "0.14.1"
+libreauth = "0.15.0"
 oso = { git = "https://github.com/fairingrey/oso", branch = "rust-addl-interface", features = [
     "uuid-07",
 ] }
@@ -35,8 +35,8 @@ redis = { version = "0.21.5", features = [
     "tokio-comp",
     "connection-manager",
 ], default-features = false }
-regex = "1.5.4"
-sea-orm = { version = "0.6.0", features = [
+regex = "1.5.5"
+sea-orm = { version = "0.7.1", features = [
     "macros",
     "debug-print",
     "runtime-tokio-native-tls",
@@ -47,13 +47,16 @@ serde_json = "1.0.79"
 thiserror = "1.0.30"
 tokio = { version = "1.17.0", features = ["rt-multi-thread", "macros", "sync"] }
 tower = "0.4.12"
-tower-http = { version = "0.2.2", features = [
+tower-http = { version = "0.2.5", features = [
     "add-extension",
     "trace",
     "cors",
 ] }
-tracing = "0.1.31"
-tracing-subscriber = { version = "0.3.9", features = ["env-filter"] }
+tracing = "0.1.32"
+tracing-subscriber = { version = "0.3.10", features = ["env-filter"] }
 ulid = { version = "0.5.0", features = ["serde", "uuid"] }
 uuid = { version = "0.8.2", features = ["serde", "v4"] }
 validator = { version = "0.14.0", features = ["derive"] }
+
+[patch.crates-io]
+sea-orm = { git = "https://github.com/fairingrey/sea-orm", branch = "changeset-like" }

entity/Cargo.toml

@@ -19,7 +19,7 @@ redis = { version = "0.21.5", features = [
     "tokio-comp",
     "connection-manager",
 ], default-features = false }
-sea-orm = { version = "0.6.0", features = [
+sea-orm = { version = "0.7.1", features = [
     "macros",
     "debug-print",
     "runtime-tokio-native-tls",

entity/src/sea_orm_active_enums.rs

@@ -1,7 +1,11 @@
 //! SeaORM Entity. Generated by sea-orm-codegen 0.6.0
 
 use oso::PolarClass;
-use sea_orm::entity::prelude::*;
+use sea_orm::{
+    entity::prelude::*,
+    ActiveValue::{self, NotSet},
+    IntoActiveValue, Set,
+};
 use serde::{Deserialize, Serialize};
 
 #[derive(
@@ -22,3 +26,12 @@ pub enum UserRole {
     #[sea_orm(string_value = "moderator")]
     Moderator,
 }
+
+impl IntoActiveValue<UserRole> for Option<UserRole> {
+    fn into_active_value(self) -> ActiveValue<UserRole> {
+        match self {
+            Some(value) => Set(value),
+            None => NotSet,
+        }
+    }
+}

entity/src/user_account.rs

@@ -27,6 +27,21 @@ pub struct Model {
     pub verified: bool,
 }
 
+#[derive(Debug, DeriveIntoActiveModel)]
+pub struct NewUserAccount {
+    pub id: Uuid,
+    pub name: String,
+    pub email: String,
+    pub password: String,
+}
+
+#[derive(Debug, DeriveIntoActiveModel)]
+pub struct UpdateUserAccount {
+    pub name: Option<String>,
+    pub email: Option<String>,
+    pub role: Option<UserRole>,
+}
+
 #[derive(Copy, Clone, Debug, EnumIter)]
 pub enum Relation {}
 

src/actions.rs

@@ -1,6 +1,6 @@
 //! CRUD action-like resources
 use anyhow::Result;
-use entity::sea_orm_active_enums::UserRole;
+use entity::{sea_orm_active_enums::UserRole, user_account};
 use oso::{Oso, PolarClass};
 use serde::Deserialize;
 use validator::Validate;
@@ -41,6 +41,16 @@ pub struct UpdateUser {
     pub role: Option<UserRole>,
 }
 
+impl From<UpdateUser> for user_account::UpdateUserAccount {
+    fn from(update: UpdateUser) -> Self {
+        Self {
+            name: update.name,
+            email: update.email,
+            role: update.role,
+        }
+    }
+}
+
 /// Attempt to create a new oso instance for managing authorization schemes.
 pub fn try_register_oso() -> Result<Oso> {
     let mut oso = Oso::new();

src/error.rs

@@ -88,7 +88,7 @@ impl IntoResponse for MixiniError {
                 }
             },
             MixiniError::ValidationError(_) => {
-                let message = format!("Input validation error: [{}]", self).replace("\n", ", ");
+                let message = format!("Input validation error: [{}]", self).replace('\n', ", ");
                 (StatusCode::BAD_REQUEST, message)
             }
             MixiniError::OtherError(e) => {

src/server.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use axum::{
     routing::{get, post},
-    AddExtensionLayer, Router,
+    Extension, Router,
 };
 use lettre::{
     transport::smtp::authentication::{Credentials, Mechanism},
@@ -94,7 +94,7 @@ async fn try_app() -> Result<Router> {
 
     let middleware_stack = ServiceBuilder::new()
         .layer(TraceLayer::new_for_http())
-        .layer(AddExtensionLayer::new(state))
+        .layer(Extension(state))
         .layer(try_cors_layer()?);
 
     Ok(Router::new()