Merge pull request #30 from Noskcaj19/master

Add refresh token exchanging

Author: lipanski

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "oauth2"
 authors = ["Alex Crichton <[email protected]>", "Florin Lipan <[email protected]>"]
-version = "1.2.1"
+version = "1.3.0"
 license = "MIT/Apache-2.0"
 description = "Bindings for exchanging OAuth 2 tokens"
 repository = "https://github.com/alexcrichton/oauth2-rs"

src/lib.rs

@@ -300,6 +300,21 @@ impl Config {
         self.request_token(params)
     }
 
+    ///
+    /// Exchanges a refresh token for an access token
+    ///
+    /// See https://tools.ietf.org/html/rfc6749#section-6
+    ///
+    pub fn exchange_refresh_token<T>(&self, token: T) -> Result<Token, TokenError>
+    where T: Into<String> {
+        let params = vec![
+            ("grant_type", "refresh_token".to_string()),
+            ("refresh_token", token.into()),
+        ];
+
+        self.request_token(params)
+    }
+
     fn request_token(&self, mut params: Vec<(&str, String)>) -> Result<Token, TokenError> {
         let mut easy = Easy::new();
 

tests/lib.rs

@@ -190,6 +190,75 @@ fn test_exchange_client_credentials_with_json_response() {
     assert_eq!(None, token.refresh_token);
 }
 
+#[test]
+fn test_exchange_refresh_token_with_form_response() {
+    let mock = mock("POST", "/token")
+        .match_body("grant_type=refresh_token&refresh_token=ccc&client_id=aaa&client_secret=bbb")
+        .with_body("access_token=12%2F34&token_type=bearer&scope=read,write")
+        .create();
+
+    let config = Config::new("aaa", "bbb", "http://example.com/auth", &(SERVER_URL.to_string() + "/token"));
+    let token = config.exchange_refresh_token("ccc");
+
+    mock.assert();
+
+    assert!(token.is_ok());
+
+    let token = token.unwrap();
+    assert_eq!("12/34", token.access_token);
+    assert_eq!("bearer", token.token_type);
+    assert_eq!(vec!["read".to_string(), "write".to_string()], token.scopes);
+    assert_eq!(None, token.expires_in);
+    assert_eq!(None, token.refresh_token);
+}
+
+#[test]
+fn test_exchange_refresh_token_with_basic_auth() {
+    let mock = mock("POST", "/token")
+        .match_header("Authorization", "Basic YWFhOmJiYg==") // base64("aaa:bbb")
+        .match_body("grant_type=refresh_token&refresh_token=ccc")
+        .with_body("access_token=12%2F34&token_type=bearer&scope=read,write")
+        .create();
+
+    let mut config = Config::new("aaa", "bbb", "http://example.com/auth", &(SERVER_URL.to_string() + "/token"));
+    config = config.set_auth_type(oauth2::AuthType::BasicAuth);
+    let token = config.exchange_refresh_token("ccc");
+
+    mock.assert();
+
+    assert!(token.is_ok());
+
+    let token = token.unwrap();
+    assert_eq!("12/34", token.access_token);
+    assert_eq!("bearer", token.token_type);
+    assert_eq!(vec!["read".to_string(), "write".to_string()], token.scopes);
+    assert_eq!(None, token.expires_in);
+    assert_eq!(None, token.refresh_token);
+}
+
+#[test]
+fn test_exchange_refresh_token_with_json_response() {
+     let mock = mock("POST", "/token")
+        .match_body("grant_type=refresh_token&refresh_token=ccc&client_id=aaa&client_secret=bbb")
+        .with_header("content-type", "application/json")
+        .with_body("{\"access_token\": \"12/34\", \"token_type\": \"bearer\", \"scopes\": [\"read\", \"write\"]}")
+        .create();
+
+    let config = Config::new("aaa", "bbb", "http://example.com/auth", &(SERVER_URL.to_string() + "/token"));
+    let token = config.exchange_refresh_token("ccc");
+
+    mock.assert();
+
+    assert!(token.is_ok());
+
+    let token = token.unwrap();
+    assert_eq!("12/34", token.access_token);
+    assert_eq!("bearer", token.token_type);
+    assert_eq!(vec!["read".to_string(), "write".to_string()], token.scopes);
+    assert_eq!(None, token.expires_in);
+    assert_eq!(None, token.refresh_token);
+}
+
 #[test]
 fn test_exchange_password_with_form_response() {
     let mock = mock("POST", "/token")