diff --git a/android/build/reports/problems/problems-report.html b/android/build/reports/problems/problems-report.html
new file mode 100644
index 0000000..5294026
--- /dev/null
+++ b/android/build/reports/problems/problems-report.html
@@ -0,0 +1,663 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ Gradle Configuration Cache
+
+
+
+
+
+
+ Loading...
+
+
+
+
+
+
+
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index ce821a3..60af84f 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -45,6 +45,9 @@ PODS:
- SDWebImage (5.21.3):
- SDWebImage/Core (= 5.21.3)
- SDWebImage/Core (5.21.3)
+ - shared_preferences_foundation (0.0.1):
+ - Flutter
+ - FlutterMacOS
- SwiftyGif (5.4.5)
DEPENDENCIES:
@@ -53,6 +56,7 @@ DEPENDENCIES:
- flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
- mobile_scanner (from `.symlinks/plugins/mobile_scanner/darwin`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
+ - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
SPEC REPOS:
trunk:
@@ -72,16 +76,19 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/mobile_scanner/darwin"
path_provider_foundation:
:path: ".symlinks/plugins/path_provider_foundation/darwin"
+ shared_preferences_foundation:
+ :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
SPEC CHECKSUMS:
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
- file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49
+ file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
- flutter_native_splash: df59bb2e1421aa0282cb2e95618af4dcb0c56c29
- mobile_scanner: 77265f3dc8d580810e91849d4a0811a90467ed5e
- path_provider_foundation: 0b743cbb62d8e47eab856f09262bb8c1ddcfe6ba
+ flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
+ mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93
+ path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
SDWebImage: 16309af6d214ba3f77a7c6f6fdda888cb313a50a
+ shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
PODFILE CHECKSUM: 251cb053df7158f337c0712f2ab29f4e0fa474ce
diff --git a/lib/all_bloc_poviders/all_bloc_providers.dart b/lib/all_bloc_poviders/all_bloc_providers.dart
index 6be4eeb..5a9ca79 100644
--- a/lib/all_bloc_poviders/all_bloc_providers.dart
+++ b/lib/all_bloc_poviders/all_bloc_providers.dart
@@ -6,6 +6,20 @@ import '../login/blocs/reset_password/reset_password_bloc.dart';
import '../splash/bloc/splash_bloc.dart';
import '../profile/blocs/profile/profile_bloc.dart';
import '../profile/repository/profile_repository.dart';
+import '../support/blocs/support_details/support_details_bloc.dart';
+import '../support/repository/support_details_repository.dart';
+import '../support/blocs/raise_ticket/raise_ticket_bloc.dart';
+import '../support/repository/raise_ticket_repository.dart';
+import '../scan/bloc/submit_qr_code/submit_qr_code_bloc.dart';
+import '../scan/repository/submit_qr_code_repository.dart';
+import '../scan_history/blocs/scan_history/scan_history_bloc.dart';
+
+import '../scan_history/blocs/scan_history_details/scan_history_details_bloc.dart';
+import '../scan_history/repositories/scan_history_repository.dart';
+import '../scan/bloc/recent_scan_history/recent_scan_history_bloc.dart';
+import '../scan/repository/recent_scan_history_repository.dart';
+
+
class AllBlocProviders {
AllBlocProviders._(); // Private constructor — not meant to be instantiated
@@ -32,6 +46,29 @@ class AllBlocProviders {
BlocProvider(
create: (_) => ProfileBloc(profileRepository: ProfileRepository()),
),
+ // ─── Support ─────────────────────────────────────────────────────────
+ BlocProvider(
+ create: (_) => SupportDetailsBloc(repository: SupportDetailsRepository()),
+ ),
+ BlocProvider(
+ create: (_) => RaiseTicketBloc(raiseTicketRepository: RaiseTicketRepository()),
+ ),
+ // ─── Scan History ────────────────────────────────────────────────────
+ BlocProvider(
+ create: (_) => ScanHistoryBloc(repository: ScanHistoryRepository(),),
+ ),
+ BlocProvider(
+ create: (_) => ScanHistoryDetailsBloc(ScanHistoryRepository()),
+ ),
+ BlocProvider(
+ create: (_) => RecentScanHistoryBloc(RecentScanHistoryRepository()),
+ ),
+ BlocProvider(
+ create: (_) => SubmitQrCodeBloc(repository: SubmitQrCodeRepository()),
+ ),
];
+
+
+
}
}
\ No newline at end of file
diff --git a/lib/core/app_router.dart b/lib/core/app_router.dart
index c22212f..d1add29 100644
--- a/lib/core/app_router.dart
+++ b/lib/core/app_router.dart
@@ -61,9 +61,10 @@ class AppRouter {
case splashScreen:
return MaterialPageRoute(builder: (_) => const SplashScreen());
case scanHistoryDetailPage:
+ final passId = settings.arguments as int? ?? 0;
return MaterialPageRoute(
- builder: (_) => const ScanHistoryDetailPage(
- passId: 'P214125125',
+ builder: (_) => ScanHistoryDetailPage(
+ passId: passId,
));
case selectedTimeSlotPage:
return MaterialPageRoute(builder: (_) => const SelectedTimeSlotPage());
diff --git a/lib/local_peference/local_preference.dart b/lib/local_peference/local_preference.dart
index 8bc55de..8573001 100644
--- a/lib/local_peference/local_preference.dart
+++ b/lib/local_peference/local_preference.dart
@@ -44,6 +44,11 @@ class LocalPreference {
return prefs.getString(_keyAccessToken) ?? "";
}
+ static Future clearAccessToken() async {
+ final SharedPreferences prefs = await SharedPreferences.getInstance();
+ await prefs.remove(_keyAccessToken);
+ }
+
// -------------------- REFRESH TOKEN --------------------
static Future setRefreshToken(String token) async {
diff --git a/lib/login/blocs/forgot_password_bloc.dart b/lib/login/blocs/forgot_password_bloc.dart
deleted file mode 100644
index 7d1e848..0000000
--- a/lib/login/blocs/forgot_password_bloc.dart
+++ /dev/null
@@ -1,82 +0,0 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-// ---------------- EVENTS ----------------
-abstract class ForgotPasswordEvent {}
-
-class EmailChanged extends ForgotPasswordEvent {
- final String email;
- EmailChanged(this.email);
-}
-
-class SendResetLink extends ForgotPasswordEvent {}
-
-// ---------------- STATE ----------------
-class ForgotPasswordState {
- final String email;
- final bool isValidEmail;
- final bool isLoading;
- final bool isSuccess;
- final String message;
-
- const ForgotPasswordState({
- required this.email,
- required this.isValidEmail,
- required this.isLoading,
- required this.isSuccess,
- required this.message,
- });
-
- ForgotPasswordState copyWith({
- String? email,
- bool? isValidEmail,
- bool? isLoading,
- bool? isSuccess,
- String? message,
- }) {
- return ForgotPasswordState(
- email: email ?? this.email,
- isValidEmail: isValidEmail ?? this.isValidEmail,
- isLoading: isLoading ?? this.isLoading,
- isSuccess: isSuccess ?? this.isSuccess,
- message: message ?? this.message,
- );
- }
-
- factory ForgotPasswordState.initial() => const ForgotPasswordState(
- email: '',
- isValidEmail: false,
- isLoading: false,
- isSuccess: false,
- message: '',
- );
-}
-
-// ---------------- BLOC ----------------
-class ForgotPasswordBloc
- extends Bloc {
- ForgotPasswordBloc() : super(ForgotPasswordState.initial()) {
- // when email changes
- on((event, emit) {
- final isValid = _isValidEmail(event.email);
- emit(state.copyWith(email: event.email, isValidEmail: isValid));
- });
-
- // when button clicked
- on((event, emit) async {
- if (!state.isValidEmail) return;
-
- emit(state.copyWith(isLoading: true, message: ''));
- await Future.delayed(const Duration(seconds: 2)); // simulate API delay
- emit(state.copyWith(
- isLoading: false,
- isSuccess: true,
- message: 'Reset link sent successfully!',
- ));
- });
- }
-
- bool _isValidEmail(String email) {
- final regex = RegExp(r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$');
- return regex.hasMatch(email);
- }
-}
diff --git a/lib/login/blocs/login/login_bloc.dart b/lib/login/blocs/login/login_bloc.dart
index 91a7724..dc0d587 100644
--- a/lib/login/blocs/login/login_bloc.dart
+++ b/lib/login/blocs/login/login_bloc.dart
@@ -1,7 +1,8 @@
import 'package:equatable/equatable.dart';
+import 'package:flutter/foundation.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../local_peference/local_preference.dart';
-import '../../models/login.dart';
+import '../../models/login_model.dart';
import '../../repositories/login_repository.dart';
part 'login_event.dart';
part 'login_state.dart';
@@ -32,7 +33,10 @@ class LoginBloc extends Bloc {
password: event.password,
rememberMe: event.rememberMe,
);
-
+ if (kDebugMode) {
+ print('🔍 Login response accessToken: ${loginData.accessToken}');
+ print('🔍 Login response refreshToken: ${loginData.refreshToken}');
+ }
// ── Save to local preference ──────────────────────────────────────
await Future.wait([
LocalPreference.setAccessToken(loginData.accessToken),
diff --git a/lib/login/blocs/login_bloc.dart b/lib/login/blocs/login_bloc.dart
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/login/blocs/otp_bloc.dart b/lib/login/blocs/otp_bloc.dart
deleted file mode 100644
index 96cfcfd..0000000
--- a/lib/login/blocs/otp_bloc.dart
+++ /dev/null
@@ -1,103 +0,0 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-// --------------------- EVENTS ---------------------
-abstract class OtpEvent {}
-
-/// Triggered when user types or pastes OTP
-class OtpChanged extends OtpEvent {
- final String otp;
- OtpChanged(this.otp);
-}
-
-/// Triggered when user presses Verify button
-class OtpVerify extends OtpEvent {}
-
-/// (Optional for later) Triggered when user taps "Resend OTP"
-class OtpResend extends OtpEvent {}
-
-
-// --------------------- STATE ---------------------
-class OtpState {
- final String otp;
- final bool isVerified;
- final bool isLoading;
- final bool isResending;
- final String message;
-
- /// Computed property to know if OTP input is complete (6 digits)
- bool get isOtpFilled => otp.length == 6;
-
- const OtpState({
- required this.otp,
- required this.isVerified,
- required this.isLoading,
- required this.isResending,
- required this.message,
- });
-
- OtpState copyWith({
- String? otp,
- bool? isVerified,
- bool? isLoading,
- bool? isResending,
- String? message,
- }) {
- return OtpState(
- otp: otp ?? this.otp,
- isVerified: isVerified ?? this.isVerified,
- isLoading: isLoading ?? this.isLoading,
- isResending: isResending ?? this.isResending,
- message: message ?? this.message,
- );
- }
-
- factory OtpState.initial() => const OtpState(
- otp: '',
- isVerified: false,
- isLoading: false,
- isResending: false,
- message: '',
- );
-}
-
-
-// --------------------- BLOC ---------------------
-class OtpBloc extends Bloc {
- OtpBloc() : super(OtpState.initial()) {
- // Handle typing input
- on((event, emit) {
- emit(state.copyWith(otp: event.otp, message: ''));
- });
-
- // Handle Verify
- on((event, emit) async {
- if (!state.isOtpFilled) return; // no action if OTP incomplete
-
- emit(state.copyWith(isLoading: true, message: ''));
-
- await Future.delayed(const Duration(seconds: 2)); // simulate API delay
-
- // Mock success condition — replace with API later
- if (state.otp == "123456") {
- emit(state.copyWith(
- isVerified: true,
- isLoading: false,
- message: "OTP verified successfully!",
- ));
- } else {
- emit(state.copyWith(
- isVerified: false,
- isLoading: false,
- message: "Invalid OTP. Please try again.",
- ));
- }
- });
-
- // Handle Resend OTP (optional for later)
- on((event, emit) async {
- emit(state.copyWith(isResending: true, message: 'Resending OTP...'));
- await Future.delayed(const Duration(seconds: 3)); // simulate resend
- emit(state.copyWith(isResending: false, message: 'OTP resent successfully!'));
- });
- }
-}
diff --git a/lib/login/blocs/reset_password_bloc.dart b/lib/login/blocs/reset_password_bloc.dart
deleted file mode 100644
index f206d8e..0000000
--- a/lib/login/blocs/reset_password_bloc.dart
+++ /dev/null
@@ -1,93 +0,0 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-/// EVENTS
-abstract class ResetPasswordEvent {}
-
-class PasswordChanged extends ResetPasswordEvent {
- final String password;
- PasswordChanged(this.password);
-}
-
-class ConfirmPasswordChanged extends ResetPasswordEvent {
- final String confirmPassword;
- ConfirmPasswordChanged(this.confirmPassword);
-}
-
-/// STATE
-class ResetPasswordState {
- final String password;
- final String confirmPassword;
- final bool hasMinLength;
- final bool hasUppercase;
- final bool hasNumber;
- final int strengthLevel; // 0–4 based on password strength
-
- const ResetPasswordState({
- required this.password,
- required this.confirmPassword,
- required this.hasMinLength,
- required this.hasUppercase,
- required this.hasNumber,
- required this.strengthLevel,
- });
-
- factory ResetPasswordState.initial() => const ResetPasswordState(
- password: '',
- confirmPassword: '',
- hasMinLength: false,
- hasUppercase: false,
- hasNumber: false,
- strengthLevel: 0,
- );
-
- ResetPasswordState copyWith({
- String? password,
- String? confirmPassword,
- bool? hasMinLength,
- bool? hasUppercase,
- bool? hasNumber,
- int? strengthLevel,
- }) {
- return ResetPasswordState(
- password: password ?? this.password,
- confirmPassword: confirmPassword ?? this.confirmPassword,
- hasMinLength: hasMinLength ?? this.hasMinLength,
- hasUppercase: hasUppercase ?? this.hasUppercase,
- hasNumber: hasNumber ?? this.hasNumber,
- strengthLevel: strengthLevel ?? this.strengthLevel,
- );
- }
-}
-
-/// BLOC
-class ResetPasswordBloc extends Bloc {
- ResetPasswordBloc() : super(ResetPasswordState.initial()) {
- on((event, emit) {
- final pwd = event.password;
- final hasMin = pwd.length >= 8;
- final hasUp = pwd.contains(RegExp(r'[A-Z]'));
- final hasNum = pwd.contains(RegExp(r'[0-9]'));
-
- // count how many validations passed (max 3)
- int passed = [hasMin, hasUp, hasNum].where((e) => e).length;
-
- // convert to 4-box level (0–4)
- int level = 0;
- if (passed == 1) level = 1;
- if (passed == 2) level = 2;
- if (passed == 3) level = 4; // all conditions passed => full bar
-
- emit(state.copyWith(
- password: pwd,
- hasMinLength: hasMin,
- hasUppercase: hasUp,
- hasNumber: hasNum,
- strengthLevel: level,
- ));
- });
-
- on((event, emit) {
- emit(state.copyWith(confirmPassword: event.confirmPassword));
- });
- }
-}
diff --git a/lib/login/blocs/verify_otp/verify_otp_bloc.dart b/lib/login/blocs/verify_otp/verify_otp_bloc.dart
index 242e871..d5fd623 100644
--- a/lib/login/blocs/verify_otp/verify_otp_bloc.dart
+++ b/lib/login/blocs/verify_otp/verify_otp_bloc.dart
@@ -11,9 +11,14 @@ class VerifyOtpBloc extends Bloc {
VerifyOtpBloc({OtpRepository? otpRepository})
: _otpRepository = otpRepository ?? OtpRepository(),
super(const VerifyOtpState()) {
+ on(_onOtpChanged);
on(_onVerifyOtpSubmitted);
}
+ void _onOtpChanged(OtpChanged event, Emitter emit) {
+ emit(state.copyWith(otp: event.otp));
+ }
+
Future _onVerifyOtpSubmitted(
VerifyOtpSubmitted event,
Emitter emit,
diff --git a/lib/login/blocs/verify_otp/verify_otp_event.dart b/lib/login/blocs/verify_otp/verify_otp_event.dart
index 0abe38d..bbc8fd0 100644
--- a/lib/login/blocs/verify_otp/verify_otp_event.dart
+++ b/lib/login/blocs/verify_otp/verify_otp_event.dart
@@ -7,6 +7,15 @@ abstract class VerifyOtpEvent extends Equatable {
List get props => [];
}
+class OtpChanged extends VerifyOtpEvent {
+ final String otp;
+
+ const OtpChanged({required this.otp});
+
+ @override
+ List get props => [otp];
+}
+
class VerifyOtpSubmitted extends VerifyOtpEvent {
final String emailAddress;
final String otp;
diff --git a/lib/login/blocs/verify_otp/verify_otp_state.dart b/lib/login/blocs/verify_otp/verify_otp_state.dart
index e8d2522..16cb891 100644
--- a/lib/login/blocs/verify_otp/verify_otp_state.dart
+++ b/lib/login/blocs/verify_otp/verify_otp_state.dart
@@ -5,22 +5,26 @@ enum VerifyOtpStatus { initial, loading, success, failure }
class VerifyOtpState extends Equatable {
final VerifyOtpStatus status;
final String? errorMessage;
+ final String otp;
const VerifyOtpState({
this.status = VerifyOtpStatus.initial,
this.errorMessage,
+ this.otp = '',
});
VerifyOtpState copyWith({
VerifyOtpStatus? status,
String? errorMessage,
+ String? otp,
}) {
return VerifyOtpState(
status: status ?? this.status,
errorMessage: errorMessage ?? this.errorMessage,
+ otp: otp ?? this.otp,
);
}
@override
- List get props => [status, errorMessage];
+ List get props => [status, errorMessage, otp];
}
\ No newline at end of file
diff --git a/lib/login/models/login.dart b/lib/login/models/login_model.dart
similarity index 67%
rename from lib/login/models/login.dart
rename to lib/login/models/login_model.dart
index eb7d6b5..219aa03 100644
--- a/lib/login/models/login.dart
+++ b/lib/login/models/login_model.dart
@@ -12,18 +12,29 @@ class LoginModel {
});
factory LoginModel.fromJson(Map json) {
+ // Debug logs (remove in production)
+ // print("ACCESS TOKEN: ${json['accessToken']}");
+ // print("REFRESH TOKEN: ${json['partner_refresh_token']}");
+
return LoginModel(
accessToken: json['accessToken'] ?? '',
- refreshToken: json['refreshToken'] ?? '',
- refreshMaxAge: json['refreshMaxAge'] ?? 0,
- partner: PartnerModel.fromJson(json['partner']),
+ refreshToken: json['partner_refresh_token'] ?? '', // ✅ fixed key
+ refreshMaxAge: json['refreshMaxAge'] ?? 0, // may not come from API
+ partner: json['partner'] != null
+ ? PartnerModel.fromJson(json['partner'])
+ : const PartnerModel(
+ id: 0,
+ email: '',
+ name: '',
+ roleXid: 0,
+ ),
);
}
Map toJson() {
return {
'accessToken': accessToken,
- 'refreshToken': refreshToken,
+ 'partner_refresh_token': refreshToken, // ✅ match API
'refreshMaxAge': refreshMaxAge,
'partner': partner.toJson(),
};
diff --git a/lib/login/repositories/login_repository.dart b/lib/login/repositories/login_repository.dart
index d8f9e88..81fb871 100644
--- a/lib/login/repositories/login_repository.dart
+++ b/lib/login/repositories/login_repository.dart
@@ -1,6 +1,6 @@
import '../../network_api_service/api_service/api_service.dart';
import '../../network_api_service/api_urls/api_urls.dart';
-import '../models/login.dart';
+import '../models/login_model.dart';
class LoginRepository {
final ApiService _apiService = ApiService();
diff --git a/lib/login/viewmodels/forgot_password_viewmodel.dart b/lib/login/viewmodels/forgot_password_viewmodel.dart
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/login/viewmodels/login_viewmodel.dart b/lib/login/viewmodels/login_viewmodel.dart
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/login/viewmodels/otp_viewmodel.dart b/lib/login/viewmodels/otp_viewmodel.dart
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/login/viewmodels/reset_password_viewmodel.dart b/lib/login/viewmodels/reset_password_viewmodel.dart
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/login/views/otp_verification_page.dart b/lib/login/views/otp_verification_page.dart
index a09316c..ae0ca44 100644
--- a/lib/login/views/otp_verification_page.dart
+++ b/lib/login/views/otp_verification_page.dart
@@ -9,18 +9,11 @@ import '../../core/app_router.dart';
import '../../custome_widgets/custom_button.dart';
import '../blocs/verify_otp/verify_otp_bloc.dart';
-class OtpVerificationPage extends StatefulWidget {
+class OtpVerificationPage extends StatelessWidget {
final String email;
const OtpVerificationPage({super.key, required this.email});
- @override
- State createState() => _OtpVerificationPageState();
-}
-
-class _OtpVerificationPageState extends State {
- String _otp = "";
-
@override
Widget build(BuildContext context) {
return GestureDetector(
@@ -34,7 +27,7 @@ class _OtpVerificationPageState extends State {
Navigator.pushReplacementNamed(
context,
AppRouter.resetPassword,
- arguments: widget.email,
+ arguments: email,
);
} else if (state.status == VerifyOtpStatus.failure) {
ScaffoldMessenger.of(context).showSnackBar(
@@ -68,7 +61,7 @@ class _OtpVerificationPageState extends State {
),
SizedBox(height: 8.h),
Text(
- "Partner’s App",
+ "Partner's App",
style: GoogleFonts.poppins(
color: AppColors.primaryRed,
fontSize: 20.sp,
@@ -92,7 +85,7 @@ class _OtpVerificationPageState extends State {
),
SizedBox(height: 12.h),
Text(
- "We’ve sent an OTP to your registered email. Please enter it below.",
+ "We've sent an OTP to your registered email. Please enter it below.",
textAlign: TextAlign.center,
style: GoogleFonts.poppins(
color: AppColors.textGrey,
@@ -118,17 +111,17 @@ class _OtpVerificationPageState extends State {
color: AppColors.black,
),
onCodeChanged: (String code) {
- setState(() {
- _otp = code;
- });
+ context.read().add(
+ OtpChanged(otp: code),
+ );
},
onSubmit: (String verificationCode) {
- setState(() {
- _otp = verificationCode;
- });
+ context.read().add(
+ OtpChanged(otp: verificationCode),
+ );
context.read().add(
VerifyOtpSubmitted(
- emailAddress: widget.email,
+ emailAddress: email,
otp: verificationCode,
),
);
@@ -143,12 +136,12 @@ class _OtpVerificationPageState extends State {
CustomButton(
text: "Verify",
isLoading: isLoading,
- onPressed: _otp.length == 6
+ onPressed: state.otp.length == 6
? () {
context.read().add(
VerifyOtpSubmitted(
- emailAddress: widget.email,
- otp: _otp,
+ emailAddress: email,
+ otp: state.otp,
),
);
}
diff --git a/lib/network_api_service/api_service/api_service.dart b/lib/network_api_service/api_service/api_service.dart
index dc71698..74ad468 100644
--- a/lib/network_api_service/api_service/api_service.dart
+++ b/lib/network_api_service/api_service/api_service.dart
@@ -8,11 +8,14 @@ class ApiService {
static const String _baseUrl = 'https://your-api-base-url.com/api';
static final ApiService _instance = ApiService._internal();
+
late Dio _dio;
+ late Dio _tokenDio; // ✅ Separate Dio for token refresh (no interceptors)
factory ApiService() => _instance;
ApiService._internal() {
+ // ================= MAIN DIO =================
_dio = Dio(
BaseOptions(
baseUrl: _baseUrl,
@@ -25,7 +28,21 @@ class ApiService {
),
);
- // ================= RETRY INTERCEPTOR =================
+ // ================= TOKEN DIO (No interceptors — used only for refresh) =================
+ _tokenDio = Dio(
+ BaseOptions(
+ baseUrl: _baseUrl,
+ connectTimeout: const Duration(seconds: 30),
+ receiveTimeout: const Duration(seconds: 30),
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json',
+ },
+ ),
+ );
+
+ // ================= 1. RETRY INTERCEPTOR =================
+ // ✅ Added FIRST so it only retries network errors
_dio.interceptors.add(
InterceptorsWrapper(
onError: (err, handler) async {
@@ -42,7 +59,7 @@ class ApiService {
if (shouldRetry) {
if (kDebugMode) {
print(
- '🔁 Retrying request (${currentRetry + 1}) => ${options.uri}',
+ '🔁 Retrying request (${currentRetry + 1}/$maxRetries) => ${options.uri}',
);
}
options.extra['retry'] = currentRetry + 1;
@@ -54,12 +71,13 @@ class ApiService {
}
}
- return handler.reject(err);
+ return handler.next(err);
},
),
);
- // ================= MAIN INTERCEPTOR (Queued for concurrency) =================
+ // ================= 2. MAIN INTERCEPTOR (Auth + Token Refresh) =================
+ // ✅ Added SECOND — handles auth and token refresh
_dio.interceptors.add(
QueuedInterceptorsWrapper(
onRequest: (options, handler) async {
@@ -70,6 +88,10 @@ class ApiService {
handler.next(options);
},
+ onResponse: (response, handler) {
+ handler.next(response);
+ },
+
onError: (error, handler) async {
if (error.response?.statusCode == 401) {
final requestOptions = error.requestOptions;
@@ -80,13 +102,18 @@ class ApiService {
if (refreshed) {
final newToken = await LocalPreference.getAccessToken();
requestOptions.headers['Authorization'] = 'Bearer $newToken';
+
+ // ✅ Retry original request with new token
final response = await _dio.fetch(requestOptions);
return handler.resolve(response);
} else {
await _forceLogout();
return handler.reject(error);
}
- } catch (_) {
+ } catch (e) {
+ if (kDebugMode) {
+ print('❌ Error during token refresh flow: $e');
+ }
await _forceLogout();
return handler.reject(error);
}
@@ -97,7 +124,8 @@ class ApiService {
),
);
- // ================= LOGGING INTERCEPTOR =================
+ // ================= 3. LOGGING INTERCEPTOR =================
+ // ✅ Added LAST so it captures the final state of all requests/responses
if (kDebugMode) {
_dio.interceptors.add(
LogInterceptor(
@@ -105,7 +133,9 @@ class ApiService {
requestHeader: true,
requestBody: true,
responseBody: true,
+ responseHeader: false,
error: true,
+ logPrint: (log) => print('📡 $log'),
),
);
}
@@ -198,26 +228,67 @@ class ApiService {
}
// ================= REFRESH TOKEN =================
+ // ✅ Uses _tokenDio (no interceptors) to avoid QueuedInterceptor deadlock
Future _refreshToken() async {
try {
final refreshToken = await LocalPreference.getRefreshToken();
- if (refreshToken == null) return false;
- final response = await _dio.post(
+ if (kDebugMode) print('🔍 Refresh token from storage: $refreshToken');
+
+ if (refreshToken == null || refreshToken.isEmpty) {
+ if (kDebugMode) print('❌ No refresh token found');
+ return false;
+ }
+
+ if (kDebugMode) print('🔄 Attempting token refresh...');
+
+ final response = await _tokenDio.post(
ApiUrls.refreshToken,
- data: {"refreshToken": refreshToken},
- options: Options(headers: {'Authorization': null}),
+ data: '', // ✅ Empty body — server reads token from Cookie header
+ options: Options(
+ headers: {
+ // ✅ Manually inject refresh token as cookie header
+ 'Cookie': 'partner_refresh_token=$refreshToken',
+ },
+ validateStatus: (status) => status != null && status < 500,
+ ),
);
- await LocalPreference.setAccessToken(response.data['accessToken']);
+ if (kDebugMode) {
+ print("🔄 Refresh response status: ${response.statusCode}");
+ print("✅ REFRESH RESPONSE => ${response.data}");
+ }
+
+ if (response.statusCode != 200 && response.statusCode != 201) {
+ if (kDebugMode) {
+ print('❌ Refresh failed with status: ${response.statusCode}');
+ }
+ return false;
+ }
+
+ final newAccessToken = response.data['accessToken'];
+
+ if (newAccessToken == null || (newAccessToken as String).isEmpty) {
+ if (kDebugMode) print('❌ Access token missing in refresh response');
+ return false;
+ }
+
+ await LocalPreference.setAccessToken(newAccessToken);
+ if (kDebugMode) print('✅ Token refreshed successfully');
return true;
- } catch (_) {
+
+ } on DioException catch (e) {
+ if (kDebugMode) print('❌ Refresh token DioException: ${e.message}');
+ return false;
+ } catch (e) {
+ if (kDebugMode) print('❌ Refresh token unexpected error: $e');
return false;
}
}
// ================= FORCE LOGOUT =================
Future _forceLogout() async {
+ if (kDebugMode) print('🚪 Force logout triggered');
await LocalPreference.clearAll();
await LocalPreference.setLogin(false);
}
@@ -241,10 +312,8 @@ class ApiService {
responseData['error'] ??
"Invalid status code: ${error.response?.statusCode}";
}
- if (responseData is String) {
- return responseData.isNotEmpty
- ? responseData
- : "Invalid status code: ${error.response?.statusCode}";
+ if (responseData is String && responseData.isNotEmpty) {
+ return responseData;
}
return "Invalid status code: ${error.response?.statusCode}";
} catch (_) {
diff --git a/lib/network_api_service/api_urls/api_urls.dart b/lib/network_api_service/api_urls/api_urls.dart
index cc42a40..4924ce6 100644
--- a/lib/network_api_service/api_urls/api_urls.dart
+++ b/lib/network_api_service/api_urls/api_urls.dart
@@ -4,15 +4,16 @@ class ApiUrls {
static const baseUrl = "https://testingapi.citycards.betadelivery.com"; // Test API
// static const baseUrl = "https://uatapi.citycard.betadelivery.com"; // Production Lvl API
- static const refreshToken = "$baseUrl/auth/refresh";
+ static const refreshToken = "$baseUrl/partner/auth/refresh";
// ================= GET APIs =================
static const authUserDetails = "$baseUrl/partner/auth";
-
+ static const supportDetails = "$baseUrl/mobile/partners/support";
+ static const scanHistory = "$baseUrl/mobile/partners/scan-history";
// ================= POST APIs =================
static const login = "$baseUrl/partner/auth/login";
static const forgotPassword = "$baseUrl/partner/auth/forgot-password";
static const verifyOtp = "$baseUrl/partner/auth/verify-otp";
static const resetPassword = "$baseUrl/partner/auth/set-password";
-
+ static const redeem = "$baseUrl/mobile/partners/redeem";
}
\ No newline at end of file
diff --git a/lib/onboarding/views/onboarding_page.dart b/lib/onboarding/views/onboarding_page.dart
index 3937a24..1687963 100644
--- a/lib/onboarding/views/onboarding_page.dart
+++ b/lib/onboarding/views/onboarding_page.dart
@@ -68,7 +68,9 @@ class _OnboardingPageState extends State {
child: Align(
alignment: Alignment.topRight,
child: OutlinedButton(
- onPressed: () {},
+ onPressed: () {
+ _skip();
+ },
style: OutlinedButton.styleFrom(
side: const BorderSide(color: Colors.white),
foregroundColor: Colors.white,
diff --git a/lib/scan/bloc/recent_scan_history/recent_scan_history_bloc.dart b/lib/scan/bloc/recent_scan_history/recent_scan_history_bloc.dart
new file mode 100644
index 0000000..b37af9b
--- /dev/null
+++ b/lib/scan/bloc/recent_scan_history/recent_scan_history_bloc.dart
@@ -0,0 +1,26 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:equatable/equatable.dart';
+import '../../repository/recent_scan_history_repository.dart';
+import '../../models/recent_scan_history_model.dart';
+
+part 'recent_scan_history_event.dart';
+part 'recent_scan_history_state.dart';
+
+class RecentScanHistoryBloc extends Bloc {
+ final RecentScanHistoryRepository _repository;
+
+ RecentScanHistoryBloc(this._repository) : super(RecentScanHistoryInitial()) {
+ on(_onFetchRecentScanHistory);
+ }
+
+ Future _onFetchRecentScanHistory(
+ FetchRecentScanHistory event, Emitter emit) async {
+ emit(RecentScanHistoryLoading());
+ try {
+ final history = await _repository.fetchRecentScanHistory();
+ emit(RecentScanHistoryLoaded(history));
+ } catch (e) {
+ emit(RecentScanHistoryError(e.toString()));
+ }
+ }
+}
diff --git a/lib/scan/bloc/recent_scan_history/recent_scan_history_event.dart b/lib/scan/bloc/recent_scan_history/recent_scan_history_event.dart
new file mode 100644
index 0000000..815fd76
--- /dev/null
+++ b/lib/scan/bloc/recent_scan_history/recent_scan_history_event.dart
@@ -0,0 +1,10 @@
+part of 'recent_scan_history_bloc.dart';
+
+abstract class RecentScanHistoryEvent extends Equatable {
+ const RecentScanHistoryEvent();
+
+ @override
+ List