fix: users prevented from logging in (#1686)

* fix: support null value in sendQuincyEmail

* chore: remove privacy terms page

the privacy terms are now mentioned in the login page

* fix: service test

Author: Nirajn2311

mobile-app/lib/models/main/user_model.dart

@@ -36,8 +36,7 @@ class FccUserModel {
 
   final bool emailVerified;
   final bool isEmailVerified;
-  final bool acceptedPrivacyTerms;
-  final bool sendQuincyEmail;
+  final bool? sendQuincyEmail;
 
   final bool isCheater;
   final bool isDonating;
@@ -99,8 +98,7 @@ class FccUserModel {
     this.about,
     required this.emailVerified,
     required this.isEmailVerified,
-    required this.acceptedPrivacyTerms,
-    required this.sendQuincyEmail,
+    this.sendQuincyEmail,
     required this.isCheater,
     required this.isDonating,
     required this.isHonest,
@@ -154,7 +152,6 @@ class FccUserModel {
       about: data['about'],
       emailVerified: data['emailVerified'],
       isEmailVerified: data['isEmailVerified'],
-      acceptedPrivacyTerms: data['acceptedPrivacyTerms'],
       sendQuincyEmail: data['sendQuincyEmail'],
       isCheater: data['isCheater'],
       isDonating: data['isDonating'] ?? false,

mobile-app/lib/service/authentication/authentication_service.dart

@@ -12,7 +12,6 @@ import 'package:freecodecamp/app/app.router.dart';
 import 'package:freecodecamp/extensions/i18n_extension.dart';
 import 'package:freecodecamp/models/main/user_model.dart';
 import 'package:freecodecamp/service/dio_service.dart';
-import 'package:freecodecamp/ui/views/auth/privacy_view.dart';
 import 'package:stacked_services/stacked_services.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -318,33 +317,6 @@ class AuthenticationService {
       return false;
     }
 
-    final user = await userModel;
-
-    if (user != null && user.acceptedPrivacyTerms == false) {
-      bool? quincyEmails = await Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => const PrivacyView(),
-          settings: const RouteSettings(
-            name: '/new-user-accept-privacy',
-          ),
-        ),
-      );
-
-      await _dio.put(
-        '$baseApiURL/update-privacy-terms',
-        data: {
-          'quincyEmails': quincyEmails ?? false,
-        },
-        options: Options(
-          headers: {
-            'CSRF-Token': _csrfToken,
-            'Cookie': 'jwt_access_token=$_jwtAccessToken; _csrf=$_csrf',
-          },
-        ),
-      );
-    }
-
     await auth0.credentialsManager.clearCredentials();
     // ignore: unnecessary_null_comparison
     if (res != null) {

mobile-app/lib/ui/views/auth/privacy_view.dart

@@ -1,9 +1,11 @@
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:freecodecamp/extensions/i18n_extension.dart';
 import 'package:freecodecamp/ui/theme/fcc_theme.dart';
 import 'package:freecodecamp/ui/views/login/native_login_viewmodel.dart';
 import 'package:freecodecamp/ui/widgets/drawer_widget/drawer_widget_view.dart';
 import 'package:stacked/stacked.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 class NativeLoginView extends StatelessWidget {
   const NativeLoginView({super.key, this.fromButton = false});
@@ -283,6 +285,62 @@ class NativeLoginView extends StatelessWidget {
                       ),
                     )
                   ],
+                ),
+                Row(
+                  children: [
+                    Expanded(
+                        child: Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: RichText(
+                        textAlign: TextAlign.center,
+                        text: TextSpan(
+                          style: TextStyle(
+                            color: Colors.white.withValues(alpha: 0.87),
+                          ),
+                          children: [
+                            TextSpan(
+                              text:
+                                  "By continuing, you indicate that you have read and agree to freeCodeCamp.org's ",
+                            ),
+                            TextSpan(
+                              text: 'Terms of Service',
+                              style: const TextStyle(
+                                decoration: TextDecoration.underline,
+                              ),
+                              recognizer: TapGestureRecognizer()
+                                ..onTap = () {
+                                  launchUrl(
+                                    Uri.parse(
+                                      'https://www.freecodecamp.org/news/terms-of-service',
+                                    ),
+                                  );
+                                },
+                            ),
+                            TextSpan(
+                              text: ' and ',
+                            ),
+                            TextSpan(
+                              text: 'Privacy Policy',
+                              style: const TextStyle(
+                                decoration: TextDecoration.underline,
+                              ),
+                              recognizer: TapGestureRecognizer()
+                                ..onTap = () {
+                                  launchUrl(
+                                    Uri.parse(
+                                      'https://www.freecodecamp.org/news/privacy-policy',
+                                    ),
+                                  );
+                                },
+                            ),
+                            TextSpan(
+                              text: '.',
+                            ),
+                          ],
+                        ),
+                      ),
+                    )),
+                  ],
                 )
               ],
             ),

mobile-app/lib/ui/views/login/native_login_view.dart

@@ -655,8 +655,7 @@ FccUserModel createMockUser({
     currentChallengeId: '',
     emailVerified: true,
     isEmailVerified: true,
-    acceptedPrivacyTerms: true,
-    sendQuincyEmail: false,
+    sendQuincyEmail: null,
     isCheater: false,
     isDonating: false,
     isHonest: true,