Merge branch 'main' into wip/make-wordweb-public

dsp_permissions_scripts/models/host.py

@@ -3,7 +3,7 @@ class Hosts:
 
     LOCALHOST = "http://0.0.0.0:3333"
     PROD = "https://api.dasch.swiss"
-    TEST = "https://api.test.dasch.swiss"
+    RDU_STAGE = "https://api.rdu-stage.dasch.swiss"
     DEV = "https://api.dev.dasch.swiss"
     LS_PROD = "https://api.ls-prod.admin.ch"
     STAGE = "https://api.stage.dasch.swiss"

dsp_permissions_scripts/models/scope.py

@@ -126,6 +126,6 @@ def remove(
 )
 
 PRIVATE = PermissionScope.create(
-    CR={PROJECT_ADMIN, CREATOR},
-    V={PROJECT_MEMBER},
+    CR={PROJECT_ADMIN},
+    M={PROJECT_MEMBER},
 )

dsp_permissions_scripts/utils/authentication.py

@@ -1,4 +1,5 @@
 import os
+import re
 
 from dotenv import load_dotenv
 
@@ -14,9 +15,12 @@ def _get_login_credentials(host: str) -> tuple[str, str]:
     if host == Hosts.LOCALHOST:
         user = "[email protected]"
         pw = "test"
-    elif host == Hosts.TEST:
-        user = os.getenv("TEST_EMAIL") or ""
-        pw = os.getenv("TEST_PASSWORD") or ""
+    elif host == Hosts.RDU_STAGE:
+        user = os.getenv("RDU_STAGE_EMAIL") or ""
+        pw = os.getenv("RDU_STAGE_PASSWORD") or ""
+    elif re.search(r"api.rdu-\d\d.dasch.swiss", host):
+        user = os.getenv("RDU_TEST_EMAIL") or ""
+        pw = os.getenv("RDU_TEST_PASSWORD") or ""
     elif host == Hosts.DEV:
         user = os.getenv("DEV_EMAIL") or ""
         pw = os.getenv("DEV_PASSWORD") or ""