fix: approved barber

ctrlmais · May 27, 2022 · 393f0ff · 393f0ff
1 parent f8657e2
commit 393f0ff
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/src/components/DropdownMenu/index.tsx b/src/components/DropdownMenu/index.tsx
@@ -10,7 +10,7 @@ import { useDropdown } from 'hooks/useDropdown';
 import styles from './DropdownMenu.module.scss';
 
 export function DropdownMenu() {
-  const { user, isAlexander, isBarbeiro, isBarbeiroAprroved } = useAuth();
+  const { user, isAlexander, isBarbeiro, isBarbeiroApproved } = useAuth();
   const { activeMenu, dropdownRef, calcHeight, menuHeight, photo } = useDropdown();
 
   return (
@@ -40,7 +40,7 @@ export function DropdownMenu() {
           </DropdownItem>
 
           {isAlexander && <DropdownItem link="/admin">Painel Admin</DropdownItem>}
-          {isBarbeiro && isBarbeiroAprroved && <DropdownItem link="/horarios">Atualizar horários</DropdownItem>}
+          {isBarbeiro && isBarbeiroApproved && <DropdownItem link="/horarios">Atualizar horários</DropdownItem>}
 
           <DropdownItem logout>Sair</DropdownItem>
         </div>

diff --git a/src/contexts/Auth.tsx b/src/contexts/Auth.tsx
@@ -56,12 +56,12 @@ export function AuthProvider({ children }: any) {
     return false;
   }
 
-  function isBarbeiroAprroved() {
-    if (approved === 'S') {
-      return true;
+  function isBarbeiroApproved() {
+    if (approved === '') {
+      return false;
     }
 
-    return false;
+    return true;
   }
 
   async function checkUser() {
@@ -117,7 +117,11 @@ export function AuthProvider({ children }: any) {
   }
 
   async function verificarStatusBarbeiro() {
-    const { data, status, error } = await getBarbeiro(user?.id || '', true);
+    const storagedUser = JSON.parse(localStorage.getItem('supabase.auth.token') || '{}');
+
+    const id = storagedUser?.currentSession?.user.id;
+
+    const { data, status, error } = await getBarbeiro(id, true);
 
     if (error) {
       switch (status) {
@@ -239,7 +243,7 @@ export function AuthProvider({ children }: any) {
         isBarbeiro: isBarbeiro(),
         isCliente: isCliente(),
         isAlexander: isAlexander(),
-        isBarbeiroAprroved: isBarbeiroAprroved(),
+        isBarbeiroApproved: isBarbeiroApproved(),
       }}
     >
       {children}

diff --git a/src/pages/Barbeiro/index.tsx b/src/pages/Barbeiro/index.tsx
@@ -20,7 +20,7 @@ import styles from './Barbeiro.module.scss';
 
 export function Barbeiro() {
   const navigate = useNavigate();
-  const { isBarbeiroAprroved } = useAuth();
+  const { isBarbeiroApproved } = useAuth();
   const {
     clientes,
     selectDay,
@@ -38,7 +38,7 @@ export function Barbeiro() {
 
   return (
     <div className={styles.containerBarbeiro}>
-      {isBarbeiroAprroved === false ? (
+      {isBarbeiroApproved === false ? (
         <div className={styles.containerAviso}>
           <h2 className={styles.titleHome}>
             Você ainda não foi aprovado para trabalhar como barbeiro.

diff --git a/src/types/IContext.tsx b/src/types/IContext.tsx
@@ -111,7 +111,7 @@ export interface AuthContextProps {
   isBarbeiro: boolean;
   isCliente: boolean;
   isAlexander: boolean;
-  isBarbeiroAprroved: boolean;
+  isBarbeiroApproved: boolean;
 }
 
 export interface FormikProps {