misc-deps
/
inth-oauth2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move hyper client to Client struct

This commit is contained in:
Curtis McEnroe 2015-11-28 16:56:13 -05:00
parent 593a08e017
commit a7e255b66c
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/github.rs
View File

@ -1,4 +1,3 @@
extern crate hyper;
extern crate inth_oauth2;
use std::io;
@ -6,6 +5,7 @@ use inth_oauth2::Client;
fn main() {
let client = Client::github(
Default::default(),
"01774654cd9a6051e478",
"9f14d16d95d605e715ec1a9aecec220d2565fd5c",
Some("https://cmcenroe.me/oauth2-paste")
@ -18,7 +18,7 @@ fn main() {
let mut code = String::new();
io::stdin().read_line(&mut code).unwrap();
let token = client.request_token(hyper::Client::new(), code.trim()).unwrap();
let token = client.request_token(code.trim()).unwrap();
println!("{:?}", token);
}

4
examples/google.rs
View File

@ -1,4 +1,3 @@
extern crate hyper;
extern crate inth_oauth2;
use std::io;
@ -6,6 +5,7 @@ use inth_oauth2::Client;
fn main() {
let client = Client::google(
Default::default(),
"143225766783-ip2d9qv6sdr37276t77luk6f7bhd6bj5.apps.googleusercontent.com",
"3kZ5WomzHFlN2f_XbhkyPd3o",
Some("urn:ietf:wg:oauth:2.0:oob")
@ -21,7 +21,7 @@ fn main() {
let mut code = String::new();
io::stdin().read_line(&mut code).unwrap();
let token = client.request_token(hyper::Client::new(), code.trim()).unwrap();
let token = client.request_token(code.trim()).unwrap();
println!("{:?}", token);
}

11
src/client.rs
View File

@ -9,6 +9,8 @@ use super::{Error, Result, Token};
/// OAuth 2.0 client.
pub struct Client {
http_client: hyper::Client,
auth_uri: String,
token_uri: String,
@ -27,11 +29,13 @@ macro_rules! site_constructors {
$(
#[$attr]
pub fn $ident<S: Into<String>>(
http_client: hyper::Client,
client_id: S,
client_secret: S,
redirect_uri: Option<S>
) -> Self {
Client {
http_client: http_client,
auth_uri: String::from($auth_uri),
token_uri: String::from($token_uri),
client_id: client_id.into(),
@ -46,6 +50,7 @@ macro_rules! site_constructors {
impl Client {
/// Creates an OAuth 2.0 client.
pub fn new<S: Into<String>>(
http_client: hyper::Client,
auth_uri: S,
token_uri: S,
client_id: S,
@ -53,9 +58,9 @@ impl Client {
redirect_uri: Option<S>
) -> Self {
Client {
http_client: http_client,
auth_uri: auth_uri.into(),
token_uri: token_uri.into(),
client_id: client_id.into(),
client_secret: client_secret.into(),
redirect_uri: redirect_uri.map(Into::into),
@ -100,7 +105,7 @@ impl Client {
}
/// Requests an access token using an authorization code.
pub fn request_token(&self, client: hyper::Client, code: &str) -> Result<Token> {
pub fn request_token(&self, code: &str) -> Result<Token> {
let auth_header = header::Authorization(
header::Basic {
username: self.client_id.clone(),
@ -128,7 +133,7 @@ impl Client {
let body_str = form_urlencoded::serialize(body_pairs);
let request = client.post(&self.token_uri)
let request = self.http_client.post(&self.token_uri)
.header(auth_header)
.header(accept_header)
.header(header::ContentType::form_url_encoded())