bump: textsender_models

.gitea/workflows/pr.yml

@@ -1,42 +0,0 @@
-name: textsender_models PR
-
-on:
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  check:
-    name: Check
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
-      - run: cargo check
-
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
-      - run: rustup component add rustfmt
-      - run: cargo fmt --all -- --check
-
-  clippy:
-    name: Clippy
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
-      - run: rustup component add clippy
-      - run: cargo clippy -- -D warnings

.gitea/workflows/rust.yml

@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
 
 jobs:
   check:

Cargo.lock

@@ -522,7 +522,7 @@ dependencies = [
 
 [[package]]
 name = "textsender_models"
-version = "0.3.4"
+version = "0.3.2"
 dependencies = [
  "const_format",
  "dotenvy",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "textsender_models"
-version = "0.3.4"
+version = "0.3.2"
 edition = "2024"
 rust-version = "1.95"
 description = "Models used for the textsender project"
@@ -15,11 +15,4 @@ const_format = { version = "0.2.36" }
 josekit = { version = "0.10.3" }
 utoipa = { version = "5.4.0", features = ["uuid", "time"] }
 
-[features]
-default = ["full"]
-full = ["user", "message", "contact"]
-user = []
-message = []
-contact = []
-
 [dev-dependencies]

src/token/mod.rs

@@ -3,8 +3,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Claims {
     pub user_id: uuid::Uuid,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub role: Option<String>,
+    pub role: String,
     #[serde(alias = "iss")]
     pub issued: String,
     #[serde(alias = "exp")]
@@ -43,7 +42,7 @@ pub struct LoginResult {
     pub issued_at: i64,
 }
 
-/// Alias for LoginResult
+// Alias for LoginResult
 pub type Login = LoginResult;
 
 pub fn get_issued() -> time::Result<time::OffsetDateTime> {
@@ -64,10 +63,9 @@ pub struct TokenResource {
     pub message: String,
     pub issuer: String,
     pub audiences: Vec<String>,
-    pub user_id: uuid::Uuid,
+    pub id: uuid::Uuid,
 }
 
-/// Token type
 pub const TOKEN_TYPE: &str = "JWT";
 
 pub fn create_token(
@@ -85,8 +83,8 @@ pub fn create_token(
     payload.set_subject(message);
     payload.set_issuer(issuer);
     payload.set_audience(audiences.clone());
-    if !token_resource.user_id.is_nil() {
-        match payload.set_claim("user_id", Some(serde_json::json!(token_resource.user_id))) {
+    if !token_resource.id.is_nil() {
+        match payload.set_claim("id", Some(serde_json::json!(token_resource.id))) {
             Ok(_) => {}
             Err(err) => {
                 return Err(err);