From 2be5d462b864e876ff00d398cfac12cbde5367c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 9 Jan 2024 09:37:02 +0100
Subject: [PATCH] fix

---
 conf/config.yaml   | 10 +++++-----
 doc/ADMIN_fr.md    |  2 +-
 manifest.toml      |  6 +++---
 scripts/_common.sh |  2 +-
 scripts/remove     |  2 +-
 scripts/restore    |  4 ++--
 scripts/upgrade    |  2 +-
 tests.toml         |  6 +++---
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/conf/config.yaml b/conf/config.yaml
index 1a1a5bf..4bb2647 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -1,5 +1,5 @@
 # LDAP connector + Yunohost setup + staticClient as per manifest.json
-issuer: https://__DOMAIN____PATH_URL__
+issuer: https://__DOMAIN____PATH__
 storage:
   type: sqlite3
   config:
@@ -47,8 +47,8 @@ connectors:
 # Unfortunately the api is too complex to be used here
 # As a consequence we have to setup client as staticClient, which means we will need one Dex instance per client app
 staticClients:
-- id: __OIDC_NAME__
+- id: __NAME__
   redirectURIs:
-  - https://__OIDC_CALLBACK__
-  name: __OIDC_NAME__
-  secret: __OIDC_SECRET__
+  - https://__CALLBACK__
+  name: __NAME__
+  secret: __SECRET__
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
index 9a28c79..c0410b6 100644
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@@ -7,4 +7,4 @@
 ### À utiliser avec précaution :
 
     * La modification de l'URL fonctionnera mais nécessitera certains changements de paramètres dans l'application en utilisant Dex comme fournisseur OIDC.
-    * Accéder à l'URL ne vous permettra de voir qu'un message : "C'est ici que Dex est installé".
\ No newline at end of file
+    * Accéder à l'URL ne vous permettra de voir qu'un message : "This is where Dex is installed.".
\ No newline at end of file
diff --git a/manifest.toml b/manifest.toml
index 1434547..304176d 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -40,18 +40,18 @@ ram.runtime = "50M"
     type = "group"
     default = "visitors"
 
-    [install.OIDC_name]
+    [install.name]
     ask.en = "Name of the app you want to connect to the OIDC auth flow"
     ask.fr = "Nom de l'application que vous souhaitez connecter au flux d'authentification OIDC"
     type = "string"
 
 
-    [install.OIDC_secret]
+    [install.secret]
     ask.en = "OIDC secret of the app you want to connect to the OIDC auth flow"
     ask.fr = "Secret OIDC de l'application que vous souhaitez connecter au flux d'authentification OIDC"
     type = "string"
 
-    [install.OIDC_callback]
+    [install.callback]
     ask.en = "Callback URI required by the app you want to connect to the OIDC auth flow"
     ask.fr = "URI de rappel requis par l'application que vous souhaitez connecter au flux d'authentification OIDC"
     type = "string"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 1caa48a..1021f79 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-GO_VERSION="1.19"
+GO_VERSION="1.20"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/remove b/scripts/remove
index 2644208..d3596d1 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -14,8 +14,8 @@ source /usr/share/yunohost/helpers
 #=================================================
 # REMOVE SERVICE INTEGRATION IN YUNOHOST
 #=================================================
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
-# Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
 if ynh_exec_warn_less yunohost service status $app >/dev/null
 then
 	ynh_script_progression --message="Removing $app service integration..." --weight=1
diff --git a/scripts/restore b/scripts/restore
index 8483539..6f37885 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -23,7 +23,7 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 # RESTORE SYSTEMD
 #=================================================
-ynh_script_progression --message="Restoring the systemd configuration..." --weight=1
+ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
@@ -40,7 +40,7 @@ yunohost service add $app --description="OpenID Connect Provider" --log="/var/lo
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
+ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 82ab9b9..0caabf4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -78,7 +78,7 @@ chown $app:$app "$install_dir/config.yaml"
 #=================================================
 # SETUP SYSTEMD
 #=================================================
-ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
+ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
diff --git a/tests.toml b/tests.toml
index be7184a..cfcd143 100644
--- a/tests.toml
+++ b/tests.toml
@@ -10,6 +10,6 @@ test_format = 1.0
     # Default args to use for install
     # -------------------------------	
 
-		args.OIDC_name="Outline"
-		args.OIDC_secret="secret"
-		args.OIDC_callback="domain.tld/callback"
\ No newline at end of file
+		args.name = "Outline"
+		args.secret = "secret"
+		args.callback = "domain.tld/callback"
\ No newline at end of file