Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
Uewotm90 committed Dec 8, 2023
1 parent 8b26edb commit 4857da9
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 7 deletions.
10 changes: 6 additions & 4 deletions src/api/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ use tonic::{

/// This method is used to validate the access token (not refresh).
pub fn validation_interceptor(mut req: Request<()>) -> Result<Request<()>, Status> {
let token = match req
.token_string()
.map_err(|err| Status::internal(format!("could not stringify user id in request metadata, internal error {}",err)))?
{
let token = match req.token_string().map_err(|err| {
Status::internal(format!(
"could not stringify user id in request metadata, internal error {}",
err
))
})? {
Some(token) => Token::from_str(TokenType::AccessToken, &token),
None => return Err(Status::unauthenticated("Token not found")),
};
Expand Down
21 changes: 18 additions & 3 deletions src/controllers/controller_impls/access_controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ impl AccessControllerTrait for AccessController {

let uid = request
.uid()
.map_err(|err| Status::internal(format!("could not stringify user id in request metadata, internal error {}",err)))?
.map_err(|err| {
Status::internal(format!(
"could not stringify user id in request metadata, internal error {}",
err
))
})?
.ok_or(Status::internal("Could not get uid from request metadata"))?;

match self
Expand Down Expand Up @@ -82,7 +87,12 @@ impl AccessControllerTrait for AccessController {

let uid = request
.uid()
.map_err(|err| Status::internal(format!("could not stringify user id in request metadata, internal error {}",err)))?
.map_err(|err| {
Status::internal(format!(
"could not stringify user id in request metadata, internal error {}",
err
))
})?
.ok_or(Status::internal("Could not get uid from request metadata"))?;

// Check if the requester has access to model with role 'Editor'
Expand Down Expand Up @@ -132,7 +142,12 @@ impl AccessControllerTrait for AccessController {

let uid = request
.uid()
.map_err(|err| Status::internal(format!("could not stringify user id in request metadata, internal error {}",err)))?
.map_err(|err| {
Status::internal(format!(
"could not stringify user id in request metadata, internal error {}",
err
))
})?
.ok_or(Status::internal("Could not get uid from request metadata"))?;

let user_access = self
Expand Down

0 comments on commit 4857da9

Please sign in to comment.