refactor: replace jwt references with token for improved consistency

Modified app/Cargo.toml +1 −1 View app/Cargo.toml

@@ -15,7 +15,7 @@

1515deletion = { workspace = true }

1616events = { workspace = true }

1717export = { workspace = true }

18jwt = { workspace = true }

18token = { workspace = true }

1919models = { workspace = true }

2020push = { workspace = true }

2121queue = { workspace = true }

Modified lib/chat/src/handlers/attachments.rs +2 −2 View lib/chat/src/handlers/attachments.rs

@@ -1,8 +1,8 @@

11use export::http::{Json, Path, Query, Response, State};

22use export::rest::{AppResponseData, NoData};

33use imaging::layout::ImageVariant;

4use jwt::Session;

5use jwt::share::session;

4use token::Session;

5use token::share::session;

66use serde::Deserialize;

77use utoipa::{IntoParams, ToSchema};

88use uuid::Uuid;

Modified lib/chat/src/handlers/bookmarks.rs +2 −2 View lib/chat/src/handlers/bookmarks.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/chat/src/handlers/dms.rs +2 −2 View lib/chat/src/handlers/dms.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/chat/src/handlers/drafts.rs +2 −2 View lib/chat/src/handlers/drafts.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/chat/src/handlers/emojis.rs +2 −2 View lib/chat/src/handlers/emojis.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, Path, Response, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/chat/src/handlers/messages.rs +2 −2 View lib/chat/src/handlers/messages.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/chat/src/handlers/presence.rs +2 −2 View lib/chat/src/handlers/presence.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55

66use crate::errors::ApiError;

77use crate::services::presence::{PresenceDto, SetPresenceCmd};

Modified lib/chat/src/handlers/reactions.rs +2 −2 View lib/chat/src/handlers/reactions.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/chat/src/handlers/read_state.rs +2 −2 View lib/chat/src/handlers/read_state.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/chat/src/handlers/reminders.rs +2 −2 View lib/chat/src/handlers/reminders.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/chat/src/handlers/room_admin.rs +2 −2 View lib/chat/src/handlers/room_admin.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/chat/src/handlers/rooms.rs +2 −2 View lib/chat/src/handlers/rooms.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/chat/src/handlers/settings.rs +2 −2 View lib/chat/src/handlers/settings.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/chat/src/handlers/threads.rs +2 −2 View lib/chat/src/handlers/threads.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/chat/src/handlers/voice.rs +2 −2 View lib/chat/src/handlers/voice.rs

@@ -1,7 +1,7 @@

11use export::http::{HeaderMap, Json, Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use livekit_api::access_token::TokenVerifier;

66use livekit_api::webhooks::WebhookReceiver;

77use serde::Deserialize;

Modified lib/chat/src/handlers/webhooks.rs +2 −2 View lib/chat/src/handlers/webhooks.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/chat/src/share/guard.rs +1 −1 View lib/chat/src/share/guard.rs

@@ -1 +1 @@

1pub use jwt::share::guard::session_guard as chat_guard;

1pub use token::share::guard::session_guard as chat_guard;

Modified lib/chat/Cargo.toml +1 −1 View lib/chat/Cargo.toml

@@ -12,7 +12,7 @@

1212models = { workspace = true }

1313queue = { workspace = true }

1414social = { workspace = true }

15jwt = { workspace = true }

15token = { workspace = true }

1616space = { workspace = true }

1717storage = { workspace = true }

1818actix-web = { workspace = true }

Modified lib/config/src/identity/auth.rs +1 −1 View lib/config/src/identity/auth.rs

@@ -97,7 +97,7 @@

9797 pub kind: models::users::oauth_clients::ClientKind,

9898 /// 机密客户端的初始 secret；启动时会哈希后入库，明文不落库。

9999 pub secret: Option<String>,

100 /// 令牌受众；为空时回落 `jwt::PLATFORM_AUDIENCE`。

100 /// 令牌受众；为空时回落 `token::PLATFORM_AUDIENCE`。

101101 pub audience: Option<String>,

102102 #[serde(default = "default_true")]

103103 pub enabled: bool,

Modified lib/export/src/api_error.rs +6 −6 View lib/export/src/api_error.rs

@@ -116,7 +116,7 @@

116116/// `IntoResponses` derive, envelope constructors, `IntoResponse`, and the

117117/// `From` impls shared by every crate (boxed self, `AppResponseData<()>`,

118118/// request rejections, `serde_json::Error`, `(StatusCode, &str)` and

119/// `jwt::SessionError`).

119/// `token::SessionError`).

120120///

121121/// The enum must contain an `Internal` variant; `log` labels server-side

122122/// warnings as "`<log> handler failed`".

@@ -295,14 +295,14 @@

295295 }

296296 }

297297

