From 8ca1412d7d27f465254d2a4a413867d0910e6924 Mon Sep 17 00:00:00 2001
From: Limezy <arnaudetpia@de-ruffray.fr>
Date: Fri, 1 Apr 2022 21:00:48 +0700
Subject: [PATCH] Removal of dex

---
 scripts/backup     | 11 ++++++-----
 scripts/change_url | 11 ++++++-----
 scripts/install    |  8 +++++---
 scripts/remove     | 18 +++++++++++++-----
 scripts/restore    | 11 ++++++-----
 scripts/upgrade    | 11 ++++++-----
 6 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index 742da2f..55eeaa1 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -41,11 +41,12 @@ minio_admin=$(ynh_app_setting_get --app="minio" --key=admin)
 minio_password=$(ynh_app_setting_get --app="minio" --key=password)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
-dex_domain=$(ynh_app_setting_get --app="minio" --key=dex_domain)
-dex_path=$(ynh_app_setting_get --app="minio" --key=dex_path)
-oidc_secret=$(ynh_app_setting_get --app="minio" --key=oidc_secret)
-oidc_name=$(ynh_app_setting_get --app="minio" --key=oidc_name)
-oidc_callback=$(ynh_app_setting_get --app="minio" --key=oidc_callback)
+dex_app=$(ynh_app_setting_get --app=$app --key=dex_app)
+dex_domain=$(ynh_app_setting_get --app=$dex_app --key=dex_domain)
+dex_path=$(ynh_app_setting_get --app=$dex_app --key=dex_path)
+oidc_secret=$(ynh_app_setting_get --app=$dex_app --key=oidc_secret)
+oidc_name=$(ynh_app_setting_get --app=$dex_app --key=oidc_name)
+oidc_callback=$(ynh_app_setting_get --app=$dex_app --key=oidc_callback)
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
diff --git a/scripts/change_url b/scripts/change_url
index 029298a..3d2364a 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -40,11 +40,12 @@ minio_admin=$(ynh_app_setting_get --app="minio" --key=admin)
 minio_password=$(ynh_app_setting_get --app="minio" --key=password)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
-dex_domain=$(ynh_app_setting_get --app="minio" --key=dex_domain)
-dex_path=$(ynh_app_setting_get --app="minio" --key=dex_path)
-oidc_secret=$(ynh_app_setting_get --app="minio" --key=oidc_secret)
-oidc_name=$(ynh_app_setting_get --app="minio" --key=oidc_name)
-oidc_callback=$(ynh_app_setting_get --app="minio" --key=oidc_callback)
+dex_app=$(ynh_app_setting_get --app=$app --key=dex_app)
+dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain)
+dex_path=$(ynh_app_setting_get --app=$app --key=dex_path)
+oidc_secret=$(ynh_app_setting_get --app=$app --key=oidc_secret)
+oidc_name=$(ynh_app_setting_get --app=$app --key=oidc_name)
+oidc_callback=$(ynh_app_setting_get --app=$app --key=oidc_callback)
 
 #=================================================
 # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
diff --git a/scripts/install b/scripts/install
index cacc0a8..a2ee1ee 100755
--- a/scripts/install
+++ b/scripts/install
@@ -54,8 +54,7 @@ if ! yunohost app list | grep -q "id: minio"; then
 	if yunohost app list | grep -q "$YNH_APP_ARG_MINIO_DOMAIN"; then
 		ynh_die "The domain provided for MinIO is already used by another app. Please chose another one !"
 	fi
-	### FIXME AFTER CI VERIFICATION
-	yunohost app install https://github.com/Limezy/minio_ynh/tree/ci-compatible --force --args "domain=$YNH_APP_ARG_MINIO_DOMAIN&is_public=true&admin=$YNH_APP_ARG_MINIO_ADMIN&password=$YNH_APP_ARG_MINIO_PASSWORD"
+	yunohost app install https://github.com/YunoHost-Apps/minio_ynh --force --args "domain=$YNH_APP_ARG_MINIO_DOMAIN&is_public=true&admin=$YNH_APP_ARG_MINIO_ADMIN&password=$YNH_APP_ARG_MINIO_PASSWORD"
 fi
 
 minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
@@ -79,7 +78,9 @@ if yunohost app list | grep -q "$YNH_APP_ARG_DEX_DOMAIN"; then
 	ynh_die "The domain provided for Dex is already used by another app. Please chose another one !"
 fi
 
-yunohost app install https://github.com/YunoHost-Apps/dex_ynh --force --args "domain=$dex_domain&path=$dex_path&OIDC_name=$oidc_name&OIDC_secret=$oidc_secret&OIDC_callback=$oidc_callback"
+yunohost app install https://github.com/YunoHost-Apps/dex_ynh --force --args "domain=$dex_domain&path=$dex_path&OIDC_name=$oidc_name&OIDC_secret=$oidc_secret&OIDC_callback=$oidc_callback" 2>&1 | tee dexlog.txt
+dex_app=$(gawk 'match($0, /Installation of (.+) completed/, app) {print app[1]}' dexlog.txt)
+rm dexlog.txt
 
 #===================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
@@ -103,6 +104,7 @@ ynh_app_setting_set --app=$app --key=language --value=$language
 ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key
 ynh_app_setting_set --app=$app --key=utils_secret --value=$utils_secret
 ynh_app_setting_set --app=$app --key=language_key --value=$language_key
+ynh_app_setting_set --app=$app --key=dex_app --value=$dex_app
 ynh_app_setting_set --app=$app --key=dex_domain --value=$dex_domain
 ynh_app_setting_set --app=$app --key=dex_path --value=$dex_path
 ynh_app_setting_set --app=$app --key=oidc_name --value=$oidc_name
diff --git a/scripts/remove b/scripts/remove
index 0dc8d21..2631d87 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -28,11 +28,12 @@ minio_admin=$(ynh_app_setting_get --app="minio" --key=admin)
 minio_password=$(ynh_app_setting_get --app="minio" --key=password)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
-dex_domain=$(ynh_app_setting_get --app="minio" --key=dex_domain)
-dex_path=$(ynh_app_setting_get --app="minio" --key=dex_path)
-oidc_secret=$(ynh_app_setting_get --app="minio" --key=oidc_secret)
-oidc_name=$(ynh_app_setting_get --app="minio" --key=oidc_name)
-oidc_callback=$(ynh_app_setting_get --app="minio" --key=oidc_callback)
+dex_app=$(ynh_app_setting_get --app=$app --key=dex_app)
+dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain)
+dex_path=$(ynh_app_setting_get --app=$app --key=dex_path)
+oidc_secret=$(ynh_app_setting_get --app=$app --key=oidc_secret)
+oidc_name=$(ynh_app_setting_get --app=$app --key=oidc_name)
+oidc_callback=$(ynh_app_setting_get --app=$app --key=oidc_callback)
 
 #=================================================
 # STANDARD REMOVE
@@ -88,6 +89,13 @@ ynh_script_progression --message="Removing app main directory..." --weight=1
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
 
+#=================================================
+# REMOVE DEX APP
+#=================================================
+ynh_script_progression --message="Removing Dex app used for Outline auth..." --weight=1
+
+yunohost app remove $dex_app
+
 #=================================================
 # REMOVE MINIO BUCKET
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 1b35f7a..48d68c3 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -50,11 +50,12 @@ minio_admin=$(ynh_app_setting_get --app="minio" --key=admin)
 minio_password=$(ynh_app_setting_get --app="minio" --key=password)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
-dex_domain=$(ynh_app_setting_get --app="minio" --key=dex_domain)
-dex_path=$(ynh_app_setting_get --app="minio" --key=dex_path)
-oidc_secret=$(ynh_app_setting_get --app="minio" --key=oidc_secret)
-oidc_name=$(ynh_app_setting_get --app="minio" --key=oidc_name)
-oidc_callback=$(ynh_app_setting_get --app="minio" --key=oidc_callback)
+dex_app=$(ynh_app_setting_get --app=$app --key=dex_app)
+dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain)
+dex_path=$(ynh_app_setting_get --app=$app --key=dex_path)
+oidc_secret=$(ynh_app_setting_get --app=$app --key=oidc_secret)
+oidc_name=$(ynh_app_setting_get --app=$app --key=oidc_name)
+oidc_callback=$(ynh_app_setting_get --app=$app --key=oidc_callback)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
diff --git a/scripts/upgrade b/scripts/upgrade
index 38e2c9f..391affb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -29,11 +29,12 @@ minio_admin=$(ynh_app_setting_get --app="minio" --key=admin)
 minio_password=$(ynh_app_setting_get --app="minio" --key=password)
 minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
 mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
-dex_domain=$(ynh_app_setting_get --app="minio" --key=dex_domain)
-dex_path=$(ynh_app_setting_get --app="minio" --key=dex_path)
-oidc_secret=$(ynh_app_setting_get --app="minio" --key=oidc_secret)
-oidc_name=$(ynh_app_setting_get --app="minio" --key=oidc_name)
-oidc_callback=$(ynh_app_setting_get --app="minio" --key=oidc_callback)
+dex_app=$(ynh_app_setting_get --app=$app --key=dex_app)
+dex_domain=$(ynh_app_setting_get --app=$app --key=dex_domain)
+dex_path=$(ynh_app_setting_get --app=$app --key=dex_path)
+oidc_secret=$(ynh_app_setting_get --app=$app --key=oidc_secret)
+oidc_name=$(ynh_app_setting_get --app=$app --key=oidc_name)
+oidc_callback=$(ynh_app_setting_get --app=$app --key=oidc_callback)
 
 #=================================================
 # CHECK VERSION