From 7810dd3f34a4a9034efdda89a18179f9e08d38bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Thu, 9 Feb 2023 18:43:40 +0100
Subject: [PATCH] Fix permission url

---
 manifest.json   | 6 +++---
 scripts/install | 2 +-
 scripts/upgrade | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/manifest.json b/manifest.json
index 55c1aee..e183343 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Opensource groupware for E-Mail, Contacts and Calender",
         "fr": "Groupware opensource pour les e-mail, contacts et calendrier"
     },
-    "version": "5.0.1~ynh1",
+    "version": "5.0.1~ynh2",
     "url": "https://sogo.nu/",
     "upstream": {
         "license": "LGPL-2.1,GPL-2.0",
@@ -31,7 +31,7 @@
         "mysql"
     ],
     "requirements": {
-        "yunohost": ">= 4.3.0"
+        "yunohost": ">= 11.1.6.1"
     },
     "arguments": {
         "install" : [
@@ -46,7 +46,7 @@
             {
                 "name": "is_public",
                 "type": "boolean",
-                "help": { 
+                "help": {
                     "en": "If it's not public, everybody which want to access to any page of SOGo need to be authenticated on the SSO. On the public mode anybody can access to the authentication page. The shared calendar will be also accessible by anybody who has this link",
                     "fr": "Si n'est pas publique, n'importe qui veux accéder à n'importe quelle page de SOGo doit être authentifié dans le SSO. Dans le mode publique n'importe qui peut accéder à la page d'authentification de SOGo. Les agenda partagé seront aussi accessible par n'import qui qui à ce liens."
                 },
diff --git a/scripts/install b/scripts/install
index 4b9d7be..231effb 100755
--- a/scripts/install
+++ b/scripts/install
@@ -158,7 +158,7 @@ fi
 
 ynh_permission_create --permission="sync_client" --allowed='visitors' --auth_header=false\
     --label="Sync client" --protected=true --show_tile=false\
-    --additional_urls="/Microsoft-Server-ActiveSync" "/principals" "/.well-known/caldav" "/.well-known/carddav"
+    --additional_urls="$domain/Microsoft-Server-ActiveSync" "$domain/principals" "$domain/.well-known/caldav" "$domain/.well-known/carddav"
 
 #=================================================
 # RELOAD NGINX
diff --git a/scripts/upgrade b/scripts/upgrade
index 14480f7..7709454 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -147,13 +147,14 @@ ynh_script_progression --message="Configuring permissions..."
 if ! ynh_permission_exists --permission sync_client; then
     ynh_permission_create --permission="sync_client" --allowed 'visitors' --auth_header=false\
         --label="Sync client" --protected=true --show_tile=false\
-        --additional_urls="/Microsoft-Server-ActiveSync" "/principals" "/.well-known/caldav" "/.well-known/carddav"
+        --additional_urls="$domain/Microsoft-Server-ActiveSync" "$domain/principals" "$domain/.well-known/caldav" "$domain/.well-known/carddav"
     python3 remove_sso_conf_persistent.py $domain \
         || ynh_print_warn --message="Your file /etc/ssowat/""conf.json.persistent doesn't respect the json syntax. The config file wasn't cleaned. Please clean it manually."
 else
     ynh_permission_update --permission="sync_client" --add='visitors' --label="Sync client" --protected=true --show_tile=false
+    ynh_permission_url --permission "sync_client" --clear_urls
     ynh_permission_url --permission "sync_client" --auth_header=false\
-        --add_url="/Microsoft-Server-ActiveSync" "/principals" "/.well-known/caldav" "/.well-known/carddav"
+        --add_url="$domain/Microsoft-Server-ActiveSync" "$domain/principals" "$domain/.well-known/caldav" "$domain/.well-known/carddav"
 fi
 
 #=================================================