feature/phone-auth

.gitignore

@@ -31,6 +31,9 @@ migrate_working_dir/
 .pub/
 /build/
 
+node_modules
+android/app/google-services.json
+
 # Symbolication related
 app.*.symbols
 
@@ -61,10 +64,15 @@ android/app/src/main/res/values-night/styles.xml
 android/app/src/profile/AndroidManifest.xml
 android/gradle/wrapper/gradle-wrapper.properties
 ios/.gitignore
+ios/Flutter/flutter_export_environment.sh
+ios/Flutter/Generated.xcconfig
+ios/Runner/GeneratedPluginRegistrant.h
+ios/Runner/GeneratedPluginRegistrant.m
 ios/Flutter/Debug.xcconfig
 ios/Flutter/Release.xcconfig
 ios/Runner/AppDelegate.swift
 ios/Runner/Runner-Bridging-Header.h
+ios/Runner/GoogleService-Info.plist
 ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
@@ -110,6 +118,7 @@ macos/.gitignore
 macos/Flutter/Flutter-Debug.xcconfig
 macos/Flutter/Flutter-Release.xcconfig
 macos/Flutter/GeneratedPluginRegistrant.swift
+macos/Flutter/ephemeral/
 macos/Runner/AppDelegate.swift
 macos/Runner/DebugProfile.entitlements
 macos/Runner/MainFlutterWindow.swift

README.md

