[UI/#159][FEAT/#160] mypage / 전체 로직 구현

.github/workflows/pr_checker.yml

@@ -38,10 +38,12 @@ jobs:
                     NAVER_MAP_CLIENT_ID: ${{ secrets.NAVER_MAP_CLIENT_ID }}
                     NAVER_MAP_CLIENT_SECRET: ${{ secrets.NAVER_MAP_CLIENT_SECRET }}
                     GOOGLE_WEB_CLIENT_ID: ${{ secrets.GOOGLE_WEB_CLIENT_ID }}
+                    PRIVACY_POLICY: ${{ secrets.PRIVACY_POLICY }}
                 run: |
                     echo NAVER_MAP_CLIENT_ID=$NAVER_MAP_CLIENT_ID > ./local.properties
                     echo NAVER_MAP_CLIENT_SECRET=$NAVER_MAP_CLIENT_SECRET >> ./local.properties
                     echo GOOGLE_WEB_CLIENT_ID=$GOOGLE_WEB_CLIENT_ID >> ./local.properties
+                    echo PRIVACY_POLICY=$PRIVACY_POLICY >> ./local.properties
 
             -   name: Create google-services.json
                 run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./app/google-services.json

core/auth/src/main/java/com/boostcamp/mapisode/auth/GoogleOauth.kt

@@ -7,6 +7,7 @@ import androidx.credentials.CustomCredential
 import androidx.credentials.GetCredentialRequest
 import androidx.credentials.exceptions.GetCredentialCancellationException
 import com.boostcamp.mapisode.model.AuthData
+import com.google.android.libraries.identity.googleid.GetGoogleIdOption
 import com.google.android.libraries.identity.googleid.GetSignInWithGoogleOption
 import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
 import com.google.firebase.auth.AuthResult
@@ -65,17 +66,42 @@ class GoogleOauth(private val context: Context) {
 		}
 	}
 
+	suspend fun googleSignOut() = FirebaseAuth.getInstance().signOut()
+
+	suspend fun isUserLoggedIn(): Boolean = FirebaseAuth.getInstance().currentUser != null
+
+	suspend fun deleteCurrentUser() {
+		try {
+			val credentialManager = initializeCredentialManager()
+			val googleIdOption = GetGoogleIdOption.Builder().setFilterByAuthorizedAccounts(true)
+				.setNonce(generateNonce()).build()
+			val request: GetCredentialRequest =
+				GetCredentialRequest.Builder().addCredentialOption(googleIdOption).build()
+
+			val resultCredential = credentialManager.getCredential(context, request).credential
+			val validatedCredential = validateCredential(resultCredential)
+
+			val authCredential = GoogleAuthProvider.getCredential(validatedCredential.idToken, null)
+
+			FirebaseAuth.getInstance().currentUser?.let { user ->
+				user.reauthenticate(authCredential).await()
+				user.delete().await()
+			} ?: throw Exception("현재 로그인된 사용자가 없습니다.")
+		} catch (e: Exception) {
+			throw Exception("계정 삭제 실패: ${e.message}")
+		}
+	}
+
 	private fun initializeCredentialManager(): CredentialManager = CredentialManager.create(context)
 
-	private fun createGoogleSignInOption(): GetSignInWithGoogleOption = GetSignInWithGoogleOption
-		.Builder(BuildConfig.GOOGLE_WEB_CLIENT_ID)
-		.setNonce(generateNonce())
-		.build()
+	private fun createGoogleSignInOption(): GetSignInWithGoogleOption =
+		GetSignInWithGoogleOption.Builder(BuildConfig.GOOGLE_WEB_CLIENT_ID)
+			.setNonce(generateNonce()).build()
 
 	private fun createCredentialRequest(googleIdOption: GetSignInWithGoogleOption):
