Moved old client into separate module

examples/old_search.rs

@@ -1,5 +1,5 @@
-use centerdevice::old_client::search::NamedSearches;
-use centerdevice::old_client::{self, CenterDeviceConfig};
+use centerdevice::old::client::search::NamedSearches;
+use centerdevice::old::client::{self, CenterDeviceConfig};
 use std::env;
 
 fn main() {
@@ -18,7 +18,7 @@ fn main() {
  api_base_url: "centerdevice.de".to_string(),
  };
 
- let search_results = old_client::search::search_documents(
+ let search_results = client::search::search_documents(
  &config.api_base_url,
  &config.access_token,
  None,

src/client.rs

@@ -7,6 +7,10 @@ use reqwest;
 use reqwest::IntoUrl;
 
 
+pub trait CenterDevice {
+ fn refresh_access_token(&self) -> Result<Token>;
+}
+
 pub struct Client {}
 
 impl Client {
@@ -70,8 +74,10 @@ impl AuthorizedClient {
  pub fn token(&self) -> &Token {
  &self.token
  }
+}
 
- pub fn refresh_access_token(&self) -> Result<Token> {
+impl CenterDevice for AuthorizedClient {
+ fn refresh_access_token(&self) -> Result<Token> {
  auth::refresh_access_token(self)
  }
 }
@@ -206,16 +212,16 @@ mod auth {
  Ok(token)
  }
 
- pub fn refresh_access_token(client: &AuthorizedClient) -> Result<Token> {
- let url = format!("https://auth.{}/token", client.base_url);
- let params = [("grant_type", "refresh_token"), ("refresh_token", &client.token.refresh_token)];
+ pub fn refresh_access_token(authorized_client: &AuthorizedClient) -> Result<Token> {
+ let url = format!("https://auth.{}/token", authorized_client.base_url);
+ let params = [("grant_type", "refresh_token"), ("refresh_token", &authorized_client.token.refresh_token)];
 
- let token = client
+ let token = authorized_client
  .http_client
  .post(&url)
  .basic_auth(
- &client.client_credentials.client_id,
- Some(&client.client_credentials.client_secret),
+ &authorized_client.client_credentials.client_id,
+ Some(&authorized_client.client_credentials.client_secret),
  )
  .form(&params)
  .send()

src/lib.rs

@@ -1,18 +1,2 @@
 pub mod client;
-pub(crate) mod net;
-pub mod old_client;
-pub(crate) mod utils;
-
-use serde::Deserialize;
-
-#[derive(Debug, Deserialize)]
-pub struct GeneralConfig {
- pub output_format: bool,
- pub verbosity: bool,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct Config {
- pub general: GeneralConfig,
- pub centerdevice: old_client::CenterDeviceConfig,
-}
+pub mod old;

src/old_client.rs → src/old/client.rs

@@ -29,7 +29,7 @@ fn prepare_request<'a, 'b>(client: &'a Client, method: Method, url: &'b str, tok
 
 pub mod collections {
  use super::prepare_request;
- use crate::net::http::tls_client;
+ use crate::old::net::http::tls_client;
 
  use error_chain::*;
  use hyper::method::Method;
@@ -124,7 +124,7 @@ pub mod collections {
 
 mod delete {
  use super::prepare_request;
- use crate::net::http::tls_client;
+ use crate::old::net::http::tls_client;
 
  use error_chain::*;
  use hyper::method::Method;
@@ -190,8 +190,8 @@ mod delete {
 
 mod download {
  use super::prepare_request;
- use crate::net::http::tls_client;
- use crate::utils::io::ReadWithProgress;
+ use crate::old::net::http::tls_client;
+ use crate::old::utils::io::ReadWithProgress;
 
  use error_chain::*;
  use hyper::client::Response;
@@ -313,7 +313,7 @@ mod download {
 }
 
 mod refresh_token {
- use crate::net::http::tls_client;
+ use crate::old::net::http::tls_client;
 
  use error_chain::*;
  use hyper::header::{ContentType, Authorization, Basic};
@@ -356,7 +356,7 @@ mod refresh_token {
 
 pub mod search {
  use super::prepare_request;
- use crate::net::http::tls_client;
+ use crate::old::net::http::tls_client;
 
  use error_chain::*;
  use hyper::header::{ContentType, Accept, qitem};
@@ -482,7 +482,7 @@ pub mod search {
 }
 
 mod upload {
- use crate::utils::io::WriteWithProgress;
+ use crate::old::utils::io::WriteWithProgress;
 
  use crypto::digest::Digest;
  use crypto::sha2::Sha256;

src/old/mod.rs

@@ -0,0 +1,17 @@
+mod net;
+pub mod client;
+mod utils;
+
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize)]
+pub struct GeneralConfig {
+ pub output_format: bool,
+ pub verbosity: bool,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct Config {
+ pub general: GeneralConfig,
+ pub centerdevice: client::CenterDeviceConfig,
+}

src/net/mod.rs → src/old/net/mod.rs

@@ -1,4 +1,3 @@
 pub mod oauth;
-
 pub mod http;
 

src/net/oauth.rs → src/old/net/oauth.rs

@@ -1,5 +1,5 @@
-use crate::Config;
-use crate::net::http::tls_client;
+use crate::old::Config;
+use crate::old::net::http::tls_client;
 
 use base64;
 use error_chain::*;