myriation/atuin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix registration (#740)

Browse source
This commit is contained in:
Conrad Ludgate 2023-02-28 15:46:24 +00:00 committed by GitHub
parent b80f91c6a2
commit fe67dbb96c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atuin-server/src/handlers/user.rs
View file

@ -2,7 +2,7 @@ use std::borrow::Borrow;
use axum::{ use axum::{
extract::{Path, State}, extract::{Path, State},
Extension, Json, Json,
}; };
use http::StatusCode; use http::StatusCode;
use sodiumoxide::crypto::pwhash::argon2id13; use sodiumoxide::crypto::pwhash::argon2id13;
@ -14,7 +14,6 @@ use crate::{
database::Database, database::Database,
models::{NewSession, NewUser}, models::{NewSession, NewUser},
router::AppState, router::AppState,
settings::Settings,
}; };
use atuin_common::api::*; use atuin_common::api::*;
@ -59,11 +58,10 @@ pub async fn get<DB: Database>(
#[instrument(skip_all)] #[instrument(skip_all)]
pub async fn register<DB: Database>( pub async fn register<DB: Database>(
settings: Extension<Settings>,
state: State<AppState<DB>>, state: State<AppState<DB>>,
Json(register): Json<RegisterRequest>, Json(register): Json<RegisterRequest>,
) -> Result<Json<RegisterResponse>, ErrorResponseStatus<'static>> { ) -> Result<Json<RegisterResponse>, ErrorResponseStatus<'static>> {
if !settings.open_registration { if !state.settings.open_registration {
return Err( return Err(
ErrorResponse::reply("this server is not open for registrations") ErrorResponse::reply("this server is not open for registrations")
.with_status(StatusCode::BAD_REQUEST), .with_status(StatusCode::BAD_REQUEST),