Merge branch 'main' into modal

Author: chriscarrollsmith

docs/deployment.qmd

@@ -69,7 +69,7 @@ doctl databases firewalls append <database-cluster-id> --rule <type>:<value>
 
 where `<type>` is `ip_addr` and `<value>` is the IP address of the application server. See the [DigitalOcean documentation](https://docs.digitalocean.com/reference/doctl/reference/databases/firewalls/append/) for more details.
 
-**Note:** You can only complete this step after you have deployed your application layer and obtained the IP address of the application server.
+**Note:** You can only complete this step after you have deployed your application layer and obtained a static IP address for the application server.
 
 ## Deploying and Configuring the FastAPI App
 
@@ -80,8 +80,9 @@ The big advantages of deploying on Modal.com are:
 2. that it's a very user-friendly platform.
 
 The disadvantages are:
-1. that Modal is a Python-only platform and cannot run the database layer, so you'll have to deploy that somewhere else, and
-2. that you'll need to make some modest changes to the codebase to get it to work on Modal.
+1. that Modal is a Python-only platform and cannot run the database layer, so you'll have to deploy that somewhere else,
+2. that you'll need to make some modest changes to the codebase to get it to work on Modal, and
+3. that Modal offers a [static IP address for the application server](https://modal.com/docs/guide/proxy-ips) only if you pay for a higher-tier plan starting at $250/year, which makes securing the database layer with a firewall rule cost prohibitive.
 
 #### Getting Started
 

routers/organization.py

@@ -232,10 +232,6 @@ def invite_member(
 
     if not organization:
         raise OrganizationNotFoundError()
-
-    # Log organization and roles state
-    org_identity = session.identity_key(instance=organization)
-    role_info = [(r.id, r.name, session.identity_key(instance=r)) for r in organization.roles]
 
     # Find the account and associated user by email
     account = session.exec(
@@ -250,7 +246,6 @@ def invite_member(
         raise UserNotFoundError()
 
     invited_user = account.user
-    user_identity = session.identity_key(instance=invited_user)
 
     # Check if user is already a member of this organization
     is_already_member = False

tests/utils/test_auth.py

@@ -123,7 +123,7 @@ def test_password_pattern() -> None:
                     password += random.choice(required_elements[other_element])
             # Randomize the order of the characters in the string
             password = ''.join(random.sample(password, len(password)))
-        assert re.match(COMPILED_PASSWORD_PATTERN, password) is not None, f"Password {password} does not match the pattern"
+            assert re.match(COMPILED_PASSWORD_PATTERN, password) is not None, f"Password {password} does not match the pattern"
 
     # Invalid password tests
 
@@ -213,7 +213,7 @@ def test_send_email_update_confirmation(mock_send: MagicMock) -> None:
 
     # Test existing token case
     session.reset_mock()
-    session.exec.return_value.first.return_value = EmailUpdateToken()  # Existing token
+    session.exec.return_value.first.return_value = EmailUpdateToken(account_id=account_id)
 
     send_email_update_confirmation(current_email, new_email, account_id, session)