Fixed refresh missing email issue

service/src/auth/model.rs

@@ -152,7 +152,7 @@ impl FromRequest for JwtAuth {
       Ok(result) => result,
       Err(_) => {
         return ready(Err(ActixError::from(ServiceError {
-          status: 404,
+          status: 401,
           message: format!("Access token was not found")
         })))
       }
@@ -163,7 +163,7 @@ impl FromRequest for JwtAuth {
         ready(Ok(JwtAuth { token: access_token_uuid, user: user.into() }))
       }
       Err(_) => return ready(Err(ActixError::from(ServiceError {
-        status: 404,
+        status: 401,
         message: format!("User was not found")
       })))
     }

service/src/auth/routes.rs

@@ -155,22 +155,7 @@ async fn refresh(req: HttpRequest) -> HttpResponse {
     Err(err) => return ResponseError::error_response(&err)
   };
 
-  let mut conn = match db::redis_async_connection().await {
+  let email = refresh_token_details.email.clone();
-    Ok(conn) => conn,
-    Err(err) => {
-      error!("Failed to get redis connection: {}", err);
-      return ResponseError::error_response(&err)
-    }
-  };
-
-  let redis_result: redis::RedisResult<String> = conn.get(refresh_token_details.token_uuid.to_string()).await;
-  let email = match redis_result {
-    Ok(email) => email,
-    Err(_) => return ResponseError::error_response(&ServiceError {
-      status: 404,
-      message: format!("Refresh token was not found")
-    })
-  };
 
   match QueryUser::get_by_email(&email) {
     Ok(query_user) => {
@@ -182,6 +167,14 @@ async fn refresh(req: HttpRequest) -> HttpResponse {
         }
       };
 
+      let mut conn = match db::redis_async_connection().await {
+        Ok(conn) => conn,
+        Err(err) => {
+          error!("Failed to get redis connection: {}", err);
+          return ResponseError::error_response(&err)
+        }
+      };
+
       // Delete old auth token if it exists
       match req.cookie("access_token") {
         Some(cookie) => {

ui/src/api/auth.ts

@@ -1,10 +1,10 @@
 import { getRequest, postRequest } from '.';
-import { RegisterUser, ResponseUser } from './auth.types';
+import { RegisterUser, ResponseAuth } from './auth.types';
 
-export async function login(email: string, password: string): Promise<ResponseUser | undefined> {
+export async function login(email: string, password: string): Promise<ResponseAuth | undefined> {
   const response = await postRequest('auth/login', { email, password }, { withCredentials: true });
   if (response?.status === 200) {
-    return response.data as ResponseUser;
+    return response.data as ResponseAuth;
   } else {
     return undefined;
   }
@@ -23,16 +23,16 @@ export async function logout() {
   return await postRequest('auth/logout', {}, { withCredentials: true });
 }
 
-export async function refresh(refresh_token_rotation?: boolean): Promise<ResponseUser | undefined> {
+export async function refresh(refresh_token_rotation?: boolean): Promise<ResponseAuth | undefined> {
   const response = await getRequest('auth/refresh', { withCredentials: true, params: { refresh_token_rotation } });
   if (response?.status === 200) {
-    return response.data as ResponseUser;
+    return response.data as ResponseAuth;
   } else {
     return undefined;
   }
 }
 
-export async function me(): Promise<ResponseUser | undefined> {
+export async function me(): Promise<ResponseAuth | undefined> {
   const response = await getRequest('auth/me', { withCredentials: true });
   if (response?.status === 200) {
     return response.data;

ui/src/api/auth.types.ts

@@ -1,4 +1,4 @@
-export interface ResponseUser {
+export interface ResponseAuth {
   token: string;
   user: User;
 }

ui/src/components/Topbar/index.tsx

@@ -23,7 +23,7 @@ import {
 import Cookies from 'js-cookie';
 import { useEffect, useState } from 'react';
 import { useForm } from '@mantine/form';
-import { login, register, logout, me } from '@/api/auth';
+import { login, register, logout, me, refresh } from '@/api/auth';
 import { User } from '@/api/auth.types';
 import { useToggle } from '@mantine/hooks';
 
@@ -81,9 +81,15 @@ export default function Topbar() {
           setUser(response.user);
         }
       });
+    } else {
+      refresh(true).then((response) => {
+        if (response) {
+          setUser(response.user);
         } else {
           setUser(undefined);
         }
+      });
+    }
   }, []);
 
   useEffect(() => {