Merge pull request #661 from alphagov/invite-accepted-bug

Change when invite gets marked as accepted.

app/main/views/invites.py

@@ -54,6 +54,7 @@ def accept_invite(token):
     service_users = user_api_client.get_users_for_service(invited_user.service)
 
     if existing_user:
+        invite_api_client.accept_invite(invited_user.service, invited_user.id)
         if existing_user in service_users:
             return redirect(url_for('main.service_dashboard', service_id=invited_user.service))
         else:

app/main/views/register.py

@@ -21,7 +21,10 @@ from app.main.forms import (
     RegisterUserFromInviteForm
 )
 
-from app import user_api_client
+from app import (
+    user_api_client,
+    invite_api_client
+)
 
 
 @main.route('/register', methods=['GET', 'POST'])
@@ -53,6 +56,7 @@ def register_from_invite():
             abort(400)
         registered = _do_registration(form, send_email=False)
         if registered:
+            invite_api_client.accept_invite(invited_user['service'], invited_user['id'])
             return redirect(url_for('main.verify'))
         else:
             flash('There was an error registering your account')

app/main/views/sign_in.py

@@ -17,8 +17,8 @@ from flask.ext.login import (
 
 from app import (
     user_api_client,
-    invite_api_client,
-    service_api_client
+    service_api_client,
+    invite_api_client
 )