Move auth to api

This commit is contained in:
2025-02-05 21:03:17 -05:00
parent 6666002533
commit 745d4c1b0a
12 changed files with 10 additions and 10 deletions

View File

@ -22,7 +22,7 @@ pub async fn get_album(id: i32) -> Result<frontend::Album, ServerFnError> {
#[server(endpoint = "album/get_songs")]
pub async fn get_songs(id: i32) -> Result<Vec<frontend::Song>, ServerFnError> {
use crate::models::backend::Album;
use crate::auth::get_logged_in_user;
use crate::api::auth::get_logged_in_user;
let user = get_logged_in_user().await?;
let db_con = &mut get_db_conn();
// TODO: NEEDS SONG DATA QUERIES

View File

@ -61,7 +61,7 @@ pub async fn get_artist_by_id(artist_id: i32) -> Result<Option<Artist>, ServerFn
#[server(endpoint = "artists/top_songs")]
pub async fn top_songs_by_artist(artist_id: i32, limit: Option<i64>) -> Result<Vec<(frontend::Song, i64)>, ServerFnError> {
use crate::models::backend::Song;
use crate::auth::get_user;
use crate::api::auth::get_user;
use crate::schema::*;
use leptos::server_fn::error::NoCustomError;

View File

@ -9,7 +9,7 @@ cfg_if! {
if #[cfg(feature = "ssr")] {
use leptos::server_fn::error::NoCustomError;
use crate::util::database::get_db_conn;
use crate::auth::get_user;
use crate::api::auth::get_user;
}
}

View File

@ -6,3 +6,4 @@ pub mod songs;
pub mod album;
pub mod search;
pub mod upload;
pub mod auth;

View File

@ -8,7 +8,7 @@ use chrono::NaiveDateTime;
cfg_if! {
if #[cfg(feature = "ssr")] {
use crate::auth::get_user;
use crate::api::auth::get_user;
use server_fn::error::NoCustomError;
use crate::util::database::get_db_conn;

View File

@ -8,7 +8,7 @@ cfg_if! {
if #[cfg(feature = "ssr")] {
use leptos::server_fn::error::NoCustomError;
use crate::util::database::get_db_conn;
use crate::auth::get_user;
use crate::api::auth::get_user;
use crate::models::backend::{Song, Album, Artist};
use diesel::prelude::*;
}

View File

@ -2,7 +2,7 @@ use leptos::leptos_dom::*;
use leptos::prelude::*;
use leptos_icons::*;
use leptos::task::spawn_local;
use crate::auth::logout;
use crate::api::auth::logout;
use crate::util::state::GlobalState;
#[component]

View File

@ -1,5 +1,4 @@
pub mod app;
pub mod auth;
pub mod models;
pub mod pages;
pub mod components;

View File

@ -1,4 +1,4 @@
use crate::auth::login;
use crate::api::auth::login;
use crate::util::state::GlobalState;
use leptos::leptos_dom::*;
use leptos::prelude::*;

View File

@ -1,4 +1,4 @@
use crate::auth::signup;
use crate::api::auth::signup;
use crate::models::backend::User;
use crate::util::state::GlobalState;
use leptos::leptos_dom::*;

View File

@ -3,7 +3,7 @@ use leptos::logging::*;
use crate::models::frontend::PlayStatus;
use crate::models::backend::User;
use crate::auth::get_logged_in_user;
use crate::api::auth::get_logged_in_user;
/// Global front-end state
/// Contains anything frequently needed across multiple components