Skip to content
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.

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

feat: change password + refactor Field component #141

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions platform/api/src/api/v1/gql/mutations/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ impl AuthMutation {
.bind(user.id)
.bind(!user.totp_enabled)
.bind(expires_at)
.fetch_one(&mut *tx)
.fetch_one(tx.as_mut())
.await?;

sqlx::query("UPDATE users SET last_login_at = NOW() WHERE id = $1")
.bind(user.id)
.execute(&mut *tx)
.execute(tx.as_mut())
.await?;

tx.commit().await?;
Expand Down
54 changes: 54 additions & 0 deletions platform/api/src/api/v1/gql/mutations/user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use bytes::Bytes;
use prost::Message;

use crate::api::middleware::auth::AuthError;
use crate::api::v1::gql::validators::PasswordValidator;
use crate::{
api::v1::gql::{
error::{GqlError, Result, ResultExt},
Expand Down Expand Up @@ -148,6 +149,59 @@ impl UserMutation {
Ok(user.into())
}

async fn password<'ctx>(
&self,
ctx: &Context<'_>,
#[graphql(desc = "Current password")] current_password: String,
#[graphql(desc = "New password", validator(custom = "PasswordValidator"))]
new_password: String,
) -> Result<User> {
lennartkloock marked this conversation as resolved.
Show resolved Hide resolved
let global = ctx.get_global();
let request_context = ctx.get_req_context();

let auth = request_context
.auth()
.await?
.ok_or(GqlError::Auth(AuthError::NotLoggedIn))?;

let user = global
.user_by_id_loader
.load(auth.session.user_id.0)
.await
.map_err_gql("failed to fetch user")?
.map_err_gql(GqlError::NotFound("user"))?;

if !user.verify_password(&current_password) {
return Err(GqlError::InvalidInput {
fields: vec!["password"],
message: "wrong password",
}
.into());
}

let mut tx = global.db.begin().await?;

let user: database::User =
sqlx::query_as("UPDATE users SET password_hash = $1 WHERE id = $2 RETURNING *")
.bind(database::User::hash_password(&new_password))
.bind(user.id)
.fetch_one(tx.as_mut())
.await?;

// Delete all sessions except current
sqlx::query("DELETE FROM user_sessions WHERE user_id = $1 AND id != $2")
.bind(user.id)
.bind(auth.session.id)
.execute(tx.as_mut())
.await?;

// TODO: Logout active connections

tx.commit().await?;

Ok(user.into())
}

/// Follow or unfollow a user.
async fn follow<'ctx>(
&self,
Expand Down
7 changes: 2 additions & 5 deletions platform/website/src/assets/styles/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,8 @@ input[type="password"] {
border-color: $primaryColor;
}

&:not(:focus) {
&.invalid,
&:invalid {
border-color: $errorColor;
}
&:not(:focus).invalid {
border-color: $errorColor;
}
}

Expand Down
17 changes: 0 additions & 17 deletions platform/website/src/assets/styles/settings.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
@import "./variables.scss";

.message {
font-size: 0.9rem;
font-weight: 500;

&.error {
color: $errorColor;
}

&.success {
color: $successColor;
}
}

.input {
margin-top: 0.5rem;
background-color: $bgColor2;
Expand Down Expand Up @@ -52,7 +39,3 @@
gap: 0.5rem;
}
}

input.input.invalid:not(:focus) {
border-color: $errorColor;
}
Loading
Loading