chore(deps): bump jsonwebtoken from 9.3.1 to 10.1.0

Bumps [jsonwebtoken](https://github.com/Keats/jsonwebtoken) from 9.3.1 to 10.1.0. - [Changelog](https://github.com/Keats/jsonwebtoken/blob/master/CHANGELOG.md) - [Commits](https://github.com/Keats/jsonwebtoken/compare/v9.3.1...v10.1.0) --- updated-dependencies: - dependency-name: jsonwebtoken dependency-version: 10.1.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
2025-12-06 09:47:50 +03:00 · 2025-10-28 02:56:56 +00:00
10 changed files with 60 additions and 145 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -139,7 +139,4 @@ jobs:
          cache-from: type=gha
          cache-to: type=gha,mode=max
          build-args: |
-            "BINARY_NAME=${{ env.BINARY_NAME }}"
-
-      - name: Deploy
-        run: curl ${{ secrets.DEPLOY_URL }}
+            "BINARY_NAME=${{ env.BINARY_NAME }}"
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -534,10 +534,11 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"

 [[package]]
 name = "axum"
-version = "0.8.6"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871"
+checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
+ "async-trait",
 "axum-core",
 "bytes",
 "futures-util",
@@ -550,26 +551,29 @@ dependencies = [
 "mime",
 "percent-encoding",
 "pin-project-lite",
- "serde_core",
+ "rustversion",
+ "serde",
 "sync_wrapper",
- "tower",
+ "tower 0.5.2",
 "tower-layer",
 "tower-service",
 ]

 [[package]]
 name = "axum-core"
-version = "0.5.5"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22"
+checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
 dependencies = [
+ "async-trait",
 "bytes",
- "futures-core",
+ "futures-util",
 "http 1.3.1",
 "http-body",
 "http-body-util",
 "mime",
 "pin-project-lite",
+ "rustversion",
 "sync_wrapper",
 "tower-layer",
 "tower-service",
@@ -965,23 +969,22 @@ dependencies = [

 [[package]]
 name = "console-api"
-version = "0.9.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8599749b6667e2f0c910c1d0dff6901163ff698a52d5a39720f61b5be4b20d3"
+checksum = "8030735ecb0d128428b64cd379809817e620a40e5001c54465b99ec5feec2857"
 dependencies = [
 "futures-core",
 "prost",
 "prost-types",
 "tonic",
- "tonic-prost",
 "tracing-core",
 ]

 [[package]]
 name = "console-subscriber"
-version = "0.5.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb4915b7d8dd960457a1b6c380114c2944f728e7c65294ab247ae6b6f1f37592"
+checksum = "6539aa9c6a4cd31f4b1c040f860a1eac9aa80e7df6b05d506a6e7179936d6a01"
 dependencies = [
 "console-api",
 "crossbeam-channel",
@@ -1727,10 +1730,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
 "cfg-if",
- "js-sys",
 "libc",
 "wasi 0.11.1+wasi-snapshot-preview1",
- "wasm-bindgen",
 ]

 [[package]]
@@ -2377,16 +2378,17 @@ dependencies = [

 [[package]]
 name = "jsonwebtoken"
-version = "9.3.1"
+version = "10.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde"
+checksum = "3d119c6924272d16f0ab9ce41f7aa0bfef9340c00b0bb7ca3dd3b263d4a9150b"
 dependencies = [
 "base64 0.22.1",
+ "getrandom 0.2.16",
 "js-sys",
 "pem",
- "ring",
 "serde",
 "serde_json",
+ "signature 2.2.0",
 "simple_asn1",
 ]

@@ -2520,9 +2522,9 @@ dependencies = [

 [[package]]
 name = "matchit"
-version = "0.8.4"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"

 [[package]]
 name = "md-5"
@@ -3058,9 +3060,9 @@ dependencies = [

 [[package]]
 name = "prost"
-version = "0.14.1"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d"
+checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
 dependencies = [
 "bytes",
 "prost-derive",
@@ -3068,9 +3070,9 @@ dependencies = [

 [[package]]
 name = "prost-derive"
-version = "0.14.1"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425"
+checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
 "anyhow",
 "itertools",
@@ -3081,9 +3083,9 @@ dependencies = [

 [[package]]
 name = "prost-types"
-version = "0.14.1"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b4db3d6da204ed77bb26ba83b6122a73aeb2e87e25fbf7ad2e84c4ccbf8f72"
+checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
 dependencies = [
 "prost",
 ]
@@ -3386,7 +3388,7 @@ dependencies = [
 "sync_wrapper",
 "tokio",
 "tokio-native-tls",
- "tower",
+ "tower 0.5.2",
 "tower-http",
 "tower-service",
 "url",
@@ -4799,10 +4801,11 @@ checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"

 [[package]]
 name = "tonic"
-version = "0.14.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb7613188ce9f7df5bfe185db26c5814347d110db17920415cf2fbcad85e7203"
+checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
 dependencies = [
+ "async-stream",
 "async-trait",
 "axum",
 "base64 0.22.1",
@@ -4816,25 +4819,34 @@ dependencies = [
 "hyper-util",
 "percent-encoding",
 "pin-project",
- "socket2 0.6.1",
- "sync_wrapper",
+ "prost",
+ "socket2 0.5.10",
 "tokio",
 "tokio-stream",
- "tower",
+ "tower 0.4.13",
 "tower-layer",
 "tower-service",
 "tracing",
 ]

 [[package]]
-name = "tonic-prost"
-version = "0.14.2"
+name = "tower"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66bd50ad6ce1252d87ef024b3d64fe4c3cf54a86fb9ef4c631fdd0ded7aeaa67"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
- "bytes",
- "prost",
- "tonic",
+ "futures-core",
+ "futures-util",
+ "indexmap 1.9.3",
+ "pin-project",
+ "pin-project-lite",
+ "rand 0.8.5",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+ "tracing",
 ]

 [[package]]
@@ -4845,15 +4857,11 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
 "futures-core",
 "futures-util",
- "indexmap 2.12.0",
 "pin-project-lite",
- "slab",
 "sync_wrapper",
 "tokio",
- "tokio-util",
 "tower-layer",
 "tower-service",
- "tracing",
 ]

 [[package]]
@@ -4869,7 +4877,7 @@ dependencies = [
 "http-body",
 "iri-string",
 "pin-project-lite",
- "tower",
+ "tower 0.5.2",
 "tower-layer",
 "tower-service",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,7 +38,7 @@ futures-util = "0"

 # authorization
 bcrypt = "0"
-jsonwebtoken = { version = "9", features = ["use_pem"] }
+jsonwebtoken = { version = "10", features = ["use_pem"] }

 # creating users
 objectid = "0"
--- a/providers/base/src/lib.rs
+++ b/providers/base/src/lib.rs
@@ -103,9 +103,6 @@ pub enum LessonType {

    /// Практическое занятие.
    Practice,
-
-    /// Дифференцированный зачёт.
-    DifferentiatedExam,
 }

 #[derive(Clone, Hash, Debug, Serialize, Deserialize, ToSchema)]
--- a/providers/provider-engels-polytechnic/src/parser/mod.rs
+++ b/providers/provider-engels-polytechnic/src/parser/mod.rs
@@ -187,7 +187,6 @@ fn guess_lesson_type(text: &str) -> Option<LessonType> {
            ("курсовой проект", LessonType::CourseProject),
            ("защита курсового проекта", LessonType::CourseProjectDefense),
            ("практическое занятие", LessonType::Practice),
-            ("дифференцированный зачет", LessonType::DifferentiatedExam),
        ])
    });

--- a/src/main.rs
+++ b/src/main.rs
@@ -50,22 +50,7 @@ pub fn get_api_scope<
        .service(routes::auth::sign_up_vk);

    let users_scope = utoipa_actix_web::scope("/users")
-        .wrap(
-            JWTAuthorizationBuilder::new()
-                .add_paths(
-                    ["/by/id/{id}", "/by/telegram-id/{id}"],
-                    Some(ServiceConfig {
-                        allow_service: true,
-                        user_roles: Some(&[UserRole::Admin]),
-                    }),
-                )
-                .build(),
-        )
-        .service(
-            utoipa_actix_web::scope("/by")
-                .service(routes::users::by::by_id)
-                .service(routes::users::by::by_telegram_id),
-        )
+        .wrap(JWTAuthorizationBuilder::new().build())
        .service(routes::users::change_group)
        .service(routes::users::change_username)
        .service(routes::users::me);
--- a/src/middlewares/authorization.rs
+++ b/src/middlewares/authorization.rs
@@ -5,13 +5,13 @@ use actix_web::body::{BoxBody, EitherBody};
 use actix_web::dev::{forward_ready, Service, ServiceRequest, ServiceResponse, Transform};
 use actix_web::{web, Error, HttpRequest, ResponseError};
 use database::entity::sea_orm_active_enums::UserRole;
-use database::entity::UserType;
 use database::query::Query;
 use futures_util::future::LocalBoxFuture;
 use std::future::{ready, Ready};
 use std::ops::Deref;
 use std::rc::Rc;
 use std::sync::Arc;
+use database::entity::UserType;

 #[derive(Default, Clone)]
 pub struct ServiceConfig {
@@ -42,11 +42,7 @@ impl JWTAuthorizationBuilder {
        self
    }

-    pub fn add_paths(
-        mut self,
-        paths: impl AsRef<[&'static str]>,
-        config: Option<ServiceConfig>,
-    ) -> Self {
+    pub fn add_paths(mut self, paths: impl AsRef<[&'static str]>, config: Option<ServiceConfig>) -> Self {
        self.path_configs.push((Arc::from(paths.as_ref()), config));
        self
    }
@@ -180,20 +176,11 @@ where
    fn call(&self, req: ServiceRequest) -> Self::Future {
        let service = Rc::clone(&self.service);

-        let match_info = req.match_info();
-        let path = if let Some(pattern) = req.match_pattern() {
-            let scope_start_idx = match_info
-                .as_str()
-                .find(match_info.unprocessed())
-                .unwrap_or(0);
-
-            pattern.as_str().split_at(scope_start_idx).1.to_owned()
-        } else {
-            match_info.unprocessed().to_owned()
-        };
-
-        let Some(config) = Self::find_config(&path, &self.path_configs, &self.default_config)
-        else {
+        let Some(config) = Self::find_config(
+            req.match_info().unprocessed(),
+            &self.path_configs,
+            &self.default_config,
+        ) else {
            let fut = self.service.call(req);
            return Box::pin(async move { Ok(fut.await?.map_into_left_body()) });
        };
--- a/src/routes/schema.rs
+++ b/src/routes/schema.rs
@@ -163,7 +163,6 @@ pub mod user {
        #[schema(examples(
            "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpZCI6IjY3ZGNjOWE5NTA3YjAwMDA3NzI3NDRhMiIsImlhdCI6IjE3NDMxMDgwOTkiLCJleHAiOiIxODY5MjUyMDk5In0.rMgXRb3JbT9AvLK4eiY9HMB5LxgUudkpQyoWKOypZFY"
        ))]
-        #[serde(skip_serializing_if = "Option::is_none")]
        pub access_token: Option<String>,
    }

--- a/src/routes/users/by.rs
+++ b/src/routes/users/by.rs
@@ -1,56 +0,0 @@
-use crate::routes::schema::user::UserResponse;
-use crate::routes::users::by::schema::{ErrorCode, ServiceResponse};
-use crate::state::AppState;
-use actix_web::{get, web};
-use database::query::Query;
-
-#[utoipa::path(responses((status = OK, body = UserResponse)))]
-#[get("/id/{id}")]
-pub async fn by_id(app_state: web::Data<AppState>, path: web::Path<String>) -> ServiceResponse {
-    let user_id = path.into_inner();
-
-    let db = app_state.get_database();
-
-    match Query::find_user_by_id(db, &user_id).await {
-        Ok(Some(user)) => Ok(UserResponse::from(user)),
-        _ => Err(ErrorCode::NotFound),
-    }
-    .into()
-}
-
-#[utoipa::path(responses((status = OK, body = UserResponse)))]
-#[get("/telegram-id/{id}")]
-pub async fn by_telegram_id(
-    app_state: web::Data<AppState>,
-    path: web::Path<i64>,
-) -> ServiceResponse {
-    let telegram_id = path.into_inner();
-
-    let db = app_state.get_database();
-
-    match Query::find_user_by_telegram_id(db, telegram_id).await {
-        Ok(Some(user)) => Ok(UserResponse::from(user)),
-        _ => Err(ErrorCode::NotFound),
-    }
-    .into()
-}
-
-mod schema {
-    use crate::routes::schema::user::UserResponse;
-    use actix_macros::ErrResponse;
-    use derive_more::Display;
-    use serde::Serialize;
-    use utoipa::ToSchema;
-
-    pub type ServiceResponse = crate::routes::schema::Response<UserResponse, ErrorCode>;
-
-    #[derive(Clone, Serialize, Display, ToSchema, ErrResponse)]
-    #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
-    #[schema(as = Users::By::ErrorCode)]
-    pub enum ErrorCode {
-        /// User not found.
-        #[status_code = "actix_web::http::StatusCode::NOT_FOUND"]
-        #[display("Required user not found.")]
-        NotFound,
-    }
-}
--- a/src/routes/users/mod.rs
+++ b/src/routes/users/mod.rs
@@ -1,4 +1,3 @@
-pub mod by;
 mod change_group;
 mod change_username;
 mod me;