Skip to content

Commit 3f4a540

Browse files
Revert "fix(ui_auth): add showPasswordVisibilityToggle to the SignInScreen (firebase#114)"
This reverts commit 77ed75d.
1 parent 8f62b29 commit 3f4a540

File tree

12 files changed

+3
-110
lines changed

12 files changed

+3
-110
lines changed

packages/firebase_ui_auth/doc/README.md

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -42,34 +42,7 @@ Future<void> main() async {
4242

4343
## macOS entitlements
4444

45-
If you're building for macOS, make sure to add necessary entitlements. Learn more [from the official Flutter documentation](https://docs.flutter.dev/platform-integration/macos/building#setting-up-entitlements).
46-
47-
## Writing widget unit tests
48-
49-
If you're writing widget unit tests, you'll need to add the following to your `setUpAll` method:
50-
51-
```dart
52-
setUpAll(() {
53-
setFirebaseUiIsTestMode(true);
54-
});
55-
```
56-
57-
Also, you will likely want to mock the `FirebaseAuth` instance:
58-
59-
```dart
60-
class MockFirebaseAuth extends Mock implements FirebaseAuth {
61-
/// mock necessary methods
62-
}
63-
```
64-
65-
An instance of `MockFirebaseAuth` can then be passed to Firebase UI widgets:
66-
67-
```dart
68-
SignInScreen(
69-
auth: MockFirebaseAuth(),
70-
/// ... other props
71-
)
72-
```
45+
If you're building for macOS, make sure to add necessary entitlements. Learn more [from the official Flutter documentation](https://docs.flutter.dev/development/platform-integration/macos/building).
7346

7447
## Next steps
7548

packages/firebase_ui_auth/example/windows/flutter/generated_plugin_registrant.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77
#include "generated_plugin_registrant.h"
88

99
#include <desktop_webview_auth/desktop_webview_auth_plugin.h>
10-
#include <firebase_auth/firebase_auth_plugin_c_api.h>
1110
#include <firebase_core/firebase_core_plugin_c_api.h>
1211
#include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
1312

1413
void RegisterPlugins(flutter::PluginRegistry* registry) {
1514
DesktopWebviewAuthPluginRegisterWithRegistrar(
1615
registry->GetRegistrarForPlugin("DesktopWebviewAuthPlugin"));
17-
FirebaseAuthPluginCApiRegisterWithRegistrar(
18-
registry->GetRegistrarForPlugin("FirebaseAuthPluginCApi"));
1916
FirebaseCorePluginCApiRegisterWithRegistrar(
2017
registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
2118
FlutterSecureStorageWindowsPluginRegisterWithRegistrar(

packages/firebase_ui_auth/example/windows/flutter/generated_plugins.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
list(APPEND FLUTTER_PLUGIN_LIST
66
desktop_webview_auth
7-
firebase_auth
87
firebase_core
98
flutter_secure_storage_windows
109
)

packages/firebase_ui_auth/lib/firebase_ui_auth.dart

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,6 @@ export 'src/widgets/sign_out_button.dart';
9595
export 'src/widgets/sms_code_input.dart' show SMSCodeInputState, SMSCodeInput;
9696
export 'src/widgets/user_avatar.dart';
9797

98-
bool _isTestMode = false;
99-
100-
@visibleForTesting
101-
void setFirebaseUiIsTestMode(bool isTestMode) {
102-
_isTestMode = isTestMode;
103-
}
104-
10598
class FirebaseUIAuth {
10699
static final _providers = <FirebaseApp, List<AuthProvider>>{};
107100
static final _configuredApps = <FirebaseApp, bool>{};
@@ -111,15 +104,14 @@ class FirebaseUIAuth {
111104
}
112105

113106
static bool isAppConfigured(FirebaseApp app) {
114-
if (_isTestMode) return true;
115107
return _providers.containsKey(app);
116108
}
117109

118110
static void configureProviders(
119111
List<AuthProvider> configs, {
120112
FirebaseApp? app,
121113
}) {
122-
if (!_isTestMode && Firebase.apps.isEmpty) {
114+
if (Firebase.apps.isEmpty) {
123115
throw Exception(
124116
'You must call Firebase.initializeApp() '
125117
'before calling configureProviders()',

packages/firebase_ui_auth/lib/src/screens/sign_in_screen.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ class SignInScreen extends MultiProviderScreen {
9595
/// * [EmailFormStyle]
9696
final Set<FirebaseUIStyle>? styles;
9797

98-
/// {@macro ui.auth.widgets.email_form.showPasswordVisibilityToggle}
99-
final bool showPasswordVisibilityToggle;
100-
10198
/// {@macro ui.auth.screens.sign_in_screen}
10299
const SignInScreen({
103100
super.key,
@@ -117,7 +114,6 @@ class SignInScreen extends MultiProviderScreen {
117114
this.actions = const [],
118115
this.breakpoint = 800,
119116
this.styles,
120-
this.showPasswordVisibilityToggle = false,
121117
});
122118

123119
Future<void> _signInWithDifferentProvider(
@@ -169,7 +165,6 @@ class SignInScreen extends MultiProviderScreen {
169165
subtitleBuilder: subtitleBuilder,
170166
footerBuilder: footerBuilder,
171167
breakpoint: breakpoint,
172-
showPasswordVisibilityToggle: showPasswordVisibilityToggle,
173168
),
174169
);
175170
}

packages/firebase_ui_auth/test/screens/sign_in_screen_test.dart

Lines changed: 0 additions & 47 deletions
This file was deleted.

packages/firebase_ui_auth/test/views/login_view_test.dart renamed to packages/firebase_ui_auth/test/src/views/login_view_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
88
import 'package:flutter/rendering.dart';
99
import 'package:flutter_test/flutter_test.dart';
1010

11-
import '../test_utils.dart';
11+
import '../../test_utils.dart';
1212

1313
void main() {
1414
group("$LoginView", () {

packages/firebase_ui_auth/test/test_utils.dart

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'package:firebase_auth/firebase_auth.dart';
6-
import 'package:firebase_core/firebase_core.dart';
76
import 'package:firebase_dynamic_links/firebase_dynamic_links.dart';
87
import 'package:flutter/material.dart';
98
import 'package:mockito/mockito.dart';
@@ -61,19 +60,12 @@ class MockDynamicLinks extends Mock implements FirebaseDynamicLinks {
6160
Stream<PendingDynamicLinkData> get onLink => _linkStream;
6261
}
6362

64-
class MockApp extends Mock implements FirebaseApp {}
65-
6663
class MockAuth extends Mock implements FirebaseAuth {
6764
MockUser? user;
6865

6966
@override
7067
User? get currentUser => user;
7168

72-
@override
73-
FirebaseApp get app => MockApp();
74-
75-
List<FirebaseApp> get apps => [app];
76-
7769
@override
7870
Future<UserCredential> signInWithCredential(
7971
AuthCredential? credential,

packages/firebase_ui_localizations/example/windows/flutter/generated_plugin_registrant.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@
77
#include "generated_plugin_registrant.h"
88

99
#include <desktop_webview_auth/desktop_webview_auth_plugin.h>
10-
#include <firebase_auth/firebase_auth_plugin_c_api.h>
1110
#include <firebase_core/firebase_core_plugin_c_api.h>
1211

1312
void RegisterPlugins(flutter::PluginRegistry* registry) {
1413
DesktopWebviewAuthPluginRegisterWithRegistrar(
1514
registry->GetRegistrarForPlugin("DesktopWebviewAuthPlugin"));
16-
FirebaseAuthPluginCApiRegisterWithRegistrar(
17-
registry->GetRegistrarForPlugin("FirebaseAuthPluginCApi"));
1815
FirebaseCorePluginCApiRegisterWithRegistrar(
1916
registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
2017
}

packages/firebase_ui_localizations/example/windows/flutter/generated_plugins.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
list(APPEND FLUTTER_PLUGIN_LIST
66
desktop_webview_auth
7-
firebase_auth
87
firebase_core
98
)
109

packages/firebase_ui_oauth/example/windows/flutter/generated_plugin_registrant.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77
#include "generated_plugin_registrant.h"
88

99
#include <desktop_webview_auth/desktop_webview_auth_plugin.h>
10-
#include <firebase_auth/firebase_auth_plugin_c_api.h>
1110
#include <firebase_core/firebase_core_plugin_c_api.h>
1211
#include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
1312

1413
void RegisterPlugins(flutter::PluginRegistry* registry) {
1514
DesktopWebviewAuthPluginRegisterWithRegistrar(
1615
registry->GetRegistrarForPlugin("DesktopWebviewAuthPlugin"));
17-
FirebaseAuthPluginCApiRegisterWithRegistrar(
18-
registry->GetRegistrarForPlugin("FirebaseAuthPluginCApi"));
1916
FirebaseCorePluginCApiRegisterWithRegistrar(
2017
registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
2118
FlutterSecureStorageWindowsPluginRegisterWithRegistrar(

packages/firebase_ui_oauth/example/windows/flutter/generated_plugins.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
list(APPEND FLUTTER_PLUGIN_LIST
66
desktop_webview_auth
7-
firebase_auth
87
firebase_core
98
flutter_secure_storage_windows
109
)

0 commit comments

Comments
 (0)