Skip to content

I
InvestCustomer
Commit ddb75ea2 by Giang Tran
Options

update code

parent 1d08f5bb
Showing with 273 additions and 255 deletions
android/app/build.gradle
......@@ -132,8 +132,8 @@ android {
applicationId "com.dcv.invest"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 20
versionName "2.4"
versionCode 23
versionName "2.7"
vectorDrawables.useSupportLibrary = true
}
splits {
......
ios/Invest.xcodeproj/project.pbxproj
......@@ -905,7 +905,7 @@
CODE_SIGN_ENTITLEMENTS = Invest/InvestDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 16;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = MXZ24GRH48;
ENABLE_BITCODE = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
......@@ -914,7 +914,7 @@
);
INFOPLIST_FILE = Invest/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.3.2;
MARKETING_VERSION = 2.3.4;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......@@ -939,11 +939,11 @@
CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 16;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = MXZ24GRH48;
INFOPLIST_FILE = Invest/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.3.2;
MARKETING_VERSION = 2.3.4;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......
ios/Invest/Info.plist
......@@ -61,13 +61,13 @@
</dict>
</dict>
<key>NSCameraUsageDescription</key>
<string>Accect connect camera</string>
<string>Cho phép truy cập vào máy ảnh và thư viện để tải ảnh lên ứng dụng</string>
<key>NSFaceIDUsageDescription</key>
<string>Enabling Face ID allows you quick and secure access to your account.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>
<key>NSPhotoLibraryUsageDescription</key>
<string>To upload images</string>
<string>Upload ảnh lên ứng dụng</string>
<key>UIAppFonts</key>
<array>
<string>AntDesign.ttf</string>
......
src/Screens/Authen/Login.js
import React, {useState, useEffect} from 'react';
import {
View,
Text,
StyleSheet,
Image,
TouchableOpacity,
KeyboardAvoidingView,
Platform,
Alert,
View,
Text,
StyleSheet,
Image,
TouchableOpacity,
KeyboardAvoidingView,
Platform,
Alert,
} from 'react-native';
import InputIcon from '../../components/Input/InputIcon';
import {getFontXD, HEIGHTXD, WIDTHXD} from '../../Config/Functions';
import R from '../../assets/R';
import {useNavigation} from '@react-navigation/native';
import {
TABNAVIGATOR,
FORGOTPASSWORD,
CONFIRMEMAIL,
TABNAVIGATOR,
FORGOTPASSWORD,
CONFIRMEMAIL,
} from '../../routers/ScreenNames';
import {checkFormatArray, encryptRSAString} from '../../Config/Functions';
import {loginApi} from '../../apis/Functions/users';
......@@ -38,254 +38,262 @@ import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import DeviceInfo from 'react-native-device-info';
const Login = (props) => {
const {navigation} = props;
const {navigation} = props;
const [email, setEmail] = useState('');
const [pass, setPass] = useState('');
const [biometryType, setBiometryType] = useState(null);
const [isShowBiometryLogin, setIsShowBiometryLogin] = useState(false);
const [email, setEmail] = useState('');
const [pass, setPass] = useState('');
const [biometryType, setBiometryType] = useState(null);
const [isShowBiometryLogin, setIsShowBiometryLogin] = useState(false);
const navigate = useNavigation();
const optionalConfigObject = {
title: 'Authentication Required', // Android
color: '#e00606', // Android,
fallbackLabel: '', // iOS (if empty, then label is hidden)
};
const getTokenDevice = async () => {
let fcmToken = await AsyncStorage.getItem(KEY.FIREBASE);
const navigate = useNavigation();
const optionalConfigObject = {
title: 'Authentication Required', // Android
color: '#e00606', // Android,
fallbackLabel: '', // iOS (if empty, then label is hidden)
};
const getTokenDevice = async () => {
let fcmToken = await AsyncStorage.getItem(KEY.FIREBASE);
if (!fcmToken) {
fcmToken = await messaging().getToken();
if (fcmToken) {
AsyncStorage.setItem(KEY.FIREBASE, fcmToken);
}
}
};
const getLoginByBiometry = async () => {
let loginByBiometry = await AsyncStorage.getItem(KEY.IS_LOGIN_BY_BIOMETRY);
if (loginByBiometry) {
loginByBiometry = JSON.parse(loginByBiometry)
setIsShowBiometryLogin(loginByBiometry.isLoginByBiometry);
loginByBiometry.isLoginByBiometry && Keychain.getSupportedBiometryType({}).then((biometryType) => {
setBiometryType(biometryType);
});
}
};
useEffect(() => {
props.hideLoading();
getAccount();
getTokenDevice();
getLoginByBiometry();
}, []);
if (!fcmToken) {
fcmToken = await messaging().getToken();
if (fcmToken) {
AsyncStorage.setItem(KEY.FIREBASE, fcmToken);
}
}
};
const getLoginByBiometry = async () => {
let loginByBiometry = await AsyncStorage.getItem(KEY.IS_LOGIN_BY_BIOMETRY);
if (loginByBiometry) {
loginByBiometry = JSON.parse(loginByBiometry);
setIsShowBiometryLogin(loginByBiometry.isLoginByBiometry);
loginByBiometry.isLoginByBiometry &&
Keychain.getSupportedBiometryType({}).then((biometryType) => {
setBiometryType(biometryType);
});
}
};
useEffect(() => {
props.hideLoading();
getAccount();
getTokenDevice();
getLoginByBiometry();
}, []);
const getAccount = async () => {
const jsonValue = await AsyncStorage.getItem(KEY.ACCOUNT);
const account = JSON.parse(jsonValue);
if (account) {
onSubmitLogin(account.email, account.pass);
}
};
const getCredentialInfo = async () => {
try {
const appBundleId = await DeviceInfo.getBundleId(); // only used for android as default for service on iOS is bundleId
const getAccount = async () => {
const jsonValue = await AsyncStorage.getItem(KEY.ACCOUNT);
const account = JSON.parse(jsonValue);
if (account) {
onSubmitLogin(account.email, account.pass);
}
};
const getCredentialInfo = async () => {
try {
const appBundleId = await DeviceInfo.getBundleId(); // only used for android as default for service on iOS is bundleId
// Retrieve the credentials
const options = {
service: Platform.OS === 'ios' ? undefined : appBundleId,
forceAuth: true,
authenticationPrompt: {
title: 'Authentication needed',
cancel: 'Cancel',
},
};
const credentials = await Keychain.getGenericPassword(options);
if (credentials) {
console.log(
'Credentials successfully loaded for user ', credentials,
);
onSubmitLogin(credentials.username, credentials.password);
} else {
showAlert(
TYPE.ERROR,
I18n.t('Notification'),
I18n.t('HaveNotCredential', {type: biometryType == 'FaceID' ? I18n.t('FaceId') : I18n.t('Fingerprint')}),
);
console.log('No credentials stored');
}
} catch (error) {
console.log('Keychain couldn\'t be accessed!', error);
}
};
const onSubmitLogin = async (email, pass) => {
const titles = [
I18n.t('Username').toLowerCase(),
I18n.t('Password').toLowerCase(),
];
const index = checkFormatArray([email, pass]);
// Retrieve the credentials
const options = {
service: Platform.OS === 'ios' ? undefined : appBundleId,
forceAuth: true,
authenticationPrompt: {
title: 'Authentication needed',
cancel: 'Cancel',
},
};
const credentials = await Keychain.getGenericPassword(options);
if (credentials) {
console.log('Credentials successfully loaded for user ', credentials);
onSubmitLogin(credentials.username, credentials.password);
} else {
showAlert(
TYPE.ERROR,
I18n.t('Notification'),
I18n.t('HaveNotCredential', {
type:
biometryType == 'FaceID'
? I18n.t('FaceId')
: I18n.t('Fingerprint'),
}),
);
console.log('No credentials stored');
}
} catch (error) {
console.log("Keychain couldn't be accessed!", error);
}
};
const onSubmitLogin = async (email, pass) => {
const titles = [
I18n.t('Username').toLowerCase(),
I18n.t('Password').toLowerCase(),
];
const index = checkFormatArray([email, pass]);
if (index === true) {
firebase = await AsyncStorage.getItem(KEY.FIREBASE);
props.showLoading();
const res = await loginApi({
email,
password: encryptRSAString(pass),
platform: Platform.OS,
device_token: firebase,
account_type: 'CUSTOMER',
});
props.hideLoading();
if (res.data) {
if (res.data.code == 200 && res.data.data) {
const jsonValue = JSON.stringify({email, pass});
AsyncStorage.setItem(KEY.TOKEN, res.data.data.token);
AsyncStorage.setItem(KEY.ACCOUNT, jsonValue);
props.saveUserToRedux(res.data.data);
navigate.reset({
index: 1,
routes: [{name: TABNAVIGATOR}],
});
} else {
showAlert(TYPE.ERROR, I18n.t('Notification'), res.data.message);
}
} else {
showAlert(
TYPE.ERROR,
I18n.t('Notification'),
I18n.t('Systemmaintenance'),
);
}
if (index === true) {
firebase = await AsyncStorage.getItem(KEY.FIREBASE);
props.showLoading();
const res = await loginApi({
email,
password: encryptRSAString(pass),
platform: Platform.OS,
device_token: firebase,
account_type: 'CUSTOMER',
});
props.hideLoading();
if (res.data) {
if (res.data.code == 200 && res.data.data) {
const jsonValue = JSON.stringify({email, pass});
AsyncStorage.setItem(KEY.TOKEN, res.data.data.token);
AsyncStorage.setItem(KEY.ACCOUNT, jsonValue);
props.saveUserToRedux(res.data.data);
navigate.reset({
index: 1,
routes: [{name: TABNAVIGATOR}],
});
} else {
showAlert(
TYPE.WARN,
I18n.t('Notification'),
I18n.t('Please_fill_in') + titles[index],
);
showAlert(TYPE.ERROR, I18n.t('Notification'), res.data.message);
}
};
} else {
showAlert(
TYPE.ERROR,
I18n.t('Notification'),
I18n.t('Systemmaintenance'),
);
}
} else {
showAlert(
TYPE.WARN,
I18n.t('Notification'),
I18n.t('Please_fill_in') + titles[index],
);
}
};
return (
<View
style={{
flex: 1,
paddingHorizontal: 20,
paddingTop: 20,
backgroundColor: 'white',
}}>
<InputIcon
icon={R.images.iconUser3}
title={'Email'}
onChangeText={(val) => setEmail(val)}
value={email}
/>
<InputIcon
icon={R.images.iconLock}
title={'Password'}
isPassWord={true}
onChangeText={(val) => setPass(val)}
value={pass}
/>
<TouchableOpacity
onPress={() => navigate.navigate(CONFIRMEMAIL)}
style={styles.forgotView}>
<AppText i18nKey={'ForgotPassword'} style={styles.txtTitle}/>
</TouchableOpacity>
return (
<View
style={{
flex: 1,
paddingHorizontal: 20,
paddingTop: 20,
backgroundColor: 'white',
}}>
<InputIcon
icon={R.images.iconUser3}
title={'Email'}
onChangeText={(val) => setEmail(val)}
value={email}
/>
<InputIcon
icon={R.images.iconLock}
title={'Password'}
isPassWord={true}
onChangeText={(val) => setPass(val)}
value={pass}
/>
<TouchableOpacity
onPress={() => navigate.navigate(CONFIRMEMAIL)}
style={styles.forgotView}>
<AppText i18nKey={'ForgotPassword'} style={styles.txtTitle} />
</TouchableOpacity>
<View
style={{
marginVertical: 20,
alignItems: 'center',
<View
style={{
marginVertical: 20,
alignItems: 'center',
}}>
<TouchableOpacity
onPress={() => onSubmitLogin(email, pass)}
style={styles.wrapLogin}>
<AppText i18nKey={'Login'} style={styles.txtLogin} />
<Image source={R.images.iconRight1} style={styles.imgIcon} />
</TouchableOpacity>
{isShowBiometryLogin ? (
<View style={{flexDirection: 'row', marginTop: WIDTHXD(70)}}>
{biometryType == 'FaceID' ? (
<TouchableOpacity
onPress={() => {
getCredentialInfo();
}}>
<TouchableOpacity
onPress={() => onSubmitLogin(email, pass)}
style={styles.wrapLogin}>
<AppText i18nKey={'Login'} style={styles.txtLogin}/>
<Image source={R.images.iconRight1} style={styles.imgIcon}/>
</TouchableOpacity>
{isShowBiometryLogin ?
<View style={{flexDirection: 'row', marginTop: WIDTHXD(70)}}>
{biometryType == 'FaceID' ?
<TouchableOpacity
onPress={() => {
getCredentialInfo();
}}>
<Image source={R.images.iconFaceId} style={[styles.imgIconBiometry, {tintColor: R.colors.main}]}/>
</TouchableOpacity>
:
<TouchableOpacity
onPress={() => {
getCredentialInfo();
}}>
<Image source={R.images.fingerprint} style={styles.imgIconBiometry}/>
</TouchableOpacity>
}
</View>
: null}
<Image
source={R.images.iconFaceId}
style={[styles.imgIconBiometry, {tintColor: R.colors.main}]}
/>
</TouchableOpacity>
) : (
<TouchableOpacity
onPress={() => {
getCredentialInfo();
}}>
<Image
source={R.images.fingerprint}
style={styles.imgIconBiometry}
/>
</TouchableOpacity>
)}
</View>
) : null}
<View style={styles.row}>
<AppText i18nKey={'Have_account'} style={styles.txtTitle}/>
<TouchableOpacity
onPress={() => {
navigation.navigate('REGISTOR');
}}>
<AppText i18nKey={'Register'} style={styles.txtRegistor}/>
</TouchableOpacity>
</View>
</View>
<View style={{height: 100}}/>
<View style={styles.row}>
<AppText i18nKey={'Have_account'} style={styles.txtTitle} />
<TouchableOpacity
onPress={() => {
navigation.navigate('REGISTOR');
}}>
<AppText i18nKey={'Register'} style={styles.txtRegistor} />
</TouchableOpacity>
</View>
);
</View>
<View style={{height: 100}} />
</View>
);
};
const styles = StyleSheet.create({
forgotView: {
marginVertical: 20,
alignItems: 'flex-end',
},
txtTitle: {
fontSize: getFontXD(42),
color: '#929292',
},
txtLogin: {
fontSize: getFontXD(48),
color: 'white',
fontWeight: '700',
},
wrapLogin: {
width: WIDTHXD(512),
height: HEIGHTXD(150),
backgroundColor: '#1C6AF6',
borderRadius: 30,
flexDirection: 'row',
justifyContent: 'center',
alignItems: 'center',
},
imgIcon: {
width: WIDTHXD(72),
height: HEIGHTXD(72),
marginLeft: 5,
},
imgIconBiometry: {
width: WIDTHXD(120),
height: WIDTHXD(120),
},
row: {
flexDirection: 'row',
marginTop: 30,
},
txtRegistor: {
marginLeft: WIDTHXD(10),
fontSize: getFontXD(42),
color: '#1473E6',
},
forgotView: {
marginVertical: 20,
alignItems: 'flex-end',
},
txtTitle: {
fontSize: getFontXD(42),
color: '#929292',
},
txtLogin: {
fontSize: getFontXD(48),
color: 'white',
fontWeight: '700',
},
wrapLogin: {
width: WIDTHXD(512),
height: HEIGHTXD(150),
backgroundColor: '#1C6AF6',
borderRadius: 30,
flexDirection: 'row',
justifyContent: 'center',
alignItems: 'center',
},
imgIcon: {
width: WIDTHXD(72),
height: HEIGHTXD(72),
marginLeft: 5,
},
imgIconBiometry: {
width: WIDTHXD(120),
height: WIDTHXD(120),
},
row: {
flexDirection: 'row',
marginTop: 30,
},
txtRegistor: {
marginLeft: WIDTHXD(10),
fontSize: getFontXD(42),
color: '#1473E6',
},
});
const mapStateToProps = (state) => {
return {};
return {};
};
export default connect(mapStateToProps, {
showLoading,
hideLoading,
saveUserToRedux,
showLoading,
hideLoading,
saveUserToRedux,
})(Login);
src/helper/FirebaseNotification.js
......@@ -38,13 +38,23 @@ const FirebaseNotification = (props) => {
const unsubscribe = messaging().onMessage(async (remoteMessage) => {
console.log('A new FCM message arrived!', remoteMessage.data);
const {action_type, body, title, record_id} = remoteMessage.data;
props.showNotificaton({
title,
content: body,
screen: convertScreen(action_type),
id_record: record_id,
link: remoteMessage.data?.redirect_to,
});
if (action_type == 'REDIRECT') {
props.showNotificaton({
title,
content: body,
screen: convertScreen(action_type),
id_record: record_id,
link: remoteMessage.data?.redirect_to,
});
} else {
props.showNotificaton({
title,
content: body,
screen: convertScreen(action_type),
id_record: record_id,
link: null,
});
}
if (action_type != 'CUSTOMER_NEWS') refetchDataUser();
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment