add private user data for auth
This commit is contained in:
parent
17ec26728b
commit
4019b40b33
|
|
@ -75,7 +75,7 @@ function BottomTab() {
|
|||
/>
|
||||
<Tab.Screen
|
||||
name="t"
|
||||
component={HouseLocation}
|
||||
component={RegisterUserScreen}
|
||||
options={{
|
||||
tabBarIcon: ({focused}) => (
|
||||
<Icon
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import {Icon} from 'react-native-elements';
|
|||
|
||||
const LoginUserScreen = ({navigation}) => {
|
||||
const [username, setUsername] = useState('');
|
||||
const [orgname, setOrgname] = useState('');
|
||||
const [orgname, setOrgname] = useState('Org1');
|
||||
const [password, setPassword] = useState('');
|
||||
const [token, setToken] = useState('');
|
||||
const [message, setMessage] = useState('');
|
||||
|
|
@ -41,10 +41,11 @@ const LoginUserScreen = ({navigation}) => {
|
|||
|
||||
const login_user = async () => {
|
||||
var data = {
|
||||
email: username,
|
||||
password: password,
|
||||
username: username,
|
||||
orgName: orgname,
|
||||
args: [JSON.stringify({email: username, password: password})],
|
||||
};
|
||||
await fetch('http://locaft.ap-south-1.elasticbeanstalk.com/users/login', {
|
||||
await fetch('http://192.168.29.141:4000/users/login', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
Accept: 'application/json',
|
||||
|
|
@ -53,70 +54,20 @@ const LoginUserScreen = ({navigation}) => {
|
|||
body: JSON.stringify(data),
|
||||
})
|
||||
.then(function (response) {
|
||||
//console.log("response ", response);
|
||||
//const cred = await Keychain.setGenericPassword(JSON.stringify(response));
|
||||
return response.json();
|
||||
})
|
||||
.then(async function (response_data) {
|
||||
console.log('\n data ', response_data);
|
||||
console.log('\n response_data ', response_data);
|
||||
console.log('\nuser data success');
|
||||
if (response_data.token) {
|
||||
await setKey('token', response_data.token);
|
||||
setToken(response_data.token);
|
||||
setMessage('user ' + response_data.user.username + ' logged in');
|
||||
var userobj = JSON.parse(response_data.user);
|
||||
setMessage('user ' + userobj.username + ' logged in');
|
||||
} else {
|
||||
setMessage(response_data.msg);
|
||||
}
|
||||
if (response_data.user.organization) {
|
||||
if (response_data.user.organization === 'mod') {
|
||||
login_fabric(response_data.user.id, 'Org1');
|
||||
}
|
||||
if (response_data.user.organization === 'tenant') {
|
||||
console.log("if in org condition");
|
||||
login_fabric(response_data.user.id, 'Org2');
|
||||
}
|
||||
|
||||
if (response_data.user.organization === 'owner') {
|
||||
login_fabric(response_data.user.id, 'Org3');
|
||||
}
|
||||
}
|
||||
var key_token = await getKey('token');
|
||||
console.log('retrived key_token ' + key_token);
|
||||
})
|
||||
.catch(error => {
|
||||
setError(error);
|
||||
console.log('error ' + error);
|
||||
});
|
||||
};
|
||||
const login_fabric = async (username_fab, orgname_fab) => {
|
||||
var data = {
|
||||
username: username_fab,
|
||||
orgName: orgname_fab,
|
||||
};
|
||||
await fetch('http://192.168.29.141:4000/users', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
Accept: 'application/json',
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify(data),
|
||||
})
|
||||
.then(function (response) {
|
||||
console.log('response ', response);
|
||||
//const cred = await Keychain.setGenericPassword(JSON.stringify(response));
|
||||
return response.json();
|
||||
})
|
||||
.then(async function (response_data) {
|
||||
console.log('\n data ', response_data);
|
||||
console.log(
|
||||
'\n fabric data success',
|
||||
response_data.success + typeof response_data.success,
|
||||
);
|
||||
if (response_data.success) {
|
||||
await setKey('token', response_data.token);
|
||||
setToken(response_data.token);
|
||||
setMessage(response_data.message);
|
||||
}
|
||||
var key_token = await getKey('token');
|
||||
console.log('retrived key_token ' + key_token);
|
||||
})
|
||||
|
|
@ -155,9 +106,8 @@ const LoginUserScreen = ({navigation}) => {
|
|||
}}>
|
||||
<TouchableHighlight
|
||||
onPress={() => navigation.goBack()}
|
||||
underlayColor="white"
|
||||
activeOpacity={0.5}
|
||||
>
|
||||
underlayColor="white"
|
||||
activeOpacity={0.5}>
|
||||
<Icon name="arrow-back" type="ionicon" size={36} color="#206ba5" />
|
||||
</TouchableHighlight>
|
||||
</View>
|
||||
|
|
|
|||
|
|
@ -45,15 +45,38 @@ const RegisterUserScreen = ({navigation}) => {
|
|||
keychainService: 'myKeychain',
|
||||
});
|
||||
};
|
||||
|
||||
const adaptOrgName = org => {
|
||||
if (org === 'tenant') {
|
||||
setSelectedOrg('Org1');
|
||||
}
|
||||
if (org === 'owner') {
|
||||
setSelectedOrg('Org2');
|
||||
}
|
||||
if (org === 'mod') {
|
||||
setSelectedOrg('Org3');
|
||||
}
|
||||
|
||||
return selectedOrg;
|
||||
};
|
||||
const register_user = async () => {
|
||||
console.log('register user touched');
|
||||
|
||||
var data = {
|
||||
email: username,
|
||||
password: password,
|
||||
organization: selectedOrg,
|
||||
username: username,
|
||||
orgName: adaptOrgName(selectedOrg),
|
||||
transient: JSON.stringify({
|
||||
user: {
|
||||
username: username,
|
||||
email: username,
|
||||
password: password,
|
||||
phonenumber: 0,
|
||||
pricing: 'free',
|
||||
organization: adaptOrgName(selectedOrg),
|
||||
},
|
||||
}),
|
||||
};
|
||||
await fetch('http://192.168.29.141:5000/users/register', {
|
||||
await fetch('http://192.168.29.141:4000/users/register', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
Accept: 'application/json',
|
||||
|
|
@ -66,26 +89,8 @@ const RegisterUserScreen = ({navigation}) => {
|
|||
return response.json();
|
||||
})
|
||||
.then(async function (response_data) {
|
||||
console.log('\nuser data ', response_data);
|
||||
if (response_data._id) {
|
||||
//await setKey('token', response_data._id);
|
||||
setToken(response_data._id);
|
||||
}
|
||||
setMessage(response_data.msg);
|
||||
//var key_token = await getKey('token');
|
||||
//console.log('retrived key_token ' + key_token + ' ' + typeof(key_token));
|
||||
if (response_data.organization) {
|
||||
if (response_data.organization === 'mod') {
|
||||
register_fabric(response_data._id, 'Org1');
|
||||
}
|
||||
if (response_data.organization === 'tenant') {
|
||||
register_fabric(response_data._id, 'Org2');
|
||||
}
|
||||
|
||||
if (response_data.organization === 'owner') {
|
||||
register_fabric(response_data._id, 'Org3');
|
||||
}
|
||||
}
|
||||
console.log('\nresponse data ', response_data);
|
||||
navigation.navigate('LoginUserScreen');
|
||||
})
|
||||
.catch(error => {
|
||||
setError(error);
|
||||
|
|
@ -189,7 +194,7 @@ const RegisterUserScreen = ({navigation}) => {
|
|||
nRequestClose={() => changeModalVisibility(false)}>
|
||||
<DropDown
|
||||
changeModalVisibility={changeModalVisibility}
|
||||
setData={setSelectedOrg}
|
||||
setData={adaptOrgName}
|
||||
options={options}
|
||||
/>
|
||||
</Modal>
|
||||
|
|
|
|||
Loading…
Reference in New Issue