Skip to content

Commit c3acdba

Browse files
russellwheatleyrussellwheatley
authored
feat(auth): upgrade flutter_facebook_auth dependency and use limited/classic login depending on ATT status (#553)
1 parent 98a4f0d commit c3acdba

File tree

16 files changed

+741
-77
lines changed

16 files changed

+741
-77
lines changed

‎melos.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,6 @@ scripts:
158158
description: Add a license header to all necessary files.
159159

160160
emulator:start:
161-
run: firebase emulators:start --only firestore,auth,functions,storage,database --import=./emulators-data --export-on-exit=./emulators-data
161+
run: firebase emulators:start --only firestore,auth,functions,storage,database --project flutterfire-e2e-tests --import=./emulators-data --export-on-exit=./emulators-data
162162
update-dependencies:
163163
run: dart scripts/update_dependencies.dart

‎packages/firebase_ui_auth/example/android/app/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="io.flutter.plugins.firebase_ui_example">
3+
<uses-permission android:name="android.permission.INTERNET"/>
4+
<queries>
5+
<provider android:authorities="com.facebook.katana.provider.PlatformProvider" />
6+
</queries>
37
<application
48
android:label="firebase_ui_example"
59
android:name="${applicationName}"
610
android:icon="@mipmap/ic_launcher"
711
android:usesCleartextTraffic="true">
812
<meta-data android:name="flutter_deeplinking_enabled" android:value="false" />
9-
<meta-data
10-
android:name="com.facebook.sdk.ApplicationId"
11-
android:value="@string/facebook_app_id"/>
12-
<meta-data
13-
android:name="com.facebook.sdk.ClientToken"
14-
android:value="@string/facebook_client_token"/>
13+
<meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
14+
<meta-data android:name="com.facebook.sdk.ClientToken" android:value="@string/facebook_client_token"/>
1515

1616
<activity
1717
android:name=".MainActivity"

‎packages/firebase_ui_auth/example/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>12.0</string>
24+
<string>13.0</string>
2525
</dict>
2626
</plist>

‎packages/firebase_ui_auth/example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1212
615AB19345F2CB9C4AFB55AE /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5CBE04B4787B566D8CAE0579 /* GoogleService-Info.plist */; };
1313
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
14-
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
1514
83A0F86F233458219B2DC55F /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 416FB58C991096C1726F437F /* Pods_Runner.framework */; };
1615
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1716
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -43,6 +42,7 @@
4342
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
4443
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4544
762BD74E83C8639023D97BD3 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
45+
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
4646
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4747
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4848
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
@@ -58,7 +58,6 @@
5858
isa = PBXFrameworksBuildPhase;
5959
buildActionMask = 2147483647;
6060
files = (
61-
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
6261
83A0F86F233458219B2DC55F /* Pods_Runner.framework in Frameworks */,
6362
);
6463
runOnlyForDeploymentPostprocessing = 0;
@@ -69,6 +68,7 @@
6968
9740EEB11CF90186004384FC /* Flutter */ = {
7069
isa = PBXGroup;
7170
children = (
71+
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
7272
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
7373
9740EEB21CF90195004384FC /* Debug.xcconfig */,
7474
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -153,9 +153,6 @@
153153
dependencies = (
154154
);
155155
name = Runner;
156-
packageProductDependencies = (
157-
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
158-
);
159156
productName = Runner;
160157
productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
161158
productType = "com.apple.product-type.application";
@@ -374,7 +371,7 @@
374371
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
375372
GCC_WARN_UNUSED_FUNCTION = YES;
376373
GCC_WARN_UNUSED_VARIABLE = YES;
377-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
374+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
378375
MTL_ENABLE_DEBUG_INFO = NO;
379376
SDKROOT = iphoneos;
380377
SUPPORTED_PLATFORMS = iphoneos;
@@ -394,6 +391,7 @@
394391
DEVELOPMENT_TEAM = YYX2P3XVJ7;
395392
ENABLE_BITCODE = NO;
396393
INFOPLIST_FILE = Runner/Info.plist;
394+
IPHONEOS_DEPLOYMENT_TARGET = 17.6;
397395
LD_RUNPATH_SEARCH_PATHS = (
398396
"$(inherited)",
399397
"@executable_path/Frameworks",
@@ -453,7 +451,7 @@
453451
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
454452
GCC_WARN_UNUSED_FUNCTION = YES;
455453
GCC_WARN_UNUSED_VARIABLE = YES;
456-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
454+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
457455
MTL_ENABLE_DEBUG_INFO = YES;
458456
ONLY_ACTIVE_ARCH = YES;
459457
SDKROOT = iphoneos;
@@ -502,7 +500,7 @@
502500
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
503501
GCC_WARN_UNUSED_FUNCTION = YES;
504502
GCC_WARN_UNUSED_VARIABLE = YES;
505-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
503+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
506504
MTL_ENABLE_DEBUG_INFO = NO;
507505
SDKROOT = iphoneos;
508506
SUPPORTED_PLATFORMS = iphoneos;
@@ -524,6 +522,7 @@
524522
DEVELOPMENT_TEAM = YYX2P3XVJ7;
525523
ENABLE_BITCODE = NO;
526524
INFOPLIST_FILE = Runner/Info.plist;
525+
IPHONEOS_DEPLOYMENT_TARGET = 17.6;
527526
LD_RUNPATH_SEARCH_PATHS = (
528527
"$(inherited)",
529528
"@executable_path/Frameworks",
@@ -548,6 +547,7 @@
548547
DEVELOPMENT_TEAM = YYX2P3XVJ7;
549548
ENABLE_BITCODE = NO;
550549
INFOPLIST_FILE = Runner/Info.plist;
550+
IPHONEOS_DEPLOYMENT_TARGET = 17.6;
551551
LD_RUNPATH_SEARCH_PATHS = (
552552
"$(inherited)",
553553
"@executable_path/Frameworks",
@@ -591,13 +591,6 @@
591591
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
592592
};
593593
/* End XCLocalSwiftPackageReference section */
594-
595-
/* Begin XCSwiftPackageProductDependency section */
596-
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
597-
isa = XCSwiftPackageProductDependency;
598-
productName = FlutterGeneratedPluginSwiftPackage;
599-
};
600-
/* End XCSwiftPackageProductDependency section */
601594
};
602595
rootObject = 97C146E61CF9000F007C117D /* Project object */;
603596
}

‎packages/firebase_ui_auth/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,24 @@
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<PreActions>
9+
<ExecutionAction
10+
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
11+
<ActionContent
12+
title = "Run Prepare Flutter Framework Script"
13+
scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
14+
<EnvironmentBuildable>
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
18+
BuildableName = "Runner.app"
19+
BlueprintName = "Runner"
20+
ReferencedContainer = "container:Runner.xcodeproj">
21+
</BuildableReference>
22+
</EnvironmentBuildable>
23+
</ActionContent>
24+
</ExecutionAction>
25+
</PreActions>
826
<BuildActionEntries>
927
<BuildActionEntry
1028
buildForTesting = "YES"
@@ -26,6 +44,7 @@
2644
buildConfiguration = "Debug"
2745
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2846
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2948
shouldUseLaunchSchemeArgsEnv = "YES">
3049
<MacroExpansion>
3150
<BuildableReference
@@ -43,11 +62,13 @@
4362
buildConfiguration = "Debug"
4463
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4564
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
65+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
4666
launchStyle = "0"
4767
useCustomWorkingDirectory = "NO"
4868
ignoresPersistentStateOnLaunch = "NO"
4969
debugDocumentVersioning = "YES"
5070
debugServiceExtension = "internal"
71+
enableGPUValidationMode = "1"
5172
allowLocationSimulation = "YES">
5273
<BuildableProductRunnable
5374
runnableDebuggingMode = "0">

‎packages/firebase_ui_auth/example/ios/Runner/Info.plist‎

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>CADisableMinimumFrameDurationOnPhone</key>
6+
<true/>
57
<key>CFBundleDevelopmentRegion</key>
68
<string>$(DEVELOPMENT_LANGUAGE)</string>
79
<key>CFBundleDisplayName</key>
@@ -20,10 +22,48 @@
2022
<string>$(FLUTTER_BUILD_NAME)</string>
2123
<key>CFBundleSignature</key>
2224
<string>????</string>
25+
<key>CFBundleURLTypes</key>
26+
<array>
27+
<dict>
28+
<key>CFBundleTypeRole</key>
29+
<string>Editor</string>
30+
<key>CFBundleURLSchemes</key>
31+
<array>
32+
<string>com.googleusercontent.apps.406099696497-65v1b9ffv6sgfqngfjab5ol5qdikh2rm</string>
33+
</array>
34+
</dict>
35+
<dict>
36+
<key>CFBundleTypeRole</key>
37+
<string>Editor</string>
38+
<key>CFBundleURLSchemes</key>
39+
<array>
40+
<string>fb128693022464535</string>
41+
</array>
42+
</dict>
43+
</array>
2344
<key>CFBundleVersion</key>
2445
<string>$(FLUTTER_BUILD_NUMBER)</string>
46+
<key>FacebookAppID</key>
47+
<string>128693022464535</string>
48+
<key>FacebookClientToken</key>
49+
<string>16dbbdf0cfb309034a6ad98ac2a21688</string>
50+
<key>FacebookDisplayName</key>
51+
<string>Flutter Firebase UI Example</string>
52+
<key>FlutterDeepLinkingEnabled</key>
53+
<false/>
54+
<key>GIDClientID</key>
55+
<string>406099696497-65v1b9ffv6sgfqngfjab5ol5qdikh2rm.apps.googleusercontent.com</string>
56+
<key>LSApplicationQueriesSchemes</key>
57+
<array>
58+
<string>fbapi</string>
59+
<string>fb-messenger-share-api</string>
60+
</array>
2561
<key>LSRequiresIPhoneOS</key>
2662
<true/>
63+
<key>NSUserTrackingUsageDescription</key>
64+
<string>This app would like to track your activity to provide a personalized experience with Facebook login.</string>
65+
<key>UIApplicationSupportsIndirectInputEvents</key>
66+
<true/>
2767
<key>UILaunchStoryboardName</key>
2868
<string>LaunchScreen</string>
2969
<key>UIMainStoryboardFile</key>
@@ -43,24 +83,5 @@
4383
</array>
4484
<key>UIViewControllerBasedStatusBarAppearance</key>
4585
<false/>
46-
<key>CADisableMinimumFrameDurationOnPhone</key>
47-
<true/>
48-
<key>UIApplicationSupportsIndirectInputEvents</key>
49-
<true/>
50-
<key>FlutterDeepLinkingEnabled</key>
51-
<false/>
52-
<key>CFBundleURLTypes</key>
53-
<array>
54-
<dict>
55-
<key>CFBundleTypeRole</key>
56-
<string>Editor</string>
57-
<key>CFBundleURLSchemes</key>
58-
<array>
59-
<string>com.googleusercontent.apps.406099696497-65v1b9ffv6sgfqngfjab5ol5qdikh2rm</string>
60-
</array>
61-
</dict>
62-
</array>
63-
<key>GIDClientID</key>
64-
<string>406099696497-65v1b9ffv6sgfqngfjab5ol5qdikh2rm.apps.googleusercontent.com</string>
6586
</dict>
6687
</plist>

0 commit comments

Comments
 (0)