matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-08-09 04:22:45 +03:00
Code Activity

Move the Encrypter from the config to the keystore

Browse Source
This commit is contained in:
Quentin Gliech
2022-08-31 18:42:23 +02:00
parent e1d50b818e
commit 8c25dc03ce
26 changed files with 157 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/axum-utils/Cargo.toml
View File

@@ -29,11 +29,10 @@ tower = { version = "0.4.13", features = ["util"] }
tracing = "0.1.36"
url = "2.2.2"
# TODO: remove the config dependency by moving out the encrypter
mas-config = { path = "../config" }
mas-templates = { path = "../templates" }
mas-storage = { path = "../storage" }
mas-data-model = { path = "../data-model" }
mas-jose = { path = "../jose" }
mas-iana = { path = "../iana" }
mas-http = { path = "../http", features = ["client"] }
mas-iana = { path = "../iana" }
mas-jose = { path = "../jose" }
mas-keystore = { path = "../keystore" }
mas-storage = { path = "../storage" }
mas-templates = { path = "../templates" }

2
crates/axum-utils/src/client_authorization.rs
View File

@@ -26,7 +26,7 @@ use axum::{
};
use headers::{authorization::Basic, Authorization};
use http::StatusCode;
use mas_config::Encrypter;
use mas_keystore::Encrypter;
use mas_data_model::{Client, JwksOrJwksUri, StorageBackend};
use mas_http::HttpServiceExt;
use mas_iana::oauth::OAuthClientAuthenticationMethod;