From a6ac2c983a633503fd589539e9dd9bd47331463d Mon Sep 17 00:00:00 2001
From: Titus PiJean <titus@pijean.ovh>
Date: Mon, 5 Mar 2018 15:28:04 +0100
Subject: [PATCH] Update on SSOwat extension

---
 scripts/install |  5 +++--
 scripts/upgrade | 11 +++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index 4e25d76..2ee61a2 100644
--- a/scripts/install
+++ b/scripts/install
@@ -41,6 +41,7 @@ title=$YNH_APP_ARG_TITLE
 is_public=$YNH_APP_ARG_IS_PUBLIC
 language=$YNH_APP_ARG_LANGUAGE
 flarum_version="v0.1.0-beta.7"
+ssowat_ext_ver="*@dev"
 
 #===================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
@@ -203,10 +204,10 @@ if [[ -n $admin && -n $title ]]; then
   ynh_mysql_execute_as_root "$sql_command" $db_name
 
   # Install and active the SSOwat auth extension
-  install_and_activate_extension $app $final_path $db_name "tituspijean/flarum-ext-auth-ssowat:0.4.x-dev" "tituspijean-auth-ssowat"
+  install_and_activate_extension $app $final_path $db_name "tituspijean/flarum-ext-auth-ssowat:$ssowat_ext_ver" "tituspijean-auth-ssowat"
   # Configure SSOwat auth extension
   ssowatdomain=$(</etc/yunohost/current_host)
-  sql_command="INSERT INTO \`settings\` (\`key\`, \`value\`) VALUES ('flarum-ext-auth-ssowat.address', '$ssowatdomain'), ('flarum-ext-auth-ssowat.onlyUse', '0');"
+  sql_command="INSERT INTO \`settings\` (\`key\`, \`value\`) VALUES ('tituspijean-auth-ssowat.domain', '$ssowatdomain'), ('tituspijean-auth-ssowat.onlyUse', '0');"
   ynh_mysql_execute_as_root "$sql_command" $db_name
 
   # Install, activate and set language extensions
diff --git a/scripts/upgrade b/scripts/upgrade
index 1dd9bae..80d4563 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -43,6 +43,7 @@ db_name=$(ynh_app_setting_get $app db_name)
 db_pwd=$(ynh_app_setting_get $app db_pwd)
 old_flarum_version=$(ynh_app_setting_get "$app" flarum_version)
 flarum_version="v0.1.0-beta.7"
+ssowat_ext_ver="*@dev"
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
@@ -110,13 +111,19 @@ fi
 # FLARUM UPGRADE
 #=================================================
 
-# Install Flarum
-exec_composer $app $final_path "require tituspijean/flarum-ext-auth-ssowat:0.4.x-dev --ansi"
+# Upgrade Flarum
 exec_composer $app $final_path "update --ansi"
 pushd $final_path
 exec_as $app php flarum cache:clear
 popd
 
+# Update SSOwat extension
+install_and_activate_extension $app $final_path $db_name "tituspijean/flarum-ext-auth-ssowat:$ssowat_ext_ver" "tituspijean-auth-ssowat"
+# Configure SSOwat auth extension
+ssowatdomain=$(</etc/yunohost/current_host)
+sql_command="INSERT INTO \`settings\` (\`key\`, \`value\`) VALUES ('tituspijean-auth-ssowat.domain', '$ssowatdomain'), ('tituspijean-auth-ssowat.onlyUse', '0');"
+ynh_mysql_execute_as_root "$sql_command" $db_name
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================