fix: imports services

ctrlmais · Mar 31, 2022 · f942aed · f942aed
1 parent bb45291
commit f942aed
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 38 deletions.
diff --git a/src/hooks/useForgetPassword.tsx b/src/hooks/useForgetPassword.tsx
@@ -5,7 +5,8 @@ import { forgetPasswordSchema, resetPasswordSchema } from 'validations/ForgetPas
 
 import { useToast } from 'contexts/Toast';
 
-import { supabase } from 'services/supabase';
+import { resetPassword } from 'services/post/resetPassword';
+import { updatePassword } from 'services/update/password';
 
 export function useForgetPassword() {
   const navigate = useNavigate();
@@ -18,9 +19,7 @@ export function useForgetPassword() {
     validationSchema: forgetPasswordSchema,
     onSubmit: async (values) => {
       toast.loading('Enviando email...', { id: 'toast' });
-      const { error } = await supabase.auth.api.resetPasswordForEmail(values.email, {
-        redirectTo: 'http://localhost:3000/reset-password',
-      });
+      const { error } = await resetPassword(values.email);
 
       if (error) {
         toast.error(error.message, { id: 'toast' });
@@ -40,9 +39,7 @@ export function useForgetPassword() {
     validationSchema: resetPasswordSchema,
     onSubmit: async (values) => {
       toast.loading('Alterando senha...', { id: 'toast' });
-      const { error } = await supabase.auth.update({
-        password: values.senha,
-      });
+      const { error } = await updatePassword(values.senha);
 
       if (error) {
         toast.error(error.message, { id: 'toast' });

diff --git a/src/hooks/useProfile.tsx b/src/hooks/useProfile.tsx
@@ -7,7 +7,8 @@ import { useToast } from 'contexts/Toast';
 
 import { useAuth } from 'hooks/useAuth';
 
-import { supabase } from 'services/supabase';
+import { updateProfile } from 'services/update/profile';
+import { updateProfilePhoto } from 'services/update/profileAvatar';
 
 export function useProfile() {
   const { toast } = useToast();
@@ -27,18 +28,27 @@ export function useProfile() {
     validationSchema: profileSchema,
     onSubmit: async (values) => {
       setLoading(true);
-      const { user: userData, error } = await supabase.auth.update({
-        email: values.email,
-        password: values.password === '' ? undefined : values.newPassword,
-        data: { name: values.nome },
-      });
-
-      const { error: errorAvatar } = await supabase.rpc('upsert_profile_photo', {
-        p_user_id: user?.id,
-        p_src: values.avatar,
-      });
-
-      if (errorAvatar || error) {
+
+      const { user: userData, error } = await updateProfile(
+        values.email,
+        values.password,
+        values.newPassword,
+        values.nome,
+      );
+
+      if (!userData) return;
+
+      if (values.avatar !== '') {
+        const { error } = await updateProfilePhoto(userData.id, values.avatar);
+
+        if (error) {
+          toast.error(error.message, { id: 'toast' });
+          setLoading(false);
+          return;
+        }
+      }
+
+      if (error) {
         toast.error('Não foi possível atualizar perfil', { id: 'toast' });
         setLoading(false);
         return;

diff --git a/src/hooks/useRegister.tsx b/src/hooks/useRegister.tsx
@@ -8,7 +8,8 @@ import { useToast } from 'contexts/Toast';
 
 import { useAuth } from 'hooks/useAuth';
 
-import { supabase } from 'services/supabase';
+import { registerUser } from 'services/post/register';
+import { updateOcupacao } from 'services/update/ocupacao';
 
 export function useRegister() {
   const navigate = useNavigate();
@@ -31,18 +32,7 @@ export function useRegister() {
       try {
         setLoading(true);
 
-        const { error } = await supabase.auth.signUp(
-          {
-            email: values.email,
-            password: values.senha,
-          },
-          {
-            data: {
-              name: values.nome,
-              ocupacao: ocupacao,
-            },
-          },
-        );
+        const { error } = await registerUser(values.email, values.senha, values.nome, ocupacao);
 
         if (error) {
           toast.error(error.message, { id: 'toast' });
@@ -53,8 +43,10 @@ export function useRegister() {
 
         setStatus('success');
         setLoading(false);
-      } catch (error: any) {
-        toast.error(error?.message, { id: 'toast' });
+      } catch (error) {
+        const { message } = error as Error;
+
+        toast.error(message, { id: 'toast' });
         setStatus('error');
         setLoading(false);
       } finally {
@@ -71,9 +63,7 @@ export function useRegister() {
     },
     validationSchema: ocupacao ? '' : registerSchema,
     onSubmit: async (values) => {
-      const { error } = await supabase.auth.update({
-        data: { ocupacao: values.ocupacao },
-      });
+      const { error } = await updateOcupacao(values.ocupacao);
 
       if (error) {
         toast.error(error.message, { id: 'toast' });