@@ -63,7 +63,7 @@ Step 7: Additional Auth flow items
    * Phone Auth on Web has a ReCaptcha already [https://firebase.flutter.dev/docs/auth/phone/]. Tried to use that library but it is very cryptic.
    * Use the following instead [https://stackoverflow.com/questions/60675575/how-to-implement-recaptcha-into-a-flutter-app] or [https://medium.com/cloudcraftz/securing-your-flutter-web-app-with-google-recaptcha-b556c567f409] or [https://pub.dev/packages/g_recaptcha_v3]
 3. TODO: Ensure Reset Password has Email verification
-4. TODO: Add Phone verification [https://firebase.google.com/docs/auth/flutter/phone-auth]
+4. Added Phone verification [https://firebase.google.com/docs/auth/flutter/phone-auth]
    * See [https://github.com/firebase/flutterfire/issues/4189].
 5. TODO: Add 2FA with SMS Pin. This screen is available in the Flutter Fire package
 

ios/Runner/Info.plist

@@ -52,4 +52,20 @@
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Allow access to photo library</string>
 </dict>
+<!-- Put me in the [my_project]/ios/Runner/Info.plist file -->
+<!-- Google Sign-in Section -->
+<key>CFBundleURLTypes</key>
+<array>
+	<dict>
+		<key>CFBundleTypeRole</key>
+		<string>Editor</string>
+		<key>CFBundleURLSchemes</key>
+		<array>
+			<!-- TODO Replace this value: -->
+			<!-- Copied from GoogleService-Info.plist key REVERSED_CLIENT_ID -->
+			<string>com.googleusercontent.apps.260821266676-n1dskq31gq05s8egsuemfl2slek3vd9b</string>
+		</array>
+	</dict>
+</array>
+<!-- End of the Google Sign-in Section -->
 </plist>

lib/app/modules/login/views/custom_login.dart

@@ -0,0 +1,275 @@
+import 'dart:developer';
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import '../../../../models/screens.dart';
+import '../../../../services/auth_service.dart';
+
+class CustomSignIn extends StatelessWidget {
+  const CustomSignIn({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final height = MediaQuery.of(context).size.height;
+    final width = MediaQuery.of(context).size.width;
+
+    final emailController = TextEditingController();
+    final passwordController = TextEditingController();
+
+    return Scaffold(
+      backgroundColor: Colors.grey[300],
+      body: SingleChildScrollView(
+        child: Center(
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              SizedBox(height: height * 0.02),
+              //logo
+              Image.asset(
+                'assets/icons/logo.png',
+                height: height * 0.25,
+                width: width * 0.25,
+              ),
+
+              SizedBox(
+                height: height * 0.02,
+              ),
+
+              // welcome back
+              const Text("You were missed! Welcome Back"),
+              SizedBox(height: height * 0.02),
+
+              //username textfield
+              InputWidget(
+                width: width,
+                emailController: emailController,
+                hintText: 'Email ID',
+                obscureText: false,
+                keyboardType: TextInputType.emailAddress,
+              ),
+              SizedBox(height: height * 0.02),
+              //password textfield
+              InputWidget(
+                width: width,
+                emailController: passwordController,
+                hintText: 'Password',
+                obscureText: true,
+              ),
+
+              //forgot password?
+              Padding(
+                padding: EdgeInsets.only(right: width * 0.055),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.end,
+                  children: [
+                    TextButton(
+                        onPressed: () {
+                          TextEditingController resetController =
+                              TextEditingController();
+                          Get.defaultDialog(
+                            title: "Reset Passsword",
+                            content: Column(
+                              children: [
+                                const Text("Enter your Email-ID"),
+                                InputWidget(
+                                    width: width,
+                                    emailController: resetController,
+                                    hintText: "Email",
+                                    obscureText: false),
+                              ],
+                            ),
+                            actions: [
+                              TextButton(
+                                child: const Text("Cancel"),
+                                onPressed: () {
+                                  Get.back();
+                                },
+                              ),
+                              TextButton(
+                                child: const Text('Send Reset Link'),
+                                onPressed: () async {
+                                  try {
+                                    await AuthService().resetPassword(
+                                        email: resetController.text.trim());
+                                    Get.snackbar('Password Reset',
+                                        'A password reset link has been sent to your email.');
+                                    Get.back(); // Close dialog using GetX
+                                  } catch (e) {
+                                    Get.snackbar(
+                                        'Error', 'Failed to send reset link.');
+                                    log("Error sending reset link: $e");
+                                  }
+                                },
+                              ),
+                            ],
+                          );
+                        },
+                        child: Text(
+                          "Forgot Password?",
+                          style: TextStyle(color: Colors.grey.shade600),
+                        )),
+                  ],
+                ),
+              ),
+              //sign in button
+              GestureDetector(
+                onTap: () {
+                  if (emailController.text.isEmpty ||
+                      !emailController.text.contains('@')) {
+                    Get.snackbar(
+                      'Invalid Email',
+                      "Please enter a valid email id.",
+                    );
+                  } else if (passwordController.text.isEmpty ||
+                      passwordController.text.length < 6) {
+                    Get.snackbar(
+                      'Invalid Password',
+                      "Please enter a password longer than 6 letters.",
+                    );
+                  } else if (emailController.text.isNotEmpty &&
+                      passwordController.text.isNotEmpty) {
+                    AuthService()
+                        .login(emailController.text, passwordController.text);
+                  }
+                },
+                child: Container(
+                  padding: EdgeInsets.symmetric(horizontal: width * 0.05),
+                  margin: EdgeInsets.symmetric(horizontal: width * 0.1),
+                  height: height * 0.07,
+                  width: width * 0.2,
+                  decoration: BoxDecoration(
+                    color: Colors.black,
+                    borderRadius: BorderRadius.circular(10),
+                  ),
+                  child: const Center(
+                      child: Text("Sign In",
+                          style: TextStyle(
+                              color: Colors.white,
+                              fontWeight: FontWeight.bold,
+                              fontSize: 18))),
+                ),
+              ),
+
+              SizedBox(height: height * 0.05),
+
+              //or continue with
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  SizedBox(
+                      width: width * 0.2,
+                      child: Divider(
+                        thickness: 0.5,
+                        color: Colors.grey.shade900,
+                      )),
+                  SizedBox(
+                    width: width * 0.05,
+                  ),
+                  const Text("Or Continue with"),
+                  SizedBox(
+                    width: width * 0.05,
+                  ),
+                  SizedBox(
+                      width: width * 0.2,
+                      child: Divider(
+                        thickness: 0.5,
+                        color: Colors.grey.shade900,
+                      )),
+                ],
+              ),
+
+              SizedBox(height: height * 0.02),
+
+              //google sign in
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  GestureDetector(
+                    onTap: () => AuthService().signInwithGoogle(),
+                    child: Container(
+                      padding: EdgeInsets.all(width * 0.03),
+                      margin: EdgeInsets.symmetric(horizontal: width * 0.04),
+                      decoration: BoxDecoration(
+                        color: Colors.grey.shade200,
+                        borderRadius: BorderRadius.circular(10),
+                      ),
+                      child: Image.asset('assets/icons/google.png',
+                          height: height * 0.045),
+                    ),
+                  ),
+                  GestureDetector(
+                    onTap: () =>
+                        Get.rootDelegate.toNamed(Screen.MOBILEAUTH.route),
+                    child: Container(
+                      padding: EdgeInsets.all(width * 0.03),
+                      margin: EdgeInsets.symmetric(horizontal: width * 0.04),
+                      decoration: BoxDecoration(
+                        color: Colors.grey.shade200,
+                        borderRadius: BorderRadius.circular(10),
+                      ),
+                      child: Icon(Icons.phone, size: height * 0.045),
+                    ),
+                  ),
+                ],
+              ),
+
+              SizedBox(height: height * 0.02),
+
+              //register now / sign up now
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  const Text('New user?'),
+                  GestureDetector(
+                      onTap: () {
+                        Get.rootDelegate.toNamed(Screen.SIGNUP.route);
+                      },
+                      child: const Text(' Register now',
+                          style: TextStyle(color: Colors.blue))),
+                ],
+              ),
+              const SizedBox(
+                height: 40,
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class InputWidget extends StatelessWidget {
+  const InputWidget(
+      {super.key,
+      required this.width,
+      required this.emailController,
+      required this.hintText,
+      required this.obscureText,
+      this.keyboardType});
+
+  final double width;
+  final TextEditingController emailController;
+  final String hintText;
+  final bool obscureText;
+  final TextInputType? keyboardType;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: EdgeInsets.symmetric(horizontal: width * 0.08),
+      child: TextField(
+        controller: emailController,
+        decoration: InputDecoration(
+            enabledBorder: const OutlineInputBorder(
+                borderSide: BorderSide(color: Colors.white)),
+            focusedBorder: OutlineInputBorder(
+                borderSide: BorderSide(color: Colors.grey.shade400)),
+            fillColor: Colors.grey.shade200,
+            filled: true,
+            hintText: hintText),
+        obscureText: obscureText,
+      ),
+    );
+  }
+}