Browse Source

remove some outdated comments / move import

pull/3870/merge^2
BlockListed 2 years ago
parent
commit
fae770a6a2
No known key found for this signature in database GPG Key ID: 2D204777C477B588
  1. 3
      src/auth.rs
  2. 1
      src/db/models/cipher.rs

3
src/auth.rs

@ -359,6 +359,7 @@ use rocket::{
outcome::try_outcome, outcome::try_outcome,
request::{FromRequest, Outcome, Request}, request::{FromRequest, Outcome, Request},
}; };
use std::borrow::Cow;
use crate::db::{ use crate::db::{
models::{Collection, Device, User, UserOrgStatus, UserOrgType, UserOrganization, UserStampException}, models::{Collection, Device, User, UserOrgStatus, UserOrgType, UserOrganization, UserStampException},
@ -392,7 +393,6 @@ impl<'r> FromRequest<'r> for HostInfo {
let headers = request.headers(); let headers = request.headers();
// Get host // Get host
// TODO: UPDATE THIS SECTION
let host_info = if CONFIG.domain_set() { let host_info = if CONFIG.domain_set() {
log::debug!("Using configured host info"); log::debug!("Using configured host info");
let host: Cow<'_, str> = if let Some(host) = headers.get_one("X-Forwarded-Host") { let host: Cow<'_, str> = if let Some(host) = headers.get_one("X-Forwarded-Host") {
@ -864,7 +864,6 @@ impl<'r> FromRequest<'r> for OwnerHeaders {
} }
} }
use std::borrow::Cow;
// //
// Client IP address detection // Client IP address detection
// //

1
src/db/models/cipher.rs

@ -113,7 +113,6 @@ use crate::error::MapResult;
/// Database methods /// Database methods
impl Cipher { impl Cipher {
// TODO: Change back
pub async fn to_json( pub async fn to_json(
&self, &self,
base_url: &str, base_url: &str,

Loading…
Cancel
Save