Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

API & Client - remove id in user data

Browse Source
This commit is contained in:
Sam
2020-02-08 14:49:37 +01:00
parent 2c3bc0f9bc
commit 9f487a4d68
16 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fittrackee_api/fittrackee_api/tests/test_users_api.py
View File

@@ -261,7 +261,7 @@ def test_decode_auth_token(app, user_1):
def test_user_no_picture(app, user_1):
client = app.test_client()
response = client.get('/api/users/1/picture')
response = client.get(f'/api/users/{user_1.username}/picture')
data = json.loads(response.data.decode())
assert response.status_code == 404
@@ -271,7 +271,7 @@ def test_user_no_picture(app, user_1):
def test_user_picture_no_user(app, user_1):
client = app.test_client()
response = client.get('/api/users/2/picture')
response = client.get('/api/users/not_existing/picture')
data = json.loads(response.data.decode())
assert response.status_code == 404

1
fittrackee_api/fittrackee_api/tests/test_users_model.py
View File

@@ -2,7 +2,6 @@ def test_user_model(app, user_1):
assert '<User \'test\'>' == str(user_1)
serialized_user = user_1.serialize()
assert 1 == serialized_user['id']
assert 'test' == serialized_user['username']
assert 'created_at' in serialized_user
assert serialized_user['admin'] is False

28
fittrackee_api/fittrackee_api/users/auth.py
View File

@@ -237,7 +237,7 @@ def login_user():
@auth_blueprint.route('/auth/logout', methods=['GET'])
@authenticate
def logout_user(user_id):
def logout_user(auth_user_id):
"""
user logout
@@ -285,7 +285,7 @@ def logout_user(user_id):
if auth_header:
auth_token = auth_header.split(" ")[1]
resp = User.decode_auth_token(auth_token)
if not isinstance(user_id, str):
if not isinstance(auth_user_id, str):
response_object = {
'status': 'success',
'message': 'Successfully logged out.',
@@ -304,7 +304,7 @@ def logout_user(user_id):
@auth_blueprint.route('/auth/profile', methods=['GET'])
@authenticate
def get_user_status(user_id):
def get_authenticated_user_profile(auth_user_id):
"""
get authenticated user info
@@ -330,7 +330,6 @@ def get_user_status(user_id):
"created_at": "Sun, 14 Jul 2019 14:09:58 GMT",
"email": "sam@example.com",
"first_name": null,
"id": 2,
"language": "en",
"last_name": null,
"location": null,
@@ -360,14 +359,14 @@ def get_user_status(user_id):
- Invalid token. Please log in again.
"""
user = User.query.filter_by(id=user_id).first()
user = User.query.filter_by(id=auth_user_id).first()
response_object = {'status': 'success', 'data': user.serialize()}
return jsonify(response_object), 200
@auth_blueprint.route('/auth/profile/edit', methods=['POST'])
@authenticate
def edit_user(user_id):
def edit_user(auth_user_id):
"""
edit authenticated user
@@ -393,7 +392,6 @@ def edit_user(user_id):
"created_at": "Sun, 14 Jul 2019 14:09:58 GMT",
"email": "sam@example.com",
"first_name": null,
"id": 2,
"language": "en",
"last_name": null,
"location": null,
@@ -476,7 +474,7 @@ def edit_user(user_id):
).decode()
try:
user = User.query.filter_by(id=user_id).first()
user = User.query.filter_by(id=auth_user_id).first()
user.first_name = first_name
user.last_name = last_name
user.bio = bio
@@ -513,7 +511,7 @@ def edit_user(user_id):
@auth_blueprint.route('/auth/picture', methods=['POST'])
@authenticate
def edit_picture(user_id):
def edit_picture(auth_user_id):
"""
update authenticated user picture
@@ -573,15 +571,17 @@ def edit_picture(user_id):
file = request.files['file']
filename = secure_filename(file.filename)
dirpath = os.path.join(
current_app.config['UPLOAD_FOLDER'], 'pictures', str(user_id)
current_app.config['UPLOAD_FOLDER'], 'pictures', str(auth_user_id)
)
if not os.path.exists(dirpath):
os.makedirs(dirpath)
absolute_picture_path = os.path.join(dirpath, filename)
relative_picture_path = os.path.join('pictures', str(user_id), filename)
relative_picture_path = os.path.join(
'pictures', str(auth_user_id), filename
)
try:
user = User.query.filter_by(id=user_id).first()
user = User.query.filter_by(id=auth_user_id).first()
if user.picture is not None:
old_picture_path = get_absolute_file_path(user.picture)
if os.path.isfile(get_absolute_file_path(old_picture_path)):
@@ -608,7 +608,7 @@ def edit_picture(user_id):
@auth_blueprint.route('/auth/picture', methods=['DELETE'])
@authenticate
def del_picture(user_id):
def del_picture(auth_user_id):
"""
delete authenticated user picture
@@ -637,7 +637,7 @@ def del_picture(user_id):
"""
try:
user = User.query.filter_by(id=user_id).first()
user = User.query.filter_by(id=auth_user_id).first()
picture_path = get_absolute_file_path(user.picture)
if os.path.isfile(picture_path):
os.remove(picture_path)

1
fittrackee_api/fittrackee_api/users/models.py
View File

@@ -110,7 +110,6 @@ class User(db.Model):
.first()
)
return {
'id': self.id,
'username': self.username,
'email': self.email,
'created_at': self.created_at,

15
fittrackee_api/fittrackee_api/users/users.py
View File

@@ -37,7 +37,6 @@ def get_users(auth_user_id):
"created_at": "Sun, 14 Jul 2019 14:09:58 GMT",
"email": "admin@example.com",
"first_name": null,
"id": 1,
"language": "en",
"last_name": null,
"location": null,
@@ -61,7 +60,6 @@ def get_users(auth_user_id):
"created_at": "Sat, 20 Jul 2019 11:27:03 GMT",
"email": "sam@example.com",
"first_name": null,
"id": 2,
"language": "fr",
"last_name": null,
"location": null,
@@ -108,7 +106,7 @@ def get_single_user(auth_user_id, user_name):
.. sourcecode:: http
GET /api/users/1 HTTP/1.1
GET /api/users/admin HTTP/1.1
Content-Type: application/json
**Example response**:
@@ -127,7 +125,6 @@ def get_single_user(auth_user_id, user_name):
"created_at": "Sun, 14 Jul 2019 14:09:58 GMT",
"email": "admin@example.com",
"first_name": null,
"id": 1,
"language": "en",
"last_name": null,
"location": null,
@@ -177,15 +174,15 @@ def get_single_user(auth_user_id, user_name):
return jsonify(response_object), 404
@users_blueprint.route('/users/<user_id>/picture', methods=['GET'])
def get_picture(user_id):
@users_blueprint.route('/users/<user_name>/picture', methods=['GET'])
def get_picture(user_name):
""" get user picture
**Example request**:
.. sourcecode:: http
GET /api/users/1/picture HTTP/1.1
GET /api/users/admin/picture HTTP/1.1
Content-Type: application/json
**Example response**:
@@ -195,7 +192,7 @@ def get_picture(user_id):
HTTP/1.1 200 OK
Content-Type: image/jpeg
:param integer user_id: user id
:param integer user_name: user name
:statuscode 200: success
:statuscode 404:
@@ -205,7 +202,7 @@ def get_picture(user_id):
"""
response_object = {'status': 'not found', 'message': 'No picture.'}
try:
user = User.query.filter_by(id=int(user_id)).first()
user = User.query.filter_by(username=user_name).first()
if not user:
response_object = {
'status': 'fail',