use real types for user id and username

Author: Emilgardis

Cargo.toml

@@ -35,6 +35,7 @@ aliri_braid = "0.1.9"
 url = "2.2.2"
 base64 = "0.13.0"
 rand = "0.8.4"
+twitch_types = "0.1.0"
 
 [dev-dependencies]
 tokio = { version = "1.12.0", features = ["rt-multi-thread", "macros", "test-util"] }

src/tokens.rs

@@ -5,6 +5,7 @@ pub mod errors;
 mod user_token;
 
 pub use app_access_token::AppAccessToken;
+use twitch_types::{UserId, UserName, UserIdRef, UserNameRef};
 pub use user_token::{ImplicitUserTokenBuilder, UserToken, UserTokenBuilder};
 
 use crate::client::Client;
@@ -47,9 +48,9 @@ pub trait TwitchToken {
     /// ```
     fn token(&self) -> &AccessToken;
     /// Get the username associated to this token
-    fn login(&self) -> Option<&str>;
+    fn login(&self) -> Option<&UserNameRef>;
     /// Get the user id associated to this token
-    fn user_id(&self) -> Option<&str>;
+    fn user_id(&self) -> Option<&UserIdRef>;
     /// Refresh this token, changing the token to a newer one
     async fn refresh_token<'a, C>(
         &mut self,
@@ -121,9 +122,9 @@ impl<T: TwitchToken + Send> TwitchToken for Box<T> {
 
     fn token(&self) -> &AccessToken { (**self).token() }
 
-    fn login(&self) -> Option<&str> { (**self).login() }
+    fn login(&self) -> Option<&UserNameRef> { (**self).login() }
 
-    fn user_id(&self) -> Option<&str> { (**self).user_id() }
+    fn user_id(&self) -> Option<&UserIdRef> { (**self).user_id() }
 
     async fn refresh_token<'a, C>(
         &mut self,
@@ -149,9 +150,9 @@ pub struct ValidatedToken {
     /// Client ID associated with the token. Twitch requires this in all helix API calls
     pub client_id: ClientId,
     /// Username associated with the token
-    pub login: Option<String>,
+    pub login: Option<UserName>,
     /// User ID associated with the token
-    pub user_id: Option<String>,
+    pub user_id: Option<UserId>,
     /// Scopes attached to the token.
     pub scopes: Option<Vec<Scope>>,
     /// Lifetime of the token

src/tokens/app_access_token.rs

@@ -1,3 +1,5 @@
+use twitch_types::{UserIdRef, UserNameRef};
+
 use super::errors::{AppAccessTokenError, ValidationError};
 use crate::{
     client::Client,
@@ -47,9 +49,9 @@ impl TwitchToken for AppAccessToken {
 
     fn token(&self) -> &AccessToken { &self.access_token }
 
-    fn login(&self) -> Option<&str> { None }
+    fn login(&self) -> Option<&UserNameRef> { None }
 
-    fn user_id(&self) -> Option<&str> { None }
+    fn user_id(&self) -> Option<&UserIdRef> { None }
 
     async fn refresh_token<'a, C>(
         &mut self,

src/tokens/user_token.rs

@@ -1,3 +1,5 @@
+use twitch_types::{UserId, UserName, UserIdRef, UserNameRef};
+
 use crate::client::Client;
 use crate::tokens::{
     errors::{RefreshTokenError, UserTokenExchangeError, ValidationError},
@@ -20,9 +22,9 @@ pub struct UserToken {
     client_id: ClientId,
     client_secret: Option<ClientSecret>,
     /// Username of user associated with this token
-    pub login: String,
+    pub login: UserName,
     /// User ID of the user associated with this token
-    pub user_id: String,
+    pub user_id: UserId,
     /// The refresh token used to extend the life of this user token
     pub refresh_token: Option<RefreshToken>,
     /// Expiration from when the response was generated.
@@ -61,8 +63,8 @@ impl UserToken {
         refresh_token: impl Into<Option<RefreshToken>>,
         client_id: impl Into<ClientId>,
         client_secret: impl Into<Option<ClientSecret>>,
-        login: String,
-        user_id: String,
+        login: UserName,
+        user_id: UserId,
         scopes: Option<Vec<Scope>>,
         expires_in: Option<std::time::Duration>,
     ) -> UserToken {
@@ -155,7 +157,7 @@ impl UserToken {
         http_client: &'a C,
         client_id: ClientId,
         client_secret: ClientSecret,
-        user_id: impl AsRef<str>,
+        user_id: impl AsRef<UserIdRef>,
         scopes: Vec<Scope>,
     ) -> Result<UserToken, UserTokenExchangeError<<C as Client<'a>>::Error>>
     where
@@ -209,9 +211,9 @@ impl TwitchToken for UserToken {
 
     fn token(&self) -> &AccessToken { &self.access_token }
 
-    fn login(&self) -> Option<&str> { Some(&self.login) }
+    fn login(&self) -> Option<&UserNameRef> { Some(&self.login) }
 
-    fn user_id(&self) -> Option<&str> { Some(&self.user_id) }
+    fn user_id(&self) -> Option<&UserIdRef> { Some(&self.user_id) }
 
     async fn refresh_token<'a, C>(
         &mut self,