From 2318a33f9b359ae27b52cd9a19db1f6782d8dae3 Mon Sep 17 00:00:00 2001
From: Vika <vika@fireburn.ru>
Date: Thu, 1 Aug 2024 22:50:28 +0300
Subject: Upgrade dependencies and fix deprecated functionality

I think I managed to not lose any functionality from my dependencies.

sqlparser remains unupgraded, but that's mostly because it is only
used in one example and it's not worth it to upgrade right now.
---
 src/indieauth/mod.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/indieauth/mod.rs')

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()
 }
-- 
cgit 1.4.1