matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-31 09:24:31 +03:00
Code Activity

Apply cargo fmt following changes in nightly rustfmt

Browse Source 
rustfmt now formats `let … else { … }` expressions
This commit is contained in:
Quentin Gliech
2023-07-03 14:50:59 +02:00
parent 991e18d426
commit 4f8b87fbfe
10 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/graphql/src/model/compat_sessions.rs
View File

@ -101,7 +101,9 @@ impl CompatSsoLogin {
&self,
ctx: &Context<'_>,
) -> Result<Option<CompatSession>, async_graphql::Error> {
let Some(session_id) = self.0.session_id() else { return Ok(None) };
let Some(session_id) = self.0.session_id() else {
return Ok(None);
};
let state = ctx.state();
let mut repo = state.repository().await?;

12
crates/graphql/src/query/mod.rs
View File

@ -82,7 +82,9 @@ impl BaseQuery {
let id = NodeType::User.extract_ulid(&id)?;
let requester = ctx.requester();
let Some(current_user) = requester.user() else { return Ok(None) };
let Some(current_user) = requester.user() else {
return Ok(None);
};
if current_user.id == id {
Ok(Some(User(current_user.clone())))
@ -101,7 +103,9 @@ impl BaseQuery {
let id = NodeType::BrowserSession.extract_ulid(&id)?;
let requester = ctx.requester();
let Some(current_user) = requester.user() else { return Ok(None) };
let Some(current_user) = requester.user() else {
return Ok(None);
};
let mut repo = state.repository().await?;
let browser_session = repo.browser_session().lookup(id).await?;
@ -129,7 +133,9 @@ impl BaseQuery {
let id = NodeType::UserEmail.extract_ulid(&id)?;
let requester = ctx.requester();
let Some(current_user) = requester.user() else { return Ok(None) };
let Some(current_user) = requester.user() else {
return Ok(None);
};
let mut repo = state.repository().await?;
let user_email = repo

4
crates/graphql/src/query/upstream_oauth.rs
View File

@ -38,7 +38,9 @@ impl UpstreamOAuthQuery {
let id = NodeType::UpstreamOAuth2Link.extract_ulid(&id)?;
let requester = ctx.requester();
let Some(current_user) = requester.user() else { return Ok(None) };
let Some(current_user) = requester.user() else {
return Ok(None);
};
let mut repo = state.repository().await?;
let link = repo.upstream_oauth_link().lookup(id).await?;

8
crates/handlers/src/upstream_oauth2/cookie.rs
View File

@ -41,8 +41,12 @@ pub struct Payload {
impl Payload {
fn expired(&self, now: DateTime<Utc>) -> bool {
let Ok(ts) = self.session.timestamp_ms().try_into() else { return true };
let Some(when) = NaiveDateTime::from_timestamp_millis(ts) else { return true };
let Ok(ts) = self.session.timestamp_ms().try_into() else {
return true;
};
let Some(when) = NaiveDateTime::from_timestamp_millis(ts) else {
return true;
};
let when = DateTime::from_utc(when, Utc);
let max_age = Duration::seconds(SESSION_MAX_TIME_SECS);
now - when > max_age

4
crates/handlers/src/views/shared.rs
View File

@ -44,7 +44,9 @@ impl OptionalPostAuthAction {
&'a self,
repo: &'a mut impl RepositoryAccess,
) -> anyhow::Result<Option<PostAuthContext>> {
let Some(action) = self.post_auth_action.clone() else { return Ok(None) };
let Some(action) = self.post_auth_action.clone() else {
return Ok(None);
};
let ctx = match action {
PostAuthAction::ContinueAuthorizationGrant { id } => {
let grant = repo

4
crates/jose/src/jwt/signed.rs
View File

@ -238,7 +238,9 @@ impl<'a, T> Jwt<'a, T> {
let Ok(key) = crate::jwa::AsymmetricVerifyingKey::from_jwk_and_alg(
candidate.params(),
self.header().alg(),
) else { continue };
) else {
continue;
};
if self.verify(&key).is_ok() {
return Ok(());

3
crates/listener/src/proxy_protocol/v1.rs
View File

@ -78,7 +78,8 @@ impl ProxyProtocolV1Info {
.as_ref()
.windows(2)
.take(108)
.position(|needle| needle == [0x0D, 0x0A]) else {
.position(|needle| needle == [0x0D, 0x0A])
else {
// If not, it might be because we don't have enough bytes
return if buf.remaining() < 108 {
Err(E::NotEnoughBytes)

8
crates/oidc-client/src/utils/mod.rs
View File

@ -28,8 +28,12 @@ where
}
pub fn http_all_error_status_codes() -> impl RangeBounds<StatusCode> {
let Ok(client_errors_start_code) = StatusCode::from_u16(400) else { unreachable!() };
let Ok(server_errors_end_code) = StatusCode::from_u16(599) else { unreachable!() };
let Ok(client_errors_start_code) = StatusCode::from_u16(400) else {
unreachable!()
};
let Ok(server_errors_end_code) = StatusCode::from_u16(599) else {
unreachable!()
};
client_errors_start_code..=server_errors_end_code
}

12
crates/storage-pg/src/user/email.rs
View File

@ -126,7 +126,9 @@ impl<'c> UserEmailRepository for PgUserEmailRepository<'c> {
.await
.to_option()?;
let Some(user_email) = res else { return Ok(None) };
let Some(user_email) = res else {
return Ok(None);
};
Ok(Some(user_email.into()))
}
@ -162,7 +164,9 @@ impl<'c> UserEmailRepository for PgUserEmailRepository<'c> {
.await
.to_option()?;
let Some(user_email) = res else { return Ok(None) };
let Some(user_email) = res else {
return Ok(None);
};
Ok(Some(user_email.into()))
}
@ -177,7 +181,9 @@ impl<'c> UserEmailRepository for PgUserEmailRepository<'c> {
err,
)]
async fn get_primary(&mut self, user: &User) -> Result<Option<UserEmail>, Self::Error> {
let Some(id) = user.primary_user_email_id else { return Ok(None) };
let Some(id) = user.primary_user_email_id else {
return Ok(None);
};
let user_email = self.lookup(id).await?.ok_or_else(|| {
DatabaseInconsistencyError::on("users")

4
crates/storage/src/oauth2/client.rs
View File

@ -47,7 +47,9 @@ pub trait OAuth2ClientRepository: Send + Sync {
/// Find an OAuth2 client by its client ID
async fn find_by_client_id(&mut self, client_id: &str) -> Result<Option<Client>, Self::Error> {
let Ok(id) = client_id.parse() else { return Ok(None) };
let Ok(id) = client_id.parse() else {
return Ok(None);
};
self.lookup(id).await
}