Cleanup

CharlesTaylor7 · May 19, 2024 · 70ae570 · 70ae570
1 parent cb1c0fd
commit 70ae570
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 24 deletions.
diff --git a/src/server/middleware.rs b/src/server/middleware.rs
@@ -1,6 +1,6 @@
 use http::{Request, Response};
 use std::task::{Context, Poll};
-use tower_cookies::{Cookie, Cookies};
+use tower_cookies::{Cookies};
 use tower_layer::Layer;
 use tower_service::Service;
 

diff --git a/src/server/routes.rs b/src/server/routes.rs
@@ -27,7 +27,7 @@ use rand_core::SeedableRng;
 use serde::Deserialize;
 use std::borrow::{Borrow, Cow};
 use std::collections::{HashMap, HashSet};
-use tower_cookies::{Cookie, CookieManagerLayer, Cookies};
+use tower_cookies::{CookieManagerLayer, Cookies};
 use tower_http::trace::TraceLayer;
 
 pub fn get_router(state: AppState) -> Router {

diff --git a/src/server/state.rs b/src/server/state.rs
@@ -3,16 +3,14 @@ use super::ws::WebSockets;
 use crate::server::supabase::SupabaseAnonClient;
 use crate::server::ws;
 use crate::strings::UserName;
-use crate::strings::{AccessToken, OAuthCode, OAuthCodeVerifier, RefreshToken, SessionId, UserId};
+use crate::strings::{AccessToken, RefreshToken, SessionId, UserId};
 use crate::{game::Game, lobby::Lobby};
 use serde::Deserialize;
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 use tokio::sync::RwLock;
 use tower_cookies::Cookies;
 
-type PrivateCookieJar = Cookies;
-
 fn new_arc_mutex<T>(item: T) -> Arc<std::sync::Mutex<T>> {
     Arc::new(std::sync::Mutex::new(item))
 }
@@ -46,7 +44,7 @@ impl Default for AppState {
 }
 
 impl AppState {
-    pub async fn session(&self, cookies: &PrivateCookieJar) -> Option<UserSession> {
+    pub async fn session(&self, cookies: &Cookies) -> Option<UserSession> {
         let session_id = cookies.get("session_id")?;
         self.logged_in
             .read()
@@ -55,7 +53,7 @@ impl AppState {
             .cloned()
     }
 
-    pub async fn logout(&self, cookies: &PrivateCookieJar) -> anyhow::Result<()> {
+    pub async fn logout(&self, cookies: &Cookies) -> anyhow::Result<()> {
         let session_id = cookies
             .get("session_id")
             .ok_or(anyhow::anyhow!("not actually logged in"))?;

diff --git a/src/server/supabase.rs b/src/server/supabase.rs
@@ -1,4 +1,4 @@
-use crate::strings::{AccessToken, OAuthCode, OAuthCodeVerifier, RefreshToken, UserId};
+use crate::strings::{AccessToken, RefreshToken, UserId};
 use arcstr::ArcStr;
 use reqwest::Response;
 use serde::{Deserialize, Serialize};

diff --git a/src/strings.rs b/src/strings.rs
@@ -8,8 +8,6 @@ pub type UserId = ImmutableString<tags::UserId>;
 pub type SessionId = ImmutableString<tags::SessionId>;
 pub type AccessToken = ImmutableString<tags::AccessToken>;
 pub type RefreshToken = ImmutableString<tags::RefreshToken>;
-pub type OAuthCode = ImmutableString<tags::OAuthCode>;
-pub type OAuthCodeVerifier = ImmutableString<tags::OAuthCodeVerifier>;
 
 #[derive(PartialEq, Eq, Clone, Hash)]
 pub struct ImmutableString<Tag> {
@@ -109,16 +107,6 @@ mod tags {
         const SECRET: bool = true;
     }
 
-    impl Tag for OAuthCode {
-        const NAME: &'static str = "oauth_code";
-        const SECRET: bool = false;
-    }
-
-    impl Tag for OAuthCodeVerifier {
-        const NAME: &'static str = "oauth_code_verifier";
-        const SECRET: bool = false;
-    }
-
     #[derive(Debug, Eq, PartialEq, Clone, Hash)]
     pub enum UserName {}
     #[derive(Debug, Eq, PartialEq, Clone, Hash)]
@@ -129,8 +117,4 @@ mod tags {
     pub enum AccessToken {}
     #[derive(Debug, Eq, PartialEq, Clone, Hash)]
     pub enum RefreshToken {}
-    #[derive(Debug, Eq, PartialEq, Clone, Hash)]
-    pub enum OAuthCode {}
-    #[derive(Debug, Eq, PartialEq, Clone, Hash)]
-    pub enum OAuthCodeVerifier {}
 }