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

Basic improvements to oauth2-types requests

Browse Source 
Make sure all types implement Serialize, Deserialize, Debug and Clone.
Make sure all types can be constructed and all fields can be accessed.
This commit is contained in:
Kévin Commaille
2022-09-01 14:14:20 +02:00
committed by Quentin Gliech
parent ee47c821e3
commit 7a931925fa
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
crates/oauth2-types/src/requests.rs
View File

@ -98,8 +98,9 @@ pub enum Prompt {
Create, Create,
} }
#[skip_serializing_none]
#[serde_as] #[serde_as]
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize, Debug, Clone)]
pub struct AuthorizationRequest { pub struct AuthorizationRequest {
pub response_type: OAuthAuthorizationEndpointResponseType, pub response_type: OAuthAuthorizationEndpointResponseType,
@ -115,7 +116,7 @@ pub struct AuthorizationRequest {
pub nonce: Option<String>, pub nonce: Option<String>,
display: Option<Display>, pub display: Option<Display>,
pub prompt: Option<Prompt>, pub prompt: Option<Prompt>,
@ -125,15 +126,15 @@ pub struct AuthorizationRequest {
#[serde_as(as = "Option<StringWithSeparator::<SpaceSeparator, LanguageTag>>")] #[serde_as(as = "Option<StringWithSeparator::<SpaceSeparator, LanguageTag>>")]
#[serde(default)] #[serde(default)]
ui_locales: Option<Vec<LanguageTag>>, pub ui_locales: Option<Vec<LanguageTag>>,
id_token_hint: Option<String>, pub id_token_hint: Option<String>,
login_hint: Option<String>, pub login_hint: Option<String>,
#[serde_as(as = "Option<StringWithSeparator::<SpaceSeparator, String>>")] #[serde_as(as = "Option<StringWithSeparator::<SpaceSeparator, String>>")]
#[serde(default)] #[serde(default)]
acr_values: Option<HashSet<String>>, pub acr_values: Option<HashSet<String>>,
pub request: Option<String>, pub request: Option<String>,
@ -142,7 +143,8 @@ pub struct AuthorizationRequest {
pub registration: Option<String>, pub registration: Option<String>,
} }
#[derive(Serialize, Deserialize, Default)] #[skip_serializing_none]
#[derive(Serialize, Deserialize, Default, Debug, Clone)]
pub struct AuthorizationResponse<R> { pub struct AuthorizationResponse<R> {
pub code: Option<String>, pub code: Option<String>,
#[serde(flatten)] #[serde(flatten)]
@ -150,7 +152,7 @@ pub struct AuthorizationResponse<R> {
} }
#[skip_serializing_none] #[skip_serializing_none]
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
pub struct AuthorizationCodeGrant { pub struct AuthorizationCodeGrant {
pub code: String, pub code: String,
#[serde(default)] #[serde(default)]
@ -161,18 +163,19 @@ pub struct AuthorizationCodeGrant {
pub code_verifier: Option<String>, pub code_verifier: Option<String>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] #[skip_serializing_none]
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
pub struct RefreshTokenGrant { pub struct RefreshTokenGrant {
pub refresh_token: String, pub refresh_token: String,
#[serde(default)] #[serde(default)]
scope: Option<Scope>, pub scope: Option<Scope>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
pub struct ClientCredentialsGrant { pub struct ClientCredentialsGrant {
#[serde(default)] #[serde(default)]
scope: Option<Scope>, pub scope: Option<Scope>,
} }
#[derive( #[derive(
@ -197,7 +200,7 @@ pub enum GrantType {
ClientCredentials, ClientCredentials,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
#[serde(tag = "grant_type", rename_all = "snake_case")] #[serde(tag = "grant_type", rename_all = "snake_case")]
pub enum AccessTokenRequest { pub enum AccessTokenRequest {
AuthorizationCode(AuthorizationCodeGrant), AuthorizationCode(AuthorizationCodeGrant),
@ -209,19 +212,19 @@ pub enum AccessTokenRequest {
#[serde_as] #[serde_as]
#[skip_serializing_none] #[skip_serializing_none]
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
pub struct AccessTokenResponse { pub struct AccessTokenResponse {
access_token: String, pub access_token: String,
refresh_token: Option<String>, pub refresh_token: Option<String>,
// TODO: this should be somewhere else // TODO: this should be somewhere else
id_token: Option<String>, pub id_token: Option<String>,
token_type: OAuthAccessTokenType, pub token_type: OAuthAccessTokenType,
#[serde_as(as = "Option<DurationSeconds<i64>>")] #[serde_as(as = "Option<DurationSeconds<i64>>")]
expires_in: Option<Duration>, pub expires_in: Option<Duration>,
scope: Option<Scope>, pub scope: Option<Scope>,
} }
impl AccessTokenResponse { impl AccessTokenResponse {
@ -263,7 +266,7 @@ impl AccessTokenResponse {
} }
#[skip_serializing_none] #[skip_serializing_none]
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
pub struct IntrospectionRequest { pub struct IntrospectionRequest {
pub token: String, pub token: String,
@ -273,7 +276,7 @@ pub struct IntrospectionRequest {
#[serde_as] #[serde_as]
#[skip_serializing_none] #[skip_serializing_none]
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Default)] #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Default)]
pub struct IntrospectionResponse { pub struct IntrospectionResponse {
pub active: bool, pub active: bool,