diff --git a/seahub/share/decorators.py b/seahub/share/decorators.py index fca6f9e427..fb77ebbb06 100644 --- a/seahub/share/decorators.py +++ b/seahub/share/decorators.py @@ -21,7 +21,6 @@ def _share_link_auth_email_entry(request, fileshare, func, *args, **kwargs): session_key = "link_authed_email_%s" % fileshare.token if request.session.get(session_key) is not None: - request.user.username = request.session.get(session_key) return func(request, fileshare, *args, **kwargs) if request.method == 'GET': @@ -37,7 +36,6 @@ def _share_link_auth_email_entry(request, fileshare, func, *args, **kwargs): authed_details = json.loads(fileshare.authed_details) if code == code_post and email_post in authed_details.get('authed_emails'): request.session[session_key] = email_post - request.user.username = request.session.get(session_key) cache.delete(cache_key) return func(request, fileshare, *args, **kwargs) else: diff --git a/seahub/share/utils.py b/seahub/share/utils.py index b9b2017399..d19e4cad01 100644 --- a/seahub/share/utils.py +++ b/seahub/share/utils.py @@ -269,7 +269,7 @@ def has_shared_to_group(repo_id, path, gid, org_id=None): def check_share_link_user_access(share, username): - if share.user_scope == 'all_users': + if share.user_scope in [SCOPE_ALL_USERS, SCOPE_SPECIFIC_EMAILS]: return True if username == share.username: return True @@ -283,9 +283,4 @@ def check_share_link_user_access(share, username): if username in authed_users: return True - if share.user_scope == SCOPE_SPECIFIC_EMAILS: - auhhed_emails = authed_details.get('authed_emails', []) - if username in auhhed_emails: - return True - return False