From aa435fae17d359b13b141d7b2776e2112f62ac78 Mon Sep 17 00:00:00 2001
From: Stein Milder <steinmilder@mbp-van-stein.lan>
Date: Tue, 20 Sep 2022 16:42:09 +0200
Subject: [PATCH] refactor naming

---
 lib/backend/login_repository.dart              | 18 +++++++++---------
 lib/model/confirmation_result.dart             |  1 -
 lib/model/login_confirmation_result.dart       |  1 +
 lib/model/{user.dart => login_user.dart}       |  4 ++--
 lib/plugins/login/login_phone_number.dart      |  6 +++---
 .../login/login_phone_number_verify.dart       | 10 +++++-----
 6 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 lib/model/confirmation_result.dart
 create mode 100644 lib/model/login_confirmation_result.dart
 rename lib/model/{user.dart => login_user.dart} (76%)

diff --git a/lib/backend/login_repository.dart b/lib/backend/login_repository.dart
index 59235b3..51f55f5 100644
--- a/lib/backend/login_repository.dart
+++ b/lib/backend/login_repository.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 import 'package:flutter/foundation.dart';
 import '../login_config.dart';
-import '../model/confirmation_result.dart';
-import '../model/user.dart';
+import '../model/login_confirmation_result.dart';
+import '../model/login_user.dart';
 
 abstract class LoginRepository with ChangeNotifier {
   String? _loggedIn = '';
@@ -37,7 +37,7 @@ abstract class LoginRepository with ChangeNotifier {
     _initialized = true;
   }
 
-  Future<User?> signInWithSocial(SocialLoginBundle bundle);
+  Future<LoginUser?> signInWithSocial(SocialLoginBundle bundle);
   Future<bool?> userprofileExists();
   Future sendLoginEmail(String input);
   Future<void> trySignInWithPhoneNumber({
@@ -45,20 +45,20 @@ abstract class LoginRepository with ChangeNotifier {
     void Function(
       String verificationId,
       int? resendToken,
-      ConfirmationResult? resultWeb,
+      LoginConfirmationResult? resultWeb,
     )?
         onCodeSent,
     void Function(String errorCode)? onVerificationFailed,
-    void Function(User? user)? onAutoLogin,
+    void Function(LoginUser? user)? onAutoLogin,
   });
-  Future<User?> signInWithSMSCode(
+  Future<LoginUser?> signInWithSMSCode(
     String verificationId,
     String smsCode,
     String phoneNumber, {
-    ConfirmationResult? resultWeb,
+    LoginConfirmationResult? resultWeb,
   });
   Future<bool> forgotPassword(String email);
-  Future<bool> isRegistrationRequired(User user);
+  Future<bool> isRegistrationRequired(LoginUser user);
   Future<void> reLogin();
-  Future<User?> signInAnonymous();
+  Future<LoginUser?> signInAnonymous();
 }
diff --git a/lib/model/confirmation_result.dart b/lib/model/confirmation_result.dart
deleted file mode 100644
index 61658a8..0000000
--- a/lib/model/confirmation_result.dart
+++ /dev/null
@@ -1 +0,0 @@
-class ConfirmationResult {}
diff --git a/lib/model/login_confirmation_result.dart b/lib/model/login_confirmation_result.dart
new file mode 100644
index 0000000..0267bc4
--- /dev/null
+++ b/lib/model/login_confirmation_result.dart
@@ -0,0 +1 @@
+class LoginConfirmationResult {}
diff --git a/lib/model/user.dart b/lib/model/login_user.dart
similarity index 76%
rename from lib/model/user.dart
rename to lib/model/login_user.dart
index f32b730..803f29f 100644
--- a/lib/model/user.dart
+++ b/lib/model/login_user.dart
@@ -1,5 +1,5 @@
-class User {
-  User({
+class LoginUser {
+  LoginUser({
     this.displayName = '',
     this.email = '',
   });
diff --git a/lib/plugins/login/login_phone_number.dart b/lib/plugins/login/login_phone_number.dart
index 0177aa9..a7d9c5f 100644
--- a/lib/plugins/login/login_phone_number.dart
+++ b/lib/plugins/login/login_phone_number.dart
@@ -3,7 +3,7 @@ import 'package:flutter_login/flutter_login_view.dart';
 import 'package:intl_phone_number_input/intl_phone_number_input.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../../extensions/widget.dart';
-import '../../model/user.dart';
+import '../../model/login_user.dart';
 import '../form/inputs/validators/phone_number_validator.dart';
 import 'login_phone_number_verify.dart';
 
@@ -141,7 +141,7 @@ class LoginPhoneNumberState extends State<LoginPhoneNumber>
                                         onLogin: _onLoggedIn,
                                       ),
                                     ),
-                                    onAutoLogin: _onLoggedIn,
+                                    onAutoLogin: (_) => _onLoggedIn,
                                     onVerificationFailed: (String errorCode) {
                                       if (errorCode == 'invalid-phone-number') {
                                         setState(() {
@@ -173,7 +173,7 @@ class LoginPhoneNumberState extends State<LoginPhoneNumber>
     );
   }
 
-  Future<void> _onLoggedIn(User? user) async {
+  Future<void> _onLoggedIn(LoginUser? user) async {
     var prefs = await SharedPreferences.getInstance();
     await prefs.setBool('autoLogin', true);
     if (user != null) {
diff --git a/lib/plugins/login/login_phone_number_verify.dart b/lib/plugins/login/login_phone_number_verify.dart
index 770bf63..2691149 100644
--- a/lib/plugins/login/login_phone_number_verify.dart
+++ b/lib/plugins/login/login_phone_number_verify.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_login/flutter_login_view.dart';
 import 'package:pinput/pinput.dart';
 import '../../extensions/widget.dart';
-import '../../model/confirmation_result.dart';
-import '../../model/user.dart';
+import '../../model/login_confirmation_result.dart';
+import '../../model/login_user.dart';
 
 class LoginPhoneNumberVerify extends StatefulWidget {
   const LoginPhoneNumberVerify({
@@ -16,8 +16,8 @@ class LoginPhoneNumberVerify extends StatefulWidget {
 
   final String verificationId;
   final String phoneNumber;
-  final Function(User? user) onLogin;
-  final ConfirmationResult? resultWeb;
+  final Function(LoginUser? user) onLogin;
+  final LoginConfirmationResult? resultWeb;
 
   @override
   LoginPhoneNumberVerifyState createState() => LoginPhoneNumberVerifyState(
@@ -32,7 +32,7 @@ class LoginPhoneNumberVerifyState extends State<LoginPhoneNumberVerify>
   String? code;
   bool errorMsg = false;
   String verificationId;
-  ConfirmationResult? resultWeb;
+  LoginConfirmationResult? resultWeb;
   TextEditingController pinPutController = TextEditingController();
 
   @override