298 impl From<::jwt::SessionError> for $name {

299 fn from(error: ::jwt::SessionError) -> Self {

298 impl From<::token::SessionError> for $name {

299 fn from(error: ::token::SessionError) -> Self {

300300 match error {

301 ::jwt::SessionError::Unauthorized => {

301 ::token::SessionError::Unauthorized => {

302302 Self::build(401, Self::payload(401, "unauthenticated"))

303303 }

304 ::jwt::SessionError::Expired => Self::build(401, Self::payload(401, "token_expired")),

305 ::jwt::SessionError::Verifier(message) => {

304 ::token::SessionError::Expired => Self::build(401, Self::payload(401, "token_expired")),

305 ::token::SessionError::Verifier(message) => {

306306 ::tracing::debug!(error = %message, "bearer token rejected");

307307 Self::build(401, Self::payload(401, "invalid_token"))

308308 }

Modified lib/export/src/http.rs +1 −1 View lib/export/src/http.rs

@@ -489,7 +489,7 @@

489489 move |request, next| {

490490 Box::pin(async move {

491491 match guard {

492 Guard::Session => jwt::share::guard::session_guard(request, next).await,

492 Guard::Session => token::share::guard::session_guard(request, next).await,

493493 Guard::ServiceKey => require_service_key(request, next).await,

494494 }

495495 })

Modified lib/export/Cargo.toml +1 −1 View lib/export/Cargo.toml

@@ -12,7 +12,7 @@

1212redis = { workspace = true }

1313tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal"] }

1414auth = { workspace = true }

15jwt = { workspace = true }

15token = { workspace = true }

1616imaging = { workspace = true }

1717actix-web = { workspace = true }

1818http = "1.5.0"

Modified lib/git/src/handler/analysis/code_activity.rs +1 −1 View lib/git/src/handler/analysis/code_activity.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/analysis/contributors.rs +1 −1 View lib/git/src/handler/analysis/contributors.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/analysis/languages.rs +1 −1 View lib/git/src/handler/analysis/languages.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/analysis/languages_read.rs +1 −1 View lib/git/src/handler/analysis/languages_read.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/archives/create.rs +1 −1 View lib/git/src/handler/archives/create.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/archives/create_bundle.rs +1 −1 View lib/git/src/handler/archives/create_bundle.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/archives/download.rs +1 −1 View lib/git/src/handler/archives/download.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPathRev, resolve_reader};

Modified lib/git/src/handler/blobs/content.rs +1 −1 View lib/git/src/handler/blobs/content.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/blobs/list_lfs_pointers.rs +1 −1 View lib/git/src/handler/blobs/list_lfs_pointers.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/blobs/metadata.rs +1 −1 View lib/git/src/handler/blobs/metadata.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/branch_protection/create_policy.rs +1 −1 View lib/git/src/handler/branch_protection/create_policy.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_repo_admin};

Modified lib/git/src/handler/branch_protection/delete_policy.rs +1 −1 View lib/git/src/handler/branch_protection/delete_policy.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/branch_protection/get_policy.rs +1 −1 View lib/git/src/handler/branch_protection/get_policy.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/branch_protection/list_policies.rs +1 −1 View lib/git/src/handler/branch_protection/list_policies.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_repo_admin};

Modified lib/git/src/handler/branch_protection/update_policy.rs +1 −1 View lib/git/src/handler/branch_protection/update_policy.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/branches/create.rs +1 −1 View lib/git/src/handler/branches/create.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/branches/delete.rs +1 −1 View lib/git/src/handler/branches/delete.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/branches/get.rs +1 −1 View lib/git/src/handler/branches/get.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/branches/list.rs +1 −1 View lib/git/src/handler/branches/list.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/branches/rename.rs +1 −1 View lib/git/src/handler/branches/rename.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/branches/set_default.rs +1 −1 View lib/git/src/handler/branches/set_default.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/code_comments/create_code_comment.rs +1 −1 View lib/git/src/handler/code_comments/create_code_comment.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/code_comments/list_code_comments.rs +1 −1 View lib/git/src/handler/code_comments/list_code_comments.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/code_comments/modify.rs +1 −1 View lib/git/src/handler/code_comments/modify.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44use uuid::Uuid;

55

66use crate::errors::{ApiError, GitApiError};

Modified lib/git/src/handler/code_comments/resolve_code_comment.rs +1 −1 View lib/git/src/handler/code_comments/resolve_code_comment.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/commits/get.rs +1 −1 View lib/git/src/handler/commits/get.rs

@@ -1,7 +1,7 @@

11use crate::rpcgit::commit::types::CommitInfo;

22use export::http::{Path, State};

33use export::rest::AppResponseData;

4use jwt::Session;

4use token::Session;

55

66use crate::errors::{ApiError, GitApiError};

77use crate::handler;

Modified lib/git/src/handler/commits/is_ancestor.rs +1 −1 View lib/git/src/handler/commits/is_ancestor.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44use serde::Serialize;

55

66use crate::errors::{ApiError, GitApiError};

Modified lib/git/src/handler/commits/list.rs +1 −1 View lib/git/src/handler/commits/list.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/commits/list_commit_statuses.rs +1 −1 View lib/git/src/handler/commits/list_commit_statuses.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/commits/rev_parse.rs +1 −1 View lib/git/src/handler/commits/rev_parse.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/commits/set_commit_status.rs +1 −1 View lib/git/src/handler/commits/set_commit_status.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/commits/stats.rs +1 −1 View lib/git/src/handler/commits/stats.rs

@@ -3,7 +3,7 @@

33use crate::rpcgit::commit::types::CommitStats;

44use export::http::{Path, Query, State};

55use export::rest::AppResponseData;

6use jwt::Session;

6use token::Session;

77

88use crate::errors::{ApiError, GitApiError};

99use crate::handler;

Modified lib/git/src/handler/commits/sync_commit.rs +1 −1 View lib/git/src/handler/commits/sync_commit.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44use serde::Serialize;

55

66use crate::errors::{ApiError, GitApiError};

Modified lib/git/src/handler/conflicts/detail.rs +1 −1 View lib/git/src/handler/conflicts/detail.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/conflicts/get_conflicts.rs +1 −1 View lib/git/src/handler/conflicts/get_conflicts.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/content/caller_signature.rs +1 −1 View lib/git/src/handler/content/caller_signature.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44use time::OffsetDateTime;

55

66use crate::errors::{ApiError, GitApiError};

Modified lib/git/src/handler/content/commit_object.rs +1 −1 View lib/git/src/handler/content/commit_object.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/content/write_blob.rs +1 −1 View lib/git/src/handler/content/write_blob.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/content/write_tree_from_files.rs +1 −1 View lib/git/src/handler/content/write_tree_from_files.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/diffs/for_commit.rs +1 −1 View lib/git/src/handler/diffs/for_commit.rs

@@ -1,7 +1,7 @@

11use crate::rpcgit::diff::types::ChangedPath;

22use export::http::{Path, State};

33use export::rest::AppResponseData;

4use jwt::Session;

4use token::Session;

55

66use crate::errors::{ApiError, GitApiError};

77use crate::handler;

Modified lib/git/src/handler/diffs/get_diff.rs +1 −1 View lib/git/src/handler/diffs/get_diff.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44use serde::Deserialize;

55

66use crate::errors::{ApiError, GitApiError};

Modified lib/git/src/handler/diffs/range_diff.rs +1 −1 View lib/git/src/handler/diffs/range_diff.rs

@@ -1,7 +1,7 @@

11use crate::rpcgit::diff::types::RangeDiffSpec;

22use export::http::{Path, Query, State};

33use export::rest::AppResponseData;

4use jwt::Session;

4use token::Session;

55

66use crate::errors::{ApiError, GitApiError};

77use crate::handler;

Modified lib/git/src/handler/diffs/raw.rs +1 −1 View lib/git/src/handler/diffs/raw.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/hooks/execute_script.rs +1 −1 View lib/git/src/handler/hooks/execute_script.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/lfs/cleanup_unreferenced.rs +1 −1 View lib/git/src/handler/lfs/cleanup_unreferenced.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/lfs/list_locks.rs +1 −1 View lib/git/src/handler/lfs/list_locks.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, resolve_reader};

Modified lib/git/src/handler/lfs/lock.rs +1 −1 View lib/git/src/handler/lfs/lock.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/lfs/mod.rs +1 −1 View lib/git/src/handler/lfs/mod.rs

@@ -1,4 +1,4 @@

1use jwt::Session;

1use token::Session;

22

33use crate::errors::ApiError;

44use crate::handler::{require_repo_admin, require_writer};

Modified lib/git/src/handler/lfs/unlock.rs +1 −1 View lib/git/src/handler/lfs/unlock.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, lfs};

Modified lib/git/src/handler/lfs/unlock_by_id.rs +1 −1 View lib/git/src/handler/lfs/unlock_by_id.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::lfs;

Modified lib/git/src/handler/lfs/verify_locks.rs +1 −1 View lib/git/src/handler/lfs/verify_locks.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/maintenance/fsck.rs +1 −1 View lib/git/src/handler/maintenance/fsck.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/maintenance/prune.rs +1 −1 View lib/git/src/handler/maintenance/prune.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/packs/ingest.rs +1 −1 View lib/git/src/handler/packs/ingest.rs

@@ -1,6 +1,6 @@

11use export::http::{Bytes, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/packs/repack.rs +1 −1 View lib/git/src/handler/packs/repack.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/packs/stats.rs +1 −1 View lib/git/src/handler/packs/stats.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, resolve_reader};

Modified lib/git/src/handler/patches/apply.rs +1 −1 View lib/git/src/handler/patches/apply.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/patches/generate.rs +1 −1 View lib/git/src/handler/patches/generate.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/patches/parse.rs +1 −1 View lib/git/src/handler/patches/parse.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/refs/branches.rs +1 −1 View lib/git/src/handler/refs/branches.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/refs/delete.rs +1 −1 View lib/git/src/handler/refs/delete.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/refs/filtered.rs +1 −1 View lib/git/src/handler/refs/filtered.rs

@@ -1,7 +1,7 @@

11use crate::rpcgit::refs::types::RefInfo;

22use export::http::{Path, Query, State};

33use export::rest::AppResponseData;

4use jwt::Session;

4use token::Session;

55

66use crate::errors::{ApiError, GitApiError};

77use crate::handler;

Modified lib/git/src/handler/refs/get.rs +1 −1 View lib/git/src/handler/refs/get.rs

@@ -1,7 +1,7 @@

11use crate::rpcgit::refs::types::RefInfo;

22use export::http::{Path, State};

33use export::rest::AppResponseData;

4use jwt::Session;

4use token::Session;

55

66use crate::errors::{ApiError, GitApiError};

77use crate::handler;

Modified lib/git/src/handler/refs/head.rs +1 −1 View lib/git/src/handler/refs/head.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/refs/is_object_in_ref.rs +1 −1 View lib/git/src/handler/refs/is_object_in_ref.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44use serde::Serialize;

55

66use crate::errors::{ApiError, GitApiError};

Modified lib/git/src/handler/refs/list.rs +1 −1 View lib/git/src/handler/refs/list.rs

@@ -1,7 +1,7 @@

11use crate::rpcgit::refs::types::RefInfo;

22use export::http::{Path, State};

33use export::rest::AppResponseData;

4use jwt::Session;

4use token::Session;

55

66use crate::errors::{ApiError, GitApiError};

77use crate::handler;

Modified lib/git/src/handler/refs/resolve.rs +1 −1 View lib/git/src/handler/refs/resolve.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/refs/update.rs +1 −1 View lib/git/src/handler/refs/update.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44use serde::{Deserialize, Serialize};

55

66use crate::errors::{ApiError, GitApiError};

Modified lib/git/src/handler/releases/create_release.rs +1 −1 View lib/git/src/handler/releases/create_release.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/releases/delete_release.rs +1 −1 View lib/git/src/handler/releases/delete_release.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{require_repo_admin, require_writer};

Modified lib/git/src/handler/releases/get_release.rs +1 −1 View lib/git/src/handler/releases/get_release.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/releases/list_releases.rs +1 −1 View lib/git/src/handler/releases/list_releases.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/releases/update_release.rs +1 −1 View lib/git/src/handler/releases/update_release.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{require_repo_admin, require_writer};

Modified lib/git/src/handler/remotes/add.rs +1 −1 View lib/git/src/handler/remotes/add.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/remotes/clone_import.rs +1 −1 View lib/git/src/handler/remotes/clone_import.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/remotes/fetch.rs +1 −1 View lib/git/src/handler/remotes/fetch.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/remotes/list.rs +1 −1 View lib/git/src/handler/remotes/list.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, ensure_read_access};

Modified lib/git/src/handler/remotes/push.rs +1 −1 View lib/git/src/handler/remotes/push.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_writer};

Modified lib/git/src/handler/remotes/remove.rs +1 −1 View lib/git/src/handler/remotes/remove.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/repos/archive.rs +1 −1 View lib/git/src/handler/repos/archive.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, ensure_caller};

Modified lib/git/src/handler/repos/create.rs +1 −1 View lib/git/src/handler/repos/create.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/repos/get.rs +1 −1 View lib/git/src/handler/repos/get.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, resolve_reader};

Modified lib/git/src/handler/repos/list.rs +1 −1 View lib/git/src/handler/repos/list.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::service::GitService;

Modified lib/git/src/handler/repos/update.rs +1 −1 View lib/git/src/handler/repos/update.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, ensure_caller};

Modified lib/git/src/handler/signatures/verify_commit.rs +1 −1 View lib/git/src/handler/signatures/verify_commit.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/signatures/verify_tag.rs +1 −1 View lib/git/src/handler/signatures/verify_tag.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/submodules/list.rs +1 −1 View lib/git/src/handler/submodules/list.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/submodules/resolve.rs +1 −1 View lib/git/src/handler/submodules/resolve.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/tag_protection/create_policy.rs +1 −1 View lib/git/src/handler/tag_protection/create_policy.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_repo_admin};

Modified lib/git/src/handler/tag_protection/delete_policy.rs +1 −1 View lib/git/src/handler/tag_protection/delete_policy.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/tag_protection/get_policy.rs +1 −1 View lib/git/src/handler/tag_protection/get_policy.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/tag_protection/list_policies.rs +1 −1 View lib/git/src/handler/tag_protection/list_policies.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler::{RepoPath, require_repo_admin};

Modified lib/git/src/handler/tag_protection/update_policy.rs +1 −1 View lib/git/src/handler/tag_protection/update_policy.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/tags/create.rs +1 −1 View lib/git/src/handler/tags/create.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/tags/delete.rs +1 −1 View lib/git/src/handler/tags/delete.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/tags/get.rs +1 −1 View lib/git/src/handler/tags/get.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/tags/list.rs +1 −1 View lib/git/src/handler/tags/list.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/trees/read.rs +1 −1 View lib/git/src/handler/trees/read.rs

@@ -2,7 +2,7 @@

22

33use export::http::{Path, Query, State};

44use export::rest::AppResponseData;

5use jwt::Session;

5use token::Session;

66use serde::Deserialize;

77

88use crate::errors::{ApiError, GitApiError};

Modified lib/git/src/handler/blame.rs +1 −1 View lib/git/src/handler/blame.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/path_log.rs +1 −1 View lib/git/src/handler/path_log.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, GitApiError};

66use crate::handler;

Modified lib/git/src/handler/share.rs +1 −1 View lib/git/src/handler/share.rs

@@ -3,7 +3,7 @@

33

44use actix_web::dev::Payload;

55use actix_web::{FromRequest, HttpRequest};

6use jwt::Session;

6use token::Session;

77use serde::Deserialize;

88use utoipa::IntoParams;

99

Modified lib/git/src/handler/stars.rs +1 −1 View lib/git/src/handler/stars.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44use serde::Deserialize;

55use utoipa::IntoParams;

66

Modified lib/git/src/handler/topics.rs +1 −1 View lib/git/src/handler/topics.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44use serde::{Deserialize, Serialize};

55use utoipa::IntoParams;

66

Modified lib/git/src/handler/watches.rs +1 −1 View lib/git/src/handler/watches.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44use models::common::watch_mode::WatchMode;

55use serde::Deserialize;

66use utoipa::IntoParams;

Modified lib/git/src/handler/whitelists.rs +1 −1 View lib/git/src/handler/whitelists.rs

@@ -4,7 +4,7 @@

44use utoipa::IntoParams;

55use uuid::Uuid;

66

7use jwt::Session;

7use token::Session;

88

99use crate::errors::{ApiError, GitApiError};

1010use crate::handler;

Modified lib/git/Cargo.toml +1 −1 View lib/git/Cargo.toml

@@ -29,7 +29,7 @@

2929tracing = { workspace = true }

3030flate2 = { workspace = true }

3131bytes = { workspace = true }

32jwt = { workspace = true }

32token = { workspace = true }

3333utoipa = { workspace = true }

3434maud = { workspace = true }

3535pulldown-cmark = { workspace = true }

Modified lib/issues/src/handlers/attachments/create_attachment.rs +2 −2 View lib/issues/src/handlers/attachments/create_attachment.rs

@@ -1,7 +1,7 @@

