Skip to content

Dan set user #697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 6, 2023
Merged

Dan set user #697

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15c655c
git user from stored cookie, rename shared state
chillenberger Jun 6, 2023
974667e
format
chillenberger Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions pgml-dashboard/src/guards.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use rocket::request::{FromRequest, Outcome, Request};
use rocket::State;
use sqlx::PgPool;

use crate::models::User;
use crate::{Clusters, Context};

pub fn default_database_url() -> String {
Expand Down Expand Up @@ -46,17 +47,31 @@ impl<'r> FromRequest<'r> for Cluster {
None => -1,
};

let shared_state = match request.guard::<&State<Clusters>>().await {
let user_id: i64 = match cookies.get_private("user_id") {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let user_id: i64 = match cookies.get_private("user_id") {
let user_id = match cookies.get_private("user_id") {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also we are setting this object in our closed source code, you don't need to fetch the cookie here. The cookie won't provide enough user information once we start adding more, e.g. email.

Some(user_id) => match user_id.value().parse::<i64>() {
Ok(user_id) => user_id,
Err(_) => -1,
},

None => -1,
};

let clusters_shared_state = match request.guard::<&State<Clusters>>().await {
Outcome::Success(pool) => pool,
_ => return Outcome::Forward(()),
};

let pool = shared_state.get(cluster_id);
let pool = clusters_shared_state.get(cluster_id);

let context = Context {
Copy link
Contributor

@levkk levkk Jun 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't Context an exported public struct of this app? If not, it should be, so we instantiate it and set it in our code.

user: shared_state.get_context(cluster_id).user,
cluster: shared_state.get_context(cluster_id).cluster,
visible_clusters: shared_state.get_context(cluster_id).visible_clusters,
user: User {
id: user_id,
email: "".to_string(),
},
cluster: clusters_shared_state.get_context(cluster_id).cluster,
visible_clusters: clusters_shared_state
.get_context(cluster_id)
.visible_clusters,
};

Outcome::Success(Cluster { pool, context })
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy