2 files changed, 8 insertions, 8 deletions
diff --git a/src/indieauth/mod.rs b/src/indieauth/mod.rs
index 2550df0..de4c367 100644
--- a/src/indieauth/mod.rs
+++ b/src/indieauth/mod.rs
@@ -1,13 +1,13 @@
 use std::marker::PhantomData;
-
 use microformats::types::Class;
 use tracing::error;
 use serde::Deserialize;
 use axum::{
-    extract::{Form, FromRef, Host, Json, Query, State}, headers::{authorization::Bearer, Authorization}, http::StatusCode, response::{Html, IntoResponse, Response}, Extension, TypedHeader
+    extract::{Form, FromRef, Host, Json, Query, State}, http::StatusCode, response::{Html, IntoResponse, Response}, Extension
 };
 #[cfg_attr(not(feature = "webauthn"), allow(unused_imports))]
 use axum_extra::extract::cookie::{CookieJar, Cookie};
+use axum_extra::{TypedHeader, headers::{authorization::Bearer, Authorization}};
 use crate::database::Storage;
 use kittybox_indieauth::{
     Metadata, IntrospectionEndpointAuthMethod, RevocationEndpointAuthMethod,
@@ -17,7 +17,6 @@ use kittybox_indieauth::{
     TokenIntrospectionRequest, TokenIntrospectionResponse, TokenRevocationRequest, TokenData
 };
 use std::str::FromStr;
-use std::ops::Deref;
 
 pub mod backend;
 #[cfg(feature = "webauthn")]
@@ -174,7 +173,7 @@ async fn authorization_endpoint_get<A: AuthBackend, D: Storage + 'static>(
 
                         mf2.items
                             .iter()
-                            .find(|&i| (**i).borrow().r#type.iter()
+                            .find(|&i| i.r#type.iter()
                                 .any(|i| {
                                     *i == Class::from_str("h-app").unwrap()
                                         || *i == Class::from_str("h-x-app").unwrap()
@@ -182,7 +181,7 @@ async fn authorization_endpoint_get<A: AuthBackend, D: Storage + 'static>(
                             )
                             .cloned()
                             .map(|i| {
-                                serde_json::to_value(i.borrow().deref()).unwrap()
+                                serde_json::to_value(&i).unwrap()
                             })
                     },
                     Err(err) => {
@@ -315,7 +314,7 @@ async fn authorization_endpoint_confirm<A: AuthBackend>(
     (StatusCode::NO_CONTENT,
      [("Location", location.as_str())],
      #[cfg(feature = "webauthn")]
-     cookies.remove(Cookie::named(webauthn::CHALLENGE_ID_COOKIE))
+     cookies.remove(Cookie::from(webauthn::CHALLENGE_ID_COOKIE))
     )
         .into_response()
 }
diff --git a/src/indieauth/webauthn.rs b/src/indieauth/webauthn.rs
index ea3ad3d..b7d8c71 100644
--- a/src/indieauth/webauthn.rs
+++ b/src/indieauth/webauthn.rs
@@ -1,9 +1,10 @@
 use axum::{
     extract::{Json, Host},
     response::{IntoResponse, Response},
-    http::StatusCode, Extension, TypedHeader, headers::{authorization::Bearer, Authorization}
+    http::StatusCode, Extension
 };
 use axum_extra::extract::cookie::{CookieJar, Cookie};
+use axum_extra::{TypedHeader, headers::{authorization::Bearer, Authorization}};
 
 use super::backend::AuthBackend;
 use crate::database::Storage;
@@ -66,7 +67,7 @@ pub async fn webauthn_pre_register<A: AuthBackend, D: Storage + 'static>(
     match auth.persist_registration_challenge(&uid_url, state).await {
         Ok(challenge_id) => (
             cookies.add(
-                Cookie::build(CHALLENGE_ID_COOKIE, challenge_id)
+                Cookie::build((CHALLENGE_ID_COOKIE, challenge_id))
                     .secure(true)
                     .finish()
             ),