From 8c651def82c0363c719ae03aa90557f283b35a8e Mon Sep 17 00:00:00 2001
From: GabrielTrettel <gabrielmtrettel@gmail.com>
Date: Wed, 30 Mar 2022 17:57:33 -0300
Subject: [PATCH] Enabling already logged-in user to change password.

---
 src/app/navigation/AccountNavigator.js    | 23 +++++++++++++++--------
 src/app/navigation/AuthNavigator.js       |  7 ++++---
 src/app/screens/AccountScreen.js          | 12 +++++++++++-
 src/app/screens/PasswordRecoveryScreen.js | 10 +++++++---
 4 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/app/navigation/AccountNavigator.js b/src/app/navigation/AccountNavigator.js
index a330fec..20a1c8e 100644
--- a/src/app/navigation/AccountNavigator.js
+++ b/src/app/navigation/AccountNavigator.js
@@ -9,6 +9,8 @@ import UpdatePassword from "../screens/UpdatePassword";
 import EditUserData from "../screens/EditUserData";
 import ActivateInstitutionCode from "../screens/ActivateInstitutionCode";
 import ActivateInstitutionShowCode from "../screens/ActivateInstitutionShowCode";
+import PasswordRecovery from "../screens/PasswordRecoveryScreen";
+import PasswordRecoveryChangePswd from "../screens/PasswordRecoveryChangePswdScreen";
 
 const Stack = createStackNavigator();
 
@@ -78,15 +80,20 @@ const AccountNavigator = () => (
       }}
     />
     <Stack.Screen
-      name="UpdatePassword"
-      component={UpdatePassword}
-      options={{
-        title: "",
-        headerStyle: {
-          backgroundColor: "white",
-        },
-      }}
+      name="PasswordRecovery"
+      component={PasswordRecovery}
+      initialParams={{ user : {} }}
+      options={{ headerTitle: "" }}
     />
+
+    <Stack.Screen
+      name="PasswordRecoveryChangePswd"
+      component={PasswordRecoveryChangePswd}
+      initialParams={{ authToken : "" }}
+      options={{ headerTitle: "" }}
+    />
+
+
     <Stack.Screen
       name="EditUserData"
       component={EditUserData}
diff --git a/src/app/navigation/AuthNavigator.js b/src/app/navigation/AuthNavigator.js
index 9ff86f4..74139dd 100644
--- a/src/app/navigation/AuthNavigator.js
+++ b/src/app/navigation/AuthNavigator.js
@@ -19,18 +19,19 @@ const AuthNavigator = () => (
     <Stack.Screen
       name="Register"
       component={RegisterScreen}
-      options={{ headerTitle: "" }} //headerStyle: {backgroundColor: colors.primary} }}
+      options={{ headerTitle: "" }}
     />
     <Stack.Screen
       name="UserAgreement"
       component={UserAgreement}
-      options={{ headerTitle: "" }} //headerStyle: {backgroundColor: colors.primary} }}
+      options={{ headerTitle: "" }}
     />
 
     <Stack.Screen
       name="PasswordRecovery"
       component={PasswordRecovery}
-      options={{ headerTitle: "" }} //headerStyle: {backgroundColor: colors.primary} }}
+      initialParams={{ user : {} }}
+      options={{ headerTitle: "" }}
     />
 
     <Stack.Screen
diff --git a/src/app/screens/AccountScreen.js b/src/app/screens/AccountScreen.js
index 04788ba..9f0b528 100644
--- a/src/app/screens/AccountScreen.js
+++ b/src/app/screens/AccountScreen.js
@@ -122,7 +122,16 @@ function AccountScreen(props) {
   }
 
 
-  const profileItems = [
+  const profileItems = [ 
+   {
+      icon: "lock",
+      show: true,
+      IconProvider: MaterialCommunityIcons,
+      title: "alterar senha",
+      onPress: () => {
+        props.navigation.navigate("PasswordRecovery", {user: user});
+      },
+    },
     {
       icon: "account",
       show: user.pluviometer != undefined,
@@ -160,6 +169,7 @@ function AccountScreen(props) {
         setShowLog(true);
       },
     },
+
     {
       icon: "login",
       show: !isRegistered,
diff --git a/src/app/screens/PasswordRecoveryScreen.js b/src/app/screens/PasswordRecoveryScreen.js
index aef112d..ff27596 100644
--- a/src/app/screens/PasswordRecoveryScreen.js
+++ b/src/app/screens/PasswordRecoveryScreen.js
@@ -65,7 +65,10 @@ const validationSchema = Yup.object().shape({
     .max(255),
 });
 
-export default function PasswordRecovery({ navigation }) {
+export default function PasswordRecovery({ navigation, route }) {
+  const user = route.params.user;
+  console.log(user)
+
   const [showLoading, setShowLoading] = useState(false);
   const [confirmatioModalData, setConfirmatioModalData] = useState({
     show: false,
@@ -142,7 +145,7 @@ export default function PasswordRecovery({ navigation }) {
       <Form
         validationSchema={validationSchema}
         initialValues={{
-          number: "",
+          number: user.username || "",
           answer: "",
           secQuestion: "",
         }}
@@ -163,7 +166,8 @@ export default function PasswordRecovery({ navigation }) {
           <PhoneNumberFormField
             name="number"
             maxLength={11}
-            placeholder="(DDD) XXXXX-XXXX"
+            placeholder={"(DDD) XXXXX-XXXX"}
+            editable={user.username == null}
           />
         </View>