-		GetCredentialRequest = GetCredentialRequest.Builder()
-		.addCredentialOption(googleIdOption)
-		.build()
+		GetCredentialRequest = GetCredentialRequest
+		.Builder()
+		.addCredentialOption(googleIdOption).build()
 
 	private fun validateCredential(credential: Credential): GoogleIdTokenCredential {
 		if (credential is CustomCredential &&
@@ -91,8 +117,7 @@ class GoogleOauth(private val context: Context) {
 		firebaseAuth: FirebaseAuth,
 		googleIdTokenCredential: GoogleIdTokenCredential,
 	): AuthResult {
-		val authCredential =
-			GoogleAuthProvider.getCredential(googleIdTokenCredential.idToken, null)
+		val authCredential = GoogleAuthProvider.getCredential(googleIdTokenCredential.idToken, null)
 		return firebaseAuth.signInWithCredential(authCredential).await()
 	}
 

core/designsystem/src/main/res/drawable/ic_document.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="#000000"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M7,3H4v3H2V1h5V3zM22,6V1h-5v2h3v3H22zM7,21H4v-3H2v5h5V21zM20,18v3h-3v2h5v-5H20zM17,6H7v12h10V6zM19,18c0,1.1 -0.9,2 -2,2H7c-1.1,0 -2,-0.9 -2,-2V6c0,-1.1 0.9,-2 2,-2h10c1.1,0 2,0.9 2,2V18zM15,8H9v2h6V8zM15,11H9v2h6V11zM15,14H9v2h6V14z" />
+
+</vector>

core/designsystem/src/main/res/drawable/ic_withdrawal.xml

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="#000000"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M15.18,10.94c0.2,-0.44 0.32,-0.92 0.32,-1.44C15.5,7.57 13.93,6 12,6c-0.52,0 -1,0.12 -1.44,0.32L15.18,10.94z" />
+
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-1.85 0.63,-3.55 1.69,-4.9l2.86,2.86c0.21,1.56 1.43,2.79 2.99,2.99l2.2,2.2C13.17,15.05 12.59,15 12,15c-2.32,0 -4.45,0.8 -6.14,2.12C4.7,15.73 4,13.95 4,12zM12,20c-1.74,0 -3.34,-0.56 -4.65,-1.5C8.66,17.56 10.26,17 12,17s3.34,0.56 4.65,1.5C15.34,19.44 13.74,20 12,20zM18.31,16.9L7.1,5.69C8.45,4.63 10.15,4 12,4c4.42,0 8,3.58 8,8C20,13.85 19.37,15.54 18.31,16.9z" />
+
+</vector>

core/navigation/src/main/java/com/boostcamp/mapisode/navigation/MypageRoute.kt

@@ -0,0 +1,8 @@
+package com.boostcamp.mapisode.navigation
+
+import kotlinx.serialization.Serializable
+
+sealed interface MypageRoute : Route {
+	@Serializable
+	data object ProfileEdit : MypageRoute
+}

data/user/src/main/java/com/boostcamp/mapisode/user/UserRepositoryImpl.kt

@@ -55,4 +55,23 @@ class UserRepositoryImpl @Inject constructor(database: FirebaseFirestore) : User
 			throw Exception("Failed to get user", e)
 		}
 	}
+
+	override suspend fun updateUserNameAndProfileUrl(
+		uid: String,
+		userName: String,
+		profileUrl: String,
+	) {
+		val userDocument = userCollection.document(uid)
+
+		try {
+			userDocument.update(
+				mapOf(
+					"name" to userName,
+					"profileUrl" to profileUrl,
+				),
+			).await()
+		} catch (e: Exception) {
+			throw Exception("Failed to update user", e)
+		}
+	}
 }

domain/user/src/main/java/com/boostcamp/mapisode/user/UserRepository.kt

@@ -7,4 +7,6 @@ interface UserRepository {
 
 	suspend fun getUserInfo(uid: String): UserModel
 	suspend fun isUserExist(uid: String): Boolean
+
+	suspend fun updateUserNameAndProfileUrl(uid: String, userName: String, profileUrl: String)
 }

feature/login/src/main/java/com/boostcamp/mapisode/login/AuthIntent.kt

