Nhances/post_enrollment_app
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CHANGE_

Browse Source
This commit is contained in:
Venba 2024-07-16 08:17:12 +05:30
parent a2e6ad558a
commit 76ba68f022
9 changed files with 58 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/customAppBar/enrollmentAppBar.dart
View File

@ -25,7 +25,7 @@ class _CustomAppBarState extends State<CustomAppBar> {
final String? token = prefs.getString('token'); final String? token = prefs.getString('token');
if (token != null && token.isNotEmpty) { if (token != null && token.isNotEmpty) {
// await prefs.clear(); await prefs.clear();
Navigator.pushNamed(context, 'login'); Navigator.pushNamed(context, 'login');
} }
} }

2
lib/main.dart
View File

@ -1,4 +1,3 @@
import 'package:firebase_core/firebase_core.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:nhance_app_pwa/pages/enrollment/addons.dart'; import 'package:nhance_app_pwa/pages/enrollment/addons.dart';
@ -28,7 +27,6 @@ import 'models/environment.dart';
Future<void> main() async { Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
await Firebase.initializeApp();
await dotenv.load(fileName: Environment.fileName); await dotenv.load(fileName: Environment.fileName);
final AuthService _authService = AuthService(); final AuthService _authService = AuthService();

5
lib/models/platform_helper_mobile.dart Normal file
View File

@ -0,0 +1,5 @@
import 'dart:io';
bool isMobilePlatform() {
return Platform.isAndroid || Platform.isIOS;
}

3
lib/models/platform_helper_other.dart Normal file
View File

@ -0,0 +1,3 @@
bool isMobilePlatform() {
return false;
}

34
lib/pages/login.dart
View File

@ -2,16 +2,15 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:nhance_app_pwa/pages/session/SetPinBiometric.dart';
import 'dart:convert'; import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:flutter_animated_button/flutter_animated_button.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import '../customAppBar/responsive.dart'; import '../customAppBar/responsive.dart';
import '../customAppBar/toastHelper.dart'; import '../customAppBar/toastHelper.dart';
import '../models/environment.dart'; import '../models/environment.dart';
import '../models/platform_helper_mobile.dart'
if (dart.library.html) '../models/platform_helper_other.dart';
class login extends StatefulWidget { class login extends StatefulWidget {
const login({Key? key}); const login({Key? key});
@ -31,30 +30,16 @@ class _loginState extends State<login> {
void initState() { void initState() {
countryController.text = "+91"; countryController.text = "+91";
super.initState(); super.initState();
checkLoginPin(); checkLoginPinOnMobile();
WidgetsBinding.instance
.addPostFrameCallback((_) => checkTokenAvailability());
} }
Future<void> checkTokenAvailability() async { void checkLoginPinOnMobile() {
if (_isCheckingToken) return; if (isMobilePlatform()) {
_isCheckingToken = true; checkLoginPin(context);
print('checkTokenAvailability'); }
final SharedPreferences prefs = await SharedPreferences.getInstance();
final String? token = prefs.getString('token');
final mpin = prefs.getString('user_pin');
int skipStatus = prefs.getInt('skipStatus') ?? 1;
final emp_status = prefs.getString('emp_status');
// if (prefs.containsKey('skipStatus') && skipStatus == 1) {
// if (prefs.containsKey('user_pin') && mpin != null && mpin.isNotEmpty) {
// Navigator.pushReplacementNamed(context, 'pinPage');
// }
// }
// checkLoginPin();
} }
Future<void> checkLoginPin() async { Future<void> checkLoginPin(BuildContext context) async {
print('checkLoginPin'); print('checkLoginPin');
try { try {
final SharedPreferences prefs = await SharedPreferences.getInstance(); final SharedPreferences prefs = await SharedPreferences.getInstance();
@ -73,7 +58,8 @@ class _loginState extends State<login> {
Map<String, dynamic> data = json.decode(response.body); Map<String, dynamic> data = json.decode(response.body);
if (data['status'] == 'success') { if (data['status'] == 'success') {
print('data'); print('data');
prefs.setString('mpin', data['data']); prefs.setString('mpinText', data['data']);
prefs.setString('mpin', data['Mpin']);
Navigator.pushReplacementNamed(context, 'pinPage'); Navigator.pushReplacementNamed(context, 'pinPage');
} }
} else { } else {

24
lib/pages/postEnrollment/profile.dart
View File

@ -11,6 +11,10 @@ import '../../customAppBar/responsive.dart';
import '../../customAppBar/tabs.dart'; import '../../customAppBar/tabs.dart';
import '../../customAppBar/toastHelper.dart'; import '../../customAppBar/toastHelper.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import '../../models/platform_helper_mobile.dart'
if (dart.library.html) '../../models/platform_helper_other.dart';
import '../session/authenticationService.dart';
class profile extends StatefulWidget { class profile extends StatefulWidget {
const profile({Key? key}) : super(key: key); const profile({Key? key}) : super(key: key);
@ -21,6 +25,7 @@ class profile extends StatefulWidget {
class _profileState extends State<profile> { class _profileState extends State<profile> {
late ApiService apiService; late ApiService apiService;
final AuthService _authService = AuthService();
int _currentIndex = 0; int _currentIndex = 0;
bool isActive = true; bool isActive = true;
dynamic _token; dynamic _token;
@ -140,12 +145,25 @@ class _profileState extends State<profile> {
} }
Future<void> logout(BuildContext context) async { Future<void> logout(BuildContext context) async {
final prefs = await SharedPreferences.getInstance(); if (isMobilePlatform()) {
if (Responsive.isDesktop(context)) { final SharedPreferences prefs = await SharedPreferences.getInstance();
// Get the value of the mobile_number key
String? mobileNumber = prefs.getString('empMobileNo');
// Clear all keys
await prefs.clear(); await prefs.clear();
// Re-set the mobile_number key
if (mobileNumber != null) {
await prefs.setString('empMobileNo', mobileNumber);
}
ToastHelper.showSuccessToast(context, 'logout');
// Navigate to login page
Navigator.pushNamed(context, 'login'); Navigator.pushNamed(context, 'login');
} else { } else {
// await prefs.clear(); final prefs = await SharedPreferences.getInstance();
await prefs.clear();
Navigator.pushNamed(context, 'login'); Navigator.pushNamed(context, 'login');
} }
} }

59
lib/pages/session/SetPinBiometric.dart
View File

@ -35,6 +35,7 @@ class _pinPageState extends State<pinPage> {
dynamic clientName; dynamic clientName;
dynamic clientLogo; dynamic clientLogo;
dynamic emp_status; dynamic emp_status;
dynamic bioMetricMpin;
@override @override
void initState() { void initState() {
@ -51,15 +52,17 @@ class _pinPageState extends State<pinPage> {
} }
Future<void> _checkBiometricAuthentication() async { Future<void> _checkBiometricAuthentication() async {
final SharedPreferences prefs = await SharedPreferences.getInstance();
bioMetricMpin = prefs.getString('mpin');
bool authenticated = await _authService.authenticateWithBiometrics(); bool authenticated = await _authService.authenticateWithBiometrics();
if (authenticated) { if (authenticated) {
enterPinApi(); enterPinApi(bioMetricMpin);
} else { } else {
ToastHelper.showErrorToast(context, 'Biometric authentication failed'); ToastHelper.showErrorToast(context, 'Biometric authentication failed');
} }
} }
Future<void> enterPinApi() async { Future<void> enterPinApi(mpin) async {
try { try {
final SharedPreferences prefs = await SharedPreferences.getInstance(); final SharedPreferences prefs = await SharedPreferences.getInstance();
empMobileNo = prefs.getString('empMobileNo'); empMobileNo = prefs.getString('empMobileNo');
@ -67,8 +70,7 @@ class _pinPageState extends State<pinPage> {
final response = await http.post( final response = await http.post(
Uri.parse(Environment.apiUrl + 'verifyMpin'), Uri.parse(Environment.apiUrl + 'verifyMpin'),
body: json.encode( body: json.encode({'mobile_number': empMobileNo, 'mpin': mpin}),
{'mobile_number': empMobileNo, 'mpin': _pinController.text}),
headers: { headers: {
HttpHeaders.contentTypeHeader: 'application/json', HttpHeaders.contentTypeHeader: 'application/json',
}, },
@ -124,7 +126,7 @@ class _pinPageState extends State<pinPage> {
Future<void> enterLoginPin() async { Future<void> enterLoginPin() async {
try { try {
if (_formKey.currentState!.validate()) { if (_formKey.currentState!.validate()) {
enterPinApi(); enterPinApi(_pinController.text);
} }
} catch (e) { } catch (e) {
ToastHelper.showErrorToast(context, 'Something went wrong'); ToastHelper.showErrorToast(context, 'Something went wrong');
@ -573,51 +575,4 @@ class _pinPageState extends State<pinPage> {
]), ]),
))); )));
} }
// Widget build(BuildContext context) {
// return Scaffold(
// appBar: AppBar(title: Text('Authenticate')),
// body: Padding(
// padding: const EdgeInsets.all(16.0),
// child: Column(
// children: [
// ElevatedButton(
// onPressed: () async {
// bool authenticated =
// await _authService.authenticateWithBiometrics();
// if (authenticated) {
// Navigator.pushReplacementNamed(context, 'home');
// } else {
// ScaffoldMessenger.of(context).showSnackBar(SnackBar(
// content: Text('Biometric authentication failed'),
// ));
// }
// },
// child: Text('Authenticate with Biometric'),
// ),
// TextField(
// controller: _pinController,
// decoration: InputDecoration(labelText: 'Enter PIN'),
// keyboardType: TextInputType.number,
// obscureText: true,
// ),
// SizedBox(height: 20),
// ElevatedButton(
// onPressed: () async {
// String pin = _pinController.text;
// String? savedPin = await _authService.getPin();
// if (pin == savedPin) {
// Navigator.pushReplacementNamed(context, 'home');
// } else {
// ScaffoldMessenger.of(context).showSnackBar(SnackBar(
// content: Text('Incorrect PIN'),
// ));
// }
// },
// child: Text('Authenticate with PIN'),
// ),
// ],
// ),
// ),
// );
// }
} }

50
lib/pages/session/settingUpPinAndBiometric.dart
View File

@ -158,19 +158,6 @@ class _pinSettingPageState extends State<pinSettingPage> {
top: 0, // Example value for mobile top: 0, // Example value for mobile
); );
} }
// final defaultPinTheme = PinTheme(
// width: 56,
// height: 56,
// textStyle: TextStyle(
// fontSize: 20,
// color: Color.fromRGBO(30, 60, 87, 1),
// fontWeight: FontWeight.w600,
// ),
// decoration: BoxDecoration(
// border: Border.all(color: Color.fromRGBO(234, 239, 243, 1)),
// borderRadius: BorderRadius.circular(20),
// ),
// );
final defaultPinTheme = PinTheme( final defaultPinTheme = PinTheme(
width: 56, width: 56,
@ -664,41 +651,4 @@ class _pinSettingPageState extends State<pinSettingPage> {
]), ]),
))); )));
} }
// @override
// Widget build(BuildContext context) {
// return Scaffold(
// appBar: AppBar(title: Text('Set PIN and Biometric')),
// body: Padding(
// padding: const EdgeInsets.all(16.0),
// child: Column(
// children: [
// TextField(
// controller: _pinController,
// decoration: InputDecoration(labelText: 'Enter PIN'),
// keyboardType: TextInputType.number,
// obscureText: true,
// ),
// SizedBox(height: 20),
// ElevatedButton(
// onPressed: () async {
// String pin = _pinController.text;
// await _authService.savePin(pin);
// bool biometricEnabled =
// await _authService.authenticateWithBiometrics();
// if (biometricEnabled) {
// Navigator.pushReplacementNamed(context, 'home');
// } else {
// ScaffoldMessenger.of(context).showSnackBar(SnackBar(
// content: Text('Biometric authentication failed'),
// ));
// }
// },
// child: Text('Set PIN and Enable Biometric'),
// ),
// ],
// ),
// ),
// );
// }
} }

