Skip to content

Commit 0aefc06

Browse files
author
Gonchik Tsymzhitov
committed
Provide method for avatars
1 parent d74e7ec commit 0aefc06

File tree

1 file changed

+36
-13
lines changed

1 file changed

+36
-13
lines changed

atlassian/confluence.py

+36-13
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ def get_all_pages_by_label(self, label, start=0, limit=50):
217217
params = {}
218218
if label:
219219
params['cql'] = 'type={type} AND label={label}'.format(type='page',
220-
label=label)
220+
label=label)
221221
if start:
222222
params['start'] = start
223223
if limit:
@@ -938,13 +938,11 @@ def get_user_details_by_username(self, username, expand=None):
938938
Possible param is "status". Results are "Active, Deactivated"
939939
:return: Returns the user details
940940
"""
941+
url = 'rest/api/user'
942+
params = {'username': username}
941943
if expand:
942-
url = 'rest/api/user?username={username}&expand={expand}'.format(username=username,
943-
expand=expand)
944-
else:
945-
url = 'rest/api/user?username={username}'.format(username=username)
946-
947-
return self.get(url)
944+
params['expand'] = expand
945+
return self.get(url, params=params)
948946

949947
def get_user_details_by_userkey(self, userkey, expand=None):
950948
"""
@@ -954,12 +952,11 @@ def get_user_details_by_userkey(self, userkey, expand=None):
954952
Possible param is "status". Results are "Active, Deactivated"
955953
:return: Returns the user details
956954
"""
955+
url = 'rest/api/user'
956+
params = {'key': userkey}
957957
if expand:
958-
url = 'rest/api/user?key={userkey}&expand={expand}'.format(userkey=userkey,
959-
expand=expand)
960-
else:
961-
url = 'rest/api/user?key={userkey}'.format(userkey=userkey)
962-
return self.get(url)
958+
params['expand'] = expand
959+
return self.get(url, params=params)
963960

964961
def cql(self, cql, start=0, limit=None, expand=None, include_archived_spaces=None, excerpt=None):
965962
"""
@@ -1271,4 +1268,30 @@ def team_calendar_events(self, sub_calendar_id, start, end, user_time_zone_id=No
12711268
if end:
12721269
params['start'] = end
12731270
return self.get(url, params=params)
1274-
1271+
1272+
def get_mobile_parameters(self, username):
1273+
"""
1274+
Get mobile paramaters
1275+
:param username:
1276+
:return:
1277+
"""
1278+
url = 'rest/mobile/1.0/profile/{username}'.format(username=username)
1279+
return self.get(url)
1280+
1281+
def avatar_upload_for_user(self, user_key, data):
1282+
"""
1283+
1284+
:param user_key:
1285+
:param data: json like {"avatarDataURI":"image in base64"}
1286+
:return:
1287+
"""
1288+
url = 'rest/user-profile/1.0/{}/avatar/upload'.format(user_key)
1289+
return self.post(url, data=data)
1290+
1291+
def avatar_set_default_for_user(self, user_key):
1292+
"""
1293+
:param user_key:
1294+
:return:
1295+
"""
1296+
url = 'rest/user-profile/1.0/{}/avatar/default'.format(user_key)
1297+
return self.get(url)

0 commit comments

Comments
 (0)