feat(client): regenerate openapi types

api/api/config/default.py

@@ -18,8 +18,7 @@ class DbCredentialsSchema(BaseModel):
 class DefaultSettings(BaseSettings):
     ENV: str = environ.get("ENV", "local")
     PATH_PREFIX: str = environ.get("PATH_PREFIX", "/api/v1")
-    # APP_HOST: str = environ.get("APP_HOST", "http://127.0.0.1")
-    APP_HOST: str = environ.get("APP_HOST", "http://localhost")
+    APP_HOST: str = environ.get("APP_HOST", "http://127.0.0.1")
     APP_PORT: int = int(environ.get("APP_PORT", 8000))
     APP_ID: uuid.UUID = environ.get("APP_ID", uuid.uuid4())
     LOGS_STORAGE_PATH: str = environ.get("LOGS_STORAGE_PATH", "storage/logs")

api/api/endpoints/auth.py

@@ -1,14 +1,14 @@
 from datetime import datetime, timedelta, timezone
 
-import jwt
 from fastapi import (
     APIRouter,
     Depends,
     HTTPException,
-    Request,
     Response,
     status,
+    Request,
 )
+
 from loguru import logger
 from fastapi_jwt_auth import AuthJWT
 
@@ -22,7 +22,7 @@ from api.services.auth import authenticate_user
 
 from api.db.logic.auth import add_new_refresh_token, upgrade_old_refresh_token
 
