refactor: Add more tests and traits

Author: Archasion

src/database/wrappers/account_links/mod.rs

@@ -169,6 +169,7 @@ impl UserMarker for RobloxMarker {
 }
 
 /// Wrapper for account link user IDs.
+#[derive(Debug)]
 pub(crate) struct AccountLinkUserId<Marker: UserMarker> {
     /// Marker for the user type.
     marker: PhantomData<Marker>,

src/oauth/types/discord.rs

@@ -8,17 +8,20 @@ use std::fmt::{Display, Formatter, Result as FmtResult};
 ///
 /// The internal API should parse these scope sets into individual scopes
 /// that will be requested from the OAuth2 provider
+#[derive(PartialEq, Debug)]
 pub(crate) enum DiscordOAuthScopeSet {
     /// The scopes required for verifying a user's Discord account
     Verification,
 }
 
 /// A set of scopes that will be requested from the OAuth2 provider.
+#[derive(PartialEq, Debug)]
 pub(crate) struct DiscordOAuthScopes(pub(crate) Vec<DiscordOAuthScope>);
 
 /// A scope that can be requested from the OAuth2 provider.
 ///
 /// [Reference](https://discord.com/developers/docs/topics/oauth2#shared-resources-oauth2-scopes)
+#[derive(PartialEq, Debug)]
 pub(crate) enum DiscordOAuthScope {
     Identify,
     Guilds,
@@ -316,3 +319,44 @@ impl<'a> DiscordRefreshTokenBody<'a> {
         ])
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::{DiscordOAuthScope, DiscordOAuthScopeSet, DiscordOAuthScopes};
+
+    #[test]
+    fn test_discord_oauth_scopes_display() {
+        let scopes = DiscordOAuthScopes(vec![
+            DiscordOAuthScope::Identify,
+            DiscordOAuthScope::GuildsMembersRead,
+            DiscordOAuthScope::Guilds,
+            DiscordOAuthScope::Connections,
+        ]);
+
+        assert_eq!(
+            format!("{}", scopes),
+            "identify+guilds.members.read+guilds+connections"
+        );
+    }
+
+    #[test]
+    fn test_discord_oauth_scope_set_try_from() {
+        assert_eq!(
+            DiscordOAuthScopeSet::try_from("verification").unwrap(),
+            DiscordOAuthScopeSet::Verification
+        );
+    }
+
+    #[test]
+    fn test_discord_oauth_scopes_from() {
+        assert_eq!(
+            DiscordOAuthScopes::from(DiscordOAuthScopeSet::Verification),
+            DiscordOAuthScopes(vec![
+                DiscordOAuthScope::Identify,
+                DiscordOAuthScope::GuildsMembersRead,
+                DiscordOAuthScope::Guilds,
+                DiscordOAuthScope::Connections,
+            ])
+        );
+    }
+}

src/oauth/types/mod.rs

@@ -11,6 +11,7 @@ pub(super) struct OAuthCallback {
 }
 
 /// Result of the [`generate_session`](crate::oauth::utils::generate_session) function.
+#[derive(Debug)]
 pub(super) struct GeneratedSession<'a> {
     /// The session cookie.
     pub(super) cookie: Cookie<'a>,

src/oauth/types/roblox.rs

@@ -7,14 +7,17 @@ use std::fmt::{Display, Formatter, Result as FmtResult};
 ///
 /// The internal API should parse these scope sets into individual scopes
 /// that will be requested from the OAuth2 provider
+#[derive(PartialEq, Debug)]
 pub(crate) enum RobloxOAuthScopeSet {
     Verification,
 }
 
 /// A set of scopes that will be requested from the OAuth2 provider.
+#[derive(PartialEq, Debug)]
 pub(crate) struct RobloxOAuthScopes(pub(crate) Vec<RobloxOAuthScope>);
 
 /// A scope that will be requested from the OAuth2 provider.
+#[derive(PartialEq, Debug)]
 pub(crate) enum RobloxOAuthScope {
     OpenID,
     Profile,
@@ -66,7 +69,7 @@ pub(crate) struct RobloxAuthorizedCodeRequestBody<'a> {
 }
 
 /// The response body for the Roblox OAuth token endpoint.
-#[derive(Debug, Deserialize)]
+#[derive(Deserialize)]
 #[serde(crate = "rocket::serde")]
 pub(crate) struct RobloxAccessTokenResponse {
     /// The access token for the user.
@@ -176,14 +179,6 @@ impl TryFrom<&str> for RobloxOAuthScopeSet {
     }
 }
 
-// impl From<&RobloxOAuthScopeSet> for String {
-//     fn from(value: &RobloxOAuthScopeSet) -> Self {
-//         let scopes: RobloxOAuthScopes = value.into();
-//
-//         scopes.to_string()
-//     }
-// }
-
 impl<'a> RobloxAuthorizedCodeRequestBody<'a> {
     /// Creates a new [`RobloxAuthorizedCodeRequestBody`] with the given code, code verifier, and configuration.
     pub(crate) fn new(code: &'a str, code_verifier: &'a str, cfg: &'a Config) -> Self {
@@ -208,3 +203,46 @@ impl<'a> RobloxAuthorizedCodeRequestBody<'a> {
         ])
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::{RobloxOAuthScope, RobloxOAuthScopeSet, RobloxOAuthScopes};
+
+    #[test]
+    fn test_roblox_oauth_scopes_display() {
+        let scopes = RobloxOAuthScopes(vec![
+            RobloxOAuthScope::OpenID,
+            RobloxOAuthScope::Profile,
+            RobloxOAuthScope::GroupRead,
+            RobloxOAuthScope::UserInventoryItemRead,
+            RobloxOAuthScope::UserAdvancedRead,
+        ]);
+
+        assert_eq!(
+            format!("{}", scopes),
+            "openid%20profile%20group:read%20user.inventory-item:read%20user.advanced:read"
+        );
+    }
+
+    #[test]
+    fn test_roblox_oauth_scope_set_try_from() {
+        assert_eq!(
+            RobloxOAuthScopeSet::try_from("verification").unwrap(),
+            RobloxOAuthScopeSet::Verification
+        );
+    }
+
+    #[test]
+    fn test_roblox_oauth_scopes_from() {
+        assert_eq!(
+            RobloxOAuthScopes::from(RobloxOAuthScopeSet::Verification),
+            RobloxOAuthScopes(vec![
+                RobloxOAuthScope::OpenID,
+                RobloxOAuthScope::Profile,
+                RobloxOAuthScope::GroupRead,
+                RobloxOAuthScope::UserInventoryItemRead,
+                RobloxOAuthScope::UserAdvancedRead,
+            ])
+        );
+    }
+}