More rework

app/corpora/routes.py

@@ -116,20 +116,6 @@ def analyse_corpus(corpus_id):
     )
 
 
-@bp.route('/<hashid:corpus_id>/generate-corpus-share-link', methods=['GET', 'POST'])
-@login_required
-@corpus_follower_permission_required('GENERATE_SHARE_LINK')
-def generate_corpus_share_link(corpus_id):
-    corpus_hashid = hashids.encode(corpus_id)
-    data = request.get_json('data')
-    role_name = data['role']
-    exp_data = data['expiration']
-    expiration = datetime.strptime(exp_data, '%b %d, %Y')
-    token = current_user.generate_follow_corpus_token(corpus_hashid, role_name, expiration)
-    link = url_for('corpora.follow_corpus', corpus_id=corpus_id, token=token, _external=True)
-    return link
-
-
 @bp.route('/<hashid:corpus_id>/follow/<token>')
 @login_required
 def follow_corpus(corpus_id, token):
@@ -210,6 +196,43 @@ def build_corpus(corpus_id):
     return response
 
 
+@bp.route('/<hashid:corpus_id>/generate-corpus-share-link', methods=['POST'])
+@login_required
+@corpus_follower_permission_required('GENERATE_SHARE_LINK')
+@content_negotiation(consumes='application/json', produces='application/json')
+def generate_corpus_share_link(corpus_id):
+    corpus_hashid = hashids.encode(corpus_id)
+    data = request.json
+    if not isinstance(data, dict):
+        abort(400)
+    expiration = data.get('expiration')
+    if not isinstance(expiration, str):
+        abort(400)
+    role_name = data.get('role')
+    if not isinstance(role_name, str):
+        abort(400)
+    expiration_date = datetime.strptime(expiration, '%b %d, %Y')
+    cfr = CorpusFollowerRole.query.filter_by(name=role_name).first()
+    if cfr is None:
+        abort(400)
+    token = current_user.generate_follow_corpus_token(corpus_hashid, role_name, expiration_date)
+    corpus_share_link = url_for(
+        'corpora.follow_corpus',
+        corpus_id=corpus_id,
+        token=token,
+        _external=True
+    )
+    response_data = {
+        'message': 'Corpus share link generated',
+        'category': 'corpus',
+        'corpusShareLink': corpus_share_link
+    }
+    response = jsonify(response_data)
+    response.status_code = 200
+    return response
+    
+
+
 @bp.route('/<hashid:corpus_id>/is_public', methods=['PUT'])
 @login_required
 @corpus_owner_or_admin_required
@@ -405,7 +428,9 @@ def add_permission(corpus_id, follower_id):
     role_name = request.json
     if not isinstance(role_name, str):
         abort(400)
-    cfr = CorpusFollowerRole.query.filter_by(name=role_name).first_or_404()
+    cfr = CorpusFollowerRole.query.filter_by(name=role_name).first()
+    if cfr is None:
+        abort(400)
     cfa = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=follower_id).first_or_404()
     cfa.role = cfr
     db.session.commit()