Skip to content

Commit

Permalink
Merge pull request #6222 from haiwen/sdoc_access_token_add_default_title
Browse files Browse the repository at this point in the history
sdoc access token add default title
  • Loading branch information
shuntian authored Jun 19, 2024
2 parents 109a6d2 + 51f5173 commit 82fdc2d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion seahub/api2/endpoints/wiki2.py
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ def get(self, request, wiki_id, page_id):
latest_contributor, last_modified = None, 0

assets_url = '/api/v2.1/seadoc/download-image/' + doc_uuid
seadoc_access_token = gen_seadoc_access_token(doc_uuid, filename, request.user.username, permission=permission)
seadoc_access_token = gen_seadoc_access_token(doc_uuid, filename, request.user.username, permission=permission, default_title='')

return Response({
"latest_contributor": email2nickname(latest_contributor),
Expand Down
5 changes: 4 additions & 1 deletion seahub/seadoc/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,19 @@ def uuid_str_to_36_chars(file_uuid):
return file_uuid


def gen_seadoc_access_token(file_uuid, filename, username, permission='rw'):
def gen_seadoc_access_token(file_uuid, filename, username, permission='rw', default_title=None):
name = email2nickname(username)
url, is_default, date_uploaded = api_avatar_url(username, 72)
if default_title is None:
default_title = filename
access_token = jwt.encode({
'file_uuid': file_uuid,
'filename': filename,
'username': username,
'name': name,
'avatar_url': url,
'permission': permission,
'default_title': default_title,
'exp': int(time.time()) + 86400 * 3, # 3 days
},
SEADOC_PRIVATE_KEY,
Expand Down

0 comments on commit 82fdc2d

Please sign in to comment.