fedi/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-21 14:17:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add skip_serialize_none to OAuth structs with option fields (#5046)

Browse source 
* Add skip_serialize_none to OAuth structs with option fields

* PR feedback

* Remove serde and ts export from SSO db-only structs
This commit is contained in:
SleeplessOne1917 2024-09-26 08:24:51 +00:00 committed by GitHub
parent f6a24e133a
commit 33cbd95b7e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/api_common/src/oauth_provider.rs
View file

@ -19,11 +19,12 @@ pub struct CreateOAuthProvider {
pub client_id: String, pub client_id: String,
pub client_secret: String, pub client_secret: String,
pub scopes: String, pub scopes: String,
pub auto_verify_email: bool, pub auto_verify_email: Option<bool>,
pub account_linking_enabled: bool, pub account_linking_enabled: Option<bool>,
pub enabled: bool, pub enabled: Option<bool>,
} }
#[skip_serializing_none]
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
#[cfg_attr(feature = "full", derive(TS))] #[cfg_attr(feature = "full", derive(TS))]
#[cfg_attr(feature = "full", ts(export))] #[cfg_attr(feature = "full", ts(export))]

19
crates/db_schema/src/source/oauth_provider.rs
View file

@ -87,39 +87,30 @@ impl Serialize for PublicOAuthProvider {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[cfg_attr(feature = "full", derive(Insertable, AsChangeset, TS))] #[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
#[cfg_attr(feature = "full", diesel(table_name = oauth_provider))] #[cfg_attr(feature = "full", diesel(table_name = oauth_provider))]
#[cfg_attr(feature = "full", ts(export))]
pub struct OAuthProviderInsertForm { pub struct OAuthProviderInsertForm {
pub display_name: String, pub display_name: String,
#[cfg_attr(feature = "full", ts(type = "string"))]
pub issuer: DbUrl, pub issuer: DbUrl,
#[cfg_attr(feature = "full", ts(type = "string"))]
pub authorization_endpoint: DbUrl, pub authorization_endpoint: DbUrl,
#[cfg_attr(feature = "full", ts(type = "string"))]
pub token_endpoint: DbUrl, pub token_endpoint: DbUrl,
#[cfg_attr(feature = "full", ts(type = "string"))]
pub userinfo_endpoint: DbUrl, pub userinfo_endpoint: DbUrl,
pub id_claim: String, pub id_claim: String,
pub client_id: String, pub client_id: String,
pub client_secret: String, pub client_secret: String,
pub scopes: String, pub scopes: String,
pub auto_verify_email: bool, pub auto_verify_email: Option<bool>,
pub account_linking_enabled: bool, pub account_linking_enabled: Option<bool>,
pub enabled: bool, pub enabled: Option<bool>,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[cfg_attr(feature = "full", derive(Insertable, AsChangeset, TS))] #[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
#[cfg_attr(feature = "full", diesel(table_name = oauth_provider))] #[cfg_attr(feature = "full", diesel(table_name = oauth_provider))]
#[cfg_attr(feature = "full", ts(export))]
pub struct OAuthProviderUpdateForm { pub struct OAuthProviderUpdateForm {
pub display_name: Option<String>, pub display_name: Option<String>,
#[cfg_attr(feature = "full", ts(type = "string"))]
pub authorization_endpoint: Option<DbUrl>, pub authorization_endpoint: Option<DbUrl>,
#[cfg_attr(feature = "full", ts(type = "string"))]
pub token_endpoint: Option<DbUrl>, pub token_endpoint: Option<DbUrl>,
#[cfg_attr(feature = "full", ts(type = "string"))]
pub userinfo_endpoint: Option<DbUrl>, pub userinfo_endpoint: Option<DbUrl>,
pub id_claim: Option<String>, pub id_claim: Option<String>,
pub client_secret: Option<String>, pub client_secret: Option<String>,

2
migrations/2024-09-16-174833_create_oauth_provider/up.sql
View file

@ -14,7 +14,7 @@ CREATE TABLE oauth_provider (
scopes text NOT NULL, scopes text NOT NULL,
auto_verify_email boolean DEFAULT TRUE NOT NULL, auto_verify_email boolean DEFAULT TRUE NOT NULL,
account_linking_enabled boolean DEFAULT FALSE NOT NULL, account_linking_enabled boolean DEFAULT FALSE NOT NULL,
enabled boolean DEFAULT FALSE NOT NULL, enabled boolean DEFAULT TRUE NOT NULL,
published timestamp with time zone DEFAULT now() NOT NULL, published timestamp with time zone DEFAULT now() NOT NULL,
updated timestamp with time zone updated timestamp with time zone
); );