Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 89 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions apps/server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ hmac = "0.12"
subtle = "2.6"
png = "0.18"

[dev-dependencies]
wiremock = "0.6"

[target.'cfg(target_os = "linux")'.dependencies]
tray-icon = { version = "0.25", default-features = false, features = ["ksni"] }

Expand Down
12 changes: 12 additions & 0 deletions apps/server/src/auth_routes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1635,3 +1635,15 @@ mod session_cookie_tests {
assert_eq!(session_from_cookie_header("other=df_abc"), None);
}
}

/// Utilisateur depuis `Authorization: Bearer` ou, à défaut, le cookie de session
/// (redirections navigateur depuis GitHub, sans en-tête).
pub async fn user_from_bearer_or_cookie(
state: &AppState,
headers: &HeaderMap,
) -> Result<Option<UserRow>, (axum::http::StatusCode, Json<Value>)> {
let Some(token) = bearer_from(headers).or_else(|| session_cookie_from(headers)) else {
return Ok(None);
};
session_user(state, &token).await
}
5 changes: 5 additions & 0 deletions apps/server/src/db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1057,6 +1057,11 @@ pub async fn migrate_github_app(pool: &PgPool) -> Result<(), sqlx::Error> {
] {
sqlx::query(sql).execute(pool).await?;
}
// P1 : type du propriétaire (User/Organization) pour le lien de gestion GitHub.
let _ =
sqlx::query("ALTER TABLE github_app ADD COLUMN owner_type TEXT NOT NULL DEFAULT 'User'")
.execute(pool)
.await;
// Échec toléré : colonne déjà présente.
for (col, def) in [
("github_installation_id", "BIGINT"),
Expand Down
Loading
Loading