From 6e9cba80111673a94a7cb433d572a0b4519abd49 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Sat, 20 Oct 2018 22:27:28 +0200
Subject: [PATCH] fix sso issues

---
 README.md       | 2 +-
 scripts/install | 8 ++------
 scripts/upgrade | 9 ++-------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 923cf7a..104616f 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Installation requires a dedicated domain for now. I hope subpath installation wi
 
 ## Admin
 
-Admin password is **funkwhale**, login is the user you provided at installation.
+The admin uses the login you provided at installation. The password is the same you use for YunoHost.
 
 The admin interface is accessible with the address: your.domain.fr/api/admin
 
diff --git a/scripts/install b/scripts/install
index 841cbb5..19ba6fb 100644
--- a/scripts/install
+++ b/scripts/install
@@ -226,15 +226,11 @@ chmod -R 755 "$final_path/front/dist/"
 # SETUP SSOWAT
 #=================================================
 
-if [ "$is_public" -eq 0 ]
-then	# Remove the public access
-	ynh_app_setting_delete "$app" skipped_uris
-fi
 # Make app public if necessary
 if [ "$is_public" -eq 1 ]
 then
-	# unprotected_uris allows SSO credentials to be passed anyway.
-	ynh_app_setting_set "$app" unprotected_uris "/"
+	# makes sure no SSO credentials to be passed
+	ynh_app_setting_set "$app" skipped_uris "/"
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 88c33b3..922ea4d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -213,17 +213,12 @@ chmod -R 755 "$final_path/front/dist/"
 # SETUP SSOWAT
 #=================================================
 
-if [ "$is_public" -eq 0 ]
-then	# Remove the public access
-	ynh_app_setting_delete "$app" skipped_uris
-fi
 # Make app public if necessary
 if [ "$is_public" -eq 1 ]
 then
-	# unprotected_uris allows SSO credentials to be passed anyway
-	ynh_app_setting_set "$app" unprotected_uris "/"
+	# makes sure no SSO credentials to be passed
+	ynh_app_setting_set "$app" skipped_uris "/"
 fi
-
 #=================================================
 # RELOAD NGINX
 #=================================================