From 8495f9fbfd401e0a5840c6d8990b51d43c408233 Mon Sep 17 00:00:00 2001
From: Subhojit Paul <subhojitpaul21@gmail.com>
Date: Wed, 30 Jan 2019 08:40:05 +0530
Subject: [PATCH] refactor GitHub access token body

---
 src/github.rs | 22 ++--------------------
 src/models.rs | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/github.rs b/src/github.rs
index 7f86299..35360a7 100644
--- a/src/github.rs
+++ b/src/github.rs
@@ -1,4 +1,5 @@
 use crate::AppState;
+use crate::models;
 use actix_web::actix;
 use actix_web::client;
 use actix_web::client::ClientResponse;
@@ -42,7 +43,7 @@ pub fn login_redirect(
     let github_client_secret =
         env::var("GITHUB_CLIENT_SECRET").expect("GITHUB_CLIENT_SECRET must be set.");
 
-    let json_body = Body::new(
+    let json_body = models::GHAccessTokenBody::new(
         github_client_id,
         github_client_secret,
         session_code,
@@ -59,22 +60,3 @@ pub fn login_redirect(
         })
         .responder()
 }
-
-#[derive(Serialize, Deserialize)]
-struct Body {
-    client_id: String,
-    client_secret: String,
-    code: String,
-    accept: String,
-}
-
-impl Body {
-    fn new(client_id: String, client_secret: String, code: String, accept: String) -> Self {
-        Body {
-            client_id,
-            client_secret,
-            code,
-            accept,
-        }
-    }
-}
diff --git a/src/models.rs b/src/models.rs
index a094bbb..c46991a 100644
--- a/src/models.rs
+++ b/src/models.rs
@@ -27,3 +27,22 @@ pub struct AnswerForm {
     pub title: String,
     pub user_id: i32,
 }
+
+#[derive(Serialize, Deserialize)]
+pub struct GHAccessTokenBody {
+    client_id: String,
+    client_secret: String,
+    code: String,
+    accept: String,
+}
+
+impl GHAccessTokenBody {
+    pub fn new(client_id: String, client_secret: String, code: String, accept: String) -> Self {
+        GHAccessTokenBody {
+            client_id,
+            client_secret,
+            code,
+            accept,
+        }
+    }
+}