From d4d1e1144fb2df304ed463602f8eb0406a00cdc8 Mon Sep 17 00:00:00 2001
From: yostyle <y.pintas@gmail.com>
Date: Wed, 8 Jan 2025 13:17:30 +0100
Subject: [PATCH] Add SSO FAQ URL

---
 build.gradle                                               | 2 +-
 .../ui-strings/src/main/res/values-fr/strings_tchap.xml    | 1 +
 library/ui-strings/src/main/res/values/strings_tchap.xml   | 1 +
 vector-config/src/tchap/res/values/config-features.xml     | 4 ++--
 .../onboarding/ftueauth/AbstractFtueAuthFragment.kt        | 2 ++
 .../features/onboarding/ftueauth/FtueAuthLoginFragment.kt  | 7 +++++--
 vector/src/main/res/layout/fragment_login.xml              | 7 +++++++
 7 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 85b155e403..4449e4366d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ buildscript {
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6'
         classpath "com.likethesalad.android:stem-plugin:2.9.0"
-        classpath 'org.owasp:dependency-check-gradle:8.2.1'
+        classpath 'org.owasp:dependency-check-gradle:11.1.0'
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.8.10"
         classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
         classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
diff --git a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
index 1224a26b06..a61fdf2f97 100644
--- a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
+++ b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml
@@ -80,6 +80,7 @@
     <string name="tchap_has_account_yes">Se connecter par mot de passe</string>
     <string name="tchap_start_message">La messagerie instantanée du secteur public</string>
     <string name="tchap_connection_sso_help">➜ Qu’est-ce que %s ?</string>
+    <string name="tchap_connection_sso_description">➜ Est-ce que %s est activé pour mon administration ?</string>
     <string name="tchap_connection_email">Adresse mail professionnelle</string>
     <string name="tchap_connection_email_help">Utilisez votre adresse professionnelle</string>
     <string name="tchap_connection_password_help">Votre mot de passe doit contenir au moins 8 caractères, avec au moins un caractère de chaque type : majuscule, minuscule, chiffre, caractère spécial.</string>
diff --git a/library/ui-strings/src/main/res/values/strings_tchap.xml b/library/ui-strings/src/main/res/values/strings_tchap.xml
index 77716b8db7..33130f10af 100644
--- a/library/ui-strings/src/main/res/values/strings_tchap.xml
+++ b/library/ui-strings/src/main/res/values/strings_tchap.xml
@@ -80,6 +80,7 @@
     <string name="tchap_has_account_yes">Login by password</string>
     <string name="tchap_start_message">Instant messaging of public sector</string>
     <string name="tchap_connection_sso_help">➜ What is %s ?</string>
+    <string name="tchap_connection_sso_description">Is %s available for my organization ?</string>
     <string name="tchap_connection_email">Professional email</string>
     <string name="tchap_connection_email_help">Use your business address</string>
     <string name="tchap_connection_password_help">Your password must include a lower-case letter, an upper-case letter, a number and a symbol and be at a minimum 8 characters in length.</string>
diff --git a/vector-config/src/tchap/res/values/config-features.xml b/vector-config/src/tchap/res/values/config-features.xml
index f5041ac0a0..612c7a050d 100755
--- a/vector-config/src/tchap/res/values/config-features.xml
+++ b/vector-config/src/tchap/res/values/config-features.xml
@@ -3,8 +3,8 @@
     <bool name="tchap_is_cross_signing_enabled">true</bool>
     <bool name="tchap_is_key_backup_enabled">true</bool>
     <bool name="tchap_is_thread_enabled">false</bool>
-    <bool name="tchap_is_secure_backup_required">true</bool>
-    <bool name="tchap_is_sso_enabled">false</bool>
+    <bool name="tchap_is_secure_backup_required">false</bool>
+    <bool name="tchap_is_sso_enabled">true</bool>
 
     <string-array name="tchap_is_visio_supported_homeservers" translatable="false" />
 </resources>
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
index 6ff552e706..42b43c9463 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/AbstractFtueAuthFragment.kt
@@ -31,6 +31,7 @@ import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
 import im.vector.app.features.onboarding.OnboardingViewModel
 import im.vector.app.features.onboarding.OnboardingViewState
+import im.vector.app.features.settings.VectorSettingsUrls
 import im.vector.lib.strings.CommonStrings
 import kotlinx.coroutines.CancellationException
 
@@ -171,5 +172,6 @@ abstract class AbstractFtueAuthFragment<VB : ViewBinding> : VectorBaseFragment<V
     companion object {
         const val TCHAP_SSO_URL = "https://proconnect.gouv.fr/"
         const val TCHAP_SSO_PROVIDER = "ProConnect"
+        const val TCHAP_SSO_FAQ_URL = "${VectorSettingsUrls.HELP}/fr/article/se-connecter-a-tchap-avec-proconnect-1dh1peg/"
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
index 2bd4d32199..19eae11db1 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
@@ -385,11 +385,14 @@ class FtueAuthLoginFragment :
                     }
                 }
                 SignMode.TchapSignInWithSSO -> {
-                    views.passwordFieldTil.isVisible = false
+                    views.loginSubmit.setLeftDrawable(im.vector.lib.ui.styles.R.drawable.ic_tchap_proconnect)
                     views.loginSSOHelp.text = getString(CommonStrings.tchap_connection_sso_help, TCHAP_SSO_PROVIDER)
+                    views.loginSSODescription.text = getString(CommonStrings.tchap_connection_sso_description, TCHAP_SSO_PROVIDER)
                     views.loginSSOHelp.debouncedClicks { openUrlInExternalBrowser(requireContext(), TCHAP_SSO_URL) }
+                    views.loginSSODescription.debouncedClicks { openUrlInExternalBrowser(requireContext(), TCHAP_SSO_FAQ_URL) }
+                    views.passwordFieldTil.isVisible = false
                     views.loginSSOHelp.isVisible = true
-                    views.loginSubmit.setLeftDrawable(im.vector.lib.ui.styles.R.drawable.ic_tchap_proconnect)
+                    views.loginSSODescription.isVisible = true
                 }
                 else -> {
                     views.passwordField.imeOptions = EditorInfo.IME_ACTION_DONE
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index a0dbd372fa..600a121391 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -187,6 +187,13 @@
                 android:layout_height="wrap_content"
                 tools:text="@string/tchap_connection_sso_help" />
 
+            <Button
+                android:id="@+id/loginSSODescription"
+                style="@style/Widget.Vector.Button.Text.Login"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="@string/tchap_connection_sso_description" />
+
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>