StubUsers + connexion API + début page de connexion

Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/MainActivity.kt

@@ -1,6 +1,8 @@
 package com.example.veraxapplication
 
 import ArticlesViewModel
+import IUsersDataManager
+import StubUsers
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -8,9 +10,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.example.veraxapplication.articles.IArticlesDataManager
+import com.example.veraxapplication.modele.IArticlesDataManager
 import com.example.veraxapplication.articles.StubArticles
+import com.example.veraxapplication.modele.api.UsersViewModel
 import com.example.veraxapplication.navigation.VeraxNavHost
+import com.example.veraxapplication.ui.connexion.AfficherForm
 import com.example.veraxapplication.ui.topBar.TopBarVerax
 
 // doc navBar: https://developer.android.com/reference/kotlin/androidx/compose/material3/package-summary#TopAppBar(kotlin.Function0,androidx.compose.ui.Modifier,kotlin.Function0,kotlin.Function1,androidx.compose.foundation.layout.WindowInsets,androidx.compose.material3.TopAppBarColors,androidx.compose.material3.TopAppBarScrollBehavior)
@@ -37,12 +41,19 @@ fun VeraxContent() {
     var dataManager: IArticlesDataManager = StubArticles()
     var articles = dataManager.getDerniersArticles(4)
 
+    var usersManager: IUsersDataManager = StubUsers()
+    var users = usersManager.getUsers();
+
     // Observer les données du ViewModel
     val articlesViewModel: ArticlesViewModel = viewModel()
 
     // Observez les articles du ViewModel
     val articlesApi by articlesViewModel.articles.observeAsState(initial = articles)
 
+    val usersViewModel: UsersViewModel = viewModel()
+
+    val usersApi by usersViewModel.users.observeAsState(initial = users)
+
 
     var theme = listOf("Economique", "Culture", "Politique", "Faits divers")
 

Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/modele/ApiClientUser.kt

@@ -1,29 +0,0 @@
-package com.example.veraxapplication.modele
-
-import com.example.veraxapplication.modele.user.User
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-import retrofit2.http.GET
-
-object RetrofitClientUser {
-
-    private const val BASE_URL = "https://codefirst.iut.uca.fr/containers/Verax-verax-api"
-
-    val retrofit: Retrofit by lazy {
-        Retrofit.Builder()
-            .baseUrl(BASE_URL)
-            .addConverterFactory(GsonConverterFactory.create())
-            .build()
-    }
-
-//    interface UserApiService {
-//        @GET("users")
-//        suspend fun getUsers() : List<User>
-//    }
-}
-
-    object ApiClientUser {
-        val apiService: UserApiService by lazy {
-            RetrofitClientUser.retrofit.create(UserApiService::class.java)
-        }
-    }

Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/modele/IArticlesDataManager.kt

@@ -1,4 +1,4 @@
-package com.example.veraxapplication.articles
+package com.example.veraxapplication.modele
 
 import com.example.veraxapplication.modele.articles.Article
 

Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/modele/UserApiService.kt

@@ -1,11 +0,0 @@
-package com.example.veraxapplication.modele
-
-import com.example.veraxapplication.modele.user.User
-import retrofit2.Call
-import retrofit2.http.GET
-
-interface UserApiService {
-    @GET("users/")
-    suspend fun getUsers(): Call<List<User>>
-
-}

Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/modele/api/IUserService.kt

@@ -0,0 +1,11 @@
+package com.example.veraxapplication.modele.api
+
+import com.example.veraxapplication.modele.user.User
+import retrofit2.Call
+import retrofit2.http.GET
+
+interface IUserService {
+    @GET("users")
+    suspend fun getUsers(): List<UserDTO>
+
+}

Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/modele/api/UserDTO.kt

@@ -0,0 +1,32 @@
+package com.example.veraxapplication.modele.api
+
+import com.example.veraxapplication.modele.user.User
+import com.google.gson.annotations.SerializedName
+
+data class UserDTO (
+
+    @SerializedName("pseudo")
+    val pseudo: String,
+    @SerializedName("mdp")
+    val mdp: String,
+    @SerializedName("mail")
+    val mail: String,
+    @SerializedName("nom")
+    val nom: String,
+    @SerializedName("prenom")
+    val prenom: String,
+    @SerializedName("role")
+    val role: String,
+
+    ) {
+    fun toModel(): User {
+        return User(
+            pseudo,
+            mdp,
+            mail,
+            nom,
+            prenom,
+            role,
+            )
+    }
+}

Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/modele/api/UsersViewModel.kt

@@ -0,0 +1,63 @@
+package com.example.veraxapplication.modele.api
+
+import android.util.Log
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.veraxapplication.modele.articles.Article
+import com.example.veraxapplication.modele.user.User
+import kotlinx.coroutines.launch
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+object RetrofitClientUser {
+
+    private const val BASE_URL = "https://codefirst.iut.uca.fr/containers/Verax-verax-api"
+
+    private val logging = HttpLoggingInterceptor().apply {
+        level = HttpLoggingInterceptor.Level.BODY
+    }
+
+    private val httpClient = OkHttpClient.Builder().apply {
+        addInterceptor(logging)
+    }.build()
+
+
+    val retrofit: Retrofit by lazy {
+        Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+
+//    interface UserApiService {
+//        @GET("users")
+//        suspend fun getUsers() : List<User>
+//    }
+}
+
+class UsersViewModel : ViewModel() {
+    private val _users = MutableLiveData<List<User>>()
+    val users: LiveData<List<User>> = _users
+
+    private val service = ArticleApiClient.retrofit.create(IUserService::class.java)
+
+    init {
+        loadUsers()
+    }
+
+    fun loadUsers() {
+        viewModelScope.launch {
+            try {
+                val usersDto = service.getUsers() // Pas besoin d'appeler .execute()
+                // Convertissez les DTO en modèles de données si nécessaire
+                _users.value = usersDto.map { it.toModel() }
+            } catch (e: Exception) {
+                Log.e("UsersViewModel", "Erreur lors du chargement des users", e)
+            }
+        }
+    }
+}

Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/modele/articles/StubArticles.kt

@@ -1,5 +1,6 @@
 package com.example.veraxapplication.articles
 
+import com.example.veraxapplication.modele.IArticlesDataManager
 import com.example.veraxapplication.modele.articles.Article
 import com.example.veraxapplication.modele.articles.contenus.Contenu
 import com.example.veraxapplication.modele.articles.contenus.ContenuMedia

Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/modele/user/StubUsers.kt

@@ -0,0 +1,78 @@
+
+import com.example.veraxapplication.modele.IArticlesDataManager
+import com.example.veraxapplication.modele.articles.Article
+import com.example.veraxapplication.modele.articles.contenus.Contenu
+import com.example.veraxapplication.modele.articles.contenus.ContenuMedia
+import com.example.veraxapplication.modele.articles.contenus.ContenuParagraphe
+import com.example.veraxapplication.modele.user.User
+
+
+class StubUsers() : IUsersDataManager {
+    private var lUsers: MutableList<User>? = null
+
+    init {
+        chargerUsers()
+    }
+
+
+    private fun chargerUsers() {
+        lUsers = java.util.ArrayList<User>()
+        val user1 = User (
+            "NoaSil",
+            "1234",
+            "",
+            "Sillard",
+            "Noa",
+            "Admin"
+        )
+        lUsers!!.add(user1)
+        val user2 = User (
+            "Sha",
+            "1234",
+            "",
+            "Cascarra",
+            "Shana",
+            "Admin"
+        )
+        lUsers!!.add(user2)
+        val user3 = User (
+            "TonyF",
+            "1234",
+            "tony@gmail.com",
+            "Fages",
+            "Tony",
+            "Admin"
+        )
+        lUsers!!.add(user3)
+        val user4 = User (
+            "JeanSwaggLaPuissance63",
+            "1234",
+            "jean.lapuissance@gmail.com",
+            "Marcillac",
+            "Jean",
+            "Admin"
+        )
+        lUsers!!.add(user4)
+    }
+
+    override val allUsers: List<User>?
+        get() = lUsers
+
+    override fun getUser(pseudo : String): User? {
+        println("Passage dans getUser avec comme pseudo : $pseudo")
+        lUsers?.let {
+            println("Nombre d'utilisateurs disponibles : ${it.size}")
+
+            val userARenvoyer: User? = it.find { user -> user.pseudo == pseudo }
+
+            return userARenvoyer
+        }
+        return null
+    }
+
+    override fun getUsers(): List<User>
+    {
+        return lUsers?.takeIf { it.isNotEmpty() }?.take(lUsers!!.size) ?: emptyList()
+    }
+
+}

Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/modele/user/User.kt

@@ -1,3 +1,3 @@
 package com.example.veraxapplication.modele.user
 
-data class User(val pseudo : String, val mdp : String, val mail : String, val nom : String, val prenom : String, val role : Char)
+data class User(val pseudo : String, val mdp : String, val mail : String, val nom : String, val prenom : String, val role : String)

Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/connexion/Connexion.kt

@@ -0,0 +1,23 @@
+package com.example.veraxapplication.ui.connexion
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.example.veraxapplication.modele.user.User
+
+@Composable
+fun AfficherForm(users : List<User>) {
+    var pseudo = "DEFAULT"
+    var mdp = "DEFAULT"
+    Column {
+        TextField(value = "Pseudo", onValueChange = { value -> pseudo = value }, modifier = Modifier.padding(5.dp))
+        TextField(value = "Mot de passe", onValueChange = { value -> mdp = value }, modifier = Modifier.padding(5.dp))
+        for (u in users) {
+            Text(text = u.pseudo)
+        }
+    }
+}

Android/VeraxApplication/app/src/main/res/xml/network_security_config.xml

@@ -2,5 +2,6 @@
 <network-security-config>
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="true">181.214.189.133</domain>
+        <domain includeSubdomains="true">codefirst.iut.uca.fr/containers/Verax-verax-api</domain>
     </domain-config>
 </network-security-config>