summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDessalines <happydooby@gmail.com>2019-04-29 14:19:00 -0700
committerDessalines <happydooby@gmail.com>2019-04-29 14:19:00 -0700
commit679ec011dbc23248b22e9819c6bf446add526816 (patch)
treebee829df722f4aa00abcb0fb72a590e2cdc47913
parent9570c21dcaa4c0dc26f1df119da0ee96afc1f18e (diff)
Getting your votes on a user details page.
-rw-r--r--server/src/websocket_server/server.rs18
-rw-r--r--ui/src/services/WebSocketService.ts1
2 files changed, 17 insertions, 2 deletions
diff --git a/server/src/websocket_server/server.rs b/server/src/websocket_server/server.rs
index fb551cb3..fef60e8b 100644
--- a/server/src/websocket_server/server.rs
+++ b/server/src/websocket_server/server.rs
@@ -323,6 +323,7 @@ pub struct GetUserDetails {
limit: Option<i64>,
community_id: Option<i32>,
saved_only: bool,
+ auth: Option<String>,
}
#[derive(Serialize, Deserialize)]
@@ -2069,6 +2070,19 @@ impl Perform for GetUserDetails {
let conn = establish_connection();
+ let user_id: Option<i32> = match &self.auth {
+ Some(auth) => {
+ match Claims::decode(&auth) {
+ Ok(claims) => {
+ let user_id = claims.claims.id;
+ Some(user_id)
+ }
+ Err(_e) => None
+ }
+ }
+ None => None
+ };
+
//TODO add save
let sort = SortType::from_str(&self.sort)?;
@@ -2099,7 +2113,7 @@ impl Perform for GetUserDetails {
self.community_id,
Some(user_details_id),
None,
- None,
+ user_id,
self.saved_only,
false,
self.page,
@@ -2121,7 +2135,7 @@ impl Perform for GetUserDetails {
None,
Some(user_details_id),
None,
- None,
+ user_id,
self.saved_only,
self.page,
self.limit)?
diff --git a/ui/src/services/WebSocketService.ts b/ui/src/services/WebSocketService.ts
index 06e604e9..2b30f7d8 100644
--- a/ui/src/services/WebSocketService.ts
+++ b/ui/src/services/WebSocketService.ts
@@ -147,6 +147,7 @@ export class WebSocketService {
}
public getUserDetails(form: GetUserDetailsForm) {
+ this.setAuth(form, false);
this.subject.next(this.wsSendWrapper(UserOperation.GetUserDetails, form));
}