fix(PnX-SI/gn_mobile_occtax#258): user's first name may be null (and …

…it shouldn't be)...
PnX-SI · Jun 18, 2024 · 356b79d · 356b79d
1 parent ae3dd3f
commit 356b79d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/datasync/build.gradle b/datasync/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
 }
 
-version = "0.6.0"
+version = "0.6.1"
 
 android {
     namespace 'fr.geonature.datasync'

diff --git a/datasync/src/main/java/fr/geonature/datasync/api/model/AuthUser.kt b/datasync/src/main/java/fr/geonature/datasync/api/model/AuthUser.kt
@@ -5,12 +5,12 @@ import com.google.gson.annotations.SerializedName
 /**
  * Authenticated user.
  *
- * @author [S. Grimault](mailto:sebastien.grimault@gmail.com)
+ * @author S. Grimault
  */
 class AuthUser(
     id: Long,
     lastname: String,
-    firstname: String,
+    firstname: String?,
 
     @SerializedName("id_application")
     val applicationId: Int,

diff --git a/datasync/src/main/java/fr/geonature/datasync/api/model/User.kt b/datasync/src/main/java/fr/geonature/datasync/api/model/User.kt
@@ -5,7 +5,7 @@ import com.google.gson.annotations.SerializedName
 /**
  * GeoNature User definition.
  *
- * @author [S. Grimault](mailto:sebastien.grimault@gmail.com)
+ * @author S. Grimault
  */
 open class User(
     @SerializedName("id_role")
@@ -15,7 +15,7 @@ open class User(
     val lastname: String,
 
     @SerializedName("prenom_role")
-    val firstname: String
+    val firstname: String?
 ) {
 
     override fun equals(other: Any?): Boolean {

diff --git a/datasync/src/main/java/fr/geonature/datasync/auth/AuthManagerImpl.kt b/datasync/src/main/java/fr/geonature/datasync/auth/AuthManagerImpl.kt
@@ -112,8 +112,8 @@ class AuthManagerImpl(
                 (if (response.isSuccessful) response
                     .body()
                     ?.let {
-                        if (it.user.login.isBlank() || it.user.lastname.isBlank() || it.user.firstname.isBlank()) {
-                            Logger.warn { "invalid user: ${if (it.user.login.isBlank()) "missing 'login' attribute" else if (it.user.lastname.isBlank()) "missing 'lastname' attribute" else "missing 'firstname' attribute"}" }
+                        if (it.user.login.isBlank() || it.user.lastname.isBlank()) {
+                            Logger.warn { "invalid user: ${if (it.user.login.isBlank()) "missing 'login' attribute" else "missing 'lastname' attribute"}" }
                             Either.Left(AuthFailure.InvalidUserFailure)
                         } else Either.Right(it)
                     }

diff --git a/datasync/src/main/java/fr/geonature/datasync/auth/io/AuthLoginJsonReader.kt b/datasync/src/main/java/fr/geonature/datasync/auth/io/AuthLoginJsonReader.kt
@@ -101,7 +101,7 @@ class AuthLoginJsonReader {
 
         reader.endObject()
 
-        if (id == null || lastname.isNullOrBlank() || firstname.isNullOrBlank() || applicationId == null || organismId == null || login.isNullOrBlank()) {
+        if (id == null || lastname.isNullOrBlank() || applicationId == null || organismId == null || login.isNullOrBlank()) {
             return null
         }
 

diff --git a/datasync/version.properties b/datasync/version.properties
@@ -1,2 +1,2 @@
-#Sun May 12 14:00:50 CEST 2024
-VERSION_CODE=1220
+#Tue Jun 18 19:19:14 CEST 2024
+VERSION_CODE=1225