added: navigation menu and auth page

Author: Shaur

.idea/inspectionProfiles/Project_Default.xml

@@ -49,6 +49,7 @@ dependencies {
     def roomVersion = "2.6.1"
     def roomCompilerVersion = "1.1.1"
     def lifecycleVersion = "2.8.6"
+    def jwtVersion = "0.12.6"
 
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'com.github.junrar:junrar:7.5.5'
@@ -59,6 +60,9 @@ dependencies {
 
     implementation "org.apache.commons:commons-text:1.12.0"
 
+    implementation "io.jsonwebtoken:jjwt-api:$jwtVersion"
+    implementation "io.jsonwebtoken:jjwt-impl:$jwtVersion"
+
     kapt "androidx.room:room-compiler:$roomVersion"
 
     implementation "android.arch.persistence.room:runtime:$roomCompilerVersion"

.idea/misc.xml

@@ -0,0 +1,60 @@
+package com.home.reader.api
+
+import android.content.Context
+import android.util.Log
+import androidx.compose.runtime.mutableStateOf
+import com.home.reader.persistence.entity.User
+import com.home.reader.persistence.repository.UserRepository
+
+class ApiHandler(
+    context: Context,
+    private val userRepository: UserRepository
+) {
+
+    private val processor = ApiProcessor("https://paper.webhop.me/api", context)
+
+    private val tokenState = mutableStateOf<String?>(null)
+
+    suspend fun initToken() {
+        if (tokenState.value == null) {
+            val user = userRepository.get()
+            tokenState.value = user?.token
+        }
+    }
+
+    suspend fun login(username: String, password: String): Boolean {
+        val result = processor.login(username, password)
+        if (!result.isSuccess()) {
+            Log.i(
+                "Login request",
+                """
+                    Code: ${result.failReason?.code}
+                    Reason: ${result.failReason?.text}
+                """.trimIndent()
+            )
+
+            return false
+        }
+
+        val existsUser = userRepository.get()
+        if (existsUser == null) {
+            val user = User(
+                username = username,
+                password = password,
+                token = result.value?.token
+            )
+            userRepository.insert(user)
+        } else {
+            val user = existsUser.copy(
+                username = username,
+                password = password,
+                token = result.value?.token
+            )
+            userRepository.update(user)
+        }
+
+        tokenState.value = result.value?.token
+        return true
+    }
+
+}

app/build.gradle

@@ -4,21 +4,24 @@ import android.content.Context
 import coil.request.ImageRequest
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import com.home.reader.api.dto.Credentials
 import com.home.reader.api.dto.Issue
 import com.home.reader.api.dto.Result
 import com.home.reader.api.dto.Series
+import com.home.reader.api.dto.Token
+import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import java.io.InputStreamReader
 import java.lang.reflect.Type
 
-class ApiProcessor(host: String, port: Int, private val context: Context) {
-
-    private val baseUrl = "http://$host:$port"
+class ApiProcessor(private val host: String, private val context: Context) {
     private val client = OkHttpClient()
 
     private companion object {
+        val CONTENT_TYPE = "application/json".toMediaType()
 
         val SERIES_RESULT_TYPE: Type = TypeToken.getParameterized(
             List::class.java,
@@ -30,14 +33,27 @@ class ApiProcessor(host: String, port: Int, private val context: Context) {
             Issue::class.java
         ).type
 
+        const val AUTH = "/customer/login"
         const val ALL_SERIES = "/comics/series"
         const val ISSUES_OF_SERIES = "/comics/series/%s/issues"
     }
 
+    fun login(username: String, password: String): Result<Token> {
+        val credentials = Credentials(username, password)
+        val body = Gson().toJson(credentials).toRequestBody(CONTENT_TYPE)
+
+        val request = Request.Builder()
+            .post(body)
+            .url("$host$AUTH")
+            .build()
+
+        return client.newCall(request).execute().toResult<Token>()
+    }
+
     fun getSeries(token: String): Result<List<Series>> {
         val request = Request.Builder()
             .get()
-            .url("$baseUrl$ALL_SERIES")
+            .url("$host$ALL_SERIES")
             .addAuthorizationHeader(token)
             .build()
 
@@ -51,7 +67,7 @@ class ApiProcessor(host: String, port: Int, private val context: Context) {
         size: String = "origin"
     ): ImageRequest {
         return ImageRequest.Builder(context = context)
-            .data("$baseUrl/file/$issueId/$page?size=$size")
+            .data("$host/file/$issueId/$page?size=$size")
             .addHeader("Authorization", "Bearer $token")
             .build()
     }
@@ -60,7 +76,7 @@ class ApiProcessor(host: String, port: Int, private val context: Context) {
         val path = ISSUES_OF_SERIES.format(seriesId)
         val request = Request.Builder()
             .get()
-            .url("$baseUrl$path")
+            .url("$host$path")
             .addAuthorizationHeader(token)
             .build()
 
@@ -80,4 +96,7 @@ class ApiProcessor(host: String, port: Int, private val context: Context) {
         return Result(value)
     }
 
+    private inline fun <reified T> Response.toResult(): Result<T> {
+        return this.toResult(TypeToken.get(T::class.java).type)
+    }
 }

app/src/main/java/com/home/reader/api/ApiHandler.kt

@@ -1,6 +1,6 @@
 package com.home.reader.api.dto
 
 data class Credentials(
-    val login: String,
+    val username: String,
     val password: String
 )

app/src/main/java/com/home/reader/api/ApiProcessor.kt

@@ -0,0 +1,3 @@
+package com.home.reader.api.dto
+
+data class Token(val token: String)

app/src/main/java/com/home/reader/api/dto/Credentials.kt

@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation.NavHostController
@@ -42,7 +43,7 @@ class MainComposeActivity : ComponentActivity() {
     @Composable
     fun MainAppNavHost(
         modifier: Modifier = Modifier,
-        navController: NavHostController = rememberNavController(),
+        navController: NavHostController = rememberNavController()
     ) {
         NavHost(
             modifier = modifier,

app/src/main/java/com/home/reader/api/dto/Token.kt

@@ -1,20 +1,29 @@
 package com.home.reader.persistence
 
 import android.content.Context
+import com.home.reader.api.ApiHandler
 import com.home.reader.persistence.repository.IssueRepository
 import com.home.reader.persistence.repository.SeriesRepository
+import com.home.reader.persistence.repository.UserRepository
 import com.home.reader.persistence.repository.impl.DefaultIssueRepository
 import com.home.reader.persistence.repository.impl.DefaultSeriesRepository
+import com.home.reader.persistence.repository.impl.DefaultUserRepository
 
 interface AppContainer {
     val seriesRepository: SeriesRepository
     val issueRepository: IssueRepository
+    val userRepository: UserRepository
+    val api: ApiHandler
 }
 
-class AppDataContainer(private val context: Context) : AppContainer {
+class AppDataContainer(context: Context) : AppContainer {
 
     override val seriesRepository = DefaultSeriesRepository(AppDatabase.invoke(context).seriesDao())
 
     override val issueRepository = DefaultIssueRepository(AppDatabase.invoke(context).issueDao())
 
+    override val userRepository = DefaultUserRepository(AppDatabase.invoke(context).userDao())
+
+    override val api: ApiHandler = ApiHandler(context, userRepository)
+
 }

app/src/main/java/com/home/reader/component/activity/MainComposeActivity.kt

@@ -6,19 +6,23 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import com.home.reader.persistence.dao.IssueDao
 import com.home.reader.persistence.dao.SeriesDao
+import com.home.reader.persistence.dao.UserDao
 import com.home.reader.persistence.entity.Issue
 import com.home.reader.persistence.entity.Series
+import com.home.reader.persistence.entity.User
 
 @Database(
-    entities = [Issue::class, Series::class],
-    version = 1
+    entities = [Issue::class, Series::class, User::class],
+    version = 2
 )
 abstract class AppDatabase : RoomDatabase() {
 
     abstract fun seriesDao(): SeriesDao
 
     abstract fun issueDao(): IssueDao
 
+    abstract fun userDao(): UserDao
+
     companion object {
         @Volatile
         private var instance: AppDatabase? = null
@@ -32,6 +36,8 @@ abstract class AppDatabase : RoomDatabase() {
             context,
             AppDatabase::class.java,
             "reader-database"
-        ).build()
+        )
+            .fallbackToDestructiveMigration()
+            .build()
     }
 }