更新

app/src/main/java/com/aiosman/riderpro/data/AccountService.kt

@@ -2,6 +2,7 @@ package com.aiosman.riderpro.data
 
 import com.aiosman.riderpro.AppStore
 import com.aiosman.riderpro.data.api.ApiClient
+import com.aiosman.riderpro.data.api.ChangePasswordRequestBody
 import com.aiosman.riderpro.data.api.LoginUserRequestBody
 import com.aiosman.riderpro.data.api.RegisterRequestBody
 import com.aiosman.riderpro.test.TestDatabase
@@ -63,6 +64,7 @@ interface AccountService {
     suspend fun updateAvatar(uri: String)
     suspend fun updateProfile(avatar: UploadImage?, nickName: String?, bio: String?)
     suspend fun registerUserWithPassword(loginName: String, password: String)
+    suspend fun changeAccountPassword(oldPassword: String, newPassword: String)
 }
 
 class TestAccountServiceImpl : AccountService {
@@ -104,7 +106,7 @@ class TestAccountServiceImpl : AccountService {
         }
     }
 
-    fun createMultipartBody(file: File, filename:String,name: String): MultipartBody.Part {
+    fun createMultipartBody(file: File, filename: String, name: String): MultipartBody.Part {
         val requestFile = file.asRequestBody("image/*".toMediaTypeOrNull())
         return MultipartBody.Part.createFormData(name, filename, requestFile)
     }
@@ -112,7 +114,7 @@ class TestAccountServiceImpl : AccountService {
     override suspend fun updateProfile(avatar: UploadImage?, nickName: String?, bio: String?) {
         val nicknameField: RequestBody? = nickName?.toRequestBody("text/plain".toMediaTypeOrNull())
         val avatarField: MultipartBody.Part? = avatar?.let {
-            createMultipartBody(it.file,it.filename, "avatar")
+            createMultipartBody(it.file, it.filename, "avatar")
         }
         ApiClient.api.updateProfile(avatarField, nicknameField)
     }
@@ -120,4 +122,8 @@ class TestAccountServiceImpl : AccountService {
     override suspend fun registerUserWithPassword(loginName: String, password: String) {
         ApiClient.api.register(RegisterRequestBody(loginName, password))
     }
+
+    override suspend fun changeAccountPassword(oldPassword: String, newPassword: String) {
+        ApiClient.api.changePassword(ChangePasswordRequestBody(oldPassword, newPassword))
+    }
 }

app/src/main/java/com/aiosman/riderpro/data/api/ApiClient.kt

@@ -7,7 +7,39 @@ import okhttp3.OkHttpClient
 import okhttp3.Response
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import java.security.cert.CertificateException
+import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManager
+import javax.net.ssl.X509TrustManager
 
+fun getUnsafeOkHttpClient(): OkHttpClient {
+    return try {
+        // Create a trust manager that does not validate certificate chains
+        val trustAllCerts = arrayOf<TrustManager>(object : X509TrustManager {
+            @Throws(CertificateException::class)
+            override fun checkClientTrusted(chain: Array<java.security.cert.X509Certificate>, authType: String) {}
+
+            @Throws(CertificateException::class)
+            override fun checkServerTrusted(chain: Array<java.security.cert.X509Certificate>, authType: String) {}
+
+            override fun getAcceptedIssuers(): Array<java.security.cert.X509Certificate> = arrayOf()
+        })
+
+        // Install the all-trusting trust manager
+        val sslContext = SSLContext.getInstance("SSL")
+        sslContext.init(null, trustAllCerts, java.security.SecureRandom())
+        // Create an ssl socket factory with our all-trusting manager
+        val sslSocketFactory = sslContext.socketFactory
+
+        OkHttpClient.Builder()
+            .sslSocketFactory(sslSocketFactory, trustAllCerts[0] as X509TrustManager)
+            .hostnameVerifier { _, _ -> true }
+            .addInterceptor(AuthInterceptor())
+            .build()
+    } catch (e: Exception) {
+        throw RuntimeException(e)
+    }
+}
 class AuthInterceptor() : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         val requestBuilder = chain.request().newBuilder()
@@ -21,9 +53,7 @@ object ApiClient {
     const val BASE_API_URL = "${BASE_SERVER}/api/v1"
     const val RETROFIT_URL = "${BASE_API_URL}/"
     private val okHttpClient: OkHttpClient by lazy {
-        OkHttpClient.Builder()
-            .addInterceptor(AuthInterceptor())
-            .build()
+        getUnsafeOkHttpClient()
     }
     private val retrofit: Retrofit by lazy {
         Retrofit.Builder()

app/src/main/java/com/aiosman/riderpro/data/api/RiderProAPI.kt

@@ -52,6 +52,13 @@ data class CommentRequestBody(
     val content: String
 )
 
+data class ChangePasswordRequestBody(
+    @SerializedName("currentPassword")
+    val oldPassword: String = "",
+    @SerializedName("newPassword")
+    val newPassword: String = ""
+)
+
 interface RiderProAPI {
     @POST("register")
     suspend fun register(@Body body: RegisterRequestBody): Response<Unit>
@@ -136,6 +143,11 @@ interface RiderProAPI {
         @Part("nickname") nickname: RequestBody?,
     ): Response<Unit>
 
+    @POST("account/my/password")
+    suspend fun changePassword(
+        @Body body: ChangePasswordRequestBody
+    ): Response<Unit>
+
     @GET("profile/{id}")
     suspend fun getAccountProfileById(
         @Path("id") id: Int