Add auth token struct

eisen-oxid · Apr 18, 2021 · 1d1032f · 1d1032f
1 parent 5338c98
commit 1d1032f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/server/src/user/auth.rs b/server/src/user/auth.rs
@@ -11,6 +11,11 @@ pub enum AuthenticationError {
     DatabaseError(UserError),
 }
 
+#[derive(Serialize, Deserialize, Debug)]
+pub struct AuthToken {
+    pub token: String,
+}
+
 impl User {
     pub fn generate_password(clear_password: &str) -> String {
         bcrypt::hash(clear_password).unwrap()
@@ -23,7 +28,7 @@ impl User {
     pub fn authenticate(
         conn: &PgConnection,
         user_data: UserData,
-    ) -> Result<String, AuthenticationError> {
+    ) -> Result<AuthToken, AuthenticationError> {
         let user = User::_find_by_username(&conn, &*user_data.username);
         let user = match user {
             Err(e) => return Err(DatabaseError(e)),
@@ -34,7 +39,9 @@ impl User {
             Some(u) => u,
         };
         if user.check_password(&*user_data.password) && user_data.username == user.username {
-            Ok(String::from("AUTH_TOKEN_NOT_IMPLEMENTED"))
+            Ok(AuthToken {
+                token: String::from("AUTH_TOKEN_NOT_IMPLEMENTED"),
+            })
         } else {
             Err(AuthenticationError::IncorrectPassword)
         }

diff --git a/server/src/user/routes.rs b/server/src/user/routes.rs
@@ -88,7 +88,7 @@ pub async fn authenticate(
     let conn = pool.get().expect("couldn't get db connection from pool");
     let auth_token = web::block(move || User::authenticate(&conn, user_data.into_inner())).await;
     match auth_token {
-        Ok(token) => Ok(HttpResponse::Ok().json(json!({ "token": token }))),
+        Ok(token) => Ok(HttpResponse::Ok().json(token)),
         Err(e) => match e {
             BlockingError::Error(e) => Err(ServiceError::from(e)),
             BlockingError::Canceled => Err(ServiceError::InternalServerError),