Merge remote-tracking branch 'origin/email-invitations' into email-in…

…vitations
AI-READI · Dec 18, 2023 · 7bad7a3 · 7bad7a3
2 parents 114db97 + 3977af5
commit 7bad7a3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/apis/authentication.py b/apis/authentication.py
@@ -16,8 +16,12 @@
 from jsonschema import FormatChecker, ValidationError, validate
 
 import model
-from invitation.invitation import send_email_verification, check_trusted_device, signin_notification, \
-    add_user_to_device_list
+from invitation.invitation import (
+    send_email_verification,
+    check_trusted_device,
+    signin_notification,
+    add_user_to_device_list,
+)
 
 api = Namespace("Authentication", description="Authentication paths", path="/")
 

diff --git a/apis/contributor.py b/apis/contributor.py
@@ -64,11 +64,18 @@ def post(self, study_id: int):
         if os.environ.get("FLASK_ENV") != "testing":
             if user:
                 send_access_contributors(
-                    email_address, study_obj, first_name, last_name, contributor_.permission
+                    email_address,
+                    study_obj,
+                    first_name,
+                    last_name,
+                    contributor_.permission,
                 )
             else:
                 send_invitation_study(
-                    email_address, contributor_.token, study_name, contributor_.permission
+                    email_address,
+                    contributor_.token,
+                    study_name,
+                    contributor_.permission,
                 )
 
         return contributor_.to_dict(), 201

diff --git a/invitation/invitation.py b/invitation/invitation.py
@@ -131,6 +131,7 @@ def get_device_user_list() -> list[str]:
     return []  # type: ignore
     # token["users"]
 
+
 def add_user_to_device_list(response: Response, user) -> None:
     users = get_device_user_list()
     if user.id not in users:
@@ -148,7 +149,12 @@ def add_user_to_device_list(response: Response, user) -> None:
     )
 
     response.set_cookie(
-        "token_device", cookie, secure=True, httponly=True, samesite="None", expires=expiration
+        "token_device",
+        cookie,
+        secure=True,
+        httponly=True,
+        samesite="None",
+        expires=expiration,
     )
 
 

diff --git a/model/study.py b/model/study.py
@@ -169,7 +169,9 @@ def to_dict(self):
             if self.study_description
             else None,
             "owner": owner.to_dict()["id"] if owner else None,
-            "role": contributor_permission.to_dict()["role"] if contributor_permission else None,
+            "role": contributor_permission.to_dict()["role"]
+            if contributor_permission
+            else None,
         }
 
     def to_dict_study_metadata(self):