Marko (Hermes Implementer)
|
2e71eb73b8
|
Merge branch 'main' into fix/user-auth-error-handling
Resolved conflicts in:
- api/accounts/urls.py: Took main's complete URL set (verify/refresh/logout/me)
- web/src/App.tsx: Took main's route structure with PublicRoute/ProtectedRoute wrappers
- web/src/services/authApi.ts: Combined main's robust interceptor with PR's extractErrorMessage + getAccessToken/getRefreshToken helpers
- web/src/contexts/AuthContext.tsx: Combined main's full auth flow (refreshAccessToken, getProfile, logoutUser) with PR's extractErrorMessage and user_data persistence
|
2026-05-29 02:24:51 +00:00 |
|