Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make sure to set File.user_id

This commit is contained in:
Son NK 2020-03-20 09:52:00 +01:00
parent cd19997424
commit abd2278c24
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/auth/views/facebook.py
View File

@ -102,7 +102,7 @@ def facebook_callback():
if user:
if picture_url and not user.profile_picture_id:
LOG.d("set user profile picture to %s", picture_url)
file = create_file_from_url(picture_url)
file = create_file_from_url(user, picture_url)
user.profile_picture_id = file.id
db.session.commit()
@ -120,10 +120,11 @@ def facebook_callback():
user = User.create(
email=email.lower(), name=facebook_user_data["name"], activated=True
)
db.session.flush()
if picture_url:
LOG.d("set user profile picture to %s", picture_url)
file = create_file_from_url(picture_url)
file = create_file_from_url(user, picture_url)
user.profile_picture_id = file.id
db.session.commit()

9
app/auth/views/google.py
View File

@ -88,7 +88,7 @@ def google_callback():
if user:
if picture_url and not user.profile_picture_id:
LOG.d("set user profile picture to %s", picture_url)
file = create_file_from_url(picture_url)
file = create_file_from_url(user, picture_url)
user.profile_picture_id = file.id
db.session.commit()
# create user
@ -105,10 +105,11 @@ def google_callback():
user = User.create(
email=email.lower(), name=google_user_data["name"], activated=True
)
db.session.flush()
if picture_url:
LOG.d("set user profile picture to %s", picture_url)
file = create_file_from_url(picture_url)
file = create_file_from_url(user, picture_url)
user.profile_picture_id = file.id
db.session.commit()
@ -133,9 +134,9 @@ def google_callback():
return after_login(user, next_url)
def create_file_from_url(url) -> File:
def create_file_from_url(user, url) -> File:
file_path = random_string(30)
file = File.create(path=file_path)
file = File.create(path=file_path, user_id=user.id)
s3.upload_from_url(url, file_path)

2
app/dashboard/views/setting.py
View File

@ -106,7 +106,7 @@ def setting():
if form.profile_picture.data:
file_path = random_string(30)
file = File.create(path=file_path)
file = File.create(user_id=current_user.id, path=file_path)
s3.upload_from_bytesio(
file_path, BytesIO(form.profile_picture.data.read())

2
app/developer/views/client_detail.py
View File

@ -45,7 +45,7 @@ def client_detail(client_id):
# todo: remove current icon if any
# todo: handle remove icon
file_path = random_string(30)
file = File.create(path=file_path)
file = File.create(path=file_path, user_id=client.user_id)
s3.upload_from_bytesio(file_path, BytesIO(form.icon.data.read()))