diff --git a/src/app/api/auth.js b/src/app/api/auth.js
index 2e1ca13..6ccb946 100644
--- a/src/app/api/auth.js
+++ b/src/app/api/auth.js
@@ -1,5 +1,6 @@
import { create } from "apisauce";
import authClient from "../auth/authClient";
+import authStorage from "../auth/storage";
function login(name, password) {
return authClient.post(`/login?username=${name}&password=${password}`);
@@ -18,6 +19,7 @@ function signup({
secQuestion,
secQuestionAns,
consent,
+ role,
}) {
const body = {
username: number,
@@ -32,22 +34,37 @@ function signup({
securityquestion: secQuestion,
securityanswer: secQuestionAns,
termsofusage: consent,
- roles: ["ROLE_CLIENT"],
+ roles: role !== "" ? [role] : ["ROLE_CLIENT"],
};
- // Object.entries(body).forEach(([key, value]) => {
- // value == "" && delete body[key];
- // });
+ Object.entries(body).forEach(([key, value]) => {
+ value === "" && delete body[key];
+ });
return authClient.post(`/signup`, body);
}
-function userPersonalData(token) {
+
+async function userPersonalData() {
+ const authToken = await authStorage.getToken()
const localClient = create({
baseURL: "http://wpd.brazilsouth.cloudapp.azure.com:8080/users",
});
- localClient.setHeader("Authorization", `Bearer ${token}`);
+ localClient.setHeader("Authorization", `Bearer ${authToken}`);
return localClient.get(`/me`);
}
-export { login, signup, userPersonalData };
+
+async function userActivation(code) {
+ const { username } = await authStorage.getUser();
+ const authToken = await authStorage.getToken()
+
+ const localClient = create({
+ baseURL: "http://wpd.brazilsouth.cloudapp.azure.com:8080/users",
+ });
+ localClient.setHeader("Authorization", `Bearer ${authToken}`);
+
+ return localClient.post(`/activate?activationkey=${code}&username=${username}`);
+}
+
+export { login, signup, userPersonalData, userActivation };
diff --git a/src/app/screens/AccountScreen.js b/src/app/screens/AccountScreen.js
index e5a1c9f..a5cb40f 100644
--- a/src/app/screens/AccountScreen.js
+++ b/src/app/screens/AccountScreen.js
@@ -95,7 +95,7 @@ function AccountScreen(props) {
IconProvider: FontAwesome,
title: "ATIVAR INSTITUIÇÃO",
onPress: () => {
- props.navigation.navigate("ActivateInstitution");
+ props.navigation.navigate("ActivateInstitutionCode");
},
},
{
diff --git a/src/app/screens/ActivateInstitutionCode.js b/src/app/screens/ActivateInstitutionCode.js
index fdcc7ff..8511f67 100644
--- a/src/app/screens/ActivateInstitutionCode.js
+++ b/src/app/screens/ActivateInstitutionCode.js
@@ -7,8 +7,6 @@ import { MaterialCommunityIcons } from "@expo/vector-icons";
import { AuthContext } from "../auth/context";
import authStorage from "../auth/storage";
-
-
import {
Form,
SubmitButton,
@@ -17,7 +15,7 @@ import {
} from "../components/forms";
import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
import ConfirmationModal from "../components/ConfirmationModal";
-import {userPersonalData} from "../api/auth";
+import { userActivation } from "../api/auth";
function Header() {
return (
@@ -43,20 +41,27 @@ function Header() {
}
function Institution({ user, institutionRole }) {
- var institutionMap = {
+ const institutionMap = {
E: "Escola",
D: "Defesa Civil",
N: "Não governamental",
O: "Outra",
- N: "Nenhuma"
+ N: "Nenhuma",
};
-
+
+ const roleMap = {
+ ROLE_CLIENT: "Não responsável",
+ ROLE_INSTITUTION: "Responsável",
+ }
+
return (
Tippo de instituição:
- {institutionMap[user.institutiontype]}
+
+ {institutionMap[user.institutiontype]}
+
@@ -76,19 +81,24 @@ function Institution({ user, institutionRole }) {
size={30}
color={colors.primary}
/>
- {institutionRole}
+ {roleMap[user.role]}
);
}
-function ValidateCode({ institutionRole, user }) {
+// 950ebd56-7acc-4b45-9366-23a0f814f3f2
+
+// 1199990987
+
+function ValidateCode({ user }) {
return (
-
+
+ Código de ativação:
{
console.log("Forms values: \n" + JSON.stringify(form));
- processOnSubmit(navigation, form, instRole, setShowLog);
+ processOnSubmit(navigation, form, user.role, setShowLog);
}}
>
setShowLog(initialState)}
onDecline={() => setShowLog(initialState)}
/>
-
+
);
diff --git a/src/app/screens/LoginScreen.js b/src/app/screens/LoginScreen.js
index 5639cec..2eb2362 100644
--- a/src/app/screens/LoginScreen.js
+++ b/src/app/screens/LoginScreen.js
@@ -79,10 +79,10 @@ export default function LoginScreen(props) {
const result = await login(name, password);
if (!result.ok) return setLoginFailed(true);
- authStorage.setToken(result.data);
+ await authStorage.setToken(result.data);
setLoginFailed(false);
- const user = await userPersonalData(result.data);
+ const user = await userPersonalData();
user.ok && authContext.setUser(user.data);
};
diff --git a/src/app/screens/RegisterScreen.js b/src/app/screens/RegisterScreen.js
index 2fde494..d1b8414 100644
--- a/src/app/screens/RegisterScreen.js
+++ b/src/app/screens/RegisterScreen.js
@@ -51,6 +51,7 @@ const validationSchema = Yup.object().shape({
.required("A resposta da pergunta de segurança é obrigatória")
.max(255),
consent: Yup.bool().equals([true], "Este campo é obrigatório"),
+ role: Yup.string(),
});
function LocalDatePicker({ date, setDate, _moment }) {
@@ -218,6 +219,24 @@ function SecQuestionPicker({ name }) {
);
}
+function RolePicker({ name }) {
+ const [items, setItems] = useState([
+ { value: "ROLE_INSTITUTION", label: "Responsável" },
+ { value: "ROLE_CLIENT", label: "Não responsável" },
+ ]);
+
+ return (
+
+ );
+}
+
+
function MaterialCommunityIconsCustom({
name,
color = colors.primary,
@@ -249,7 +268,7 @@ export default function RegisterScreen(props) {
if (!result.ok) return;
authStorage.setToken(result.data);
- const user = await userPersonalData(result.data);
+ const user = await userPersonalData();
user.ok && authContext.setUser(user.data);
}
@@ -258,6 +277,8 @@ export default function RegisterScreen(props) {
const formDate = date.format("DD/MM/yyyy") === moment().format("DD/MM/yyyy") ? "" : date;
const result = await signup({...form, dateofborn: formDate})
+ console.log(result)
+
switch (result.status) {
case 200:
automaticLogin(form)
@@ -285,13 +306,12 @@ export default function RegisterScreen(props) {
institution: "",
secQuestion: "",
secQuestionAns: "",
+ role: "",
consent: false,
}}
onSubmit={(form) => {
comparePassword(form.password, form.confirmPassword);
handleSubmit(form)
- // console.log("cadastro ainda não implementado");
- // console.log("Forms values: \n" + JSON.stringify(form));
}}
validationSchema={validationSchema}
>
@@ -316,7 +336,7 @@ export default function RegisterScreen(props) {
+
+
+ Vínculo institucional:
+
+
+
+
+
+
+
Pergunta de segurança*: