Skip to content
This repository was archived by the owner on May 25, 2025. It is now read-only.

Commit 014aa80

Browse files
committed
fix axum error
1 parent e144bec commit 014aa80

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

flake.nix

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@
1919
};
2020
default = jitsi-openid;
2121
};
22+
23+
24+
devShells = {
25+
default = pkgs.mkShell {
26+
nativeBuildInputs = with pkgs; [ pkg-config ];
27+
buildInputs = with pkgs; [ openssl ];
28+
};
29+
};
2230
}
2331
) // {
2432
overlays.default = _: prev: {

src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use std::collections::HashMap;
22
use std::sync::Arc;
33

4-
use axum::Extension;
54
use config::{Config, Environment};
65
use openidconnect::core::{
76
CoreAuthDisplay, CoreAuthPrompt, CoreErrorResponseType, CoreGenderClaim, CoreJsonWebKey,

src/routes.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use axum::extract::{Path, Query, State};
22
use axum::response::{IntoResponse, Redirect};
33
use axum::routing::get;
4-
use axum::{Extension, Router};
4+
use axum::Router;
55
use axum_extra::extract::cookie::Cookie;
66
use axum_extra::extract::CookieJar;
77
use jsonwebtoken::{EncodingKey, Header};
@@ -20,16 +20,16 @@ use uuid::Uuid;
2020
use crate::AppError::{AuthenticationContextWasNotFulfilled, IdTokenRequired};
2121
use crate::{
2222
AppError, Cfg, InternalServerError, InvalidAccessToken, InvalidCode, InvalidIdTokenNonce,
23-
InvalidSession, InvalidState, JitsiSecret, JitsiState, MissingAccessTokenHash,
23+
InvalidSession, InvalidState, JitsiState, MissingAccessTokenHash,
2424
MissingIdTokenAndUserInfoEndpoint, MyClaims, MyClient, MyTokenResponse, MyUserInfoClaims,
25-
Session, Store, UnableToQueryUserInfo, UnsupportedSigningAlgorithm,
25+
Session, UnableToQueryUserInfo, UnsupportedSigningAlgorithm,
2626
};
2727

2828
const COOKIE_NAME: &str = "JITSI_OPENID_SESSION";
2929

3030
pub(crate) fn build_routes() -> Router<JitsiState> {
3131
Router::new()
32-
.route("/room/*name", get(room))
32+
.route("/room/{name}", get(room))
3333
.route("/callback", get(callback))
3434
}
3535

@@ -245,7 +245,7 @@ fn id_token_claims(
245245
.picture()
246246
.and_then(|x| x.get(None))
247247
.map(|x| x.to_string()),
248-
moderator: claims.additional_claims().moderator.clone(),
248+
moderator: claims.additional_claims().moderator,
249249
}))
250250
}
251251

@@ -276,7 +276,7 @@ async fn user_info_claims(
276276
.picture()
277277
.and_then(|x| x.get(None))
278278
.map(|x| x.to_string()),
279-
moderator: claims.additional_claims().moderator.clone(),
279+
moderator: claims.additional_claims().moderator,
280280
}))
281281
}
282282
Err(ConfigurationError::MissingUrl(_)) => Ok(None),

0 commit comments

Comments
 (0)