16
lib/pages/verify.dart
View File

@ -12,6 +12,8 @@ import 'package:jwt_decode/jwt_decode.dart';
import '../customAppBar/responsive.dart'; import '../customAppBar/responsive.dart';
import '../customAppBar/toastHelper.dart'; import '../customAppBar/toastHelper.dart';
import '../models/environment.dart'; import '../models/environment.dart';
import '../models/platform_helper_mobile.dart'
if (dart.library.html) '../models/platform_helper_other.dart';
class MyVerify extends StatefulWidget { class MyVerify extends StatefulWidget {
const MyVerify({Key? key}) : super(key: key); const MyVerify({Key? key}) : super(key: key);
@ -157,9 +159,15 @@ class _MyVerifyState extends State<MyVerify> {
// Redirect to another page // Redirect to another page
final token = prefs.getString('token'); final token = prefs.getString('token');
// int skipStatus = prefs.getInt('skipStatus') ?? 1; // int skipStatus = prefs.getInt('skipStatus') ?? 1;
final mpin = prefs.getString('mpin'); // final mpinText = prefs.getString('mpinText');
print(isMobilePlatform());
if (prefs.containsKey('mpin') && mpin != 'Mpin - exist') { if (isMobilePlatform()) {
// if (prefs.containsKey('mpin') && mpinText == 'Mpin - exist') {
if (token != null && token.isNotEmpty) {
Navigator.pushReplacementNamed(context, 'pinSettingPage');
}
// }
} else {
if (token != null && token.isNotEmpty) { if (token != null && token.isNotEmpty) {
ToastHelper.showSuccessToast(context, 'Successfully Login'); ToastHelper.showSuccessToast(context, 'Successfully Login');
if (emp_status == 'enrolled') { if (emp_status == 'enrolled') {
@ -168,8 +176,6 @@ class _MyVerifyState extends State<MyVerify> {
Navigator.pushReplacementNamed(context, 'empDetails'); Navigator.pushReplacementNamed(context, 'empDetails');
} }
} }
} else {
Navigator.pushReplacementNamed(context, 'pinSettingPage');
} }
} else { } else {
ToastHelper.showErrorToast(context, 'Invalid OTP. Please try again'); ToastHelper.showErrorToast(context, 'Invalid OTP. Please try again');