Skip to content

Allow deleting and changing comments with runtoken (closes #591) #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maormarcus wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Allow deleting and changing comments with runtoken (closes #591) #593

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions flask_app/blueprints/rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import requests

from flask import Blueprint, abort, request, jsonify, current_app, Response
from flask import Blueprint, abort, request, jsonify, current_app, Response, g
from flask_restful import Api, reqparse
from sqlalchemy.orm.exc import NoResultFound
from sqlalchemy import func, or_
Expand Down Expand Up @@ -353,6 +353,9 @@ def _get_iterator(self):

return models.Comment.query.filter_by(session_id=args.session_id, test_id=args.test_id)

def _get_user_id(self):
return current_user.get_id() or g.token_user.get_id()

def delete(self, object_id=None):
if object_id is None:
error_abort('Not implemented', code=requests.codes.not_implemented)
Expand All @@ -361,7 +364,7 @@ def delete(self, object_id=None):
obj = models.Session.query.get(comment.session_id)
else:
obj = models.Test.query.get(comment.test_id)
if comment.user_id != current_user.id:
if comment.user_id != self._get_user_id():
error_abort('Not allowed to delete comment', code=requests.codes.forbidden)
obj.num_comments = type(obj).num_comments - 1
models.db.session.add(obj)
Expand All @@ -372,7 +375,7 @@ def put(self, object_id=None):
if object_id is None:
error_abort('Not implemented', code=requests.codes.not_implemented)
comment = models.Comment.query.get_or_404(object_id)
if comment.user_id != current_user.id:
if comment.user_id != self._get_user_id():
error_abort('Not allowed to delete comment', code=requests.codes.forbidden)
comment.comment = request.get_json().get('comment', {}).get('comment')
comment.edited = True
Expand Down