From dd7e9c9283fb70f4ffa53c8b762e90bc1cb9270a Mon Sep 17 00:00:00 2001
From: Valentin Tolmer <valentin@tolmer.fr>
Date: Mon, 30 Aug 2021 09:08:42 +0200
Subject: [PATCH] app: migrate user_details to graphql endpoint

---
 app/queries/get_user_details.graphql | 10 +++++++
 app/src/api.rs                       |  9 -------
 app/src/user_details.rs              | 39 ++++++++++++++++++----------
 3 files changed, 36 insertions(+), 22 deletions(-)
 create mode 100644 app/queries/get_user_details.graphql

diff --git a/app/queries/get_user_details.graphql b/app/queries/get_user_details.graphql
new file mode 100644
index 0000000..2d31dfd
--- /dev/null
+++ b/app/queries/get_user_details.graphql
@@ -0,0 +1,10 @@
+query GetUserDetails($id: String) {
+  user(id: $id) {
+    id
+    email
+    displayName
+    firstName
+    lastName
+    creationDate
+  }
+}
diff --git a/app/src/api.rs b/app/src/api.rs
index 7411c4b..e1d9508 100644
--- a/app/src/api.rs
+++ b/app/src/api.rs
@@ -162,15 +162,6 @@ impl HostService {
         )
     }
 
-    pub fn get_user_details(username: &str, callback: Callback<Result<User>>) -> Result<FetchTask> {
-        call_server_json_with_error_message(
-            &format!("/api/user/{}", username),
-            yew::format::Nothing,
-            callback,
-            "",
-        )
-    }
-
     pub fn login_start(
         request: login::ClientLoginStartRequest,
         callback: Callback<Result<Box<login::ServerLoginStartResponse>>>,
diff --git a/app/src/user_details.rs b/app/src/user_details.rs
index c8fcf71..7542e17 100644
--- a/app/src/user_details.rs
+++ b/app/src/user_details.rs
@@ -1,9 +1,20 @@
 use crate::api::HostService;
 use anyhow::{anyhow, Result};
-use lldap_model::*;
+use graphql_client::GraphQLQuery;
 use yew::prelude::*;
 use yew::services::{fetch::FetchTask, ConsoleService};
 
+#[derive(GraphQLQuery)]
+#[graphql(
+    schema_path = "../schema.graphql",
+    query_path = "queries/get_user_details.graphql",
+    response_derives = "Debug",
+    custom_scalars_module = "crate::graphql"
+)]
+pub struct GetUserDetails;
+
+type User = get_user_details::GetUserDetailsUser;
+
 pub struct UserDetails {
     link: ComponentLink<Self>,
     username: String,
@@ -13,7 +24,7 @@ pub struct UserDetails {
 }
 
 pub enum Msg {
-    UserDetailsResponse(Result<User>),
+    UserDetailsResponse(Result<get_user_details::ResponseData>),
 }
 
 #[derive(yew::Properties, Clone, PartialEq)]
@@ -23,16 +34,18 @@ pub struct Props {
 
 impl UserDetails {
     fn get_user_details(&mut self) {
-        match HostService::get_user_details(
-            &self.username,
+        self._task = HostService::graphql_query::<GetUserDetails>(
+            get_user_details::Variables {
+                id: Some(self.username.clone()),
+            },
             self.link.callback(Msg::UserDetailsResponse),
-        ) {
-            Ok(task) => self._task = Some(task),
-            Err(e) => {
-                self._task = None;
-                ConsoleService::log(format!("Error trying to fetch user details: {}", e).as_str())
-            }
-        };
+            "Error trying to fetch user details",
+        )
+        .map_err(|e| {
+            ConsoleService::log(&e.to_string());
+            e
+        })
+        .ok();
     }
 }
 
@@ -55,7 +68,7 @@ impl Component for UserDetails {
     fn update(&mut self, msg: Self::Message) -> ShouldRender {
         match msg {
             Msg::UserDetailsResponse(Ok(user)) => {
-                self.user = Some(Ok(user));
+                self.user = Some(Ok(user.user));
                 true
             }
             Msg::UserDetailsResponse(Err(e)) => {
@@ -76,7 +89,7 @@ impl Component for UserDetails {
             Some(Ok(u)) => {
                 html! {
                     <div>
-                        <div>{"User ID: "} {&u.user_id}</div>
+                        <div>{"User ID: "} {&u.id}</div>
                         <div>{"Email: "}{&u.email}</div>
                         <div>{"Display name: "}{&u.display_name.as_ref().unwrap_or(&String::new())}</div>
                         <div>{"First name: "}{&u.first_name.as_ref().unwrap_or(&String::new())}</div>