-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
f5a5195
commit df32443
Showing
28 changed files
with
309 additions
and
855 deletions.
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...uthentication/data/auth_repository.g.dart → ...features/auth/data/auth_repository.g.dart
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
.../data_sources/local_auth_data_source.dart → .../data_sources/local_auth_data_source.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
19 changes: 19 additions & 0 deletions
19
lib/src/features/auth/data/data_sources/sns_data_sources/apple_auth_data_source_impl.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| import 'package:flutter_riverpod/flutter_riverpod.dart'; | ||
| import 'package:pets_next_door_flutter/src/features/auth/data/data_sources/sns_data_sources/sns_auth_data_source.dart'; | ||
|
|
||
| final appleAuthServiceProvider = | ||
| Provider.autoDispose<SnsAuthDataSource>((ref) => AppleAuthDataSourceImpl()); | ||
|
|
||
| class AppleAuthDataSourceImpl implements SnsAuthDataSource { | ||
| @override | ||
| snsLogin() { | ||
| // TODO: implement snsLogin | ||
| throw UnimplementedError(); | ||
| } | ||
|
|
||
| @override | ||
| Future<Valid> validateLoginStatus() { | ||
| // TODO: implement validateLoginStatus | ||
| throw UnimplementedError(); | ||
| } | ||
| } |
60 changes: 60 additions & 0 deletions
60
lib/src/features/auth/data/data_sources/sns_data_sources/google_auth_data_source_impl.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| import 'package:firebase_auth/firebase_auth.dart'; | ||
| import 'package:flutter_riverpod/flutter_riverpod.dart'; | ||
| import 'package:google_sign_in/google_sign_in.dart'; | ||
| import 'package:pets_next_door_flutter/src/constants/enums.dart'; | ||
| import 'package:pets_next_door_flutter/src/features/auth/data/data_sources/sns_data_sources/sns_auth_data_source.dart'; | ||
| import 'package:pets_next_door_flutter/src/features/auth/domain/sns_oauth_info.dart'; | ||
|
|
||
| final googleAuthServiceProvider = Provider.autoDispose<SnsAuthDataSource>( | ||
| (ref) => GoogleAuthDataSourceImpl()); | ||
|
|
||
| class GoogleAuthDataSourceImpl implements SnsAuthDataSource { | ||
| @override | ||
| Future<SnsOAuthInfo> snsLogin() async { | ||
| final signInResult = await _signInWithGoogle(); | ||
|
|
||
| // Once signed in, return the UserCredential | ||
| // return FirebaseAuth.instance.signInWithCredential(oAuthCredential); | ||
| return SnsOAuthInfo.credential( | ||
| providerType: SnsProviderType.google, | ||
| authCredential: signInResult.oAuthCredential, | ||
| email: signInResult.email, | ||
| ); | ||
| } | ||
|
|
||
| Future<SignInResultOAuthCredential> _signInWithGoogle() async { | ||
| final googleSignIn = GoogleSignIn(); | ||
| final isSignedIn = await googleSignIn.isSignedIn(); | ||
| final GoogleSignInAuthentication? googleAuth; | ||
| final String? userEmail; | ||
|
|
||
| if (isSignedIn && googleSignIn.currentUser != null) { | ||
| final currentUser = googleSignIn.currentUser; | ||
|
|
||
| googleAuth = await currentUser?.authentication; | ||
| userEmail = currentUser?.email; | ||
| } else { | ||
| // Trigger the authentication flow | ||
| final googleUser = await googleSignIn.signIn(); | ||
|
|
||
| // Obtain the auth details from the request | ||
| googleAuth = await googleUser?.authentication; | ||
| userEmail = googleUser?.email; | ||
| } | ||
|
|
||
| // Create a new credential | ||
| return ( | ||
| oAuthCredential: GoogleAuthProvider.credential( | ||
| accessToken: googleAuth?.accessToken, | ||
| idToken: googleAuth?.idToken, | ||
| ), | ||
| email: userEmail ?? '' | ||
| ); | ||
| } | ||
|
|
||
| @override | ||
| Future<Valid> validateLoginStatus() { | ||
| // TODO: implement validateLoginStatus | ||
| throw UnimplementedError(); | ||
| } | ||
| } |
79 changes: 79 additions & 0 deletions
79
lib/src/features/auth/data/data_sources/sns_data_sources/kakao_auth_data_source_impl.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| import 'package:flutter/services.dart'; | ||
| import 'package:flutter_riverpod/flutter_riverpod.dart'; | ||
| import 'package:kakao_flutter_sdk_user/kakao_flutter_sdk_user.dart'; | ||
| import 'package:pets_next_door_flutter/src/constants/enums.dart'; | ||
| import 'package:pets_next_door_flutter/src/features/auth/data/data_sources/sns_data_sources/sns_auth_data_source.dart'; | ||
| import 'package:pets_next_door_flutter/src/features/auth/domain/sns_oauth_info.dart'; | ||
|
|
||
| final kakaoAuthServiceProvider = | ||
| Provider.autoDispose<SnsAuthDataSource>((ref) => KakaoAuthDataSourceImpl()); | ||
|
|
||
| class KakaoAuthDataSourceImpl implements SnsAuthDataSource { | ||
| @override | ||
| Future<SnsOAuthInfo> snsLogin() async { | ||
| final signInResult = await _signInWithKakao(); | ||
|
|
||
| // TODO: 여기다가 우리 자체 API 태워서 customToken 가지고 오는 로직 넣어야 함 | ||
|
|
||
| return SnsOAuthInfo.token( | ||
| authToken: signInResult!.oAuthToken, | ||
| email: signInResult.email, | ||
| providerType: SnsProviderType.kakao, | ||
| ); | ||
| } | ||
|
|
||
| Future<SignInResultOAuthToken?> _signInWithKakao() async { | ||
| // 카카오 로그인 구현 예제 | ||
|
|
||
| // 카카오톡 실행 가능 여부 확인 | ||
| // 카카오톡 실행이 가능하면 카카오톡으로 로그인, 아니면 카카오계정으로 로그인 | ||
| if (await isKakaoTalkInstalled()) { | ||
| try { | ||
| final oAuthToken = await UserApi.instance.loginWithKakaoTalk(); | ||
| final userEmail = await UserApi.instance | ||
| .me() | ||
| .then((value) => value.kakaoAccount?.email ?? ''); | ||
|
|
||
| return (oAuthToken: oAuthToken, email: userEmail); | ||
| } catch (error) { | ||
| // 사용자가 카카오톡 설치 후 디바이스 권한 요청 화면에서 로그인을 취소한 경우, | ||
| // 의도적인 로그인 취소로 보고 카카오계정으로 로그인 시도 없이 로그인 취소로 처리 (예: 뒤로 가기) | ||
| if (error is PlatformException && error.code == 'CANCELED') { | ||
| return null; | ||
| } | ||
|
|
||
| // 카카오톡에 연결된 카카오계정이 없는 경우, 카카오계정으로 로그인 | ||
| try { | ||
| final oAuthToken = await UserApi.instance.loginWithKakaoAccount(); | ||
| final userEmail = await UserApi.instance | ||
| .me() | ||
| .then((value) => value.kakaoAccount?.email ?? ''); | ||
|
|
||
| return (oAuthToken: oAuthToken, email: userEmail); | ||
| } catch (error) { | ||
| // print('카카오계정으로 로그인 실패 $error'); | ||
| return null; | ||
| } | ||
| } | ||
| } else { | ||
| try { | ||
| // print('카카오계정으로 로그인 성공'); | ||
| final oAuthToken = await UserApi.instance.loginWithKakaoAccount(); | ||
| final userEmail = await UserApi.instance | ||
| .me() | ||
| .then((value) => value.kakaoAccount?.email ?? ''); | ||
|
|
||
| return (oAuthToken: oAuthToken, email: userEmail); | ||
| } catch (error) { | ||
| // print('카카오계정으로 로그인 실패 $error'); | ||
| return null; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @override | ||
| Future<Valid> validateLoginStatus() { | ||
| // TODO: implement validateLoginStatus | ||
| throw UnimplementedError(); | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
lib/src/features/auth/data/data_sources/sns_data_sources/sns_auth_data_source.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import 'package:firebase_auth/firebase_auth.dart'; | ||
| import 'package:kakao_flutter_sdk_user/kakao_flutter_sdk_user.dart'; | ||
| import 'package:pets_next_door_flutter/src/features/auth/domain/sns_oauth_info.dart'; | ||
|
|
||
| typedef Valid = bool; | ||
|
|
||
| typedef SignInResultOAuthCredential = ({ | ||
| OAuthCredential oAuthCredential, | ||
| String email | ||
| }); | ||
|
|
||
| typedef SignInResultOAuthToken = ({ | ||
| OAuthToken oAuthToken, | ||
| String email, | ||
| }); | ||
|
|
||
| abstract class SnsAuthDataSource { | ||
| /// 플랫폼 별로 sns로그인을 한 뒤 OAuth정보를 리턴하는 함수 | ||
| Future<SnsOAuthInfo> snsLogin(); | ||
|
|
||
| /// 플랫폼의 로그인 상태가 유효한지 리턴하는 함수 | ||
| Future<Valid> validateLoginStatus(); | ||
| } |
5 changes: 2 additions & 3 deletions
5
...ntication/data/phone_auth_repository.dart → ...ures/auth/data/phone_auth_repository.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...es/authentication/domain/auth_status.dart → ...src/features/auth/domain/auth_status.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
110 changes: 110 additions & 0 deletions
110
lib/src/features/auth/presentation/login/login_view.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| import 'dart:io'; | ||
|
|
||
| import 'package:flutter/material.dart'; | ||
| import 'package:flutter_riverpod/flutter_riverpod.dart'; | ||
| import 'package:flutter_svg/svg.dart'; | ||
| import 'package:go_router/go_router.dart'; | ||
| import 'package:pets_next_door_flutter/src/constants/enums.dart'; | ||
| import 'package:pets_next_door_flutter/src/constants/sizes.dart'; | ||
| import 'package:pets_next_door_flutter/src/constants/strings.dart'; | ||
| import 'package:pets_next_door_flutter/src/constants/svgs.dart'; | ||
| import 'package:pets_next_door_flutter/src/features/auth/domain/sns_oauth_info.dart'; | ||
| import 'package:pets_next_door_flutter/src/features/auth/presentation/login/login_view_controller.dart'; | ||
| import 'package:pets_next_door_flutter/src/features/auth/presentation/login/widgets/sns_button_widget.dart'; | ||
| import 'package:pets_next_door_flutter/src/features/user/domain/user_profile_view_state.dart'; | ||
| import 'package:pets_next_door_flutter/src/routing/app_router.dart'; | ||
|
|
||
| class LoginView extends StatelessWidget { | ||
| const LoginView({super.key}); | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| return Scaffold( | ||
| backgroundColor: Colors.white, | ||
| body: Consumer( | ||
| builder: (BuildContext context, WidgetRef ref, Widget? child) { | ||
| final loginViewController = | ||
| ref.watch(loginViewControllerProvider.notifier); | ||
|
|
||
| final providerList = (Platform.isIOS) | ||
| ? SnsProviderType.values.toList() | ||
| : SnsProviderType.getAndroidProviderList(); | ||
|
|
||
| return SafeArea( | ||
| child: Column( | ||
| children: [ | ||
| Expanded( | ||
| child: Column( | ||
| mainAxisAlignment: MainAxisAlignment.end, | ||
| children: [ | ||
| SvgPicture.asset(PNDSvgs.mainIcon), | ||
| gapH20, | ||
| SvgPicture.asset(PNDSvgs.mainTitleIcon), | ||
| ], | ||
| ), | ||
| ), | ||
| SizedBox( | ||
| height: MediaQuery.of(context).size.height * (155 / 844), | ||
| ), | ||
| Expanded( | ||
| child: Column( | ||
| children: [ | ||
| Row( | ||
| mainAxisAlignment: MainAxisAlignment.center, | ||
| children: providerList.map((provider) { | ||
| final index = | ||
| SnsProviderType.values.indexOf(provider); | ||
| final isLastIndex = | ||
| SnsProviderType.values.length - 1 == index; | ||
|
|
||
| return Padding( | ||
| padding: EdgeInsets.only( | ||
| right: isLastIndex ? 0 : PNDSizes.p24, | ||
| ), | ||
| child: SnsButtonWidget( | ||
| snsType: provider, | ||
| onTap: (provider) { | ||
| loginViewController.signIn( | ||
| selectedProvider: provider, | ||
| onRegisterUser: (registerInfo) => | ||
| _routeToRegister(context, registerInfo), | ||
| onExistingUser: () => _routeToHome(context), | ||
| ); | ||
| }, | ||
| ), | ||
| ); | ||
| }).toList(), | ||
| ), | ||
| gapH32, | ||
| const Text( | ||
| PNDStrings.problemWhenLogin, | ||
| style: TextStyle( | ||
| color: Color(0xff9E9E9E), shadows: [BoxShadow()]), | ||
| ), | ||
| ], | ||
| ), | ||
| ), | ||
| ], | ||
| ), | ||
| ); | ||
| }, | ||
| ), | ||
| ); | ||
| } | ||
|
|
||
| void _routeToRegister( | ||
| BuildContext context, | ||
| SnsOAuthInfo snsOAuthInfo, | ||
| ) { | ||
| // ref.read(registrationInfoStateProvider(snsOAuthInfo).notifier); | ||
|
|
||
| context.pushNamed( | ||
| AppRoute.profile.name, | ||
| extra: UserProfileViewState.edit(userId: 1), | ||
| ); | ||
| } | ||
|
|
||
| void _routeToHome(BuildContext context) { | ||
| context.goNamed(AppRoute.home.name); | ||
| } | ||
| } |
4 changes: 2 additions & 2 deletions
4
...entation/login/login_view_controller.dart → ...entation/login/login_view_controller.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
Oops, something went wrong.