YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Alter SSOwat conf output

Browse source
This commit is contained in:
Ludovic Coues 2016-05-02 18:16:29 +02:00
parent 3f0ad9139e
commit 540551470e
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/yunohost/app.py
View file

@ -965,7 +965,11 @@ def app_ssowatconf(auth):
users = {} users = {}
for username in user_list(auth)['users'].keys(): for username in user_list(auth)['users'].keys():
users[username] = app_map(user=username) apps_by_domains = app_map(user=username, raw=True)
users[username] = []
for apps in apps_by_domains.values():
for app in apps.values():
users[username].append(app.get('id'))
skipped_urls = [] skipped_urls = []
skipped_regex = [] skipped_regex = []
@ -990,6 +994,11 @@ def app_ssowatconf(auth):
if _is_installed(app['id']): if _is_installed(app['id']):
with open(apps_setting_path + app['id'] +'/settings.yml') as f: with open(apps_setting_path + app['id'] +'/settings.yml') as f:
app_settings = yaml.load(f) app_settings = yaml.load(f)
# Add url to the app details
app['url'] = "{0}{1}".format(
app_settings.get('domain', ""),
app_settings.get('path', "")
)
for item in _get_setting(app_settings, 'skipped_uris'): for item in _get_setting(app_settings, 'skipped_uris'):
if item[-1:] == '/': if item[-1:] == '/':
item = item[:-1] item = item[:-1]
@ -1035,6 +1044,7 @@ def app_ssowatconf(auth):
'redirected_urls': redirected_urls, 'redirected_urls': redirected_urls,
'redirected_regex': redirected_regex, 'redirected_regex': redirected_regex,
'users': users, 'users': users,
'apps': {a['id']:a for a in apps_list if a.get('installed', False)},
} }
with open('/etc/ssowat/conf.json', 'w+') as f: with open('/etc/ssowat/conf.json', 'w+') as f: