From bc929c23a60587afe4c0e5d2038eabc5f0812835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Mennetrier?= <mennetrier@smart4.io>
Date: Wed, 18 May 2022 15:24:23 +0200
Subject: [PATCH] Improve upgrade of sso module

---
 scripts/_common.sh | 5 +----
 scripts/install    | 6 ++++--
 scripts/upgrade    | 8 ++++++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 287c851..b02cd8c 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -73,16 +73,13 @@ myynh_urlencode() {
     return 0
 }
 
-enable_sso() {
+install_sso() {
     tmp_auth_basic_module="$(mktemp /tmp/humhub_ynh.XXXXXX)"
     wget -q -O $tmp_auth_basic_module "https://github.com/smart4life/humhub-auth-basic/archive/refs/tags/$HUMHUB_AUTH_BASIC_VERSION.tar.gz"
 
     tar xf $tmp_auth_basic_module -C $final_path/protected/modules
     mv $final_path/protected/modules/humhub-auth-basic* $final_path/$HUMHUB_AUTH_BASIC_PATH
 
-    pushd $final_path/protected/
-    php${YNH_PHP_VERSION} yii module/enable auth-basic
-    popd
     ynh_secure_remove $tmp_auth_basic_module
 }
 
diff --git a/scripts/install b/scripts/install
index 2446443..e88538f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -136,6 +136,8 @@ ynh_systemd_action --service_name=nginx --action=reload
 # Installation with curl
 ynh_script_progression --message="Finalizing installation..." --weight=2
 
+install_sso
+
 pushd $final_path/protected
 	php${YNH_PHP_VERSION} yii migrate/up --includeModuleMigrations=1 --interactive=0
 
@@ -173,9 +175,9 @@ pushd $final_path/protected
 	php${YNH_PHP_VERSION} yii settings/set user auth.allowGuestAccess '0'
 	php${YNH_PHP_VERSION} yii settings/set user auth.internalUsersCanInvite '0'
 
-popd
+	php${YNH_PHP_VERSION} yii module/enable auth-basic
 
-enable_sso
+popd
 
 # Remove the public access
 ynh_permission_update --permission="main" --remove="visitors"
diff --git a/scripts/upgrade b/scripts/upgrade
index e1c02c7..767532f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -86,12 +86,16 @@ then
 	ynh_secure_remove --file="$final_path.old"
 
 	if [[ ! -d $final_path/$HUMHUB_AUTH_BASIC_PATH ]]; then
-			enable_sso
+			install_sso
+
+			pushd $final_path/protected
+				php${YNH_PHP_VERSION} yii module/enable auth-basic
+			popd
 	else
 			current_version=$(cat $final_path/$HUMHUB_AUTH_BASIC_PATH/module.json | jq -j '.version')
 			if [ "$current_version" != "$HUMHUB_AUTH_BASIC_VERSION" ]; then
 				ynh_secure_remove $final_path/$HUMHUB_AUTH_BASIC_PATH
-				enable_sso
+				install_sso
 			fi
 	fi
 fi