consider react router routes in caddy file (#433)

papermerge · Aug 18, 2024 · 07b7362 · 07b7362
1 parent 50ba20b
commit 07b7362
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 13 deletions.
diff --git a/docker/cloud/etc/Caddyfile b/docker/cloud/etc/Caddyfile
@@ -8,6 +8,14 @@
   }
 }
 
+@ExceptBackendPaths {
+  not {
+    path /oidc/callback
+    path /probe/
+    path /api/
+  }
+}
+
 forward_auth @ExceptPaths :8010 {
   uri /verify
 }
@@ -19,5 +27,14 @@ handle_path /api/* {
     reverse_proxy :8000
 }
 
+# Will server /index.html for all paths except the ones for the backend.
+# The point is that react router will take over URL.
+# For example:
+#     /home/e87e06ed-66ee-482f-9be5-ee85501d59c4 -> index.html
+#     /document/42533b61-c856-491c-8e65-a901d9c777c4 -> index.html
+#     /api/users/me -> won't be handled here, but in the backend part
+handle @ExceptBackendPaths {
+  try_files {path} /index.html
+}
 root * /usr/share/html/ui
-file_server browse
+file_server
diff --git a/papermerge/core/auth/__init__.py b/papermerge/core/auth/__init__.py
@@ -83,13 +83,12 @@ def get_current_user(
             total_scopes.extend(scopes.SCOPES.keys())
         # augment user scopes with permissions associated to local groups
         if len(token_data.groups) > 0:
-            total_scopes.extend(
-                db.get_user_scopes_from_groups(
-                    engine=engine,
-                    user_id=UUID(token_data.user_id),
-                    groups=token_data.groups
-                )
+            s = db.get_user_scopes_from_groups(
+                engine=engine,
+                user_id=UUID(token_data.user_id),
+                groups=token_data.groups
             )
+            total_scopes.extend(s)
 
     elif remote_user:  # get user from headers
         # Using here external identity provider i.e.
@@ -111,13 +110,12 @@ def get_current_user(
             total_scopes.extend(scopes.SCOPES.keys())
         # augment user scopes with permissions associated to local groups
         if len(remote_user.groups) > 0:
-            total_scopes.extend(
-                db.get_user_scopes_from_groups(
-                    engine=engine,
-                    user_id=user.id,
-                    groups=remote_user.groups
-                )
+            s = db.get_user_scopes_from_groups(
+                engine=engine,
+                user_id=user.id,
+                groups=remote_user.groups
             )
+            total_scopes.extend(s)
 
     if user is None:
         raise HTTPException(

diff --git a/papermerge/core/db/users.py b/papermerge/core/db/users.py
@@ -224,10 +224,12 @@ def get_user_scopes_from_groups(
     user_id: UUID,
     groups: list[str]
 ) -> list[str]:
+
     with Session(engine) as session:
         db_user = session.get(User, user_id)
 
         if db_user is None:
+            logger.debug(f"User with user_id {user_id} not found")
             return []
 
         db_groups = session.scalars(