From 7c35fce0316c22bb2246738f6fd72db030b04d9e Mon Sep 17 00:00:00 2001
From: bricezele <bricezele1@gmail.com>
Date: Mon, 7 Dec 2020 14:47:35 +0100
Subject: [PATCH] Before switching to preprod

---
 screens/home/Home.js               |  4 ++--
 screens/login/ForgottenPassword.js | 21 ++++++++++++---------
 webservice/AuthApi.js              |  7 ++++---
 webservice/IlinkConstants.js       |  4 ++--
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/screens/home/Home.js b/screens/home/Home.js
index 30aafe75..ebf4f7a9 100644
--- a/screens/home/Home.js
+++ b/screens/home/Home.js
@@ -1653,7 +1653,7 @@ class Home extends BaseScreen {
                     translucent={true}
                 />
                 {/* Start here to comment */}
-                {
+                {/*{
                     (this.state.loadingDialog || this.props.loading) ?
                         <View
                             style={{
@@ -1705,7 +1705,7 @@ class Home extends BaseScreen {
                             }
                         }])
                     }}
-                />
+                />*/}
                 {this.makeCardSearch()}
                 {this.makeSlidingUp()}
                 {this.makeDialogLoader()}
diff --git a/screens/login/ForgottenPassword.js b/screens/login/ForgottenPassword.js
index e4486b4c..b2c7cab4 100644
--- a/screens/login/ForgottenPassword.js
+++ b/screens/login/ForgottenPassword.js
@@ -13,6 +13,7 @@ import {getPositionInformation} from "../../webservice/MapService";
 import isEqual from 'lodash/isEqual'
 let country=require('./../../utils/country_code.json');
 import Icon from 'react-native-vector-icons/MaterialIcons';
+import _ from 'lodash';
 
 const GEOLOCATION_OPTIONS= { enableHighAccuracy: true, timeout: 20000 }
 
@@ -30,7 +31,8 @@ export default class ForgottenPassword extends Component{
 
     constructor(props){
         super(props);
-        console.log(this.props);
+        console.log("RESET PASSWORD PROPS",this.props);
+        console.warn("USER TYPE", this.props.navigation.state.params.type, typeof this.props.navigation.state.params.type);
         this.state=this.initState();
     };
 
@@ -196,22 +198,22 @@ export default class ForgottenPassword extends Component{
 
     render(){
         return <View style={{
-            backgroundColor:this.props.type===0?theme.primary:theme.primaryDarkAdvanced,
+            backgroundColor:this.props.navigation.state.params.type===0?theme.primary:theme.primaryDarkAdvanced,
             flex:1,
-         
+
         }}>
                <View style={{flexDirection:'row',flex:1}}>
                 <Icon.Button name={"keyboard-backspace"}
                 color={"white"}
                 size={24}
-                backgroundColor={this.props.type===0?theme.primary:theme.primaryDarkAdvanced}
+                backgroundColor={this.props.navigation.state.params.type===0?theme.primary:theme.primaryDarkAdvanced}
                 onPress={()=>this.props.navigation.pop()}
                 />
 
                 </View>
             <View style={{ flex:4, justifyContent:'center',
             alignItems:'center'}} >
-           
+
             <Text
                 style={styles.TitlePassword}
             >
@@ -248,13 +250,14 @@ export default class ForgottenPassword extends Component{
 
     onRenitPassword() {
        if(this.state.phone.length>0){
-           if(this.props.type!==null){
-               let type=this.props.type===0?'user':'agent';
-               this.setState({isSending:true})
+           if(this.props.navigation.state.params.type!==null){
+               let type= this.props.navigation.state.params.type === 0 ? 'user' : 'agent';
+               console.log("Type user send", this.props.navigation.state.params.type);
+               this.setState({isSending:true});
                reinitpassword(this.state.indicatif+this.state.phone,type).then((data)=>{
 
                    this.setState({isSending:false})
-                 
+
                    if(data.error){
                        this.state.passRef.shake(1200);
 
diff --git a/webservice/AuthApi.js b/webservice/AuthApi.js
index 5c6607d8..01bf3a38 100644
--- a/webservice/AuthApi.js
+++ b/webservice/AuthApi.js
@@ -35,8 +35,8 @@ function queryAuth(data) {
      return timeout(50000, queryData(data, adhesionUrl))
 }
 async function queryData(data, url) {
-
-     data["lang"] = I18n.currentLocale()
+     console.warn("REQUEST BODY", JSON.stringify(data));
+     data["lang"] = I18n.currentLocale();
      data["isTest"] = isDebugMode
      let response = await fetch(url, {
           method: 'POST',
@@ -49,9 +49,10 @@ async function queryData(data, url) {
      let responseJson = null;
      let responseText = await response.text()
      try {
+          console.warn("SERVER RESPONSE SUCCESS",responseText);
           responseJson = JSON.parse(responseText)
      } catch (e) {
-          console.log(responseText)
+          console.warn("SERVER RESPONSE ERROR",responseText);
           return { "error": "error", "error_msg": responseText }
      }
      return responseJson;
diff --git a/webservice/IlinkConstants.js b/webservice/IlinkConstants.js
index ddeed37f..b31a3cc3 100644
--- a/webservice/IlinkConstants.js
+++ b/webservice/IlinkConstants.js
@@ -7,8 +7,8 @@ export const isDebugMode = false
 //export const baseUrl = "http://test.ilink-app.com:8080/mobilebackendtest";
 //const baseUrl = "https://ilink-app.com/mobilebackendtest2"
 
-export const baseUrl = "http://test.ilink-app.com:8080/mobilebackend";
-export const testBaseUrl = "https://test.ilink-app.com";
+export const baseUrl = " http://ilink-app.com:8082/mobilebackend";
+export const testBaseUrl = "http://ilink-app.com:8080";
 
 /* export const baseUrl = "https://preprod.ilink-app.com:8080/mobilebackend";
 export const testBaseUrl = "https://preprod.ilink-app.com"; */