Added a new endpoint that can be used for organisation or service invitations.

The other two invitation endpoints will be removed once the admin app is updated.

app/accept_invite/rest.py

@@ -9,6 +9,7 @@ from itsdangerous import SignatureExpired
 from notifications_utils.url_safe_token import check_token
 
 from app.dao.invited_user_dao import get_invited_user_by_id
+from app.dao.organisation_dao import dao_get_invited_organisation_user
 
 from app.errors import (
     register_errors,
@@ -24,7 +25,10 @@ register_errors(accept_invite)
 
 @accept_invite.route('/<token>', methods=['GET'])
 def get_invited_user_by_token(token):
-
+    """
+    This method is now deprecated,
+    in favor of a single accept_invite endpoint for both service and organisation invitations
+    """
     max_age_seconds = 60 * 60 * 24 * current_app.config['INVITATION_EXPIRATION_DAYS']
 
     try:
@@ -41,3 +45,29 @@ def get_invited_user_by_token(token):
     invited_user = get_invited_user_by_id(invited_user_id)
 
     return jsonify(data=invited_user_schema.dump(invited_user).data), 200
+
+
+@accept_invite.route('/<invitation_type>/<token>', methods=['GET'])
+def validate_invitation_token(invitation_type, token):
+
+    max_age_seconds = 60 * 60 * 24 * current_app.config['INVITATION_EXPIRATION_DAYS']
+
+    try:
+        invited_user_id = check_token(token,
+                                      current_app.config['SECRET_KEY'],
+                                      current_app.config['DANGEROUS_SALT'],
+                                      max_age_seconds)
+    except SignatureExpired:
+        errors = {'invitation':
+                  ['Your invitation to GOV.UK Notify has expired. '
+                   'Please ask the person that invited you to send you another one']}
+        raise InvalidRequest(errors, status_code=400)
+
+    if invitation_type == 'service':
+        invited_user = get_invited_user_by_id(invited_user_id)
+        return jsonify(data=invited_user_schema.dump(invited_user).data), 200
+    elif invitation_type == 'organisation':
+        invited_user = dao_get_invited_organisation_user(invited_user_id)
+        return jsonify(data=invited_user.serialize()), 200
+    else:
+        raise InvalidRequest("Unrecognised invitation type: {}".format(invitation_type))