Merge pull request #318 from DevKor-github/308-add-apple-sign-in-authentication

jjoonleo · web-flow · commit 1120dc4380a0 · 2025-09-15T22:05:42.000+09:00
feat(auth): Add Sign in with Apple
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,5 @@ app.*.map.json
 ios/Flutter/Dart-Defines.xcconfig
 ios/GoogleService-Info.plist
 android/app/google-services.json
+
+.cursor
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>13.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -106,6 +106,8 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - sign_in_with_apple (0.0.1):
+    - Flutter
   - sqlite3 (3.49.1):
     - sqlite3/common (= 3.49.1)
   - sqlite3/common (3.49.1)
@@ -143,6 +145,7 @@ DEPENDENCIES:
   - kakao_flutter_sdk_common (from `.symlinks/plugins/kakao_flutter_sdk_common/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`)
   - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`)
@@ -187,6 +190,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+  sign_in_with_apple:
+    :path: ".symlinks/plugins/sign_in_with_apple/ios"
   sqlite3_flutter_libs:
     :path: ".symlinks/plugins/sqlite3_flutter_libs/darwin"
   url_launcher_ios:
@@ -203,7 +208,7 @@ SPEC CHECKSUMS:
   FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629
   FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917
   FirebaseMessaging: 487b634ccdf6f7b7ff180fdcb2a9935490f764e8
-  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
   flutter_appauth: 914057fda669db5073d3ca9d94ea932e7df3c964
   flutter_local_notifications: 395056b3175ba4f08480a7c5de30cd36d69827e4
   flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
@@ -219,6 +224,7 @@ SPEC CHECKSUMS:
   path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418
   sqlite3: fc1400008a9b3525f5914ed715a5d1af0b8f4983
   sqlite3_flutter_libs: f8fc13346870e73fe35ebf6dbb997fbcd156b241
   url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -483,7 +483,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -614,7 +614,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -665,7 +665,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
@@ -4,5 +4,9 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.applesignin</key>
+	<array>
+		<string>Default</string>
+	</array>
 </dict>
 </plist>
diff --git a/ios/Runner/RunnerDebug.entitlements b/ios/Runner/RunnerDebug.entitlements
@@ -4,5 +4,9 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.applesignin</key>
+	<array>
+		<string>Default</string>
+	</array>
 </dict>
 </plist>
diff --git a/lib/core/constants/endpoint.dart b/lib/core/constants/endpoint.dart
@@ -5,11 +5,13 @@ class Endpoint {
   static const _signIn = '/login';
   static const _signUp = '/sign-up';
   static const _signInWithGoogle = '/oauth2/google/login';
+  static const _signInWithApple = '/oauth2/apple/login';
   static const _getUser = '/users/me';
 
   static get signIn => _signIn;
   static get signUp => _signUp;
   static get signInWithGoogle => _signInWithGoogle;
+  static get signInWithApple => _signInWithApple;
   static get getUser => _getUser;
 
   // schedule
diff --git a/lib/data/data_sources/authentication_remote_data_source.dart b/lib/data/data_sources/authentication_remote_data_source.dart
@@ -4,6 +4,7 @@ import 'package:on_time_front/core/constants/endpoint.dart';
 import 'package:on_time_front/data/models/get_user_response_model.dart';
 import 'package:on_time_front/data/models/sign_in_user_response_model.dart';
 import 'package:on_time_front/data/models/sign_in_with_google_request_model.dart';
+import 'package:on_time_front/data/models/sign_in_with_apple_request_model.dart';
 import 'package:on_time_front/domain/entities/token_entity.dart';
 import 'package:on_time_front/domain/entities/user_entity.dart';
 
@@ -16,6 +17,9 @@ abstract interface class AuthenticationRemoteDataSource {
   Future<(UserEntity, TokenEntity)> signInWithGoogle(
       SignInWithGoogleRequestModel signInWithGoogleRequestModel);
 
+  Future<(UserEntity, TokenEntity)> signInWithApple(
+      SignInWithAppleRequestModel signInWithAppleRequestModel);
+
   Future<UserEntity> getUser();
 }
 
@@ -92,6 +96,26 @@ class AuthenticationRemoteDataSourceImpl
     }
   }
 
+  @override
+  Future<(UserEntity, TokenEntity)> signInWithApple(
+      SignInWithAppleRequestModel signInWithAppleRequestModel) async {
+    try {
+      final result = await dio.post(
+        Endpoint.signInWithApple,
+        data: signInWithAppleRequestModel.toJson(),
+      );
+      if (result.statusCode == 200) {
+        final user = SignInUserResponseModel.fromJson(result.data['data']);
+        final token = TokenEntity.fromHeaders(result.headers);
+        return (user.toEntity(), token);
+      } else {
+        throw Exception('Error signing in with Apple');
+      }
+    } catch (e) {
+      rethrow;
+    }
+  }
+
   @override
   Future<UserEntity> getUser() async {
     try {
diff --git a/lib/data/models/sign_in_with_apple_request_model.dart b/lib/data/models/sign_in_with_apple_request_model.dart
@@ -0,0 +1,30 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'sign_in_with_apple_request_model.g.dart';
+
+@JsonSerializable()
+class SignInWithAppleRequestModel {
+  final String idToken;
+  final String authCode;
+  final String fullName;
+  final String? email;
+
+  SignInWithAppleRequestModel({
+    required this.idToken,
+    required this.authCode,
+    required this.fullName,
+    this.email,
+  });
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> map = {
+      'idToken': idToken,
+      'authCode': authCode,
+      'fullName': fullName,
+    };
+    if (email != null) {
+      map['email'] = email;
+    }
+    return map;
+  }
+}
diff --git a/lib/data/repositories/user_repository_impl.dart b/lib/data/repositories/user_repository_impl.dart
@@ -4,6 +4,7 @@ import 'package:injectable/injectable.dart';
 import 'package:on_time_front/data/data_sources/authentication_remote_data_source.dart';
 import 'package:on_time_front/data/data_sources/token_local_data_source.dart';
 import 'package:on_time_front/data/models/sign_in_with_google_request_model.dart';
+import 'package:on_time_front/data/models/sign_in_with_apple_request_model.dart';
 import 'package:on_time_front/domain/entities/user_entity.dart';
 import 'package:on_time_front/domain/repositories/user_repository.dart';
 import 'package:rxdart/subjects.dart';
@@ -95,6 +96,31 @@ class UserRepositoryImpl implements UserRepository {
     }
   }
 
+  @override
+  Future<void> signInWithApple({
+    required String idToken,
+    required String authCode,
+    required String fullName,
+    String? email,
+  }) async {
+    try {
+      final signInWithAppleRequestModel = SignInWithAppleRequestModel(
+        idToken: idToken,
+        authCode: authCode,
+        fullName: fullName,
+        email: email,
+      );
+      await _tokenLocalDataSource.deleteToken();
+      final result = await _authenticationRemoteDataSource
+          .signInWithApple(signInWithAppleRequestModel);
+      await _tokenLocalDataSource.storeTokens(result.$2);
+      _userStreamController.add(result.$1);
+    } catch (e) {
+      debugPrint(e.toString());
+      rethrow;
+    }
+  }
+
   @override
   Stream<UserEntity> get userStream =>
       _userStreamController.asBroadcastStream();
diff --git a/lib/domain/repositories/user_repository.dart b/lib/domain/repositories/user_repository.dart
@@ -15,5 +15,12 @@ abstract interface class UserRepository {
 
   Future<void> signInWithGoogle(GoogleSignInAccount account);
 
+  Future<void> signInWithApple({
+    required String idToken,
+    required String authCode,
+    required String fullName,
+    String? email,
+  });
+
   Future<void> getUser();
 }
diff --git a/lib/presentation/login/components/google_sign_in_button/apple_sign_in_button_mobile.dart b/lib/presentation/login/components/google_sign_in_button/apple_sign_in_button_mobile.dart
@@ -0,0 +1,63 @@
+import 'package:flutter/material.dart' hide IconAlignment;
+import 'package:sign_in_with_apple/sign_in_with_apple.dart';
+import 'package:on_time_front/core/di/di_setup.dart';
+import 'package:on_time_front/domain/repositories/user_repository.dart';
+
+class AppleSignInButton extends StatelessWidget {
+  const AppleSignInButton({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final UserRepository userRepository = getIt.get<UserRepository>();
+
+    return SizedBox(
+      width: 358,
+      child: DefaultTextStyle.merge(
+        style: TextStyle(
+          fontSize: 19,
+          fontWeight: FontWeight.w600,
+          height: 24 / 19,
+          fontFamily: 'SF Pro',
+        ),
+        child: SignInWithAppleButton(
+          onPressed: () async {
+            try {
+              final credential = await SignInWithApple.getAppleIDCredential(
+                scopes: [
+                  AppleIDAuthorizationScopes.email,
+                  AppleIDAuthorizationScopes.fullName,
+                ],
+              );
+
+              final fullNameRaw =
+                  '${credential.givenName ?? ''} ${credential.familyName ?? ''}'
+                      .trim();
+              final fullName =
+                  fullNameRaw.isNotEmpty ? fullNameRaw : 'Apple User';
+
+              final identityToken = credential.identityToken;
+              final authorizationCode = credential.authorizationCode;
+              if (identityToken == null || authorizationCode == null) {
+                throw Exception('Apple Sign In Failed: Missing credentials');
+              }
+
+              await userRepository.signInWithApple(
+                idToken: identityToken,
+                authCode: authorizationCode,
+                fullName: fullName,
+                email: credential.email,
+              );
+            } catch (e) {
+              debugPrint('Apple Sign In Error: ${e.toString()}');
+            }
+          },
+          style: SignInWithAppleButtonStyle.black,
+          height: 54,
+          borderRadius: BorderRadius.circular(14),
+          iconAlignment: IconAlignment.center,
+          text: 'Sign in with Apple',
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/login/screens/sign_in_main_screen.dart b/lib/presentation/login/screens/sign_in_main_screen.dart
@@ -1,11 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter/foundation.dart';
+import 'dart:io' show Platform;
 import 'package:google_sign_in/google_sign_in.dart';
 import 'package:on_time_front/core/di/di_setup.dart';
 import 'package:on_time_front/domain/repositories/user_repository.dart';
 import 'package:on_time_front/l10n/app_localizations.dart';
 
 import '../components/google_sign_in_button/shared.dart';
+import '../components/google_sign_in_button/apple_sign_in_button_mobile.dart';
 
 class SignInMainScreen extends StatefulWidget {
   const SignInMainScreen({super.key});
@@ -39,6 +42,10 @@ class _SignInMainScreenState extends State<SignInMainScreen> {
             SizedBox(height: 48),
             _CharacterImage(),
             SizedBox(height: 41),
+            if (!kIsWeb && Platform.isIOS) ...[
+              AppleSignInButton(),
+              SizedBox(height: 22),
+            ],
             GoogleSignInButton(),
           ],
         ),
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -14,6 +14,7 @@ import flutter_web_auth
 import google_sign_in_ios
 import path_provider_foundation
 import shared_preferences_foundation
+import sign_in_with_apple
 import sqlite3_flutter_libs
 import url_launcher_macos
 import webview_flutter_wkwebview
@@ -28,6 +29,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FLTGoogleSignInPlugin.register(with: registry.registrar(forPlugin: "FLTGoogleSignInPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
+  SignInWithApplePlugin.register(with: registry.registrar(forPlugin: "SignInWithApplePlugin"))
   Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
   WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin"))
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml
