crates/frontend/src/api-client.ts

@@ -1,11 +0,0 @@
-import axios, { type AxiosInstance } from "axios";
-
-const api_client: AxiosInstance = axios.create({
-    baseURL: import.meta.hot ? "http://localhost:54600/api/v1" : "/api/v1",
-    headers: {
-        "Content-Type": "application/json"
-    },
-    withCredentials: true,
-});
-
-export default api_client;

crates/frontend/src/components/Error.vue

@@ -1,5 +0,0 @@
-<template>
-    <h1>
-        <slot></slot>
-    </h1>
-</template>

crates/frontend/src/components/Login.vue

@@ -1,21 +1,30 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref } from 'vue';
-import router from "@/router";
+import router from '@/router';
-import User from "@/services/user";
 
 const email = defineModel("email");
 const password = defineModel("password");
 const errorMessage = ref(null);
 
 async function login() {
-    await User.login(email.value, password.value)
+    await fetch(import.meta.hot ? "http://localhost:54600/api/v1/user/login" : "/api/v1/user/login", {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        credentials: "include",
+        body: JSON.stringify({ email: email.value, password: password.value })
+    })
         .then(async response => {
-            if (response.status != 200) {
+            //const isJson = response.headers.get('content-type')?.includes('application/json');
-                return Promise.reject(response.data && response.data.message || response.status);
+            const data = await response.json();
+
+            if (!response.ok) {
+                const error = (data && data.message) || response.status;
+                return Promise.reject(error);
             }
 
-            const login = response.data.user.login;
+            router.push({ path: '/me' });
-            router.push({ path: `/${login}` });
         })
         .catch(error => {
             errorMessage.value = error;

crates/frontend/src/router.ts

@@ -1,12 +1,11 @@
-import { createRouter, createWebHistory } from "vue-router";
+import { createRouter, createWebHistory } from 'vue-router';
 
 const router = createRouter({
     history: createWebHistory(),
     routes: [
-        { path: "/", component: () => import("@/views/Home.vue") },
+        { path: '/', component: () => import('./views/Home.vue') },
-        { path: "/user/login", component: () => import("@/views/SignIn.vue") },
+        { path: '/user/login', component: () => import('./views/SignIn.vue') },
-        { path: "/:user", name: "User", component: () => import("@/views/User.vue") },
+        { path: '/me', component: () => import('./views/Me.vue') }
-        { path: "/:pathMatch(.*)*", component: () => import("@/views/Error.vue") }
     ]
 });
 

crates/frontend/src/services/user.ts

@@ -1,17 +0,0 @@
-import api_client from "@/api-client";
-
-class User {
-    async login(email: string, password: string): Promise<JSON> {
-        return await api_client.post("/user/login", JSON.stringify({ email: email, password: password }));
-    }
-
-    async get(login: any): Promise<JSON> {
-        return await api_client.get(`/user/${login}`);
-    }
-
-    async current(): Promise<JSON> {
-        return await api_client.get("/user/current");
-    }
-}
-
-export default new User();

crates/frontend/src/views/Base.vue

@@ -1,25 +1,10 @@
 <script setup lang="ts">
 import Meerkat from '@/components/icons/Meerkat.vue';
 import NavBar from '@/components/NavBar.vue';
-import User from "@/services/user";
-import { ref, onMounted } from 'vue';
 
-const user = ref(null);
+function next() {
-
+    window.location.pathname = "/me";
-onMounted(async () => {
-    await User.current()
-        .then(async response => {
-            if (response.status != 200) {
-                return Promise.reject(response.data && response.data.message || response.status);
 };
-            if (response.data.hasOwnProperty("user")) {
-                user.value = response.data.user;
-            };
-        })
-        .catch(e => {
-            console.error("Error occured:", e);
-        });
-});
 </script>
 
 <template>
@@ -29,11 +14,10 @@ onMounted(async () => {
                 <Meerkat />
             </template>
             <template #right>
-                <RouterLink v-if="user" class="flex min-w-9 min-h-9 pt-1 pb-1 pl-3 pr-3 rounded hover:bg-zinc-600"
+                <RouterLink class="flex min-w-9 min-h-9 pt-1 pb-1 pl-3 pr-3 rounded hover:bg-zinc-600" to="/user/login">
-                    :to="{ name: 'User', params: { user: user.login } }">{{ user.name }}</RouterLink>
-                <RouterLink v-if="!user" class="flex min-w-9 min-h-9 pt-1 pb-1 pl-3 pr-3 rounded hover:bg-zinc-600"
-                    to="/user/login">
                     Sign In</RouterLink>
+                <a class="flex min-w-9 min-h-9 pt-1 pb-1 pl-3 pr-3 rounded hover:bg-zinc-600" href="/user/register">Sign
+                    up</a>
             </template>
         </NavBar>
 

crates/frontend/src/views/Error.vue

@@ -1,10 +0,0 @@
-<script setup lang="ts">
-import Base from "@/views/Base.vue";
-import Error from "@/components/Error.vue";
-</script>
-
-<template>
-    <Base>
-    <Error>Not Found</Error>
-    </Base>
-</template>

crates/frontend/src/views/Me.vue

@@ -0,0 +1,47 @@
+<script setup lang="ts">
+import Base from '@/views/Base.vue';
+import { ref, onMounted } from 'vue';
+import axios from 'axios';
+
+const email = ref(null);
+const name = ref(null);
+const is_admin = ref(null);
+const errorMessage = ref(null);
+
+onMounted(async () => {
+    const asd = await fetch(import.meta.hot ? "http://localhost:54600/api/v1/user/profile" : "/api/v1/user/profile", {
+        method: "GET",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        credentials: "include",
+    })
+        .then(async response => {
+            const isJson = response.headers.get('content-type')?.includes('application/json');
+            const data = isJson && await response.json();
+
+            if (!response.ok) {
+                const error = (data && data.message) || response.status;
+                return Promise.reject(error);
+            }
+
+            name.value = data.user.name;
+            email.value = data.user.email;
+            is_admin.value = data.user.is_admin;
+        })
+        .catch(error => {
+            errorMessage.value = error;
+            console.error("Error occured:", error);
+        });
+})
+</script>
+
+<template>
+    <Base>
+    <p v-if="errorMessage" class="text-center pt-3 pb-3 bg-orange-900 rounded border border-orange-700">{{
+        errorMessage }}</p>
+    <p>{{ name }}</p>
+    <p>{{ email }}</p>
+    <p>{{ is_admin }}</p>
+    </Base>
+</template>

crates/frontend/src/views/User.vue

@@ -1,54 +0,0 @@
-<script setup lang="ts">
-import Base from '@/views/Base.vue';
-import Error from "@/components/Error.vue";
-import { ref, onMounted, watch } from 'vue';
-import { onBeforeRouteUpdate, useRoute } from 'vue-router'
-import User from "@/services/user";
-
-const route = useRoute();
-const name = ref(null);
-const error = ref(null);
-
-onMounted(async () => {
-    await User.get(route.params.user)
-        .then(async response => {
-            if (response.status != 200) {
-                return Promise.reject(response.data && response.data.message || response.status);
-            };
-            if (response.data.hasOwnProperty("user")) {
-                name.value = response.data.user.name;
-            } else {
-                error.value = "404 Not Found";
-            };
-        })
-        .catch(e => {
-            console.error("Error occured:", e);
-        });
-});
-
-watch(() => route.params.user, async (to, from) => {
-    await User.get(route.params.user)
-        .then(async response => {
-            if (response.status != 200) {
-                return Promise.reject(response.data && response.data.message || response.status);
-            };
-            if (response.data.hasOwnProperty("user")) {
-                name.value = response.data.user.name;
-            } else {
-                error.value = "404 Not Found";
-            };
-        })
-        .catch(e => {
-            console.error("Error occured:", e);
-        });
-});
-</script>
-
-<template>
-    <Base>
-    <div v-if="error">
-        <Error>{{ error }}</Error>
-    </div>
-    <p v-else>{{ name }}</p>
-    </Base>
-</template>

src/api/v1/middleware.rs

@@ -3,10 +3,9 @@ use std::sync::Arc;
 use axum::{
     body::Body,
     extract::{Request, State},
-    http::{header, StatusCode},
+    http::header,
     middleware::Next,
     response::IntoResponse,
-    Json,
 };
 use axum_extra::extract::CookieJar;
 
@@ -15,7 +14,7 @@ use crate::{db::user::User, state::AppState};
 use super::errors::AuthError;
 use super::token::TokenClaims;
 
-pub async fn jwt(
+pub async fn jwt_auth(
     cookie_jar: CookieJar,
     State(state): State<Arc<AppState>>,
     mut req: Request<Body>,
@@ -28,8 +27,13 @@ pub async fn jwt(
             req.headers()
                 .get(header::AUTHORIZATION)
                 .and_then(|auth_header| auth_header.to_str().ok())
-                .and_then(|auth_value| auth_value.strip_prefix("Bearer "))
+                .and_then(|auth_value| {
-                .map(|auth_token| auth_token.to_owned())
+                    if auth_value.starts_with("Bearer ") {
+                        Some(auth_value[7..].to_owned())
+                    } else {
+                        None
+                    }
+                })
         });
 
     let token = token.ok_or_else(|| AuthError::MissingToken)?;
@@ -47,28 +51,3 @@ pub async fn jwt(
     req.extensions_mut().insert(user);
     Ok(next.run(req).await)
 }
-
-pub async fn jwt_auth(
-    cookie_jar: CookieJar,
-    State(state): State<Arc<AppState>>,
-    mut req: Request<Body>,
-    next: Next,
-) -> Result<impl IntoResponse, StatusCode> {
-    let token = cookie_jar
-        .get("token")
-        .map(|cookie| cookie.value().to_string())
-        .or_else(|| {
-            req.headers()
-                .get(header::AUTHORIZATION)
-                .and_then(|auth_header| auth_header.to_str().ok())
-                .and_then(|auth_value| auth_value.strip_prefix("Bearer "))
-                .map(|auth_token| auth_token.to_owned())
-        });
-
-    let user_id = token
-        .and_then(|token| TokenClaims::validate(token, state.config.jwt.secret.to_owned()).ok())
-        .and_then(|claims| uuid::Uuid::parse_str(&claims.sub).ok());
-
-    req.extensions_mut().insert(user_id);
-    Ok(next.run(req).await)
-}

src/api/v1/mod.rs

@@ -34,11 +34,7 @@ pub fn routes(state: Arc<AppState>) -> Router {
         .route("/v1/user/remove", post(user::remove))
         .route("/v1/user/login", post(user::login))
         .route("/v1/user/logout", get(user::logout))
-        .route(
+        .route("/v1/user/profile", get(user::profile).route_layer(jwt))
-            "/v1/user/current",
-            get(user::current).route_layer(jwt.to_owned()),
-        )
-        .route("/v1/user/:login", get(user::profile).route_layer(jwt))
         .layer(cors)
         .fallback(fallback)
         .with_state(state)

src/api/v1/user.rs

@@ -1,6 +1,5 @@
 use argon2::Argon2;
 use argon2::{PasswordHash, PasswordVerifier};
-use axum::extract::Path;
 use axum::Extension;
 use axum::{
     extract::State,
@@ -30,7 +29,6 @@ pub struct RegisterUser {
 #[derive(serde::Serialize)]
 pub struct FilteredUser {
     pub id: String,
-    pub login: String,
     pub name: String,
     pub email: String,
     pub is_admin: bool,
@@ -45,7 +43,6 @@ impl FilteredUser {
     pub fn from(user: &User) -> Self {
         FilteredUser {
             id: user.id.to_string(),
-            login: user.login.to_string(),
             name: user.name.to_owned(),
             email: user.email.to_owned(),
             is_admin: user.is_admin,
@@ -140,7 +137,7 @@ pub async fn login(
         .http_only(true);
 
     let mut response =
-        Json(json!({"status": StatusCode::OK.to_string(), "token": token, "user": json!(FilteredUser::from(&user))})).into_response();
+        Json(json!({"status": StatusCode::OK.to_string(), "token": token})).into_response();
     response
         .headers_mut()
         .insert(header::SET_COOKIE, cookie.to_string().parse().unwrap());
@@ -165,48 +162,9 @@ pub async fn logout() -> Result<impl IntoResponse, (StatusCode, Json<serde_json:
 }
 
 pub async fn profile(
-    State(state): State<Arc<AppState>>,
+    Extension(user): Extension<User>,
-    Extension(user_id): Extension<Option<uuid::Uuid>>,
-    Path(login): Path<String>,
 ) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
-    let user = User::find(&state.database, User::by_login(login))
-        .await
-        .map_err(|_| ())
-        .unwrap();
-
-    let response = if let Some(user) = user {
-        json!({"status": StatusCode::OK.to_string(), "user": json!(FilteredUser::from(&user))})
-    } else {
-        json!({"status": StatusCode::NOT_FOUND.to_string()})
-    };
-
-    Ok(Json(response))
-}
-
-pub async fn current(
-    State(state): State<Arc<AppState>>,
-    Extension(user_id): Extension<Option<uuid::Uuid>>,
-) -> Result<impl IntoResponse, AuthError<impl std::error::Error>> {
-    let user = get_user(state, user_id).await?;
-
     Ok(Json(
-        json!({"status": StatusCode::OK.to_string(), "user": json!(FilteredUser::from(&user))}),
+        json!({"status":"success","user":json!(FilteredUser::from(&user))}),
     ))
 }
-
-async fn get_user(
-    state: Arc<AppState>,
-    user_id: Option<uuid::Uuid>,
-) -> Result<User, AuthError<impl std::error::Error>> {
-    let user = if let Some(user_id) = user_id {
-        User::find(&state.database, User::by_id(user_id))
-            .await
-            .map_err(AuthError::InternalError)
-    } else {
-        Err(AuthError::InvalidCredentials)
-    };
-
-    let user = user?.ok_or_else(|| AuthError::MissingUser)?;
-
-    Ok(user)
-}

src/db/user.rs

@@ -102,13 +102,6 @@ impl User {
             .filter(users::id.eq(id))
     }
 
-    pub fn by_login(login: String) -> BoxedQuery<'static> {
-        users::table
-            .into_boxed()
-            .select(User::as_select())
-            .filter(users::login.eq(login))
-    }
-
     pub async fn find(
         pool: &Pool,
         query: BoxedQuery<'static>,