Fix macOS login (#200)

daohoangson · web-flow · commit 0979cf1afd75 · 2023-08-12T12:40:30.000+07:00
* Fix Facebook login doesn't work
* Fix sign in button loosing margin
* Also update Android &amp; iOS configuration best practices
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ upload the apps to GCS (automatically deleted after 30 days).
   - Windows
 - State management with [provider](https://pub.dev/packages/provider)
 - Apple login via [apple_sign_in](https://pub.dev/packages/apple_sign_in)
-- Facebook login via [flutter_facebook_login](https://pub.dev/packages/flutter_facebook_login)
+- Facebook login via [flutter_facebook_auth](https://pub.dev/packages/flutter_facebook_auth)
 - Google login via [google_sign_in](https://pub.dev/packages/google_sign_in)
 - Store authentication token with [flutter_secure_storage](https://pub.dev/packages/flutter_secure_storage)
 - Render HTML with [flutter_widget_from_html](https://pub.dev/packages/flutter_widget_from_html)
@@ -72,7 +72,7 @@ Pick a unique package name across Play Store and App Store then update these fil
 
 - `.github/workflows/flutter.yml` GCS_BUCKET, GCS_URL
 - `android/app/build.gradle` applicationId, signingConfigs.release
-- `android/app/src/main/AndroidManifest.xml` package, android:label
+- `android/app/src/main/AndroidManifest.xml` package, android:label, com.facebook.FacebookContentProvider
 - `android/app/src/main/res/values/strings.xml` app_name, facebook_app_id, facebook_client_token, fb_login_protocol_scheme
 - `android/fastlane/metadata/android/en-US/` title.txt, full_description.txt, short_description.txt
 - `android/fastlane/Appfile`
@@ -82,6 +82,7 @@ Pick a unique package name across Play Store and App Store then update these fil
 - `ios/fastlane/Appfile`
 - `ios/fastlane/Fastfile` xcargs (PROVISIONING_PROFILE_SPECIFIER), manifest (appURL, displayImageURL, fullSizeImageURL)
 - `ios/fastlane/Matchfile`
+- `lib/src/abstracts/facebook_log_in.dart` Facebook appId
 - `linux/CMakeLists.txt` APPLICATION_ID
 - `macos/Runner/Configs/AppInfo.xcconfig`
 - `macos/Runner.xcodeproj/project.pbxproj` PROVISIONING_PROFILE_SPECIFIER x3
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,64 +1,94 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <!-- flutter_facebook_auth -->
+    <uses-permission
+        android:name="com.google.android.gms.permission.AD_ID"
+        tools:node="remove" />
+    <queries>
+        <provider android:authorities="com.facebook.katana.provider.PlatformProvider" />
+    </queries>
 
     <application
+        android:name="${applicationName}"
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_rules"
-        android:label="@string/app_name"
-        android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name">
         <activity
             android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:exported="true"
+            android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
+
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="https" android:host="tinhte.vn" />
+
+                <data
+                    android:host="tinhte.vn"
+                    android:scheme="https" />
             </intent-filter>
             <intent-filter>
                 <action android:name="FLUTTER_NOTIFICATION_CLICK" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <meta-data android:name="com.facebook.sdk.ApplicationId" 
-            android:value="@string/facebook_app_id"/>
-       	<meta-data android:name="com.facebook.sdk.ClientToken"
-            android:value="@string/facebook_client_token"/>
+        <meta-data
+            android:name="com.facebook.sdk.AdvertiserIDCollectionEnabled"
+            android:value="false" />
+        <meta-data
+            android:name="com.facebook.sdk.ApplicationId"
+            android:value="@string/facebook_app_id" />
+        <meta-data
+            android:name="com.facebook.sdk.ApplicationName"
+            android:value="@string/facebook_app_name" />
+        <meta-data
+            android:name="com.facebook.sdk.AutoLogAppEventsEnabled"
+            android:value="false" />
+        <meta-data
+            android:name="com.facebook.sdk.ClientToken"
+            android:value="@string/facebook_client_token" />
 
-        <activity android:name="com.facebook.FacebookActivity"
-            android:configChanges=
-                    "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+        <activity
+            android:name="com.facebook.FacebookActivity"
+            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:label="@string/app_name" />
         <activity
             android:name="com.facebook.CustomTabActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="@string/fb_login_protocol_scheme" />
             </intent-filter>
         </activity>
+        <provider
+            android:name="com.facebook.FacebookContentProvider"
+            android:authorities="com.facebook.app.FacebookContentProvider566879507102666"
+            android:exported="true" />
 
         <service
             android:name=".FcmService"
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <string name="app_name">ttdemo</string>
     <string name="facebook_app_id">566879507102666</string>
+    <string name="facebook_app_name">com.daohoangson.flutter_ttdemo</string>
     <string name="facebook_client_token">bee1edd35d32695d76209b09c46c60dc</string>
     <string name="fb_login_protocol_scheme">fb566879507102666</string>
 </resources>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -135,11 +135,11 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - sign_in_with_apple (0.0.1):
+    - Flutter
   - sqflite (0.0.3):
     - Flutter
     - FMDB (>= 2.7.5)
-  - the_apple_sign_in (1.0.0):
-    - Flutter
   - uni_links (0.0.1):
     - Flutter
   - url_launcher_ios (0.0.1):
@@ -166,8 +166,8 @@ DEPENDENCIES:
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
-  - the_apple_sign_in (from `.symlinks/plugins/the_apple_sign_in/ios`)
   - uni_links (from `.symlinks/plugins/uni_links/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
@@ -228,10 +228,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+  sign_in_with_apple:
+    :path: ".symlinks/plugins/sign_in_with_apple/ios"
   sqflite:
     :path: ".symlinks/plugins/sqflite/ios"
-  the_apple_sign_in:
-    :path: ".symlinks/plugins/the_apple_sign_in/ios"
   uni_links:
     :path: ".symlinks/plugins/uni_links/ios"
   url_launcher_ios:
@@ -280,8 +280,8 @@ SPEC CHECKSUMS:
   PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265
   share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
   shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
+  sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
-  the_apple_sign_in: 2e78c83cdb09eba07bb16dcc1f3bc12fcdc8263d
   uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
   url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
   video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -207,6 +207,7 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				420D8C6449EA17AD742D8994 /* [CP] Embed Pods Frameworks */,
+				D544E1D3BEDF3DE7A67CADF9 /* [firebase_crashlytics] Crashlytics Upload Symbols */,
 			);
 			buildRules = (
 			);
@@ -348,6 +349,26 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		D544E1D3BEDF3DE7A67CADF9 /* [firebase_crashlytics] Crashlytics Upload Symbols */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"\"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}\"",
+				"\"$(SRCROOT)/$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)\"",
+			);
+			name = "[firebase_crashlytics] Crashlytics Upload Symbols";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"$PODS_ROOT/FirebaseCrashlytics/upload-symbols\" --flutter-project \"$PROJECT_DIR/firebase_app_id_file.json\" ";
+		};
 		D7D718D14130634A5D9FA4D1 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -41,6 +41,8 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>FacebookAppID</key>
 	<string>566879507102666</string>
+	<key>FacebookAutoLogAppEventsEnabled</key>
+	<false/>
 	<key>FacebookClientToken</key>
 	<string>bee1edd35d32695d76209b09c46c60dc</string>
 	<key>FacebookDisplayName</key>
@@ -51,8 +53,6 @@
 	<array>
 		<string>fbapi</string>
 		<string>fb-messenger-share-api</string>
-		<string>fbauth2</string>
-		<string>fbshareextension</string>
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
diff --git a/lib/main.dart b/lib/main.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:provider/provider.dart';
 import 'package:the_app/src/abstracts/error_reporting.dart' as error_reporting;
+import 'package:the_app/src/abstracts/facebook_log_in.dart' as facebook_log_in;
 import 'package:the_app/src/abstracts/firebase.dart' as firebase;
 import 'package:the_app/src/intl.dart';
 import 'package:the_app/src/link.dart';
@@ -21,20 +22,17 @@ import 'package:timeago/timeago.dart' as timeago;
 void main() async {
   timeago.setLocaleMessages('vi', timeago.ViMessages());
 
-  WidgetsFlutterBinding.ensureInitialized();
-  await firebase.initializeApp();
-  error_reporting.configureErrorReporting();
-  push_notification.configurePushNotification();
-
   DarkTheme? darkTheme;
   DevTools? devTools;
   FontScale? fontScale;
   String? initialLink;
   String? initialPath;
+  WidgetsFlutterBinding.ensureInitialized();
   await Future.wait([
     DarkTheme.create().then((value) => darkTheme = value),
     FontScale.create().then((value) => fontScale = value),
     DevTools.create().then((value) => devTools = value),
+    facebook_log_in.configureFacebookLogin(),
     uni_links.getInitialLink().then((value) => initialLink = value),
     firebase.initializeApp().then((value) async {
       error_reporting.configureErrorReporting();
diff --git a/lib/src/abstracts/apple_sign_in.dart b/lib/src/abstracts/apple_sign_in.dart
@@ -1,21 +1,26 @@
+import 'dart:io';
+
 import 'package:flutter/widgets.dart';
 import 'package:the_app/src/intl.dart';
-import 'package:the_apple_sign_in/the_apple_sign_in.dart' as lib;
+import 'package:sign_in_with_apple/sign_in_with_apple.dart' as lib;
 
-Future<bool> get isSupported => lib.TheAppleSignIn.isAvailable();
+final isSupported = Platform.isIOS;
 
 Future<String> signIn(BuildContext context) async {
   final l10n = l(context);
 
-  const req = lib.AppleIdRequest(requestedScopes: [lib.Scope.email]);
-  final result = await lib.TheAppleSignIn.performRequests([req]);
-
-  switch (result.status) {
-    case lib.AuthorizationStatus.authorized:
-      return String.fromCharCodes(result.credential!.identityToken!);
-    case lib.AuthorizationStatus.cancelled:
+  try {
+    final credential = await lib.SignInWithApple.getAppleIDCredential(
+      scopes: [
+        lib.AppleIDAuthorizationScopes.email,
+      ],
+    );
+    return credential.identityToken!;
+  } on lib.SignInWithAppleAuthorizationException catch (e) {
+    if (e.code == lib.AuthorizationErrorCode.canceled) {
       throw StateError(l10n.loginErrorCancelled(l10n.loginWithApple));
-    case lib.AuthorizationStatus.error:
-      throw StateError(result.error!.localizedDescription!);
+    } else {
+      throw StateError(e.message);
+    }
   }
 }
diff --git a/lib/src/abstracts/facebook_log_in.dart b/lib/src/abstracts/facebook_log_in.dart
@@ -1,10 +1,26 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_facebook_auth/flutter_facebook_auth.dart' as lib;
 import 'package:the_app/src/intl.dart';
 
+Future<void> configureFacebookLogin() async {
+  if (defaultTargetPlatform == TargetPlatform.macOS) {
+    await lib.FacebookAuth.instance.webAndDesktopInitialize(
+      appId: "566879507102666",
+      cookie: true,
+      xfbml: true,
+      version: "v14.0",
+    );
+  }
+}
+
 Future<String> logIn(BuildContext context) async {
   final l10n = l(context);
-  final result = await lib.FacebookAuth.instance.login();
+  final result = await lib.FacebookAuth.instance.login(
+    permissions: const [
+      'email',
+    ],
+  );
   switch (result.status) {
     case lib.LoginStatus.success:
       return result.accessToken!.token;
diff --git a/lib/src/screens/login.dart b/lib/src/screens/login.dart
@@ -43,7 +43,6 @@ class _LoginFormState extends State<LoginForm> {
 
   LoginAssociatable? _associatable;
   LoginTfa? _tfa;
-  bool _canLoginApple = false;
   bool _isLoggingIn = false;
 
   String _username = '';
@@ -52,18 +51,6 @@ class _LoginFormState extends State<LoginForm> {
 
   _LoginFormState();
 
-  @override
-  void initState() {
-    super.initState();
-
-    if (config.loginWithApple) {
-      apple_sign_in.isSupported.then((ok) {
-        if (!ok || !mounted) return;
-        setState(() => _canLoginApple = true);
-      });
-    }
-  }
-
   @override
   void dispose() {
     focusNodePassword.dispose();
@@ -145,7 +132,7 @@ class _LoginFormState extends State<LoginForm> {
             ),
           ],
         ),
-        if (_canLoginApple)
+        if (config.loginWithApple && apple_sign_in.isSupported)
           SignInButton.apple(
             onPressed: _loginApple,
             text: l(context).loginWithApple,
diff --git a/lib/src/widgets/sign_in_button.dart b/lib/src/widgets/sign_in_button.dart
@@ -50,6 +50,7 @@ class SignInButton extends StatelessWidget {
     return MaterialButton(
       key: key,
       color: backgroundColor,
+      materialTapTargetSize: MaterialTapTargetSize.padded,
       onPressed: onPressed,
       splashColor: Colors.white30,
       highlightColor: Colors.white30,
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
diff --git a/macos/Podfile.lock b/macos/Podfile.lock
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml
