fix service invites

app/main/views/verify.py

@@ -8,7 +8,6 @@ from app import user_api_client
 from app.main import main
 from app.main.forms import TwoFactorForm
 from app.models.user import User
-from app.notify_client import service_api_client
 from app.utils.login import redirect_to_sign_in
 
 
@@ -66,35 +65,6 @@ def verify_email(token):
 def activate_user(user_id):
     user = User.from_id(user_id)
 
-    # This is the login.gov path
-    try:
-        login_gov_invite_data = service_api_client.retrieve_service_invite_data(
-            f"service-invite-{user.email_address}"
-        )
-    except BaseException:  # noqa
-        # We will hit an exception if we can't find invite data,
-        # but that will be the normal sign in use case
-        login_gov_invite_data = None
-    if login_gov_invite_data:
-        login_gov_invite_data = json.loads(login_gov_invite_data)
-        service_id = login_gov_invite_data["service_id"]
-        user_id = user_id
-        permissions = login_gov_invite_data["permissions"]
-        folder_permissions = login_gov_invite_data["folder_permissions"]
-
-        # Actually call the back end and add the user to the service
-        try:
-            user_api_client.add_user_to_service(
-                service_id, user_id, permissions, folder_permissions
-            )
-        except BaseException as be:  # noqa
-            # TODO if the user is already part of service we should ignore
-            current_app.logger.warning(f"Exception adding user to service {be}")
-
-        activated_user = user.activate()
-        activated_user.login()
-        return redirect(url_for("main.service_dashboard", service_id=service_id))
-
     # TODO add org invites back in the new way
     # organization_id = redis_client.raw_get(
     #   f"organization-invite-{user.email_address}"
@@ -111,15 +81,3 @@ def activate_user(user_id):
         activated_user.login()
 
         return redirect(url_for("main.add_service", first="first"))
-
-
-def _add_invited_user_to_service(invitation):
-    user = User.from_id(session["user_id"])
-    service_id = invitation.service
-    user.add_to_service(
-        service_id,
-        invitation.permissions,
-        invitation.folder_permissions,
-        invitation.from_user.id,
-    )
-    return service_id