Skip to content

Commit

Permalink
feat: AuthApi 및 MemberApi 구현 #52
Browse files Browse the repository at this point in the history
  • Loading branch information
bamin0422 committed Jun 26, 2024
1 parent a0e358b commit ab4c364
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 21 deletions.
11 changes: 11 additions & 0 deletions app/src/main/java/com/owori/android/core/di/NetworkModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.owori.android.core.di
import com.owori.android.R
import com.owori.android.core.OworiApplication
import com.owori.android.data.api.auth.AuthApi
import com.owori.android.data.api.member.MemberApi
import com.owori.android.module.HttpRequestInterceptor
import dagger.Module
import dagger.Provides
Expand Down Expand Up @@ -50,7 +51,17 @@ object NetworkModule {
return retrofit.buildService()
}

@Provides
@Singleton
fun provideMemberApi(retrofit: Retrofit): MemberApi {
return retrofit.buildService()
}

private inline fun <reified T> Retrofit.buildService(): T {
return this.create(T::class.java)
}

// class AppInterceptor : HttpRequestInterceptor() {
//
// }
}
20 changes: 5 additions & 15 deletions app/src/main/java/com/owori/android/data/api/auth/AuthApi.kt
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
package com.owori.android.data.api.auth

import com.owori.android.data.model.SignUpRequest
import com.owori.android.data.model.SignUpResponse
import com.owori.android.data.model.auth.RefreshResponse
import com.owori.android.data.model.member.SignUpRequest
import com.owori.android.module.DataResult
import retrofit2.http.Body
import retrofit2.http.POST

/*
* Created by JJJoonngg
*/
import retrofit2.http.GET

interface AuthApi {
@POST("/members/kakao")
fun kakaoLogin(@Body data: SignUpRequest) : DataResult<SignUpResponse>

@POST("/members/google")
fun googleLogin(@Body data: SignUpRequest) : DataResult<SignUpResponse>

@POST("/members/apple")
fun appleLogin(@Body data: SignUpRequest) : DataResult<SignUpResponse>
@GET("/api/v1/auth/refresh")
fun getTokenByRefreshToken(@Body data: SignUpRequest) : DataResult<RefreshResponse>
}
18 changes: 18 additions & 0 deletions app/src/main/java/com/owori/android/data/api/member/MemberApi.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.owori.android.data.api.member

import com.owori.android.data.model.member.SignUpRequest
import com.owori.android.data.model.member.SignUpResponse
import com.owori.android.module.DataResult
import retrofit2.http.Body
import retrofit2.http.POST

interface MemberApi {
@POST("/api/v1/members/kakao")
fun kakaoLogin(@Body data: SignUpRequest) : DataResult<SignUpResponse>

@POST("/api/v1/members/google")
fun googleLogin(@Body data: SignUpRequest) : DataResult<SignUpResponse>

@POST("/api/v1/members/apple")
fun appleLogin(@Body data: SignUpRequest) : DataResult<SignUpResponse>
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.owori.android.data.model.auth

import com.google.gson.annotations.SerializedName

data class RefreshResponse(
@SerializedName("access_token")
val accessToken: String,
@SerializedName("refresh_token")
val refreshToken: String
)
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.owori.android.data.model
package com.owori.android.data.model.member

enum class AuthProvider {
GOOGLE, KAKAO, APPLE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.owori.android.data.model
package com.owori.android.data.model.member

import com.google.gson.annotations.SerializedName

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.owori.android.data.model
package com.owori.android.data.model.member

import com.google.gson.annotations.SerializedName

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.owori.android.data.model
package com.owori.android.data.model.member

import com.google.gson.annotations.SerializedName

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import com.owori.android.core.AppConfig
import okhttp3.Interceptor
import okhttp3.Response


class HttpRequestInterceptor : Interceptor {
override fun intercept(chain: Interceptor.Chain): Response {
try {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/constants.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="base_url">http://owori.store/api/v1</string>
<string name="base_url">http://13.124.20.243/api/v1</string>
</resources>

0 comments on commit ab4c364

Please sign in to comment.