From 02e6c5843a03bb5a350a282b8cfd6928089a8e52 Mon Sep 17 00:00:00 2001
From: Kload <kload@kload.fr>
Date: Sun, 27 Oct 2013 14:48:10 +0000
Subject: [PATCH] Add/remove access for apps

---
 action_map.yml  | 16 +---------------
 yunohost_app.py | 41 ++++++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/action_map.yml b/action_map.yml
index 0340df1c..b1778ebd 100644
--- a/action_map.yml
+++ b/action_map.yml
@@ -270,6 +270,7 @@ app:
                 -r:
                     full: --raw
                     help: Return the full app_dict
+                    action: store_true
 
         ### app_map()
         map:
@@ -317,21 +318,6 @@ app:
                     full: --file
                     help: Folder or tarball for upgrade
 
-        ### app_info() TODO: Write help
-        info:
-            action_help: Get app informations
-            api: GET /app
-            arguments:
-                app:
-                    help: App ID
-                -i:
-                    full: --instance
-                    help: App instance number
-                -r:
-                    full: --raw
-                    help: Return the full app_dict
-                    action: store_true
-
         ### app_setting()
         setting:
             action_help: Set ou get an app setting value
diff --git a/yunohost_app.py b/yunohost_app.py
index a78bb9c4..f7512047 100644
--- a/yunohost_app.py
+++ b/yunohost_app.py
@@ -33,7 +33,7 @@ import time
 import re
 import socket
 from yunohost import YunoHostError, YunoHostLDAP, win_msg, random_password, is_true, validate
-from yunohost_domain import domain_list, domain_add
+from yunohost_domain import domain_list, domain_add, domain_ssowatconf
 from yunohost_user import user_info
 from yunohost_hook import hook_exec
 
@@ -180,12 +180,11 @@ def app_info(app, raw=False):
     if raw:
         return app_info
     else:
-        return [
-            ('Name', app_info['manifest']['name']),
-            ('Version', app_info['manifest']['version']),
-            ('Description', app_info['manifest']['description']),
+        return {
+            'Name': app_info['manifest']['name'],
+            'Description': app_info['manifest']['description']['en'],
             #TODO: Add more infos
-        ]
+        }
 
 
 def app_map(app=None, raw=False):
@@ -413,7 +412,11 @@ def app_addaccess(apps, users):
         with open(apps_setting_path + app +'/settings.yml') as f:
             app_settings = yaml.load(f)
 
-        if 'mode' in app_settings and app_settings['mode'] == 'private':
+        if 'mode' not in app_settings:
+            app_setting(app, 'mode', 'private')
+            app_settings['mode'] = 'private'
+
+        if app_settings['mode'] == 'private':
             if 'allowed_users' in app_settings:
                 new_users = app_settings['allowed_users']
             else:
@@ -425,14 +428,14 @@ def app_addaccess(apps, users):
                         user_info(allowed_user)
                     except YunoHostError:
                         continue
-                    new_users = new_users +','+ allowed_user
+                    if new_users == '':
+                        new_users = allowed_user
+                    else:
+                        new_users = new_users +','+ allowed_user
 
-            app_settings['allowed_users'] = new_users.strip()
-            with open(apps_setting_path + app +'/settings.yml', 'w') as f:
-                yaml.safe_dump(app_settings, f, default_flow_style=False)
-                win_msg(_("App setting file updated"))
+            app_setting(app, 'allowed_users', new_users.strip())
 
-    #TODO: Regenerate SSOwat conf
+    domain_ssowatconf()
 
 
 def app_removeaccess(apps, users):
@@ -461,14 +464,14 @@ def app_removeaccess(apps, users):
             if 'allowed_users' in app_settings:
                 for allowed_user in app_settings['allowed_users'].split(','):
                     if allowed_user not in users:
-                        new_users = new_users +','+ allowed_user
+                        if new_users == '':
+                            new_users = allowed_user
+                        else:
+                            new_users = new_users +','+ allowed_user
 
-                app_settings['allowed_users'] = new_users.strip()
-                with open(apps_setting_path + app +'/settings.yml', 'w') as f:
-                    yaml.safe_dump(app_settings, f, default_flow_style=False)
-                    win_msg(_("App setting file updated"))
+                app_setting(app, 'allowed_users', new_users.strip())
 
-    #TODO: Regenerate SSOwat conf
+    domain_ssowatconf()
 
 
 def app_setting(app, key, value=None):