11use export::http::{Json, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55

66use crate::errors::ApiError;

77use crate::services::attachments::{CreateIssueAttachmentCmd, IssueUploadIntentDto};

Modified lib/issues/src/handlers/attachments/delete_attachment.rs +2 −2 View lib/issues/src/handlers/attachments/delete_attachment.rs

@@ -1,7 +1,7 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/issues/src/handlers/attachments/download_attachment.rs +2 −2 View lib/issues/src/handlers/attachments/download_attachment.rs

@@ -1,8 +1,8 @@

11use actix_web::http::header;

22use export::http::{Path, Response, State};

33use export::rest::{AppResponseData, NoData};

4use jwt::Session;

5use jwt::share::session;

4use token::Session;

5use token::share::session;

66use uuid::Uuid;

77

88use crate::errors::ApiError;

Modified lib/issues/src/handlers/attachments/finalize_attachment.rs +2 −2 View lib/issues/src/handlers/attachments/finalize_attachment.rs

@@ -1,7 +1,7 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55use uuid::Uuid;

66

77use crate::errors::ApiError;

Modified lib/issues/src/handlers/attachments/list_attachments.rs +2 −2 View lib/issues/src/handlers/attachments/list_attachments.rs

@@ -1,7 +1,7 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

4use jwt::share::session;

3use token::Session;

4use token::share::session;

55

66use crate::errors::ApiError;

77use crate::services::attachments::IssueAttachmentDto;

Modified lib/issues/src/handlers/boards/create_board.rs +2 −2 View lib/issues/src/handlers/boards/create_board.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::boards::{BoardDto, CreateBoardCmd};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99use space::services::spaces::SpaceNamePath;

1010

1111#[utoipa::path(

Modified lib/issues/src/handlers/boards/delete_board.rs +2 −2 View lib/issues/src/handlers/boards/delete_board.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::boards::BoardPath;

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/issues/src/handlers/boards/get_board.rs +2 −2 View lib/issues/src/handlers/boards/get_board.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::boards::{BoardDto, BoardPath};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/issues/src/handlers/boards/list_boards.rs +2 −2 View lib/issues/src/handlers/boards/list_boards.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::boards::{BoardPage, ListBoardQuery};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99use space::services::spaces::SpaceNamePath;

1010

1111#[utoipa::path(

Modified lib/issues/src/handlers/boards/update_board.rs +2 −2 View lib/issues/src/handlers/boards/update_board.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::boards::{BoardDto, BoardPath, UpdateBoardCmd};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 patch,

Modified lib/issues/src/handlers/comments/create_comment.rs +2 −2 View lib/issues/src/handlers/comments/create_comment.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::comments::{CommentDto, CreateCommentCmd};

77use crate::services::issues::IssuePath;

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/issues/src/handlers/comments/delete_comment.rs +2 −2 View lib/issues/src/handlers/comments/delete_comment.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::comments::CommentPath;

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/issues/src/handlers/comments/get_comment.rs +2 −2 View lib/issues/src/handlers/comments/get_comment.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::comments::{CommentDto, CommentPath};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/issues/src/handlers/comments/list_comments.rs +2 −2 View lib/issues/src/handlers/comments/list_comments.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::comments::{CommentPage, ListCommentQuery};

77use crate::services::issues::IssuePath;

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/issues/src/handlers/comments/list_comments_tree.rs +2 −2 View lib/issues/src/handlers/comments/list_comments_tree.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::comments::CommentTreeNode;

77use crate::services::issues::IssuePath;

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/issues/src/handlers/comments/update_comment.rs +2 −2 View lib/issues/src/handlers/comments/update_comment.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::comments::{CommentDto, CommentPath, UpdateCommentCmd};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 patch,

Modified lib/issues/src/handlers/content_history/list_content_history.rs +2 −2 View lib/issues/src/handlers/content_history/list_content_history.rs

@@ -1,13 +1,13 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::content_history::{

77 ContentHistoryPage, ContentHistoryPath, ListContentHistoryQuery,

88};

99use crate::services::service::IssueService;

10use jwt::share::session;

10use token::share::session;

1111

1212#[utoipa::path(

1313 get,

Modified lib/issues/src/handlers/dependencies/create_dependency.rs +2 −2 View lib/issues/src/handlers/dependencies/create_dependency.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::dependencies::{CreateDependencyCmd, DependencyDto};

77use crate::services::issues::IssuePath;

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/issues/src/handlers/dependencies/delete_dependency.rs +2 −2 View lib/issues/src/handlers/dependencies/delete_dependency.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::dependencies::DependencyPath;

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/issues/src/handlers/dependencies/list_dependencies.rs +2 −2 View lib/issues/src/handlers/dependencies/list_dependencies.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::dependencies::DependencyDto;

77use crate::services::issues::IssuePath;

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/issues/src/handlers/dependencies/list_dependents.rs +2 −2 View lib/issues/src/handlers/dependencies/list_dependents.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::dependencies::DependencyDto;

77use crate::services::issues::IssuePath;

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/issues/src/handlers/events/list_events.rs +2 −2 View lib/issues/src/handlers/events/list_events.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::events::{EventPage, EventPath, ListEventQuery};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/issues/src/handlers/issue_users/list_issue_users.rs +2 −2 View lib/issues/src/handlers/issue_users/list_issue_users.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issue_users::{IssueUserPage, ListIssueUserQuery};

77use crate::services::issues::IssuePath;

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/issues/src/handlers/issue_users/mark_issue_read.rs +2 −2 View lib/issues/src/handlers/issue_users/mark_issue_read.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issue_users::{IssueUserDto, UpdateIssueUserCmd};

77use crate::services::issues::IssuePath;

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[derive(Debug, Clone, serde::Deserialize, utoipa::ToSchema)]

1212pub struct MarkIssueReadCmd {

Modified lib/issues/src/handlers/issues/bulk_issues.rs +2 −2 View lib/issues/src/handlers/issues/bulk_issues.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::boards::BoardPath;

77use crate::services::issues::{BulkIssuesCmd, BulkResultDto};

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/issues/src/handlers/issues/close_issue.rs +2 −2 View lib/issues/src/handlers/issues/close_issue.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issues::{IssueDto, IssuePath};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 post,

Modified lib/issues/src/handlers/issues/create_issue.rs +2 −2 View lib/issues/src/handlers/issues/create_issue.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::boards::BoardPath;

77use crate::services::issues::{CreateIssueCmd, IssueDto};

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/issues/src/handlers/issues/delete_issue.rs +2 −2 View lib/issues/src/handlers/issues/delete_issue.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issues::IssuePath;

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/issues/src/handlers/issues/get_issue.rs +2 −2 View lib/issues/src/handlers/issues/get_issue.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issues::{IssueDto, IssuePath};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/issues/src/handlers/issues/list_issues.rs +2 −2 View lib/issues/src/handlers/issues/list_issues.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::boards::BoardPath;

77use crate::services::issues::{IssuePage, ListIssueQuery};

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/issues/src/handlers/issues/reopen_issue.rs +2 −2 View lib/issues/src/handlers/issues/reopen_issue.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issues::{IssueDto, IssuePath};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 post,

Modified lib/issues/src/handlers/issues/update_issue.rs +2 −2 View lib/issues/src/handlers/issues/update_issue.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issues::{IssueDto, IssuePath, UpdateIssueCmd};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 patch,

Modified lib/issues/src/handlers/labels/bind_label.rs +2 −2 View lib/issues/src/handlers/labels/bind_label.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::labels::IssueLabelPath;

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 post,

Modified lib/issues/src/handlers/labels/create_label.rs +2 −2 View lib/issues/src/handlers/labels/create_label.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::boards::BoardPath;

77use crate::services::labels::{CreateLabelCmd, LabelDto};

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/issues/src/handlers/labels/delete_label.rs +2 −2 View lib/issues/src/handlers/labels/delete_label.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::labels::LabelPath;

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/issues/src/handlers/labels/get_label.rs +2 −2 View lib/issues/src/handlers/labels/get_label.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::labels::{LabelDto, LabelPath};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/issues/src/handlers/labels/list_labels.rs +2 −2 View lib/issues/src/handlers/labels/list_labels.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::boards::BoardPath;

77use crate::services::labels::{LabelPage, ListLabelQuery};

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/issues/src/handlers/labels/list_labels_for_issue.rs +2 −2 View lib/issues/src/handlers/labels/list_labels_for_issue.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issues::IssuePath;

77use crate::services::labels::LabelDto;

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/issues/src/handlers/labels/unbind_label.rs +2 −2 View lib/issues/src/handlers/labels/unbind_label.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::labels::IssueLabelPath;

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/issues/src/handlers/labels/update_label.rs +2 −2 View lib/issues/src/handlers/labels/update_label.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::labels::{LabelDto, LabelPath, UpdateLabelCmd};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 patch,

Modified lib/issues/src/handlers/members/create_member.rs +2 −2 View lib/issues/src/handlers/members/create_member.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issues::IssuePath;

77use crate::services::members::{CreateIssueMemberCmd, IssueMemberDto};

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/issues/src/handlers/members/delete_member.rs +2 −2 View lib/issues/src/handlers/members/delete_member.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::members::IssueMemberPath;

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/issues/src/handlers/members/list_members.rs +2 −2 View lib/issues/src/handlers/members/list_members.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issues::IssuePath;

77use crate::services::members::{IssueMemberPage, ListIssueMemberQuery};

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/issues/src/handlers/milestones/create_milestone.rs +2 −2 View lib/issues/src/handlers/milestones/create_milestone.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::boards::BoardPath;

77use crate::services::milestones::{CreateMilestoneCmd, MilestoneDto};

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/issues/src/handlers/milestones/delete_milestone.rs +2 −2 View lib/issues/src/handlers/milestones/delete_milestone.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::milestones::MilestonePath;

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/issues/src/handlers/milestones/get_milestone.rs +2 −2 View lib/issues/src/handlers/milestones/get_milestone.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::milestones::{MilestoneDto, MilestonePath};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/issues/src/handlers/milestones/list_milestones.rs +2 −2 View lib/issues/src/handlers/milestones/list_milestones.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::boards::BoardPath;

77use crate::services::milestones::{ListMilestoneQuery, MilestonePage};

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/issues/src/handlers/milestones/update_milestone.rs +2 −2 View lib/issues/src/handlers/milestones/update_milestone.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::milestones::{MilestoneDto, MilestonePath, UpdateMilestoneCmd};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 patch,

Modified lib/issues/src/handlers/pins/create_pin.rs +2 −2 View lib/issues/src/handlers/pins/create_pin.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::boards::BoardPath;

77use crate::services::pins::{CreatePinCmd, PinDto};

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/issues/src/handlers/pins/delete_pin.rs +2 −2 View lib/issues/src/handlers/pins/delete_pin.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::pins::PinPath;

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/issues/src/handlers/pins/list_pins.rs +2 −2 View lib/issues/src/handlers/pins/list_pins.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::boards::BoardPath;

77use crate::services::pins::PinDto;

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/issues/src/handlers/pins/update_pin.rs +2 −2 View lib/issues/src/handlers/pins/update_pin.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::pins::{PinDto, PinPath, UpdatePinCmd};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 patch,

Modified lib/issues/src/handlers/reactions/add_comment_reaction.rs +2 −2 View lib/issues/src/handlers/reactions/add_comment_reaction.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::reactions::{CommentReactionPath, CreateReactionCmd, ReactionDto};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 put,

Modified lib/issues/src/handlers/reactions/add_reaction.rs +2 −2 View lib/issues/src/handlers/reactions/add_reaction.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issues::IssuePath;

77use crate::services::reactions::{CreateReactionCmd, ReactionDto};

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 put,

Modified lib/issues/src/handlers/reactions/list_comment_reactions.rs +2 −2 View lib/issues/src/handlers/reactions/list_comment_reactions.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::reactions::{CommentReactionPath, ReactionAggDto};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/issues/src/handlers/reactions/list_reactions.rs +2 −2 View lib/issues/src/handlers/reactions/list_reactions.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issues::IssuePath;

77use crate::services::reactions::ReactionAggDto;

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/issues/src/handlers/reactions/remove_comment_reaction.rs +2 −2 View lib/issues/src/handlers/reactions/remove_comment_reaction.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::reactions::{CommentReactionPath, EmojiQuery};

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/issues/src/handlers/reactions/remove_reaction.rs +2 −2 View lib/issues/src/handlers/reactions/remove_reaction.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issues::IssuePath;

77use crate::services::reactions::EmojiQuery;

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 delete,

Modified lib/issues/src/handlers/repo_relations/create_repo_relation.rs +2 −2 View lib/issues/src/handlers/repo_relations/create_repo_relation.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issues::IssuePath;

77use crate::services::repo_relations::{CreateRepoRelCmd, RepoRelDto};

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/issues/src/handlers/repo_relations/delete_repo_relation.rs +2 −2 View lib/issues/src/handlers/repo_relations/delete_repo_relation.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::repo_relations::RepoRelPath;

77use crate::services::service::IssueService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/issues/src/handlers/repo_relations/list_repo_relations.rs +2 −2 View lib/issues/src/handlers/repo_relations/list_repo_relations.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::issues::IssuePath;

77use crate::services::repo_relations::RepoRelDto;

88use crate::services::service::IssueService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/issues/src/handlers/stopwatch/get_stopwatch.rs +2 −2 View lib/issues/src/handlers/stopwatch/get_stopwatch.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::IssueService;

77use crate::services::stopwatch::{StopwatchDto, StopwatchPath};

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/issues/src/handlers/stopwatch/start_stopwatch.rs +2 −2 View lib/issues/src/handlers/stopwatch/start_stopwatch.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::IssueService;

77use crate::services::stopwatch::{StopwatchDto, StopwatchPath};

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 post,

Modified lib/issues/src/handlers/stopwatch/stop_stopwatch.rs +2 −2 View lib/issues/src/handlers/stopwatch/stop_stopwatch.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::IssueService;

77use crate::services::stopwatch::StopwatchPath;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 post,

Modified lib/issues/src/handlers/tracked_time/create_tracked_time.rs +2 −2 View lib/issues/src/handlers/tracked_time/create_tracked_time.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::IssueService;

77use crate::services::tracked_time::{CreateTrackedTimeCmd, TrackedTimeDto, TrackedTimePath};

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 post,

Modified lib/issues/src/handlers/tracked_time/delete_tracked_time.rs +2 −2 View lib/issues/src/handlers/tracked_time/delete_tracked_time.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::IssueService;

77use crate::services::tracked_time::TrackedTimeIdPath;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/issues/src/handlers/tracked_time/list_tracked_time.rs +2 −2 View lib/issues/src/handlers/tracked_time/list_tracked_time.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::IssueService;

77use crate::services::tracked_time::{ListTrackedTimeQuery, TrackedTimePage, TrackedTimePath};

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/issues/src/handlers/tracked_time/update_tracked_time.rs +2 −2 View lib/issues/src/handlers/tracked_time/update_tracked_time.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::IssueService;

77use crate::services::tracked_time::{TrackedTimeDto, TrackedTimeIdPath, UpdateTrackedTimeCmd};

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 patch,

Modified lib/issues/src/handlers/watches/upsert_watch.rs +2 −2 View lib/issues/src/handlers/watches/upsert_watch.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::IssueService;

77use crate::services::watches::{UpsertWatchCmd, WatchDto, WatchPath};

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 put,

Modified lib/issues/src/share/guard.rs +1 −1 View lib/issues/src/share/guard.rs

@@ -1 +1 @@

1pub use jwt::share::guard::session_guard as issue_guard;

1pub use token::share::guard::session_guard as issue_guard;

Modified lib/issues/Cargo.toml +1 −1 View lib/issues/Cargo.toml

@@ -12,7 +12,7 @@

1212i18n = { workspace = true }

1313models = { workspace = true }

1414queue = { workspace = true }

15jwt = { workspace = true }

15token = { workspace = true }

1616space = { workspace = true }

1717actix-web = { workspace = true }

1818http = { workspace = true }

Modified lib/models/src/users/oauth_clients.rs +1 −1 View lib/models/src/users/oauth_clients.rs

@@ -3,7 +3,7 @@

33//! 每个客户端对应一个消费认证中心的应用（SPA、后端服务或第三方站点）：

44//! - `kind` 决定 token 端点的客户端认证方式（public 只允许 PKCE，confidential 需要 secret）

55//! - `redirect_uris` 支持 `https://*.example.com/callback` 形式的子域通配

6//! - `audience` 为空时令牌受众回落平台受众（`jwt::PLATFORM_AUDIENCE`）

6//! - `audience` 为空时令牌受众回落平台受众（`token::PLATFORM_AUDIENCE`）

77

88use serde::{Deserialize, Serialize};

99use utoipa::ToSchema;

Modified lib/pulls/src/handlers/assignees/add_pull_assignee.rs +1 −1 View lib/pulls/src/handlers/assignees/add_pull_assignee.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, PullError};

66use crate::services::assignees::PullAssigneeDto;

Modified lib/pulls/src/handlers/assignees/list_pull_assignees.rs +1 −1 View lib/pulls/src/handlers/assignees/list_pull_assignees.rs

@@ -1,6 +1,6 @@

11use export::http::State;

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::assignees::PullAssigneeDto;

Modified lib/pulls/src/handlers/assignees/remove_pull_assignee.rs +1 −1 View lib/pulls/src/handlers/assignees/remove_pull_assignee.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, PullError};

66use crate::services::assignees::PullAssigneeDto;

Modified lib/pulls/src/handlers/checks/get_pull_checks.rs +1 −1 View lib/pulls/src/handlers/checks/get_pull_checks.rs

@@ -1,6 +1,6 @@

11use export::http::State;

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::checks::PullChecksDto;

Modified lib/pulls/src/handlers/checks/get_pull_gate.rs +1 −1 View lib/pulls/src/handlers/checks/get_pull_gate.rs

@@ -1,6 +1,6 @@

11use export::http::State;

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::checks::PullGateDto;

Modified lib/pulls/src/handlers/comments/create_pull_comment.rs +1 −1 View lib/pulls/src/handlers/comments/create_pull_comment.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, PullError};

66use crate::services::comments::{CreatePullCommentCmd, PullCommentDto};

Modified lib/pulls/src/handlers/comments/delete_pull_comment.rs +1 −1 View lib/pulls/src/handlers/comments/delete_pull_comment.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, PullError};

66use crate::handlers::comments::update_pull_comment::CommentPath;

Modified lib/pulls/src/handlers/comments/list_pull_comment_tree.rs +1 −1 View lib/pulls/src/handlers/comments/list_pull_comment_tree.rs

@@ -1,6 +1,6 @@

11use export::http::State;

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::comments::PullCommentThreadDto;

Modified lib/pulls/src/handlers/comments/list_pull_comments.rs +1 −1 View lib/pulls/src/handlers/comments/list_pull_comments.rs

@@ -1,7 +1,7 @@

11use export::http::{Query, State};

22use export::pagination::PageQuery;

33use export::rest::AppResponseData;

4use jwt::Session;

4use token::Session;

55

66use crate::errors::ApiError;

77use crate::services::comments::CommentPage;

Modified lib/pulls/src/handlers/comments/resolve_pull_comment.rs +1 −1 View lib/pulls/src/handlers/comments/resolve_pull_comment.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, PullError};

66use crate::handlers::comments::update_pull_comment::CommentPath;

Modified lib/pulls/src/handlers/comments/update_pull_comment.rs +1 −1 View lib/pulls/src/handlers/comments/update_pull_comment.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44use uuid::Uuid;

55

66use crate::errors::{ApiError, PullError};

Modified lib/pulls/src/handlers/labels/attach_pull_label.rs +1 −1 View lib/pulls/src/handlers/labels/attach_pull_label.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::{ApiError, PullError};

66use crate::services::labels::AttachLabelCmd;

Modified lib/pulls/src/handlers/inbox.rs +1 −1 View lib/pulls/src/handlers/inbox.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::AppResponseData;

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::inbox::{InboxPage, InboxQuery};

Modified lib/pulls/src/services/service.rs +1 −1 View lib/pulls/src/services/service.rs

@@ -1,7 +1,7 @@

11use config::AppConfig;

22use export::AppState;

33use git::service::GitService;

4use jwt::Session;

4use token::Session;

55use models::pull_request::pull_requests;

66use models::repo::repos;

77use sea_orm::ActiveValue::Set;

Modified lib/pulls/src/share/lookup.rs +1 −1 View lib/pulls/src/share/lookup.rs

@@ -1,6 +1,6 @@

11use git::context::facade::GitContext;

22use git::share::access;

3use jwt::Session;

3use token::Session;

44use models::pull_request::pull_requests;

55use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};

66use uuid::Uuid;

Modified lib/pulls/Cargo.toml +1 −1 View lib/pulls/Cargo.toml

@@ -10,7 +10,7 @@

1010issues = { workspace = true }

1111models = { workspace = true }

1212queue = { workspace = true }

13jwt = { workspace = true }

13token = { workspace = true }

1414space = { workspace = true }

1515actix-web = { workspace = true }

1616sea-orm = { workspace = true }

Modified lib/space/src/handlers/accept_invite.rs +2 −2 View lib/space/src/handlers/accept_invite.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::invites::AcceptInviteCmd;

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 post,

Modified lib/space/src/handlers/add_member.rs +2 −2 View lib/space/src/handlers/add_member.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::members::{AddMemberCmd, MemberDto};

77use crate::services::service::SpaceService;

88use crate::services::spaces::SpaceNamePath;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/space/src/handlers/assign_group.rs +2 −2 View lib/space/src/handlers/assign_group.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::handlers::get_member::MemberPath;

77use crate::services::groups::AssignGroupCmd;

88use crate::services::service::SpaceService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/space/src/handlers/ban_user.rs +2 −2 View lib/space/src/handlers/ban_user.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::bans::{BanDto, BanUserCmd};

77use crate::services::service::SpaceService;

88use crate::services::spaces::SpaceNamePath;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/space/src/handlers/create_dir_node.rs +2 −2 View lib/space/src/handlers/create_dir_node.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::dir::{CreateDirCmd, DirNodeDto};

77use crate::services::service::SpaceService;

88use crate::services::spaces::SpaceNamePath;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/space/src/handlers/create_group.rs +2 −2 View lib/space/src/handlers/create_group.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::groups::{CreateGroupCmd, GroupDto};

77use crate::services::service::SpaceService;

88use crate::services::spaces::SpaceNamePath;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/space/src/handlers/create_invite.rs +2 −2 View lib/space/src/handlers/create_invite.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::invites::{CreateInviteCmd, InviteDto};

77use crate::services::service::SpaceService;

88use crate::services::spaces::SpaceNamePath;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/space/src/handlers/create_join_rule.rs +2 −2 View lib/space/src/handlers/create_join_rule.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::join_rules::{CreateJoinRuleCmd, JoinRuleDto};

77use crate::services::service::SpaceService;

88use crate::services::spaces::SpaceNamePath;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/space/src/handlers/create_room.rs +2 −2 View lib/space/src/handlers/create_room.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::rooms::{CreateRoomCmd, RoomDto};

77use crate::services::service::SpaceService;

88use crate::services::spaces::SpaceNamePath;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/space/src/handlers/create_space.rs +2 −2 View lib/space/src/handlers/create_space.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::SpaceService;

77use crate::services::spaces::{CreateSpaceCmd, SpaceDto};

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 post,

Modified lib/space/src/handlers/delete_group.rs +2 −2 View lib/space/src/handlers/delete_group.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::handlers::get_group::GroupPath;

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/space/src/handlers/delete_join_rule.rs +2 −2 View lib/space/src/handlers/delete_join_rule.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::join_rules::JoinRulePath;

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/space/src/handlers/delete_room.rs +2 −2 View lib/space/src/handlers/delete_room.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44use uuid::Uuid;

55

66use crate::errors::ApiError;

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/space/src/handlers/delete_space.rs +2 −2 View lib/space/src/handlers/delete_space.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::SpaceService;

77use crate::services::spaces::SpaceNamePath;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/space/src/handlers/delete_space_image.rs +2 −2 View lib/space/src/handlers/delete_space_image.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::images::SpaceImageKindPath;

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/space/src/handlers/explore_spaces.rs +2 −2 View lib/space/src/handlers/explore_spaces.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::join_requests::{

@@ -9,7 +9,7 @@

99};

1010use crate::services::service::SpaceService;

1111use crate::services::spaces::SpaceNamePath;

12use jwt::share::session;

12use token::share::session;

1313

1414#[utoipa::path(

1515 get,

Modified lib/space/src/handlers/get_ban.rs +2 −2 View lib/space/src/handlers/get_ban.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::handlers::get_member::MemberPath;

77use crate::services::bans::BanDto;

88use crate::services::service::SpaceService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/space/src/handlers/get_group.rs +1 −1 View lib/space/src/handlers/get_group.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44use serde::Deserialize;

55use utoipa::{IntoParams, ToSchema};

66use uuid::Uuid;

Modified lib/space/src/handlers/get_member.rs +2 −2 View lib/space/src/handlers/get_member.rs

@@ -1,13 +1,13 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44use serde::Deserialize;

55use utoipa::{IntoParams, ToSchema};

66

77use crate::errors::ApiError;

88use crate::services::members::MemberDto;

99use crate::services::service::SpaceService;

10use jwt::share::session;

10use token::share::session;

1111

1212#[derive(Debug, Clone, Deserialize, IntoParams, ToSchema)]

1313pub struct MemberPath {

Modified lib/space/src/handlers/get_space.rs +1 −1 View lib/space/src/handlers/get_space.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::SpaceService;

Modified lib/space/src/handlers/get_space_dir_tree.rs +2 −2 View lib/space/src/handlers/get_space_dir_tree.rs

@@ -1,13 +1,13 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44use serde::Deserialize;

55

66use crate::errors::ApiError;

77use crate::services::dir::DirNodeDto;

88use crate::services::service::SpaceService;

99use crate::services::spaces::SpaceNamePath;

10use jwt::share::session;

10use token::share::session;

1111

1212#[derive(Debug, Clone, Deserialize, utoipa::IntoParams)]

1313pub struct DirTreeQuery {

Modified lib/space/src/handlers/get_space_image.rs +1 −1 View lib/space/src/handlers/get_space_image.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::images::{SpaceImageDto, SpaceImageKindPath};

Modified lib/space/src/handlers/get_space_image_file.rs +1 −1 View lib/space/src/handlers/get_space_image_file.rs

@@ -1,7 +1,7 @@

11use actix_web::http::header;

22use export::http::{Path, Query, Response, State};

33use imaging::layout::ImageVariant;

4use jwt::Session;

4use token::Session;

55use serde::Deserialize;

66use utoipa::{IntoParams, ToSchema};

77

Modified lib/space/src/handlers/join_group_self.rs +2 −2 View lib/space/src/handlers/join_group_self.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::handlers::get_group::GroupPath;

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 post,

Modified lib/space/src/handlers/join_requests.rs +2 −2 View lib/space/src/handlers/join_requests.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::join_requests::{CreateJoinRequestCmd, JoinRequestDto, JoinRequestPath};

77use crate::services::service::SpaceService;

88use crate::services::spaces::SpaceNamePath;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/space/src/handlers/leave_group_self.rs +2 −2 View lib/space/src/handlers/leave_group_self.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::handlers::get_group::GroupPath;

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/space/src/handlers/list_bans.rs +2 −2 View lib/space/src/handlers/list_bans.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::bans::BanPage;

77use crate::services::service::SpaceService;

88use crate::services::spaces::{PageQuery, SpaceNamePath};

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/space/src/handlers/list_dir_group_overwrites.rs +2 −2 View lib/space/src/handlers/list_dir_group_overwrites.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::dir::{DirPath, GroupOverwriteDto};

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/space/src/handlers/list_dir_user_overwrites.rs +2 −2 View lib/space/src/handlers/list_dir_user_overwrites.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::dir::{DirPath, UserOverwriteDto};

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/space/src/handlers/list_groups.rs +2 −2 View lib/space/src/handlers/list_groups.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::groups::GroupPage;

77use crate::services::service::SpaceService;

88use crate::services::spaces::{PageQuery, SpaceNamePath};

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/space/src/handlers/list_invites.rs +2 −2 View lib/space/src/handlers/list_invites.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::invites::InvitePage;

77use crate::services::service::SpaceService;

88use crate::services::spaces::{PageQuery, SpaceNamePath};

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/space/src/handlers/list_join_rules.rs +2 −2 View lib/space/src/handlers/list_join_rules.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::join_rules::JoinRuleDto;

77use crate::services::service::SpaceService;

88use crate::services::spaces::SpaceNamePath;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/space/src/handlers/list_members.rs +2 −2 View lib/space/src/handlers/list_members.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::members::MemberPage;

77use crate::services::service::SpaceService;

88use crate::services::spaces::{PageQuery, SpaceNamePath};

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/space/src/handlers/list_spaces.rs +2 −2 View lib/space/src/handlers/list_spaces.rs

@@ -1,11 +1,11 @@

11use export::http::{Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::SpaceService;

77use crate::services::spaces::{PageQuery, SpacePage};

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/space/src/handlers/move_dir_node.rs +2 −2 View lib/space/src/handlers/move_dir_node.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::dir::{DirNodeDto, DirPath, MoveDirCmd};

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 patch,

Modified lib/space/src/handlers/reject_invite.rs +2 −2 View lib/space/src/handlers/reject_invite.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::invites::AcceptInviteCmd;

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 post,

Modified lib/space/src/handlers/remove_dir_group_overwrite.rs +2 −2 View lib/space/src/handlers/remove_dir_group_overwrite.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::handlers::set_dir_group_overwrite::DirGroupPath;

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/space/src/handlers/remove_dir_user_overwrite.rs +2 −2 View lib/space/src/handlers/remove_dir_user_overwrite.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::handlers::set_dir_user_overwrite::DirUserPath;

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/space/src/handlers/remove_member.rs +2 −2 View lib/space/src/handlers/remove_member.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::handlers::get_member::MemberPath;

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/space/src/handlers/repair_dir_parents.rs +2 −2 View lib/space/src/handlers/repair_dir_parents.rs

@@ -1,12 +1,12 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::dir::RepairDirResp;

77use crate::services::service::SpaceService;

88use crate::services::spaces::SpaceNamePath;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 post,

Modified lib/space/src/handlers/revoke_invite.rs +2 −2 View lib/space/src/handlers/revoke_invite.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44use serde::Deserialize;

55use utoipa::{IntoParams, ToSchema};

66use uuid::Uuid;

@@ -8,7 +8,7 @@

88use crate::errors::ApiError;

99use crate::services::invites::InviteDto;

1010use crate::services::service::SpaceService;

11use jwt::share::session;

11use token::share::session;

1212

1313#[derive(Debug, Clone, Deserialize, IntoParams, ToSchema)]

1414pub struct InvitePath {

Modified lib/space/src/handlers/self_member.rs +2 −2 View lib/space/src/handlers/self_member.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::members::{MemberDto, UpdateMemberCmd};

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 patch,

Modified lib/space/src/handlers/set_dir_group_overwrite.rs +2 −2 View lib/space/src/handlers/set_dir_group_overwrite.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44use serde::Deserialize;

55use utoipa::{IntoParams, ToSchema};

66use uuid::Uuid;

@@ -8,7 +8,7 @@

88use crate::errors::ApiError;

99use crate::services::dir::{GroupOverwriteDto, SetOverwriteCmd};

1010use crate::services::service::SpaceService;

11use jwt::share::session;

11use token::share::session;

1212

1313#[derive(Debug, Clone, Deserialize, IntoParams, ToSchema)]

1414pub struct DirGroupPath {

Modified lib/space/src/handlers/set_dir_user_overwrite.rs +2 −2 View lib/space/src/handlers/set_dir_user_overwrite.rs

@@ -1,6 +1,6 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44use serde::Deserialize;

55use utoipa::{IntoParams, ToSchema};

66use uuid::Uuid;

@@ -8,7 +8,7 @@

88use crate::errors::ApiError;

99use crate::services::dir::{SetOverwriteCmd, UserOverwriteDto};

1010use crate::services::service::SpaceService;

11use jwt::share::session;

11use token::share::session;

1212

1313#[derive(Debug, Clone, Deserialize, IntoParams, ToSchema)]

1414pub struct DirUserPath {

Modified lib/space/src/handlers/unassign_group.rs +2 −2 View lib/space/src/handlers/unassign_group.rs

@@ -1,13 +1,13 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44use serde::Deserialize;

55use utoipa::{IntoParams, ToSchema};

66use uuid::Uuid;

77

88use crate::errors::ApiError;

99use crate::services::service::SpaceService;

10use jwt::share::session;

10use token::share::session;

1111

1212#[derive(Debug, Clone, Deserialize, IntoParams, ToSchema)]

1313pub struct MemberGroupPath {

Modified lib/space/src/handlers/unban_user.rs +2 −2 View lib/space/src/handlers/unban_user.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::handlers::get_member::MemberPath;

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/space/src/handlers/update_ban.rs +2 −2 View lib/space/src/handlers/update_ban.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::handlers::get_member::MemberPath;

77use crate::services::bans::{BanDto, UpdateBanCmd};

88use crate::services::service::SpaceService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 patch,

Modified lib/space/src/handlers/update_dir_node.rs +2 −2 View lib/space/src/handlers/update_dir_node.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::dir::{DirNodeDto, DirPath, UpdateDirCmd};

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 patch,

Modified lib/space/src/handlers/update_group.rs +2 −2 View lib/space/src/handlers/update_group.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::handlers::get_group::GroupPath;

77use crate::services::groups::{GroupDto, UpdateGroupCmd};

88use crate::services::service::SpaceService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 patch,

Modified lib/space/src/handlers/update_join_rule.rs +2 −2 View lib/space/src/handlers/update_join_rule.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::join_rules::{JoinRuleDto, JoinRulePath, UpdateJoinRuleCmd};

77use crate::services::service::SpaceService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 patch,

Modified lib/space/src/handlers/update_member.rs +2 −2 View lib/space/src/handlers/update_member.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::handlers::get_member::MemberPath;

77use crate::services::members::{MemberDto, UpdateMemberCmd};

88use crate::services::service::SpaceService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 patch,

Modified lib/space/src/handlers/update_space.rs +2 −2 View lib/space/src/handlers/update_space.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::SpaceService;

77use crate::services::spaces::{SpaceDto, SpaceNamePath, UpdateSpaceCmd};

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 patch,

Modified lib/space/src/handlers/upload_space_image.rs +2 −2 View lib/space/src/handlers/upload_space_image.rs

@@ -1,12 +1,12 @@

11use actix_web::http::header::CONTENT_TYPE;

22use export::http::{Bytes, HeaderMap, Path, Query, State};

33use export::rest::{AppResponseData, NoData};

4use jwt::Session;

4use token::Session;

55

66use crate::errors::ApiError;

77use crate::services::images::{SpaceImageDto, SpaceImageKindPath, SpaceImageUploadQuery};

88use crate::services::service::SpaceService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 put,

Modified lib/space/src/share/guard.rs +1 −1 View lib/space/src/share/guard.rs

@@ -1 +1 @@

1pub use jwt::share::guard::session_guard as space_guard;

1pub use token::share::guard::session_guard as space_guard;

Modified lib/space/Cargo.toml +1 −1 View lib/space/Cargo.toml

@@ -11,7 +11,7 @@

1111i18n = { workspace = true }

1212imaging = { workspace = true }

1313models = { workspace = true }

14jwt = { workspace = true }

14token = { workspace = true }

1515auth = { workspace = true }

1616prost-types = { workspace = true }

1717storage = { workspace = true }

Modified lib/token/src/lib.rs +14 −0 View lib/token/src/lib.rs

@@ -8,6 +8,8 @@

88mod middleware;

99pub mod scope;

1010pub mod service;

11pub mod session;

12pub mod share;

1113mod state;

1214

1315pub use claims::{AppClaims, subject};

@@ -20,6 +22,18 @@

2022pub use extract::AppToken;

2123pub use jwks::{CRV, Jwk, Jwks, KTY};

2224pub use middleware::{InnerJwtMiddleware, JwtMiddleware};

25pub use session::{

26 AccessClaims, AuthUser, IdClaims, JwtVerifier, ServiceClaims, Session, SessionError,

27 SessionUser, clear_refresh_cookie, clear_session_cookie, read_cookie, refresh_cookie,

28 require_uid, session_cookie, session_guard,

29};

2330pub use state::{

2431 JwtState, PLATFORM_AUDIENCE, installed, require_installed, verify, verify_for_audience,

2532};

33

34pub fn at_hash(access_token: &str) -> String {

35 use base64::Engine as _;

36 use sha2::{Digest, Sha512};

37 let digest = Sha512::digest(access_token.as_bytes());

38 base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(&digest[..digest.len() / 2])

39}

Modified lib/token/Cargo.toml +2 −1 View lib/token/Cargo.toml

@@ -15,12 +15,13 @@

1515chrono = { version = "0.4.45", features = ["serde"] }

1616ed25519-dalek = "2.2.0"

1717http = "1.5.0"

18jsonwebtoken = { workspace = true }

1819prost-types = { workspace = true }

1920reqwest = { version = "0.13.5", features = ["json", "stream", "form"] }

2021serde = { workspace = true, features = ["derive"] }

2122serde_json = { workspace = true }

2223sha2 = "0.10.9"

2324thiserror = { workspace = true }

24tokio = { workspace = true, features = ["time"] }

25tokio = { workspace = true, features = ["time", "sync"] }

2526tonic = { version = "0.14.6", features = ["tls-ring"] }

2627tracing = { workspace = true }

Modified lib/user/src/handlers/create_meme.rs +2 −2 View lib/user/src/handlers/create_meme.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::profile::{MemeDto, UpsertMemeCmd};

77use crate::services::service::UserService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 post,

Modified lib/user/src/handlers/delete_avatar.rs +2 −2 View lib/user/src/handlers/delete_avatar.rs

@@ -1,10 +1,10 @@

11use export::http::State;

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::UserService;

7use jwt::share::session;

7use token::share::session;

88

99#[utoipa::path(

1010 delete,

Modified lib/user/src/handlers/delete_meme.rs +2 −2 View lib/user/src/handlers/delete_meme.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44use uuid::Uuid;

55

66use crate::errors::ApiError;

77use crate::services::service::UserService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/user/src/handlers/delete_push_subscription.rs +2 −2 View lib/user/src/handlers/delete_push_subscription.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44use uuid::Uuid;

55

66use crate::errors::ApiError;

77use crate::services::service::UserService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/user/src/handlers/get_avatar.rs +2 −2 View lib/user/src/handlers/get_avatar.rs

@@ -1,11 +1,11 @@

11use export::http::State;

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::avatar::AvatarDto;

77use crate::services::service::UserService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/user/src/handlers/get_profile_detail.rs +1 −1 View lib/user/src/handlers/get_profile_detail.rs

@@ -1,6 +1,6 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::profile::ProfileDetailDto;

Modified lib/user/src/handlers/get_user_avatar.rs +2 −2 View lib/user/src/handlers/get_user_avatar.rs

@@ -1,8 +1,8 @@

11use actix_web::http::header;

22use export::http::{Path, Query, Response, State};

33use imaging::layout::ImageVariant;

4use jwt::Session;

5use jwt::share::session;

4use token::Session;

5use token::share::session;

66use serde::Deserialize;

77use utoipa::{IntoParams, ToSchema};

88

Modified lib/user/src/handlers/list_memes.rs +2 −2 View lib/user/src/handlers/list_memes.rs

@@ -1,11 +1,11 @@

11use export::http::{Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::profile::{ListLimitQuery, MemeDto};

77use crate::services::service::UserService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/user/src/handlers/list_push_subscriptions.rs +2 −2 View lib/user/src/handlers/list_push_subscriptions.rs

@@ -1,12 +1,12 @@

11use export::http::{Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::push_subscriptions::PushSubscriptionDto;

77use crate::services::service::UserService;

88use crate::share::page::PageQuery;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/user/src/handlers/list_saved_messages.rs +2 −2 View lib/user/src/handlers/list_saved_messages.rs

@@ -1,12 +1,12 @@

11use export::http::{Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::notifications::SavedMessageDto;

77use crate::services::service::UserService;

88use crate::share::page::PageQuery;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/user/src/handlers/my_reports.rs +2 −2 View lib/user/src/handlers/my_reports.rs

@@ -1,12 +1,12 @@

11use export::http::{Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::notifications::UserReportDto;

77use crate::services::service::UserService;

88use crate::share::page::PageQuery;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/user/src/handlers/my_spaces.rs +2 −2 View lib/user/src/handlers/my_spaces.rs

@@ -1,12 +1,12 @@

11use export::http::{Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::profile::MySpaceDto;

77use crate::services::service::UserService;

88use crate::share::page::PageQuery;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/user/src/handlers/my_suspensions.rs +2 −2 View lib/user/src/handlers/my_suspensions.rs

@@ -1,11 +1,11 @@

11use export::http::{Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::service::UserService;

77use crate::services::suspensions::{IncludeRevokedQuery, SuspensionDto};

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 get,

Modified lib/user/src/handlers/recent_mentions.rs +2 −2 View lib/user/src/handlers/recent_mentions.rs

@@ -1,12 +1,12 @@

11use export::http::{Query, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::notifications::RecentMentionDto;

77use crate::services::profile::ListLimitQuery;

88use crate::services::service::UserService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 get,

Modified lib/user/src/handlers/save_message.rs +2 −2 View lib/user/src/handlers/save_message.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::notifications::{SaveMessageCmd, SavedMessageDto};

77use crate::services::service::UserService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 post,

Modified lib/user/src/handlers/unsave_message.rs +2 −2 View lib/user/src/handlers/unsave_message.rs

@@ -1,11 +1,11 @@

11use export::http::{Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44use uuid::Uuid;

55

66use crate::errors::ApiError;

77use crate::services::service::UserService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 delete,

Modified lib/user/src/handlers/update_meme.rs +2 −2 View lib/user/src/handlers/update_meme.rs

@@ -1,12 +1,12 @@

11use export::http::{Json, Path, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44use uuid::Uuid;

55

66use crate::errors::ApiError;

77use crate::services::profile::{MemeDto, UpsertMemeCmd};

88use crate::services::service::UserService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 put,

Modified lib/user/src/handlers/upload_avatar.rs +2 −2 View lib/user/src/handlers/upload_avatar.rs

@@ -1,12 +1,12 @@

11use actix_web::http::header::CONTENT_TYPE;

22use export::http::{Bytes, HeaderMap, State};

33use export::rest::{AppResponseData, NoData};

4use jwt::Session;

4use token::Session;

55

66use crate::errors::ApiError;

77use crate::services::avatar::AvatarDto;

88use crate::services::service::UserService;

9use jwt::share::session;

9use token::share::session;

1010

1111#[utoipa::path(

1212 put,

Modified lib/user/src/handlers/upsert_push_subscription.rs +2 −2 View lib/user/src/handlers/upsert_push_subscription.rs

@@ -1,11 +1,11 @@

11use export::http::{Json, State};

22use export::rest::{AppResponseData, NoData};

3use jwt::Session;

3use token::Session;

44

55use crate::errors::ApiError;

66use crate::services::push_subscriptions::{PushSubscriptionDto, UpsertPushCmd};

77use crate::services::service::UserService;

8use jwt::share::session;

8use token::share::session;

99

1010#[utoipa::path(

1111 post,

Modified lib/user/src/share/guard.rs +1 −1 View lib/user/src/share/guard.rs

@@ -1 +1 @@

1pub use jwt::share::guard::session_guard as user_guard;

1pub use token::share::guard::session_guard as user_guard;

Modified lib/user/Cargo.toml +1 −1 View lib/user/Cargo.toml

@@ -10,7 +10,7 @@

1010models = { workspace = true }

1111i18n = { workspace = true }

1212imaging = { workspace = true }

13jwt = { workspace = true }

13token = { workspace = true }

1414storage = { workspace = true }

1515actix-web = { workspace = true }

1616sea-orm = { workspace = true }

Modified lib/webapi/src/cleanup.rs +2 −2 View lib/webapi/src/cleanup.rs

@@ -12,8 +12,8 @@

1212use export::http::routing::{delete, get, post};

1313use export::http::{Json, Path, Router, State};

1414use export::rest::{AppResponseData, NoData};

15use jwt::Session;

16use jwt::share::session;

15use token::Session;

16use token::share::session;

1717use models::dir::{dir_overwrite_group, dir_overwrite_users, dirs};

1818use models::issue::issues as boards;

1919use models::repo::repos;

Modified lib/webapi/src/lib.rs +3 −3 View lib/webapi/src/lib.rs

@@ -69,16 +69,16 @@

6969 .into_scope(web::scope(""))

7070}

7171

72pub fn verifier(state: &AppState) -> Option<Arc<jwt::JwtVerifier>> {

72pub fn verifier(state: &AppState) -> Option<Arc<token::JwtVerifier>> {

7373 if !state.config.oauth.enabled {

7474 return None;

7575 }

76 match jwt::JwtVerifier::with_identity(

76 match token::JwtVerifier::with_identity(

7777 &state.config.oauth,

7878 state

7979 .kenauth

8080 .as_ref()

81 .map(|client| client.service().clone()),

81 .map(|client| client.service().signing().jwks().clone()),

8282 ) {

8383 Ok(verifier) => Some(verifier),

8484 Err(error) => {

Modified lib/webapi/Cargo.toml +1 −1 View lib/webapi/Cargo.toml

@@ -24,7 +24,7 @@

2424models = { workspace = true }

2525sea-orm = { workspace = true }

2626export = { workspace = true }

27jwt = { workspace = true }

27token = { workspace = true }

2828tokio = { workspace = true }

2929actix-web = { workspace = true }

3030actix-cors = { workspace = true }

Modified Cargo.lock +10 −27 View Cargo.lock

@@ -1265,7 +1265,6 @@

12651265 "http 0.2.12",

12661266 "i18n",

12671267 "imaging",

1268 "jwt",

12691268 "livekit-api",

12701269 "livekit-protocol",

12711270 "models",

@@ -1281,6 +1280,7 @@

12811280 "space",

12821281 "storage",

12831282 "time 0.3.55",

1283 "token",

12841284 "tokio",

12851285 "tokio-util",

12861286 "tracing",

@@ -2394,7 +2394,6 @@

23942394 "config 1.0.0",

23952395 "http 1.5.0",

23962396 "imaging",

2397 "jwt",

23982397 "models",

23992398 "opentelemetry",

24002399 "opentelemetry-http",

@@ -2410,6 +2409,7 @@

24102409 "storage",

24112410 "thiserror 2.0.21",

24122411 "time 0.3.55",

2412 "token",

24132413 "tokio",

24142414 "tower",

24152415 "tracing",

@@ -2783,7 +2783,6 @@

27832783 "futures",

27842784 "globset",

27852785 "hayro",

2786 "jwt",

27872786 "maud",

27882787 "models",

27892788 "prost-types 0.14.4",

@@ -2797,6 +2796,7 @@

27972796 "space",

27982797 "thiserror 2.0.21",

27992798 "time 0.3.55",

2799 "token",

28002800 "tokio",

28012801 "tokio-util",

28022802 "tonic",

@@ -3637,7 +3637,6 @@

36373637 "futures",

36383638 "http 0.2.12",

36393639 "i18n",

3640 "jwt",

36413640 "models",

36423641 "queue",

36433642 "sea-orm",

@@ -3645,6 +3644,7 @@

36453644 "serde_json",

36463645 "space",

36473646 "time 0.3.55",

3647 "token",

36483648 "tracing",

36493649 "utoipa 5.5.0",

36503650 "uuid",

@@ -3819,24 +3819,6 @@

38193819]

38203820

38213821[[package]]

3822name = "jwt"

3823version = "1.0.0"

3824dependencies = [

3825 "actix-web",

3826 "auth",

3827 "base64 0.23.1",

3828 "config 1.0.0",

3829 "jsonwebtoken 9.3.1",

3830 "reqwest 0.12.28",

3831 "serde",

3832 "serde_json",

3833 "sha2 0.11.1",

3834 "tokio",

3835 "tracing",

3836 "uuid",

3837]

3838

3839[[package]]

38403822name = "jwt-simple"

38413823version = "0.12.17"

38423824source = "registry+https://github.com/rust-lang/crates.io-index"

@@ -3899,12 +3881,12 @@

38993881 "deletion",

39003882 "events",

39013883 "export",

3902 "jwt",

39033884 "models",

39043885 "push",

39053886 "queue",

39063887 "sea-orm",

39073888 "serde_json",

3889 "token",

39083890 "tokio",

39093891 "tokio-util",

39103892 "tracing",

@@ -5775,7 +5757,6 @@

57755757 "git",

57765758 "globset",

57775759 "issues",

5778 "jwt",

57795760 "models",

57805761 "queue",

57815762 "sea-orm",

@@ -5783,6 +5764,7 @@

57835764 "serde_json",

57845765 "space",

57855766 "time 0.3.55",

5767 "token",

57865768 "tracing",

57875769 "utoipa 5.5.0",

57885770 "uuid",

@@ -7286,7 +7268,6 @@

72867268 "export",

72877269 "i18n",

72887270 "imaging",

7289 "jwt",

72907271 "models",

72917272 "prost-types 0.14.4",

72927273 "sea-orm",

@@ -7294,6 +7275,7 @@

72947275 "serde_json",

72957276 "storage",

72967277 "time 0.3.55",

7278 "token",

72977279 "tracing",

72987280 "utoipa 5.5.0",

72997281 "uuid",

@@ -7848,6 +7830,7 @@

78487830 "ed25519-dalek",

78497831 "envelope",

78507832 "http 1.5.0",

7833 "jsonwebtoken 9.3.1",

78517834 "prost-types 0.14.4",

78527835 "proto",

78537836 "reqwest 0.13.5",

@@ -8485,7 +8468,6 @@

84858468 "futures",

84868469 "i18n",

84878470 "imaging",

8488 "jwt",

84898471 "models",

84908472 "rand 0.8.8",

84918473 "redis",

@@ -8496,6 +8478,7 @@

84968478 "space",

84978479 "storage",

84988480 "time 0.3.55",

8481 "token",

84998482 "tracing",

85008483 "utoipa 5.5.0",

85018484 "uuid",

@@ -8845,7 +8828,6 @@

88458828 "git",

88468829 "i18n",

88478830 "issues",

8848 "jwt",

88498831 "maud",

88508832 "models",

88518833 "pulldown-cmark",

@@ -8858,6 +8840,7 @@

88588840 "sha2 0.11.1",

88598841 "space",

88608842 "time 0.3.55",

8843 "token",

88618844 "tokio",

88628845 "tracing",

88638846 "url 2.5.8",

Modified Cargo.toml +0 −1 View Cargo.toml

@@ -37,7 +37,6 @@

3737proto = { path = "lib/proto" }

3838session = { path = "lib/session" }

3939token = { path = "lib/token" }

40jwt = { path = "lib/jwt" }

4140webapi = { path = "lib/webapi" }

4241pulls = { path = "lib/pulls" }

4342social = { path = "lib/social" }