darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-19 14:08:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

There endpoint to check the token of an invitation for services and organisations have been merged.

Browse Source 
This PR deletes the old endpoints.
This commit is contained in:
Rebecca Law
2018-02-27 13:46:23 +00:00
parent 25d84af63e
commit 12046ee85a
5 changed files with 0 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/__init__.py
View File

@@ -109,7 +109,6 @@ def register_blueprint(application):
from app.billing.rest import billing_blueprint
from app.organisation.rest import organisation_blueprint
from app.organisation.invite_rest import organisation_invite_blueprint
from app.organisation.accept_organisation_invite import accept_organisation_invite_blueprint
service_blueprint.before_request(requires_admin_auth)
application.register_blueprint(service_blueprint, url_prefix='/service')
@@ -186,9 +185,6 @@ def register_blueprint(application):
organisation_invite_blueprint.before_request(requires_admin_auth)
application.register_blueprint(organisation_invite_blueprint)
accept_organisation_invite_blueprint.before_request(requires_admin_auth)
application.register_blueprint(accept_organisation_invite_blueprint)
def register_v2_blueprints(application):
from app.v2.inbound_sms.get_inbound_sms import v2_inbound_sms_blueprint as get_inbound_sms

24
app/accept_invite/rest.py
View File

@@ -23,30 +23,6 @@ accept_invite = Blueprint('accept_invite', __name__)
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:
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)
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):

30
app/organisation/accept_organisation_invite.py
View File

@@ -1,30 +0,0 @@
from flask import Blueprint, jsonify, current_app
from itsdangerous import SignatureExpired
from notifications_utils.url_safe_token import check_token
from app.dao.organisation_dao import dao_get_invited_organisation_user
from app.errors import register_errors, InvalidRequest
accept_organisation_invite_blueprint = Blueprint(
'accept_organisation_invite', __name__,
url_prefix='/organisation-invitation')
register_errors(accept_organisation_invite_blueprint)
@accept_organisation_invite_blueprint.route("/<token>", methods=['GET'])
def accept_organisation_invitation(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)
invited_user = dao_get_invited_organisation_user(invited_user_id)
return jsonify(data=invited_user.serialize()), 200