Merge pull request #593 from loco-rs/bump-version-0.5.0

bump version 0.5.0

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
 ## vNext
+
+## v0.5.0
+
 * refactor auth middleware for supporting bearer, cookie and query. [https://github.com/loco-rs/loco/pull/560](https://github.com/loco-rs/loco/pull/560)
 * SeaORM upgraded: `rc1` -> `rc4`. [https://github.com/loco-rs/loco/pull/585](https://github.com/loco-rs/loco/pull/585)
 * Adding Cache to app content. [https://github.com/loco-rs/loco/pull/570](https://github.com/loco-rs/loco/pull/570)

Cargo.toml

@@ -9,7 +9,7 @@ license = "Apache-2.0"
 
 [package]
 name = "loco-rs"
-version = "0.4.0"
+version = "0.5.0"
 description = "The one-person framework for Rust"
 homepage = "https://loco.rs/"
 documentation = "https://docs.rs/loco-rs"

loco-extras/Cargo.toml

@@ -20,18 +20,26 @@ tower = { workspace = true, optional = true }
 tower-http = { workspace = true, optional = true, features = [
   "normalize-path",
 ] }
-opentelemetry = { version = "0.22" , optional = true}
-opentelemetry-otlp = { version = "0.15", optional = true, features = ["grpc-tonic"] }
+opentelemetry = { version = "0.22", optional = true }
+opentelemetry-otlp = { version = "0.15", optional = true, features = [
+  "grpc-tonic",
+] }
 axum-tracing-opentelemetry = { version = "0.18", optional = true }
-init-tracing-opentelemetry = { version = "0.18", optional = true , features = ["otlp", "tracing_subscriber_ext"] }
+init-tracing-opentelemetry = { version = "0.18", optional = true, features = [
+  "otlp",
+  "tracing_subscriber_ext",
+] }
 tracing-opentelemetry-instrumentation-sdk = { version = "0.18", optional = true }
-tracing-subscriber = { version = "0.3.18", optional = true , features = ["env-filter", "json"] }
+tracing-subscriber = { version = "0.3.18", optional = true, features = [
+  "env-filter",
+  "json",
+] }
 tracing = { version = "0.1.40", optional = true }
 mongodb = { version = "2.8.0", optional = true }
 
 [dependencies.loco-rs]
 path = "../"
-version = "0.4.0"
+version = "0.5.0"
 default-features = true
 features = ["with-db", "auth_jwt"]
 
@@ -50,6 +58,13 @@ initializer-prometheus = ["dep:axum-prometheus"]
 initializer-extra-db = []
 initializer-multi-db = ["dep:serde_json"]
 initializer-normalize-path = ["dep:tower", "dep:tower-http"]
-initializer-opentelemetry = ["dep:opentelemetry","dep:opentelemetry-otlp","dep:axum-tracing-opentelemetry",
-    "dep:init-tracing-opentelemetry", "dep:tracing-opentelemetry-instrumentation-sdk","dep:tracing-subscriber","dep:tracing"]
+initializer-opentelemetry = [
+  "dep:opentelemetry",
+  "dep:opentelemetry-otlp",
+  "dep:axum-tracing-opentelemetry",
+  "dep:init-tracing-opentelemetry",
+  "dep:tracing-opentelemetry-instrumentation-sdk",
+  "dep:tracing-subscriber",
+  "dep:tracing",
+]
 initializer-mongodb = ["dep:mongodb", "dep:serde", "dep:serde_json"]

src/boot.rs

@@ -241,8 +241,8 @@ pub async fn create_app<H: Hooks>(
 ) -> Result<BootResult> {
     let app_context = create_context::<H>(environment).await?;
 
-    if let Some(pool) = &app_context.redis {
-        redis::converge(pool, &app_context.config.redis).await?;
+    if let Some(pool) = &app_context.queue {
+        redis::converge(pool, &app_context.config.queue).await?;
     }
 
     run_app::<H>(&mode, app_context).await

starters/lightweight-service/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2021"
 
 [dependencies]
 
-loco-rs = { version = "0.4.0", default-features = false, features = ["cli"] }
+loco-rs = { version = "0.5.0", default-features = false, features = ["cli"] }
 serde = "*"
 serde_json = "*"
 eyre = "*"
@@ -28,7 +28,7 @@ required-features = []
 [dev-dependencies]
 serial_test = "*"
 rstest = "*"
-loco-rs = { version = "0.4.0", default-features = false, features = [
+loco-rs = { version = "0.5.0", default-features = false, features = [
   "testing",
   "cli",
 ] }

starters/rest-api/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2021"
 
 [dependencies]
 
-loco-rs = { version = "0.4.0" }
+loco-rs = { version = "0.5.0" }
 migration = { path = "migration" }
 
 serde = { version = "1", features = ["derive"] }
@@ -40,5 +40,5 @@ required-features = []
 [dev-dependencies]
 serial_test = "2.0.0"
 rstest = "0.18.2"
-loco-rs = { version = "0.4.0", features = ["testing"] }
+loco-rs = { version = "0.5.0", features = ["testing"] }
 insta = { version = "1.34.0", features = ["redactions", "yaml", "filters"] }

starters/rest-api/config/development.yaml

@@ -111,8 +111,8 @@ database:
   # Recreating schema when application loaded.  This is a dangerous operation, make sure that you using this flag only on dev environments or test mode
   dangerously_recreate: false
 
-# Redis Configuration
-redis:
+# Queue Configuration
+queue:
   # Redis connection URI
   uri: {{ get_env(name="REDIS_URL", default="redis://127.0.0.1") }}
   # Dangerously flush all data in Redis on startup. dangerous operation, make sure that you using this flag only on dev environments or test mode

starters/rest-api/config/test.yaml

@@ -108,8 +108,8 @@ database:
   # Recreating schema when application loaded.  This is a dangerous operation, make sure that you using this flag only on dev environments or test mode
   dangerously_recreate: false
 
-# Redis Configuration
-redis:
+# Queue Configuration
+queue:
   # Redis connection URI
   uri: {{get_env(name="REDIS_URL", default="redis://127.0.0.1")}}
   # Dangerously flush all data in Redis on startup. dangerous operation, make sure that you using this flag only on dev environments or test mode

starters/rest-api/migration/Cargo.toml

@@ -10,7 +10,7 @@ path = "src/lib.rs"
 
 [dependencies]
 async-std = { version = "1", features = ["attributes", "tokio1"] }
-loco-rs = { version = "0.4.0" }
+loco-rs = { version = "0.5.0" }
 
 [dependencies.sea-orm-migration]
 version = "1.0.0-rc.4"

starters/rest-api/src/models/users.rs

@@ -58,7 +58,11 @@ impl ActiveModelBehavior for super::_entities::users::ActiveModel {
 impl Authenticable for super::_entities::users::Model {
     async fn find_by_api_key(db: &DatabaseConnection, api_key: &str) -> ModelResult<Self> {
         let user = users::Entity::find()
-            .filter(users::Column::ApiKey.eq(api_key))
+            .filter(
+                model::query::condition()
+                    .eq(users::Column::ApiKey, api_key)
+                    .build(),
+            )
             .one(db)
             .await?;
         user.ok_or_else(|| ModelError::EntityNotFound)
@@ -77,7 +81,11 @@ impl super::_entities::users::Model {
     /// When could not find user by the given token or DB query error
     pub async fn find_by_email(db: &DatabaseConnection, email: &str) -> ModelResult<Self> {
         let user = users::Entity::find()
-            .filter(users::Column::Email.eq(email))
+            .filter(
+                model::query::condition()
+                    .eq(users::Column::Email, email)
+                    .build(),
+            )
             .one(db)
             .await?;
         user.ok_or_else(|| ModelError::EntityNotFound)
@@ -93,7 +101,11 @@ impl super::_entities::users::Model {
         token: &str,
     ) -> ModelResult<Self> {
         let user = users::Entity::find()
-            .filter(users::Column::EmailVerificationToken.eq(token))
+            .filter(
+                model::query::condition()
+                    .eq(users::Column::EmailVerificationToken, token)
+                    .build(),
+            )
             .one(db)
             .await?;
         user.ok_or_else(|| ModelError::EntityNotFound)
@@ -106,7 +118,11 @@ impl super::_entities::users::Model {
     /// When could not find user by the given token or DB query error
     pub async fn find_by_reset_token(db: &DatabaseConnection, token: &str) -> ModelResult<Self> {
         let user = users::Entity::find()
-            .filter(users::Column::ResetToken.eq(token))
+            .filter(
+                model::query::condition()
+                    .eq(users::Column::ResetToken, token)
+                    .build(),
+            )
             .one(db)
             .await?;
         user.ok_or_else(|| ModelError::EntityNotFound)
@@ -120,7 +136,11 @@ impl super::_entities::users::Model {
     pub async fn find_by_pid(db: &DatabaseConnection, pid: &str) -> ModelResult<Self> {
         let parse_uuid = Uuid::parse_str(pid).map_err(|e| ModelError::Any(e.into()))?;
         let user = users::Entity::find()
-            .filter(users::Column::Pid.eq(parse_uuid))
+            .filter(
+                model::query::condition()
+                    .eq(users::Column::Pid, parse_uuid)
+                    .build(),
+            )
             .one(db)
             .await?;
         user.ok_or_else(|| ModelError::EntityNotFound)
@@ -133,7 +153,11 @@ impl super::_entities::users::Model {
     /// When could not find user by the given token or DB query error
     pub async fn find_by_api_key(db: &DatabaseConnection, api_key: &str) -> ModelResult<Self> {
         let user = users::Entity::find()
-            .filter(users::Column::ApiKey.eq(api_key))
+            .filter(
+                model::query::condition()
+                    .eq(users::Column::ApiKey, api_key)
+                    .build(),
+            )
             .one(db)
             .await?;
         user.ok_or_else(|| ModelError::EntityNotFound)
@@ -162,7 +186,11 @@ impl super::_entities::users::Model {
         let txn = db.begin().await?;
 
         if users::Entity::find()
-            .filter(users::Column::Email.eq(&params.email))
+            .filter(
+                model::query::condition()
+                    .eq(users::Column::Email, &params.email)
+                    .build(),
+            )
             .one(&txn)
             .await?
             .is_some()
@@ -192,7 +220,7 @@ impl super::_entities::users::Model {
     ///
     /// when could not convert user claims to jwt token
     pub fn generate_jwt(&self, secret: &str, expiration: &u64) -> ModelResult<String> {
-        Ok(jwt::JWT::new(secret).generate_token(expiration, self.pid.to_string())?)
+        Ok(jwt::JWT::new(secret).generate_token(expiration, self.pid.to_string(), None)?)
     }
 }
 

starters/saas/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2021"
 
 [dependencies]
 
-loco-rs = { version = "0.4.0" }
+loco-rs = { version = "0.5.0" }
 migration = { path = "migration" }
 
 serde = { version = "1", features = ["derive"] }
@@ -45,5 +45,5 @@ required-features = []
 [dev-dependencies]
 serial_test = "2.0.0"
 rstest = "0.18.2"
-loco-rs = { version = "0.4.0", features = ["testing"] }
+loco-rs = { version = "0.5.0", features = ["testing"] }
 insta = { version = "1.34.0", features = ["redactions", "yaml", "filters"] }

starters/saas/config/development.yaml

@@ -133,8 +133,8 @@ database:
   # Recreating schema when application loaded.  This is a dangerous operation, make sure that you using this flag only on dev environments or test mode
   dangerously_recreate: false
 
-# Redis Configuration
-redis:
+# Queue Configuration
+queue:
   # Redis connection URI
   uri: {{get_env(name="REDIS_URL", default="redis://127.0.0.1")}}
   # Dangerously flush all data in Redis on startup. dangerous operation, make sure that you using this flag only on dev environments or test mode

starters/saas/config/test.yaml

@@ -114,8 +114,8 @@ database:
   # Recreating schema when application loaded.  This is a dangerous operation, make sure that you using this flag only on dev environments or test mode
   dangerously_recreate: false
 
-# Redis Configuration
-redis:
+# Queue Configuration
+queue:
   # Redis connection URI
   uri: {{get_env(name="REDIS_URL", default="redis://127.0.0.1")}}
   # Dangerously flush all data in Redis on startup. dangerous operation, make sure that you using this flag only on dev environments or test mode

starters/saas/migration/Cargo.toml

@@ -10,7 +10,7 @@ path = "src/lib.rs"
 
 [dependencies]
 async-std = { version = "1", features = ["attributes", "tokio1"] }
-loco-rs = { version = "0.4.0" }
+loco-rs = { version = "0.5.0" }
 
 [dependencies.sea-orm-migration]
 version = "1.0.0-rc.4"