Allow directly passing SecretString (#601)

XAMPPRocky · Mar 15, 2024 · 388c185 · 388c185
1 parent 71a45f7
commit 388c185
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/api/checks.rs b/src/api/checks.rs
@@ -1,5 +1,4 @@
 use chrono::{DateTime, Utc};
-use hyper::body::Body;
 
 use crate::models::checks::{AutoTriggerCheck, CheckSuite, CheckSuitePreferences};
 use crate::models::{AppId, CheckRunId, CheckSuiteId};

diff --git a/src/lib.rs b/src/lib.rs
@@ -521,8 +521,8 @@ impl OctocrabBuilder<NoSvc, DefaultOctocrabBuilderConfig, NoAuth, NotLayerReady>
     }
 
     /// Add a personal token to use for authentication.
-    pub fn personal_token(mut self, token: String) -> Self {
-        self.config.auth = Auth::PersonalToken(SecretString::new(token));
+    pub fn personal_token<S: Into<SecretString>>(mut self, token: S) -> Self {
+        self.config.auth = Auth::PersonalToken(token.into());
         self
     }
 
@@ -547,8 +547,8 @@ impl OctocrabBuilder<NoSvc, DefaultOctocrabBuilderConfig, NoAuth, NotLayerReady>
     }
 
     /// Authenticate with a user access token.
-    pub fn user_access_token(mut self, token: String) -> Self {
-        self.config.auth = Auth::UserAccessToken(SecretString::new(token));
+    pub fn user_access_token<S: Into<SecretString>>(mut self, token: S) -> Self {
+        self.config.auth = Auth::UserAccessToken(token.into());
         self
     }
 
@@ -834,9 +834,8 @@ impl CachedToken {
         self.valid_token_with_buffer(chrono::Duration::seconds(30))
     }
 
-    fn set(&self, token: String, expiration: Option<DateTime<Utc>>) {
-        *self.0.write().unwrap() =
-            Some(CachedTokenInner::new(SecretString::new(token), expiration));
+    fn set<S: Into<SecretString>>(&self, token: S, expiration: Option<DateTime<Utc>>) {
+        *self.0.write().unwrap() = Some(CachedTokenInner::new(token.into(), expiration));
     }
 }