Merge pull request #94 from MyElectricalData/develop

Develop

Author: m4dm4rtig4n

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [1.5.0-dev.1](https://github.com/MyElectricalData/myelectricaldata_new/compare/1.4.1...1.5.0-dev.1) (2025-12-21)
+
+### Features
+
+* **helm:** add Slack notification configuration ([e1570ad](https://github.com/MyElectricalData/myelectricaldata_new/commit/e1570ad296c8472a492fa1fc389948ddb306bde7))
+
+### Bug Fixes
+
+* **api:** disable redirect_slashes to fix Vite proxy routing ([7fbb6e0](https://github.com/MyElectricalData/myelectricaldata_new/commit/7fbb6e07812af81d3874385c0b03f60b69431df3))
+* **auth:** preserve query params in OAuth callback redirect ([c0b51c0](https://github.com/MyElectricalData/myelectricaldata_new/commit/c0b51c02a6e083c141afde7fad00e3f72d899fb5))
+
 ## [1.4.1](https://github.com/MyElectricalData/myelectricaldata_new/compare/1.4.0...1.4.1) (2025-12-21)
 
 ### Bug Fixes

apps/api/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "myelectricaldata-api"
-version = "1.4.1"
+version = "1.5.0-dev.1"
 description = "MyElectricalData API Gateway for Enedis data"
 authors = [{name = "m4dm4rtig4n"}]
 license = {text = "Apache-2.0"}

apps/api/src/main.py

@@ -96,6 +96,10 @@ def get_servers() -> list[dict[str, str]]:
         "clientId": "",
         "usePkceWithAuthorizationCodeGrant": False,
     },
+    # Disable automatic redirect from /path to /path/ to avoid 307 redirects
+    # that break proxy routing (Vite proxy rewrites /api/path -> /path,
+    # but redirect response /path/ doesn't get rewritten back to /api/path/)
+    redirect_slashes=False,
 )
 
 # Mount static files for custom Swagger CSS

apps/api/src/routers/pdl.py

@@ -70,7 +70,7 @@ class PDLUpdateOrder(BaseModel):
     pdl_orders: list[PDLOrderItem]
 
 
-@router.get("/", response_model=APIResponse)
+@router.get("", response_model=APIResponse)
 async def list_pdls(
     current_user: User = Depends(get_current_user), db: AsyncSession = Depends(get_db)
 ) -> APIResponse:
@@ -112,7 +112,7 @@ async def list_pdls(
     return APIResponse(success=True, data=[pdl.model_dump() for pdl in pdl_responses])
 
 
-@router.post("/", response_model=APIResponse, status_code=status.HTTP_201_CREATED)
+@router.post("", response_model=APIResponse, status_code=status.HTTP_201_CREATED)
 async def create_pdl(
     pdl_data: PDLCreate = Body(
         ...,

apps/api/src/routers/roles.py

@@ -14,7 +14,7 @@
 router = APIRouter(prefix="/admin/roles", tags=["Roles"])
 
 
-@router.get("/", response_model=APIResponse)
+@router.get("", response_model=APIResponse)
 async def list_roles(
     current_user: User = Depends(get_current_user),
     db: AsyncSession = Depends(get_db)

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myelectricaldata-web",
-  "version": "1.4.1",
+  "version": "1.5.0-dev.1",
   "type": "module",
   "scripts": {
     "dev": "vite",

apps/web/src/App.tsx

@@ -61,8 +61,9 @@ function ProtectedRoute({ children }: { children: React.ReactNode }) {
   }
 
   if (!isAuthenticated) {
-    // Sauvegarder l'URL courante pour y revenir après connexion
-    return <Navigate to="/login" state={{ from: location.pathname }} replace />
+    // Sauvegarder l'URL courante (avec query params) pour y revenir après connexion
+    const fullPath = location.pathname + location.search
+    return <Navigate to="/login" state={{ from: fullPath }} replace />
   }
 
   return <>{children}</>

apps/web/vite.config.ts

@@ -8,7 +8,8 @@ const __dirname = dirname(__filename)
 
 export default defineConfig(({ mode }) => {
   const env = loadEnv(mode, process.cwd(), '')
-  const backendUrl = env.VITE_BACKEND_URL || 'http://127.0.0.1:8000'
+  // Use process.env first (from Docker env_file), then loadEnv, then default
+  const backendUrl = process.env.VITE_BACKEND_URL || env.VITE_BACKEND_URL || 'http://backend:8000'
 
   return {
     plugins: [react()],
@@ -75,6 +76,16 @@ export default defineConfig(({ mode }) => {
       hmr: {
         clientPort: 8000,
       },
+      // Proxy API requests to backend - ensures same-origin for httpOnly cookies
+      proxy: {
+        '/api': {
+          target: backendUrl,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/api/, ''),
+          // Forward cookies
+          cookieDomainRewrite: 'localhost',
+        },
+      },
     },
     test: {
       globals: true,

docker-compose.yml

@@ -104,6 +104,7 @@ services:
       - ./apps/web/tsconfig.node.json:/app/tsconfig.node.json
       - ./apps/web/tailwind.config.js:/app/tailwind.config.js
       - ./apps/web/postcss.config.js:/app/postcss.config.js
+      - ./.env.web:/app/.env:ro
       - /app/node_modules
     ports:
       - "8000:5173"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "myelectricaldata",
-  "version": "1.4.1",
+  "version": "1.5.0-dev.1",
   "private": true,
   "description": "Secure API gateway for Linky electricity data via Enedis APIs",
   "repository": {