Force lowercase on login and install
This commit is contained in:
parent
a3b9f3e682
commit
f14f37ab0f
3 changed files with 8 additions and 6 deletions
|
|
@ -28,7 +28,7 @@ class Helpers {
|
|||
}
|
||||
|
||||
isUrlValid(value) {
|
||||
return /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(value);
|
||||
return /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(value.toLowerCase());
|
||||
}
|
||||
|
||||
generateUUID() { // Public Domain/MIT
|
||||
|
|
|
|||
|
|
@ -56,9 +56,11 @@ class InstallScreen extends React.Component {
|
|||
<Image source={require('../../Resources/assets/img/logo-square-ldc.png')} style={styles.logo} />
|
||||
<View style={styles.actions}>
|
||||
<TextInput
|
||||
keyboardType='url'
|
||||
autoCapitalize='none'
|
||||
style={commonStyles.textInput}
|
||||
placeholder={i18n.t("install.enter_url")}
|
||||
onChangeText={(newText) => this.setState({ url: newText.toLowerCase() })}
|
||||
onChangeText={(newText) => this.setState({ url: newText })}
|
||||
value={this.state.url}
|
||||
/>
|
||||
<Button
|
||||
|
|
@ -89,7 +91,7 @@ class InstallScreen extends React.Component {
|
|||
}
|
||||
|
||||
async install() {
|
||||
let url = this.state.url;
|
||||
let url = this.state.url.toLowerCase();
|
||||
Setting.upsert({ key: 'bo_url', value: url });
|
||||
const isConnected = await SyncController.checkConnection().then(state => {
|
||||
//console.log(state.isConnected)
|
||||
|
|
@ -161,7 +163,7 @@ class InstallScreen extends React.Component {
|
|||
}
|
||||
|
||||
this.setState({ txtStep: i18n.t("install.get_content_setting") });
|
||||
if (InstallController.getAppConfig(this.state.url)) {
|
||||
if (InstallController.getAppConfig(url)) {
|
||||
// getUsers
|
||||
this.setState({ txtStep: i18n.t('sync_s.updating_users') + '...' });
|
||||
const resUsers = await SyncController.getUsers().then(res => {
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ class LoginScreen extends React.Component {
|
|||
style={styles.text}
|
||||
placeholder={i18n.t('login_s.username')}
|
||||
value={this.state.login}
|
||||
onChangeText={text => this.setState({ login: text.toLowerCase() })}
|
||||
onChangeText={text => this.setState({ login: text })}
|
||||
autoCapitalize={'none'}
|
||||
autoCorrect={false}
|
||||
keyboardType={'email-address'}
|
||||
|
|
@ -72,7 +72,7 @@ class LoginScreen extends React.Component {
|
|||
/>
|
||||
<Button
|
||||
title={i18n.t('global.login')}
|
||||
onPress={() => this.login(this.state.login, this.state.password)}
|
||||
onPress={() => this.login(this.state.login.toLowerCase(), this.state.password)}
|
||||
color={this.props.mainColor}
|
||||
/>
|
||||
</View>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue