Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 5 additions & 9 deletions localbuild/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,10 @@ requirements:
- fs_filepicker
- cftime >=1.0.1
- matplotlib >=3.3.2
- flask <2.0.0
- jinja2 <3.0.0
- click <8.0.o
- itsdangerous <2.0.0
- markupsafe <2.0.0
- flask >=2.0.0
- flask-httpauth
- werkzeug <2.0.0
- flask-socketio >=4.3.1, <5
- werkzeug >2.0.0
- flask-socketio >=5
- flask-sqlalchemy
- passlib
- gitpython
Expand All @@ -69,8 +65,8 @@ requirements:
- validate_email
- multidict
- pint
- python-socketio >=4.4.0, <5
- python-engineio >=3.13.2, <4
- python-socketio >=5
- python-engineio >=4
- markdown
- xstatic
- xstatic-jquery
Expand Down
16 changes: 8 additions & 8 deletions mslib/mscolab/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def get_auth_token():

@APP.route('/test_authorized')
def authorized():
token = request.values['token']
token = request.form['token']
user = User.verify_auth_token(token)
if user:
return "True"
Expand Down Expand Up @@ -275,17 +275,17 @@ def error413(error):
@APP.route('/create_project', methods=["POST"])
@verify_user
def create_project():
path = request.values['path']
description = request.values['description']
content = request.values.get('content', None)
path = request.form['path']
content = request.form.get('content', None)
description = request.form.get('description', None)
user = g.user
return str(fm.create_project(path, description, user, content=content))


@APP.route('/get_project_by_id', methods=['GET'])
@verify_user
def get_project_by_id():
p_id = request.values.get('p_id', None)
p_id = request.form.get('p_id', None)
user = g.user
result = fm.get_file(int(p_id), user)
if result is False:
Expand All @@ -296,7 +296,7 @@ def get_project_by_id():
@APP.route('/get_all_changes', methods=['GET'])
@verify_user
def get_all_changes():
p_id = request.values.get('p_id', None)
p_id = request.form.get('p_id', None)
named_version = request.args.get('named_version')
user = g.user
result = fm.get_all_changes(int(p_id), user, named_version)
Expand All @@ -308,7 +308,7 @@ def get_all_changes():
@APP.route('/get_change_content', methods=['GET'])
@verify_user
def get_change_content():
ch_id = int(request.values.get('ch_id', 0))
ch_id = int(request.form.get('ch_id', 0))
result = fm.get_change_content(ch_id)
if result is False:
return "False"
Expand All @@ -332,7 +332,7 @@ def set_version_name():
@APP.route('/authorized_users', methods=['GET'])
@verify_user
def authorized_users():
p_id = request.values.get('p_id', None)
p_id = request.form.get('p_id', None)
return json.dumps({"users": fm.get_authorized_users(int(p_id))})


Expand Down
4 changes: 2 additions & 2 deletions mslib/mscolab/sockets_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ def join_collaborator_to_room(self, u_id, p_id):
"""
s_id = get_session_id(self.sockets, u_id)
if s_id is not None:
join_room(str(p_id), sid=s_id, namespace='/')
join_room(str(p_id), sid=s_id)

def remove_collaborator_from_room(self, u_id, p_id):
s_id = get_session_id(self.sockets, u_id)
if s_id is not None:
leave_room(str(p_id), sid=s_id, namespace='/')
leave_room(str(p_id), sid=s_id)

def handle_start_event(self, json_config):
"""
Expand Down