Remove duplicated auth example

examples/07-fullstack/auth/src/auth.rs

@@ -1,3 +1,6 @@
+//! The code here is pulled from the `axum-session-auth` crate examples, requiring little to no
+//! modification to work with dioxus fullstack.
+
 use async_trait::async_trait;
 use axum_session_auth::*;
 use axum_session_sqlx::SessionSqlitePool;
@@ -5,8 +8,9 @@ use serde::{Deserialize, Serialize};
 use sqlx::sqlite::SqlitePool;
 use std::collections::HashSet;
 
-pub(crate) type Session =
-    axum_session_auth::AuthSession<User, i64, SessionSqlitePool, sqlx::SqlitePool>;
+pub(crate) type Session = axum_session_auth::AuthSession<User, i64, SessionSqlitePool, SqlitePool>;
+pub(crate) type AuthLayer =
+    axum_session_auth::AuthSessionLayer<User, i64, SessionSqlitePool, SqlitePool>;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub(crate) struct User {
@@ -24,11 +28,36 @@ pub(crate) struct SqlPermissionTokens {
 #[async_trait]
 impl Authentication<User, i64, SqlitePool> for User {
     async fn load_user(userid: i64, pool: Option<&SqlitePool>) -> Result<User, anyhow::Error> {
-        let pool = pool.unwrap();
+        let db = pool.unwrap();
 
-        User::get_user(userid, pool)
+        #[derive(sqlx::FromRow, Clone)]
+        struct SqlUser {
+            id: i32,
+            anonymous: bool,
+            username: String,
+        }
+
+        let sqluser = sqlx::query_as::<_, SqlUser>("SELECT * FROM users WHERE id = $1")
+            .bind(userid)
+            .fetch_one(db)
             .await
-            .ok_or_else(|| anyhow::anyhow!("Could not load user"))
+            .unwrap();
+
+        //lets just get all the tokens the user can use, we will only use the full permissions if modifying them.
+        let sql_user_perms = sqlx::query_as::<_, SqlPermissionTokens>(
+            "SELECT token FROM user_permissions WHERE user_id = $1;",
+        )
+        .bind(userid)
+        .fetch_all(db)
+        .await
+        .unwrap();
+
+        Ok(User {
+            id: sqluser.id,
+            anonymous: sqluser.anonymous,
+            username: sqluser.username,
+            permissions: sql_user_perms.into_iter().map(|x| x.token).collect(),
+        })
     }
 
     fn is_authenticated(&self) -> bool {
@@ -50,95 +79,3 @@ impl HasPermission<SqlitePool> for User {
         self.permissions.contains(perm)
     }
 }
-
-impl User {
-    pub async fn get_user(id: i64, pool: &SqlitePool) -> Option<Self> {
-        #[derive(sqlx::FromRow, Clone)]
-        struct SqlUser {
-            id: i32,
-            anonymous: bool,
-            username: String,
-        }
-
-        let sqluser = sqlx::query_as::<_, SqlUser>("SELECT * FROM users WHERE id = $1")
-            .bind(id)
-            .fetch_one(pool)
-            .await
-            .ok()?;
-
-        //lets just get all the tokens the user can use, we will only use the full permissions if modifying them.
-        let sql_user_perms = sqlx::query_as::<_, SqlPermissionTokens>(
-            "SELECT token FROM user_permissions WHERE user_id = $1;",
-        )
-        .bind(id)
-        .fetch_all(pool)
-        .await
-        .ok()?;
-
-        Some(User {
-            id: sqluser.id,
-            anonymous: sqluser.anonymous,
-            username: sqluser.username,
-            permissions: sql_user_perms.into_iter().map(|x| x.token).collect(),
-        })
-    }
-
-    pub async fn create_user_tables(pool: &SqlitePool) -> Result<(), sqlx::Error> {
-        sqlx::query(
-            r#"
-                CREATE TABLE IF NOT EXISTS users (
-                    "id" INTEGER PRIMARY KEY,
-                    "anonymous" BOOLEAN NOT NULL,
-                    "username" VARCHAR(256) NOT NULL
-                )
-            "#,
-        )
-        .execute(pool)
-        .await?;
-
-        sqlx::query(
-            r#"
-                CREATE TABLE IF NOT EXISTS user_permissions (
-                    "user_id" INTEGER NOT NULL,
-                    "token" VARCHAR(256) NOT NULL
-                )"#,
-        )
-        .execute(pool)
-        .await?;
-
-        sqlx::query(
-            r#"
-                INSERT INTO users
-                    (id, anonymous, username) SELECT 1, true, 'Guest'
-                ON CONFLICT(id) DO UPDATE SET
-                    anonymous = EXCLUDED.anonymous,
-                    username = EXCLUDED.username
-            "#,
-        )
-        .execute(pool)
-        .await?;
-
-        sqlx::query(
-            r#"
-                INSERT INTO users
-                    (id, anonymous, username) SELECT 2, false, 'Test'
-                ON CONFLICT(id) DO UPDATE SET
-                    anonymous = EXCLUDED.anonymous,
-                    username = EXCLUDED.username
-            "#,
-        )
-        .execute(pool)
-        .await?;
-
-        sqlx::query(
-            r#"
-                INSERT INTO user_permissions
-                    (user_id, token) SELECT 2, 'Category::View'
-            "#,
-        )
-        .execute(pool)
-        .await?;
-
-        Ok(())
-    }
-}