@@ -4,11 +4,11 @@ import com.boostcamp.mapisode.auth.GoogleOauth
 import com.boostcamp.mapisode.ui.base.UiIntent
 
 sealed interface AuthIntent : UiIntent {
+	data object Init : AuthIntent
 	data class OnGoogleSignInClick(val googleOauth: GoogleOauth) : AuthIntent
 	data class OnNicknameChange(val nickname: String) : AuthIntent
 	data class OnProfileUrlchange(val profileUrl: String) : AuthIntent
 	data object OnSignUpClick : AuthIntent
-	data object OnAutoLogin : AuthIntent
 	data object OnLoginSuccess : AuthIntent
 	data object OnBackClickedInSignUp : AuthIntent
 }

feature/login/src/main/java/com/boostcamp/mapisode/login/AuthRoute.kt

@@ -19,7 +19,7 @@ fun AuthRoute(
 	val googleOauth = GoogleOauth(context)
 
 	LaunchedEffect(Unit) {
-		viewModel.onIntent(AuthIntent.OnAutoLogin)
+		viewModel.onIntent(AuthIntent.Init)
 	}
 
 	LaunchedEffect(Unit) {

feature/login/src/main/java/com/boostcamp/mapisode/login/AuthViewModel.kt

@@ -24,16 +24,20 @@ class AuthViewModel @Inject constructor(
 
 	override fun onIntent(intent: AuthIntent) {
 		when (intent) {
+			is AuthIntent.Init -> onInit()
 			is AuthIntent.OnGoogleSignInClick -> handleGoogleSignIn(intent.googleOauth)
 			is AuthIntent.OnNicknameChange -> onNicknameChange(intent.nickname)
 			is AuthIntent.OnProfileUrlchange -> onProfileUrlChange(intent.profileUrl)
 			is AuthIntent.OnSignUpClick -> handleSignUp()
-			is AuthIntent.OnAutoLogin -> handleAutoLogin()
 			is AuthIntent.OnLoginSuccess -> handleLoginSuccess()
 			is AuthIntent.OnBackClickedInSignUp -> onBackClickedInSignUp()
 		}
 	}
 
+	private fun onInit() {
+		handleAutoLogin()
+	}
+
 	private fun onBackClickedInSignUp() {
 		intent {
 			copy(

feature/main/src/main/java/com/boostcamp/mapisode/main/MainNavigator.kt

@@ -21,6 +21,7 @@ import com.boostcamp.mapisode.mygroup.navigation.navigateGroupCreation
 import com.boostcamp.mapisode.mygroup.navigation.navigateGroupDetail
 import com.boostcamp.mapisode.mygroup.navigation.navigateGroupEdit
 import com.boostcamp.mapisode.mygroup.navigation.navigateGroupJoin
+import com.boostcamp.mapisode.mypage.navigation.navigateToProfileEdit
 import com.boostcamp.mapisode.navigation.MainRoute
 import com.boostcamp.mapisode.navigation.Route
 
@@ -62,6 +63,12 @@ internal class MainNavigator(
 		}
 	}
 
+	fun navigateToLogin() {
+		navController.navigate(startDestination) {
+			popUpTo(startDestination) { inclusive = true }
+		}
+	}
+
 	fun navigateToMain() {
 		navController.navigate(MainRoute.Home)
 	}
@@ -113,6 +120,10 @@ internal class MainNavigator(
 		navController.navigateGroupEdit(groupId)
 	}
 
+	fun navigateToProfileEdit() {
+		navController.navigateToProfileEdit()
+	}
+
 	private fun popBackStack() {
 		navController.popBackStack()
 	}

feature/main/src/main/java/com/boostcamp/mapisode/main/component/MainNavHost.kt

@@ -56,7 +56,11 @@ internal fun MainNavHost(
 				},
 				onEpisodeClick = navigator::navigateToEpisodeDetail,
 			)
-			addMyPageNavGraph()
+			addMyPageNavGraph(
+				onBackClick = navigator::popBackStackIfNotHome,
+				onProfileEditClick = navigator::navigateToProfileEdit,
+				onNavgiatetoLogin = navigator::navigateToLogin,
+			)
 		}
 	}
 }

feature/mypage/build.gradle.kts

@@ -1,7 +1,29 @@
+import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+
 plugins {
 	alias(libs.plugins.mapisode.feature)
 }
 
 android {
 	namespace = "com.boostcamp.mapisode.mypage"
+
+	defaultConfig {
+		val privacyPolicy =
+			gradleLocalProperties(rootDir, providers).getProperty("PRIVACY_POLICY") ?: ""
+		if (privacyPolicy.isEmpty()) {
+			throw GradleException("PRIVACY_POLICY is not set.")
+		}
+		buildConfigField("String", "PRIVACY_POLICY", "\"$privacyPolicy\"")
+	}
+
+	buildFeatures {
+		buildConfig = true
+	}
+}
+
+dependencies {
+	implementation(libs.bundles.coil)
+	implementation(libs.androidx.browser)
+	implementation(projects.core.auth)
+	implementation(projects.domain.user)
 }

feature/mypage/src/main/java/com/boostcamp/mapisode/mypage/intent/MypageIntent.kt

@@ -0,0 +1,15 @@
+package com.boostcamp.mapisode.mypage.intent
+
+import android.content.Context
+import com.boostcamp.mapisode.auth.GoogleOauth
+import com.boostcamp.mapisode.ui.base.UiIntent
+
+sealed interface MypageIntent : UiIntent {
+	data object Init : MypageIntent
+	data class LogoutClick(val googleOauth: GoogleOauth) : MypageIntent
+	data object ProfileEditClick : MypageIntent
+	data class PrivacyPolicyClick(val context: Context, val useCustomTab: Boolean) : MypageIntent
+	data object WithdrawalClick : MypageIntent
+	data class ConfirmClick(val googleOauth: GoogleOauth) : MypageIntent
+	data object TurnOffDialog : MypageIntent
+}

feature/mypage/src/main/java/com/boostcamp/mapisode/mypage/intent/ProfileEditIntent.kt

@@ -0,0 +1,12 @@
+package com.boostcamp.mapisode.mypage.intent
+
+import com.boostcamp.mapisode.ui.base.UiIntent
+
+sealed interface ProfileEditIntent : UiIntent {
+	data object Init : ProfileEditIntent
+	data class NameChanged(val nickname: String) : ProfileEditIntent
+	data class ProfileChanged(val url: String) : ProfileEditIntent
+	data object PhotopickerClick : ProfileEditIntent
+	data object EditClick : ProfileEditIntent
+	data object BackClick : ProfileEditIntent
+}

feature/mypage/src/main/java/com/boostcamp/mapisode/mypage/navigation/MyPageNavigation.kt

@@ -4,17 +4,38 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
-import com.boostcamp.mapisode.mypage.MyPageRoute
+import com.boostcamp.mapisode.mypage.screen.MypageRoute
+import com.boostcamp.mapisode.mypage.screen.ProfileEditRoute
 import com.boostcamp.mapisode.navigation.MainRoute
+import com.boostcamp.mapisode.navigation.MypageRoute
 
 fun NavController.navigateMyPage(
 	navOptions: NavOptions? = null,
 ) {
 	navigate(MainRoute.Mypage, navOptions)
 }
 
-fun NavGraphBuilder.addMyPageNavGraph() {
+fun NavController.navigateToProfileEdit(
+	navOptions: NavOptions? = null,
+) {
+	navigate(MypageRoute.ProfileEdit, navOptions)
+}
+
+fun NavGraphBuilder.addMyPageNavGraph(
+	onBackClick: () -> Unit,
+	onProfileEditClick: () -> Unit,
+	onNavgiatetoLogin: () -> Unit,
+) {
 	composable<MainRoute.Mypage> {
-		MyPageRoute()
+		MypageRoute(
+			onProfileEditClick = onProfileEditClick,
+			onNavigateToLogin = onNavgiatetoLogin,
+		)
+	}
+
+	composable<MypageRoute.ProfileEdit> {
+		ProfileEditRoute(
+			onBackClick = onBackClick,
+		)
 	}
 }