cargo fmt
This commit is contained in:
@ -3,13 +3,13 @@ pub mod subscription;
|
||||
|
||||
pub use handler::endpoint;
|
||||
|
||||
use crate::error::{Error, ErrorClass, ErrorKind};
|
||||
use crate::database;
|
||||
use serde_json::Value;
|
||||
use serde::{Serialize, Deserialize};
|
||||
use crypto::sha2::Sha256;
|
||||
use crypto::digest::Digest;
|
||||
use crate::error::{Error, ErrorClass, ErrorKind};
|
||||
use base64_url;
|
||||
use crypto::digest::Digest;
|
||||
use crypto::sha2::Sha256;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::Value;
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
pub struct InputEnvelope {
|
||||
@ -60,9 +60,21 @@ pub fn get_account(session: &Option<Session>) -> Result<&Account, Error> {
|
||||
match session {
|
||||
Some(session) => match &session.account {
|
||||
Some(account) => Ok(&account),
|
||||
None => return Err(Error::new(ErrorKind::UsimpError, ErrorClass::ClientProtocolError, None))
|
||||
None => {
|
||||
return Err(Error::new(
|
||||
ErrorKind::UsimpError,
|
||||
ErrorClass::ClientProtocolError,
|
||||
None,
|
||||
))
|
||||
}
|
||||
},
|
||||
None => return Err(Error::new(ErrorKind::UsimpError, ErrorClass::ClientProtocolError, None))
|
||||
None => {
|
||||
return Err(Error::new(
|
||||
ErrorKind::UsimpError,
|
||||
ErrorClass::ClientProtocolError,
|
||||
None,
|
||||
))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -82,14 +94,20 @@ impl Session {
|
||||
let session;
|
||||
match backend {
|
||||
database::Client::Postgres(client) => {
|
||||
let res = client.query(
|
||||
"SELECT session_id, session_nr, a.account_id, account_name, domain_id \
|
||||
let res = client
|
||||
.query(
|
||||
"SELECT session_id, session_nr, a.account_id, account_name, domain_id \
|
||||
FROM accounts a JOIN sessions s ON a.account_id = s.account_id \
|
||||
WHERE session_token = $1;",
|
||||
&[&token]
|
||||
).await?;
|
||||
&[&token],
|
||||
)
|
||||
.await?;
|
||||
if res.len() == 0 {
|
||||
return Err(Error::new(ErrorKind::InvalidSessionError, ErrorClass::ClientError, None));
|
||||
return Err(Error::new(
|
||||
ErrorKind::InvalidSessionError,
|
||||
ErrorClass::ClientError,
|
||||
None,
|
||||
));
|
||||
}
|
||||
let row = &res[0];
|
||||
session = Session {
|
||||
|
Reference in New Issue
Block a user