diff options
| author | Jesse Luehrs <doy@tozt.net> | 2019-10-16 10:13:20 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2019-10-16 10:13:20 -0400 |
| commit | 85e5c74a8bce3956163d80f8fbee3cf4ad516bac (patch) | |
| tree | 7c9e549786939ac0e541fa9f5b510ab5cf6624df | |
| parent | 4eb33b05783a961a8bed262dc7b5cd7f79a13194 (diff) | |
| download | teleterm-85e5c74a8bce3956163d80f8fbee3cf4ad516bac.tar.gz teleterm-85e5c74a8bce3956163d80f8fbee3cf4ad516bac.zip | |
simplify
| -rw-r--r-- | src/oauth.rs | 3 | ||||
| -rw-r--r-- | src/oauth/recurse_center.rs | 6 | ||||
| -rw-r--r-- | src/server.rs | 18 |
3 files changed, 13 insertions, 14 deletions
diff --git a/src/oauth.rs b/src/oauth.rs index ce21e33..3817b7d 100644 --- a/src/oauth.rs +++ b/src/oauth.rs @@ -1,7 +1,8 @@ use crate::prelude::*; use oauth2::TokenResponse as _; -pub mod recurse_center; +mod recurse_center; +pub use recurse_center::RecurseCenter; pub trait Oauth { fn client(&self) -> &oauth2::basic::BasicClient; diff --git a/src/oauth/recurse_center.rs b/src/oauth/recurse_center.rs index 5a9b2b4..a83ab40 100644 --- a/src/oauth/recurse_center.rs +++ b/src/oauth/recurse_center.rs @@ -1,11 +1,11 @@ use crate::prelude::*; -pub struct Oauth { +pub struct RecurseCenter { client: oauth2::basic::BasicClient, user_id: String, } -impl Oauth { +impl RecurseCenter { pub fn new( client_id: &str, client_secret: &str, @@ -31,7 +31,7 @@ impl Oauth { } } -impl super::Oauth for Oauth { +impl super::Oauth for RecurseCenter { fn client(&self) -> &oauth2::basic::BasicClient { &self.client } diff --git a/src/server.rs b/src/server.rs index e267024..f58cda4 100644 --- a/src/server.rs +++ b/src/server.rs @@ -405,16 +405,14 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static> ( id.is_some(), - Box::new( - crate::oauth::recurse_center::Oauth::new( - &client_id, - &client_secret, - redirect_url, - &id.clone().unwrap_or_else(|| { - format!("{}", uuid::Uuid::new_v4()) - }), - ), - ), + Box::new(crate::oauth::RecurseCenter::new( + &client_id, + &client_secret, + redirect_url, + &id.clone().unwrap_or_else(|| { + format!("{}", uuid::Uuid::new_v4()) + }), + )), ) } _ => unreachable!(), |