-from api.schemas.endpoints.auth import Auth, Access
+from api.schemas.endpoints.auth import Auth, Tokens
 
 api_router = APIRouter(
     prefix="/auth",
@@ -30,21 +30,11 @@ api_router = APIRouter(
 )
 
 
-def get_login_from_jwt(token: str):
-    payload = jwt.decode(
-        token,
-        get_settings().SECRET_KEY,
-        algorithms=[get_settings().ALGORITHM],
-    )
-    return payload.get("sub")
-
-
 class Settings(BaseModel):
     authjwt_secret_key: str = get_settings().SECRET_KEY
     # Configure application to store and get JWT from cookies
-    authjwt_token_location: set = {"headers", "cookies"}
+    authjwt_token_location: set = {"headers"}
     authjwt_cookie_domain: str = get_settings().DOMAIN
-    authjwt_refresh_cookie_name: str = "refresh_token_cookie"
 
     # Only allow JWT cookies to be sent over https
     authjwt_cookie_secure: bool = get_settings().ENV == "prod"
@@ -58,7 +48,7 @@ def get_config():
     return Settings()
 
 
-@api_router.post("", response_model=Access)
+@api_router.post("", response_model=Tokens)
 async def login_for_access_token(
     user: Auth,
     response: Response,
@@ -78,9 +68,7 @@ async def login_for_access_token(
             # headers={"WWW-Authenticate": "Bearer"},
         )
 
-    # access_token_expires = timedelta(minutes=get_settings().ACCESS_TOKEN_EXPIRE_MINUTES)
-    access_token_expires = timedelta(seconds=5)
-
+    access_token_expires = timedelta(minutes=get_settings().ACCESS_TOKEN_EXPIRE_MINUTES)
     refresh_token_expires = timedelta(days=get_settings().REFRESH_TOKEN_EXPIRE_DAYS)
 
     logger.debug(f"refresh_token_expires {refresh_token_expires}")
@@ -92,26 +80,27 @@ async def login_for_access_token(
 
     await add_new_refresh_token(connection, refresh_token, refresh_token_expires_time, user)
 
-    Authorize.set_refresh_cookies(refresh_token)
-
-    return Access(access_token=access_token)
+    return Tokens(access_token=access_token, refresh_token=refresh_token)
 
 
-@api_router.post("/refresh", response_model=Access)
+@api_router.post("/refresh", response_model=Tokens)
 async def refresh(
     request: Request,
     connection: AsyncConnection = Depends(get_connection_dep),
     Authorize: AuthJWT = Depends(),
-):
-    refresh_token = request.cookies.get("refresh_token_cookie")
-
-    if not refresh_token:
-        raise HTTPException(status_code=401, detail="Refresh token is missing")
-    Authorize.jwt_refresh_token_required(refresh_token)
+) -> Tokens:
+    try:
+        Authorize.jwt_refresh_token_required()
         current_user = Authorize.get_jwt_subject()
-    # try:
-    # access_token_expires = timedelta(minutes=get_settings().ACCESS_TOKEN_EXPIRE_MINUTES)
-    access_token_expires = timedelta(seconds=5)
+    except Exception:
+        refresh_token = request.headers.get("Authorization").split(" ")[1]
+        await upgrade_old_refresh_token(connection, refresh_token)
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="Invalid refresh token",
+        )
+
+    access_token_expires = timedelta(minutes=get_settings().ACCESS_TOKEN_EXPIRE_MINUTES)
     new_access_token = Authorize.create_access_token(subject=current_user, expires_time=access_token_expires)
 
-    return Access(access_token=new_access_token)
+    return Tokens(access_token=new_access_token)

api/api/schemas/endpoints/auth.py

@@ -8,9 +8,6 @@ class Auth(Base):
     password: str
 
 
-class Refresh(Base):
-    refresh_token: str
-
-
-class Access(Base):
+class Tokens(Base):
     access_token: str
+    refresh_token: str | None = None

api/api/services/middleware.py

@@ -1,3 +1,4 @@
+from fastapi_jwt_auth import AuthJWT
 from starlette.middleware.base import BaseHTTPMiddleware
 from fastapi import (
     Request,
@@ -11,9 +12,6 @@ import re
 from re import escape
 
 
-from fastapi_jwt_auth import AuthJWT
-
-
 class MiddlewareAccessTokenValidadtion(BaseHTTPMiddleware):
     def __init__(self, app):
         super().__init__(app)
@@ -32,10 +30,8 @@ class MiddlewareAccessTokenValidadtion(BaseHTTPMiddleware):
                 status_code=status.HTTP_405_METHOD_NOT_ALLOWED,
                 content={"detail": "Method not allowed"},
             )
-
         if any(pattern.match(request.url.path) for pattern in self.excluded_routes):
             return await call_next(request)
-
         auth_header = request.headers.get("Authorization")
         if not auth_header:
             return JSONResponse(
@@ -43,7 +39,6 @@ class MiddlewareAccessTokenValidadtion(BaseHTTPMiddleware):
                 content={"detail": "Missing authorization header."},
                 headers={"WWW-Authenticate": "Bearer"},
             )
-
         try:
             token = auth_header.split(" ")[1]
             Authorize = AuthJWT(request)
@@ -55,5 +50,4 @@ class MiddlewareAccessTokenValidadtion(BaseHTTPMiddleware):
                 content={"detail": "The access token is invalid or expired."},
                 headers={"WWW-Authenticate": "Bearer"},
             )
-
         return await call_next(request)

client/src/App.tsx

@@ -1,10 +1,21 @@
-import React from 'react';
+/* eslint-disable react-hooks/exhaustive-deps */
+import React, { useEffect } from 'react';
 import { Route, Routes } from 'react-router-dom';
 import MainLayout from './pages/MainLayout';
 import ProtectedRoute from './pages/ProtectedRoute';
 import LoginPage from './pages/LoginPage';
+import { useSetUserSelector } from './store/userStore';
 
 function App() {
+  const setUser = useSetUserSelector();
+
+  useEffect(() => {
+    const storedUser = localStorage.getItem('user');
+    if (storedUser) {
+      setUser(JSON.parse(storedUser));
+    }
+  }, []);
+
   return (
     <div className="App">
       <Routes>

client/src/api/api.ts

@@ -1,8 +1,9 @@
 import axios from 'axios';
-import { Access, Auth } from '../types/auth';
+import { Auth, Tokens } from '../types/auth';
 import { User } from '../types/user';
-import { AuthService } from '../services/auth';
+import { AuthService } from '../services/authService';
 import axiosRetry from 'axios-retry';
+import { useAuthStore } from '../store/authStore';
 
 const baseURL = `${process.env.REACT_APP_HTTP_PROTOCOL}://${process.env.REACT_APP_API_URL}/api/v1`;
 
@@ -15,26 +16,29 @@ const base = axios.create({
 });
 
 base.interceptors.request.use((config) => {
-  const token = localStorage.getItem('accessToken');
+  if (config.url === '/auth/refresh') {
+    return config;
+  }
+  const token = useAuthStore.getState().accessToken;
   if (token) {
     config.headers.Authorization = `Bearer ${token}`;
   }
   return config;
 });
 
-// axiosRetry(base, {
-//   retries: 3,
-//   retryDelay: (retryCount: number) => {
-//     console.log(`retry attempt: ${retryCount}`);
-//     return retryCount * 2000;
-//   },
-//   retryCondition: async (error: any) => {
-//     if (error.code === 'ERR_CANCELED') {
-//       return true;
-//     }
-//     return false;
-//   },
-// });
+axiosRetry(base, {
+  retries: 3,
+  retryDelay: (retryCount: number) => {
+    console.log(`retry attempt: ${retryCount}`);
+    return retryCount * 2000;
+  },
+  retryCondition: async (error: any) => {
+    if (error.code === 'ERR_CANCELED') {
+      return true;
+    }
+    return false;
+  },
+});
 
 base.interceptors.response.use(
   (response) => {
@@ -43,7 +47,6 @@ base.interceptors.response.use(
   async function (error) {
     console.log('error', error);
     const originalRequest = error.response.config;
-    console.log('originalRequest._retry', originalRequest);
     const urlTokens = error?.request?.responseURL.split('/');
     const url = urlTokens[urlTokens.length - 1];
     console.log('url', url);
@@ -55,11 +58,13 @@ base.interceptors.response.use(
       url !== 'logout'
     ) {
       originalRequest._retry = true;
-      const res = await AuthService.refresh().catch(async () => {
+      try {
+        await AuthService.refresh();
+        return base(originalRequest);
+      } catch (error) {
         await AuthService.logout();
-      });
-      console.log('res', res);
-      return await base(originalRequest);
+        return new Promise(() => {});
+      }
     }
     return await Promise.reject(error);
   }
@@ -67,14 +72,22 @@ base.interceptors.response.use(
 
 const api = {
   // auth
-  async login(auth: Auth): Promise<Access> {
-    console.log(auth);
-    const response = await base.post<Access>('/auth', auth);
+  async login(auth: Auth): Promise<Tokens> {
+    const response = await base.post<Tokens>('/auth', auth);
     return response.data;
   },
 
-  async refreshToken(): Promise<Access> {
-    const response = await base.post<Access>('/auth/refresh');
+  async refreshToken(): Promise<Tokens> {
+    const token = localStorage.getItem('refreshToken');
+    const response = await base.post<Tokens>(
+      '/auth/refresh',
+      {},
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+        },
+      }
+    );
     return response.data;
   },
 
@@ -83,6 +96,13 @@ const api = {
     const response = await base.get<User>('/profile');
     return response.data;
   },
+
+  async getUsers(page: number, limit: number): Promise<any> {
+    const response = await base.get<User[]>(
+      `/account?page=${page}&limit=${limit}`
+    );
+    return response.data;
+  },
 };
 
 export default api;

client/src/pages/AccountsPage.tsx

@@ -3,6 +3,10 @@ import { useState } from 'react';
 import ContentDrawer from '../components/ContentDrawer';
 import UserCreate from '../components/UserCreate';
 import { useTranslation } from 'react-i18next';
+import { Button } from 'antd';
+import { UserService } from '../services/userService';
+import { User } from '../types/user';
+import { AuthService } from '../services/authService';
 
 export default function AccountsPage() {
   const { t } = useTranslation();
@@ -11,6 +15,8 @@ export default function AccountsPage() {
   const showDrawer = () => setOpen(true);
   const closeDrawer = () => setOpen(false);
 
+  const [accounts, setAccounts] = useState<User[]>([]);
+
   return (
     <>
       <Header

client/src/pages/LoginPage.tsx

@@ -5,7 +5,7 @@ import {
   EyeTwoTone,
   UserOutlined,
 } from '@ant-design/icons';
-import { AuthService } from '../services/auth';
+import { AuthService } from '../services/authService';
 import { Auth } from '../types/auth';
 import { useNavigate } from 'react-router-dom';
 

client/src/pages/MainLayout.tsx

@@ -9,8 +9,6 @@ import RunningProcessesPage from './RunningProcessesPage';
 import AccountsPage from './AccountsPage';
 import EventsListPage from './EventsListPage';
 import ConfigurationPage from './ConfigurationPage';
-import { useSetUserSelector } from '../store/user';
-import { UserService } from '../services/user';
 
 export default function MainLayout() {
   const navigate = useNavigate();
@@ -21,8 +19,6 @@ export default function MainLayout() {
   const [width, setWidth] = useState<number | string>('15%');
   const [collapsedWidth, setCollapsedWidth] = useState(50);
 
-  const setUser = useSetUserSelector()
-
   const calculateWidths = () => {
     const windowWidth = window.innerWidth;
     const expanded = Math.min(Math.max(windowWidth * 0.15, 180), 240);
@@ -58,21 +54,6 @@ export default function MainLayout() {
     navigate(key);
   }
 
-  useEffect(() => {
-    const token = localStorage.getItem('accessToken');
-    if (!token) {
-      navigate('/login');
-    } else {
-      if (localStorage.getItem('user')) {
-        setUser(JSON.parse(localStorage.getItem('user') as string))
-      } else {
-        UserService.getProfile().then((user) => {
-          setUser(user);
-        });
-      }
-    }
-  }, [])
-
   return (
     <Layout style={{ minHeight: '100vh' }}>
       <Sider

client/src/pages/ProtectedRoute.tsx

@@ -2,14 +2,14 @@
 // ProtectedRoute.js
 import { Outlet, useNavigate } from 'react-router-dom';
 import React, { useEffect } from 'react';
-import { useUserSelector } from '../store/user';
+import { useUserSelector } from '../store/userStore';
 
 const ProtectedRoute = (): React.JSX.Element => {
-  const user = useUserSelector();
   const navigate = useNavigate();
+  const user = useUserSelector();
 
   useEffect(() => {
-    if (user.id === null) {
+    if (!user?.id) {
       navigate('/login');
     }
   }, [user]);

client/src/services/auth.ts

@@ -1,22 +0,0 @@
-import api from '../api/api';
-import { useUserStore } from '../store/user';
-import { Auth } from '../types/auth';
-
-export class AuthService {
-  static async login(auth: Auth) {
-    const token = await api.login(auth);
-    console.log(token)
-    localStorage.setItem('accessToken', token.accessToken);
-  }
-
-  static async logout() {
-    useUserStore.getState().removeUser();
-    localStorage.removeItem('userInfo');
-    localStorage.removeItem('accessToken');
-  }
-
-  static async refresh() {
-    const token = await api.refreshToken();
-    localStorage.setItem('accessToken', token.accessToken);
-  }
-}

client/src/services/authService.ts

@@ -0,0 +1,30 @@
+import api from '../api/api';
+import { useAuthStore } from '../store/authStore';
+import { useUserStore } from '../store/userStore';
+import { Auth } from '../types/auth';
+import { UserService } from './userService';
+
+export class AuthService {
+  static async login(auth: Auth) {
+    const token = await api.login(auth);
+    useAuthStore.getState().setAccessToken(token.accessToken);
+    localStorage.setItem('refreshToken', token.refreshToken as string);
+    await UserService.getProfile().then((user) => {
+      useUserStore.getState().setUser(user);
+    });
+  }
+
+  static async logout() {
+    console.log('logout');
+    useUserStore.getState().setUser(null);
+    useAuthStore.getState().setAccessToken(null);
+    localStorage.removeItem('userInfo');
+    localStorage.removeItem('refreshToken');
+  }
+
+  static async refresh() {
+    console.log('refresh');
+    const token = await api.refreshToken();
+    useAuthStore.getState().setAccessToken(token.accessToken);
+  }
+}

client/src/services/userService.ts

@@ -3,8 +3,14 @@ import { User } from '../types/user';
 
 export class UserService {
   static async getProfile(): Promise<User> {
+    console.log('getProfile');
     const user = api.getProfile();
 
     return user;
   }
+
+  static async getUsers(page: number = 1, limit: number = 10): Promise<any> {
+    const users = api.getUsers(page, limit);
+    return users;
+  }
 }

client/src/store/authStore.ts

@@ -0,0 +1,18 @@
+import { create } from 'zustand';
+import { devtools } from 'zustand/middleware';
+
+type AuthState = {
+  accessToken: string | null;
+  setAccessToken: (token: string | null) => void;
+};
+
+export const useAuthStore = create<AuthState>()(
+  devtools((set) => ({
+    accessToken: null,
+    setAccessToken: (token) => set({ accessToken: token }),
+  }))
+);
+
+export const useAuthSelector = () => {
+  return useAuthStore((state) => state.accessToken);
+};

client/src/store/userStore.ts

@@ -5,13 +5,12 @@ import { User } from '../types/user';
 const userInfo = localStorage.getItem('userInfo');
 
 type UserStoreState = {
-  user: User;
+  user: User | null;
   loading: boolean;
 };
 
 type UserStoreActions = {
-  setUser: (user: User) => void;
-  removeUser: () => void;
+  setUser: (user: User | null) => void;
 };
 
 type UserStore = UserStoreState & UserStoreActions;
@@ -22,8 +21,7 @@ export const useUserStore = create<UserStore>()(
       (set, get) => ({
         user: userInfo != null ? JSON.parse(userInfo) : ({} as User),
         loading: false,
-        setUser: (user: User) => set({ user }),
-        removeUser: () => set({ user: {} as User }),
+        setUser: (user: User | null) => set({ user }),
       }),
       { name: 'userInfo' }
     )

client/src/types/auth.ts

@@ -1,4 +1,4 @@
 import { components } from './openapi-types';
 
 export type Auth = components['schemas']['Auth'];
-export type Access = components['schemas']['Access'];
+export type Tokens = components['schemas']['Tokens'];

client/src/types/openapi-types.ts

@@ -120,11 +120,6 @@ export interface paths {
 export type webhooks = Record<string, never>;
 export interface components {
     schemas: {
-        /** Access */
-        Access: {
-            /** Accesstoken */
-            accessToken: string;
-        };
         /** AccountKeyring */
         AccountKeyring: {
             /** Ownerid */
@@ -219,6 +214,13 @@ export interface components {
          * @enum {string}
          */
         KeyType: "PASSWORD" | "ACCESS_TOKEN" | "REFRESH_TOKEN" | "API_KEY";
+        /** Tokens */
+        Tokens: {
+            /** Accesstoken */
+            accessToken: string;
+            /** Refreshtoken */
+            refreshToken?: string | null;
+        };
         /** User */
         User: {
             /** Id */
@@ -305,7 +307,7 @@ export interface operations {
                     [name: string]: unknown;
                 };
                 content: {
-                    "application/json": components["schemas"]["Access"];
+                    "application/json": components["schemas"]["Tokens"];
                 };
             };
             /** @description Validation Error */
@@ -334,7 +336,7 @@ export interface operations {
                     [name: string]: unknown;
                 };
                 content: {
-                    "application/json": components["schemas"]["Access"];
+                    "application/json": components["schemas"]["Tokens"];
                 };
             };
         };

package-lock.json

@@ -1,6 +0,0 @@
-{
-  "name": "connect",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}

package.json

@@ -1 +0,0 @@
-{}