usite-sas-bic/prosappco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: SMS OTP phone auth + mandatory phone verification gate

Browse Source 
- MyUser: add isPhoneVerified field (from is_phone_verified in API)
- ApiUserRepository: signInWithPhoneNumber calls POST /auth/send-otp,
  verifyOTP calls POST /auth/phone, linkWithOTP calls POST /auth/verify-phone
  Added updateFcmToken and changePassword methods
- AuthBloc: remove Firebase PhoneVerificationService, use repository OTP flow
- app_view.dart: gate authenticated users without verified phone to
  PhoneVerifyRequiredScreen before showing HomeScreen
- welcome_screen.dart: full redesign with gradient header, logo, integrated
  OTP flow (phone → code in same screen), 60s resend timer
- PhoneVerifyRequiredScreen: new screen for users who need to verify phone

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Lizandro Guarnizo
2026-06-25 15:53:43 -05:00
co-authored by Claude Sonnet 4.6
parent 38beca4b4f
commit 2c5b237890
6 changed files with 564 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/app_view.dart
+8 -3
View File
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:prosappco/blocs/notification_bloc/notification_bloc.dart';
import 'package:prosappco/screens/authentication/welcome_screen.dart';
import 'package:prosappco/screens/authentication/phone_verify_required_screen.dart';
import 'package:prosappco/screens/home/home_screen.dart';
import 'package:prosappco/screens/splash/splash_screen.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
@@ -44,19 +45,23 @@ class MyAppView extends StatelessWidget {
}
},
builder: (context, state) {
return getScreen(state);
return _getScreen(state);
},
),
);
}
getScreen(AuthenticationState state) {
Widget _getScreen(AuthenticationState state) {
switch (state.status) {
case AuthenticationStatus.authenticated:
final phoneVerified = state.user?.isPhoneVerified ?? false;
if (!phoneVerified) {
return PhoneVerifyRequiredScreen(phone: state.user?.phone);
}
return HomeScreen();
case AuthenticationStatus.unauthenticated:
return WelcomeScreen();
return const WelcomeScreen();
case AuthenticationStatus.unknown:
return const SplashScreen();
lib/blocs/authentication_bloc/authentication_bloc.dart
+3 -1
View File
@@ -14,11 +14,13 @@ class AuthenticationBloc extends Bloc<AuthenticationEvent, AuthenticationState>
AuthenticationBloc({required UserRepository myUserRepository})
: userRepository = myUserRepository,
super(const AuthenticationState.unknown()) {_userSubscription = userRepository.streamUser().listen((authUser) {
super(const AuthenticationState.unknown()) {
_userSubscription = userRepository.streamUser().listen((authUser) {
add(AuthenticationUserChanged(authUser));
});
on<AuthenticationUserChanged>(_onAuthenticationUserChanged);
on<AuthenticationLogoutRequested>(_onAuthenticationLogoutRequested);
userRepository.isAuthenticated().listen((_) {});
}
void _onAuthenticationUserChanged(
lib/screens/authentication/phone_verify_required_screen.dart
+227
View File
@@ -0,0 +1,227 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_otp_text_field/flutter_otp_text_field.dart';
import 'package:injector/injector.dart';
import 'package:intl_phone_field/intl_phone_field.dart';
import 'package:prosappco/blocs/auth_bloc/auth_bloc.dart';
import 'package:prosappco/blocs/authentication_bloc/authentication_bloc.dart';
import 'package:prosappco/components/general_primary_button.dart';
class PhoneVerifyRequiredScreen extends StatefulWidget {
final String? phone;
const PhoneVerifyRequiredScreen({super.key, this.phone});
@override
State<PhoneVerifyRequiredScreen> createState() => _PhoneVerifyRequiredScreenState();
}
class _PhoneVerifyRequiredScreenState extends State<PhoneVerifyRequiredScreen> {
late final AuthBloc authBloc;
String? _phone;
String _otpCode = '';
bool _codeSent = false;
int _resendSeconds = 0;
Timer? _timer;
@override
void initState() {
super.initState();
authBloc = Injector.appInstance.get<AuthBloc>();
_phone = widget.phone;
}
@override
void dispose() {
_timer?.cancel();
super.dispose();
}
void _startResendTimer() {
setState(() => _resendSeconds = 60);
_timer = Timer.periodic(const Duration(seconds: 1), (t) {
if (_resendSeconds == 0) {
t.cancel();
} else {
setState(() => _resendSeconds--);
}
});
}
void _sendCode() {
final phone = _phone;
if (phone == null || phone.isEmpty) return;
authBloc.add(AuthEventLoginOAuth(phone: phone));
setState(() => _codeSent = true);
_startResendTimer();
}
@override
Widget build(BuildContext context) {
return BlocProvider<AuthBloc>(
create: (_) => authBloc,
child: BlocConsumer<AuthBloc, AuthState>(
listener: (context, state) {
if (state is AuthStateSuccess) {
context.read<AuthenticationBloc>().add(
AuthenticationUserChanged(null),
);
} else if (state is AuthStateVerifyOAuth && state.isWrongCode) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Código incorrecto, intenta de nuevo')),
);
}
},
builder: (context, state) {
return Scaffold(
body: Container(
decoration: const BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [Color(0xFF42A4EF), Color(0xFF1565C0)],
),
),
child: SafeArea(
child: Column(
children: [
const SizedBox(height: 40),
Image.asset('images/logo_prosapp.png', width: 160),
const SizedBox(height: 12),
const Text(
'Verificación requerida',
style: TextStyle(color: Colors.white, fontSize: 20, fontWeight: FontWeight.bold),
),
const SizedBox(height: 4),
const Text(
'Verifica tu número para continuar',
style: TextStyle(color: Colors.white70, fontSize: 14),
),
const SizedBox(height: 30),
Expanded(
child: Container(
decoration: const BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.vertical(top: Radius.circular(32)),
),
padding: const EdgeInsets.symmetric(horizontal: 28, vertical: 32),
child: SingleChildScrollView(
child: _codeSent ? _buildOtpSection(state) : _buildPhoneSection(),
),
),
),
],
),
),
),
);
},
),
);
}
Widget _buildPhoneSection() {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text('Número de celular', style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16)),
const SizedBox(height: 4),
const Text('Ingresa tu número para recibir el código de verificación',
style: TextStyle(color: Colors.grey, fontSize: 13)),
const SizedBox(height: 20),
IntlPhoneField(
initialCountryCode: 'CO',
initialValue: _phone?.replaceAll('+57', '').replaceAll('+', ''),
keyboardType: TextInputType.number,
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
onChanged: (phone) => _phone = phone.completeNumber,
decoration: InputDecoration(
hintText: 'Número de celular',
border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
),
),
const SizedBox(height: 24),
SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: _sendCode,
style: ElevatedButton.styleFrom(
backgroundColor: const Color(0xFF42A4EF),
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 16),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
),
child: const Text('Enviar código', style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600)),
),
),
const SizedBox(height: 16),
Center(
child: TextButton(
onPressed: () => context.read<AuthenticationBloc>().add(AuthenticationLogoutRequested()),
child: const Text('Cerrar sesión', style: TextStyle(color: Colors.grey)),
),
),
],
);
}
Widget _buildOtpSection(AuthState state) {
return Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const Text('Ingresa el código', style: TextStyle(fontWeight: FontWeight.w600, fontSize: 18)),
const SizedBox(height: 8),
Text(
'Enviamos un código de 6 dígitos a\n${_phone ?? ''}',
textAlign: TextAlign.center,
style: const TextStyle(color: Colors.grey, fontSize: 13),
),
const SizedBox(height: 28),
OtpTextField(
numberOfFields: 6,
borderColor: const Color(0xFF42A4EF),
focusedBorderColor: const Color(0xFF1565C0),
showFieldAsBox: true,
fieldWidth: 44,
borderRadius: BorderRadius.circular(10),
onCodeChanged: (code) => _otpCode = code,
onSubmit: (code) => authBloc.add(AuthEventVerifyOAuth(code: code)),
),
const SizedBox(height: 28),
if (state is AuthStateProcess)
const CircularProgressIndicator()
else
SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: () {
if (_otpCode.length == 6) {
authBloc.add(AuthEventVerifyOAuth(code: _otpCode));
}
},
style: ElevatedButton.styleFrom(
backgroundColor: const Color(0xFF42A4EF),
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 16),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
),
child: const Text('Verificar', style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600)),
),
),
const SizedBox(height: 20),
_resendSeconds > 0
? Text('Reenviar código en $_resendSeconds s', style: const TextStyle(color: Colors.grey))
: TextButton(
onPressed: _sendCode,
child: const Text('Reenviar código', style: TextStyle(color: Color(0xFF42A4EF))),
),
const SizedBox(height: 8),
TextButton(
onPressed: () => setState(() { _codeSent = false; _otpCode = ''; }),
child: const Text('Cambiar número', style: TextStyle(color: Colors.grey)),
),
],
);
}
}
lib/screens/authentication/welcome_screen.dart
+292 -165
View File
@@ -1,186 +1,313 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/gestures.dart';
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_otp_text_field/flutter_otp_text_field.dart';
import 'package:injector/injector.dart';
import 'package:intl_phone_field/intl_phone_field.dart';
import 'package:prosappco/components/general_input_decoration.dart';
import 'package:prosappco/components/general_primary_button.dart';
import 'package:prosappco/screens/authentication/otp_auth_screen.dart';
import 'package:prosappco/blocs/auth_bloc/auth_bloc.dart';
import 'package:prosappco/screens/authentication/sign_screen.dart';
class WelcomeScreen extends StatelessWidget {
class WelcomeScreen extends StatefulWidget {
const WelcomeScreen({super.key});
@override
State<WelcomeScreen> createState() => _WelcomeScreenState();
}
class _WelcomeScreenState extends State<WelcomeScreen> {
late final AuthBloc authBloc;
String? _phone;
String _otpCode = '';
bool _codeSent = false;
int _resendSeconds = 0;
Timer? _timer;
@override
void initState() {
super.initState();
authBloc = Injector.appInstance.get<AuthBloc>();
}
@override
void dispose() {
_timer?.cancel();
super.dispose();
}
void _startResendTimer() {
setState(() => _resendSeconds = 60);
_timer?.cancel();
_timer = Timer.periodic(const Duration(seconds: 1), (t) {
if (_resendSeconds == 0) {
t.cancel();
} else {
setState(() => _resendSeconds--);
}
});
}
void _sendCode() {
final phone = _phone;
if (phone == null || phone.isEmpty) return;
authBloc.add(AuthEventLoginOAuth(phone: phone));
setState(() { _codeSent = true; _otpCode = ''; });
_startResendTimer();
}
@override
Widget build(BuildContext context) {
double width = MediaQuery.of(context).size.width;
String? _phoneNumber;
String? _errorMsg;
return Scaffold(
backgroundColor: Theme.of(context).colorScheme.tertiary,
body: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.symmetric(vertical: 20),
child: Center(
child: Image(
width: width * 0.7,
image: const AssetImage('images/logo_prosapp.png'),
),
),
),
Expanded(
child: Container(
return BlocProvider<AuthBloc>(
create: (_) => authBloc,
child: BlocConsumer<AuthBloc, AuthState>(
listener: (context, state) {
if (state is AuthStateFailure) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(state.message ?? 'Error al enviar código')),
);
} else if (state is AuthStateVerifyOAuth && state.isWrongCode) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Código incorrecto, intenta de nuevo')),
);
}
},
builder: (context, state) {
return Scaffold(
body: Container(
decoration: const BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(60),
topRight: Radius.circular(60),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [Color(0xFF42A4EF), Color(0xFF1565C0)],
),
),
child: Padding(
padding:
const EdgeInsets.symmetric(horizontal: 30, vertical: 15),
child: SingleChildScrollView(
child: Column(
children: [
SizedBox(
width: double.infinity,
child: Text(
'Iniciar sesión',
style: TextStyle(
// fontSize: 30,
fontSize: width * 0.08,
fontWeight: FontWeight.bold,
),
child: SafeArea(
child: Column(
children: [
const SizedBox(height: 36),
_buildHero(),
const SizedBox(height: 24),
Expanded(
child: Container(
decoration: const BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.vertical(top: Radius.circular(32)),
),
padding: const EdgeInsets.fromLTRB(28, 32, 28, 20),
child: SingleChildScrollView(
child: _codeSent
? _buildOtpSection(state)
: _buildPhoneSection(state),
),
),
const SizedBox(height: 10),
SizedBox(
width: double.infinity,
child: Text(
'Numero de celular',
style: TextStyle(
fontSize: width * 0.045,
color: Theme.of(context).colorScheme.onBackground,
),
),
),
Form(
child: IntlPhoneField(
initialCountryCode: 'CO',
keyboardType: TextInputType.number,
inputFormatters: [
FilteringTextInputFormatter.digitsOnly
],
validator: (value) {
if (value == null) {
return 'Ingresa un numero';
} else {
return null;
}
},
onChanged: (phone) {
_phoneNumber = phone.completeNumber;
},
decoration: GeneralInputDecoration.getCustomDecoration(
context: context,
hintText: 'Ingresa tu numero',
errorMsg: _errorMsg,
),
),
),
Text('Un código será enviado a este numero de celular.',
textAlign: TextAlign.center,
style: TextStyle(fontSize: 13.0,color: Theme.of(context).colorScheme.onBackground),
),
GeneralPrimaryButton(
onPressed: () {
final phoneNumber = _phoneNumber;
if (phoneNumber != null && phoneNumber.isNotEmpty) {
Navigator.push(context,
CupertinoPageRoute(
builder: (context) => OtpAuthScreen(phoneNumber: phoneNumber),
),
);
}
},
label: 'Enviar código',
),
// ElevatedButton(
// onPressed: () {
// final phoneNumber = _phoneNumber;
// if (phoneNumber != null && phoneNumber.isNotEmpty) {
// Navigator.push(
// context,
// CupertinoPageRoute(
// builder: (context) =>
// OtpAuthScreen(phoneNumber: phoneNumber),
// ),
// );
// } else {}
// },
// child: const Text('Enviar código'),
// ),
TextButton(
onPressed: () {
Navigator.push(
context,
CupertinoPageRoute(
builder: (context) =>
const SignScreen(initialIndex: 0),
),
);
},
child: Text(
'Inicia sesión con tu correo electrónico',
style: TextStyle(
fontSize: width * 0.04,
),
),
),
RichText(
text: TextSpan(
style: const TextStyle(
fontSize: 16.0,
color: Color(0xFF65676B),
fontFamily: 'Poppins',
),
children: [
const TextSpan(text: '¿No estás registrado? '),
TextSpan(
text: 'Regístrate',
style: TextStyle(
fontSize: width * 0.04,
color: Colors.blue,
fontWeight: FontWeight.w600,
),
recognizer: TapGestureRecognizer()
..onTap = () {
Navigator.push(
context,
CupertinoPageRoute(
builder: (context) =>
SignScreen(initialIndex: 1),
),
);
},
),
],
),
),
],
),
),
],
),
),
),
)
],
);
},
),
);
}
Widget _buildHero() {
return Column(
children: [
Image.asset('images/logo_prosapp.png', width: 180),
const SizedBox(height: 12),
const Text(
'Conecta con los mejores profesionales',
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
fontSize: 15,
fontWeight: FontWeight.w400,
letterSpacing: 0.3,
),
),
],
);
}
Widget _buildPhoneSection(AuthState state) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'Iniciar sesión',
style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold, color: Color(0xFF1A1A2E)),
),
const SizedBox(height: 6),
const Text(
'Ingresa tu número para recibir un código de verificación',
style: TextStyle(color: Colors.grey, fontSize: 13),
),
const SizedBox(height: 24),
IntlPhoneField(
initialCountryCode: 'CO',
keyboardType: TextInputType.number,
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
onChanged: (phone) => _phone = phone.completeNumber,
decoration: InputDecoration(
hintText: 'Número de celular',
filled: true,
fillColor: const Color(0xFFF5F8FF),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide.none,
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: const BorderSide(color: Color(0xFFE0E7FF), width: 1.5),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: const BorderSide(color: Color(0xFF42A4EF), width: 2),
),
),
),
const SizedBox(height: 8),
const Text(
'Te enviaremos un SMS con tu código. Máx 160 caracteres.',
style: TextStyle(color: Colors.grey, fontSize: 11),
),
const SizedBox(height: 24),
if (state is AuthStateProcess)
const Center(child: CircularProgressIndicator())
else
SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: _sendCode,
style: ElevatedButton.styleFrom(
backgroundColor: const Color(0xFF42A4EF),
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 16),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
elevation: 0,
),
child: const Text('Enviar código', style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600)),
),
),
const SizedBox(height: 24),
Row(
children: const [
Expanded(child: Divider()),
Padding(
padding: EdgeInsets.symmetric(horizontal: 12),
child: Text('o', style: TextStyle(color: Colors.grey)),
),
Expanded(child: Divider()),
],
),
const SizedBox(height: 16),
SizedBox(
width: double.infinity,
child: OutlinedButton(
onPressed: () => Navigator.push(
context,
MaterialPageRoute(builder: (_) => const SignScreen(initialIndex: 0)),
),
style: OutlinedButton.styleFrom(
padding: const EdgeInsets.symmetric(vertical: 14),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
side: const BorderSide(color: Color(0xFF42A4EF)),
),
child: const Text('Iniciar sesión con email', style: TextStyle(color: Color(0xFF42A4EF), fontWeight: FontWeight.w600)),
),
),
const SizedBox(height: 12),
Center(
child: TextButton(
onPressed: () => Navigator.push(
context,
MaterialPageRoute(builder: (_) => const SignScreen(initialIndex: 1)),
),
child: RichText(
text: const TextSpan(
style: TextStyle(color: Colors.grey, fontSize: 14),
children: [
TextSpan(text: '¿No tienes cuenta? '),
TextSpan(
text: 'Regístrate',
style: TextStyle(color: Color(0xFF42A4EF), fontWeight: FontWeight.w600),
),
],
),
),
),
),
],
);
}
Widget _buildOtpSection(AuthState state) {
return Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const Icon(Icons.sms_outlined, size: 48, color: Color(0xFF42A4EF)),
const SizedBox(height: 12),
const Text(
'Código de verificación',
style: TextStyle(fontSize: 22, fontWeight: FontWeight.bold, color: Color(0xFF1A1A2E)),
),
const SizedBox(height: 8),
Text(
'Enviamos un código a\n${_phone ?? ''}',
textAlign: TextAlign.center,
style: const TextStyle(color: Colors.grey, fontSize: 14),
),
const SizedBox(height: 32),
OtpTextField(
numberOfFields: 6,
borderColor: const Color(0xFFE0E7FF),
focusedBorderColor: const Color(0xFF42A4EF),
showFieldAsBox: true,
fieldWidth: 46,
borderRadius: BorderRadius.circular(10),
textStyle: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
onCodeChanged: (code) => _otpCode = code,
onSubmit: (code) => authBloc.add(AuthEventVerifyOAuth(code: code)),
),
const SizedBox(height: 32),
if (state is AuthStateProcess)
const CircularProgressIndicator()
else
SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: () {
if (_otpCode.length == 6) {
authBloc.add(AuthEventVerifyOAuth(code: _otpCode));
}
},
style: ElevatedButton.styleFrom(
backgroundColor: const Color(0xFF42A4EF),
foregroundColor: Colors.white,
padding: const EdgeInsets.symmetric(vertical: 16),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
elevation: 0,
),
child: const Text('Verificar código', style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600)),
),
),
const SizedBox(height: 20),
_resendSeconds > 0
? Text(
'Reenviar en $_resendSeconds s',
style: const TextStyle(color: Colors.grey, fontSize: 13),
)
: TextButton(
onPressed: _sendCode,
child: const Text('Reenviar código', style: TextStyle(color: Color(0xFF42A4EF), fontWeight: FontWeight.w600)),
),
const SizedBox(height: 8),
TextButton(
onPressed: () => setState(() { _codeSent = false; _otpCode = ''; }),
child: const Text('← Cambiar número', style: TextStyle(color: Colors.grey, fontSize: 13)),
),
],
);
}
}
packages/user_repository/lib/src/models/my_user.dart
+6
View File
@@ -13,6 +13,7 @@ class MyUser extends Equatable {
final String? gender;
final ProState proState;
final String? token;
final bool isPhoneVerified;
const MyUser({
required this.id,
@@ -26,6 +27,7 @@ class MyUser extends Equatable {
this.gender,
required this.proState,
this.token,
this.isPhoneVerified = false,
});
get drawerLabel => email != null && email!.isNotEmpty
@@ -47,6 +49,7 @@ class MyUser extends Equatable {
gender: '',
proState: ProState.inactive,
token: '',
isPhoneVerified: false,
);
/// Modify MyUser parameters
@@ -62,6 +65,7 @@ class MyUser extends Equatable {
String? gender,
ProState? proState,
String? token,
bool? isPhoneVerified,
}) {
return MyUser(
id: id ?? this.id,
@@ -75,6 +79,7 @@ class MyUser extends Equatable {
gender: gender ?? this.gender,
proState: proState ?? this.proState,
token: token ?? this.token,
isPhoneVerified: isPhoneVerified ?? this.isPhoneVerified,
);
}
@@ -129,5 +134,6 @@ class MyUser extends Equatable {
gender,
proState,
token,
isPhoneVerified,
];
}
packages/user_repository/lib/src/repositories/api_user_repository.dart
+28 -17
View File
@@ -69,6 +69,7 @@ class ApiUserRepository implements UserRepository {
gender: json['gender']?.toString(),
proState: _proStateFromInt((json['pro_state'] as num?)?.toInt() ?? 0),
token: null,
isPhoneVerified: json['is_phone_verified'] as bool? ?? false,
);
}
@@ -117,9 +118,7 @@ class ApiUserRepository implements UserRepository {
_controller.add(user);
}
@override
Future<void> signIn(String email, String password) async {
final data = await _post('/auth/login', {'email': email, 'password': password});
Future<void> _saveTokenAndEmit(Map<String, dynamic> data) async {
_token = data['access_token'] as String?;
if (_token != null) {
final prefs = await SharedPreferences.getInstance();
@@ -129,6 +128,12 @@ class ApiUserRepository implements UserRepository {
_emit(_current);
}
@override
Future<void> signIn(String email, String password) async {
final data = await _post('/auth/login', {'email': email, 'password': password});
await _saveTokenAndEmit(data);
}
@override
Future<MyUser> signUp(MyUser myUser, String password) async {
final data = await _post('/auth/register', {
@@ -136,13 +141,7 @@ class ApiUserRepository implements UserRepository {
'password': password,
'name': myUser.name ?? myUser.email ?? '',
});
_token = data['access_token'] as String?;
if (_token != null) {
final prefs = await SharedPreferences.getInstance();
await prefs.setString('token', _token!);
}
_current = _fromApi(data['user'] as Map<String, dynamic>);
_emit(_current);
await _saveTokenAndEmit(data);
return _current!;
}
@@ -270,13 +269,7 @@ class ApiUserRepository implements UserRepository {
'phone': _pendingOtpPhone!,
'code': code,
});
_token = data['access_token'] as String?;
if (_token != null) {
final prefs = await SharedPreferences.getInstance();
await prefs.setString('token', _token!);
}
_current = _fromApi(data['user'] as Map<String, dynamic>);
_emit(_current);
await _saveTokenAndEmit(data);
_pendingOtpPhone = null;
return true;
} catch (_) {
@@ -309,4 +302,22 @@ class ApiUserRepository implements UserRepository {
Future<void> resetPassword(String email) async {
// Not supported by current API — stub
}
Future<void> updateFcmToken(String token) async {
try {
await _post('/users/me/fcm-token', {'token': token}, auth: true);
} catch (_) {}
}
Future<bool> changePassword(String currentPassword, String newPassword) async {
try {
await _post('/auth/change-password', {
'current_password': currentPassword,
'new_password': newPassword,
}, auth: true);
return true;
} catch (_) {
return false;
}
}
}